gentoo auto-resync : 25:01:2023 - 08:07:03

2021 files changed, 0 insertions, 44296 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
deleted file mode 100644
index 69c5c6f911ac..000000000000
--- a/dev-ros/Manifest.gz
+++ /dev/null
diff --git a/dev-ros/actionlib/Manifest b/dev-ros/actionlib/Manifest
deleted file mode 100644
index 3df85dd42e97..000000000000
--- a/dev-ros/actionlib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST actionlib-1.13.2.tar.gz 101040 BLAKE2B 3c48ea46a5a6f91ead92c49870415f2e3addfb21190066a9b7d3e639a1dbe50a696b1cd61dc31dcb92d25a8e5a283a5c6184848ea7270e709a43b444398e4077 SHA512 f6186c8cdff916c5a13e635322fb915867b15fe175da1e0916713e4f2fd3c8e60f59dabc9dd9b31e1f0dcf699118a00e5a2d60db4a15bc65a731ba7a956147d9
-EBUILD actionlib-1.13.2-r1.ebuild 894 BLAKE2B 949f844f810ba8ca6c40778185588b4eaf9005957abf76017aab0d8bc64f898bf1f2ed5a7d11228e56a557321af314e97dd11e802299936af578c8f5b022ed7b SHA512 85390cfc23540ba05f41e6dc4a55df7233acedea3da3ff9142ee049ff87df15dfe93ed68fe646d6df0f5e67dbe1184f8b37dda7785a2260bc0f9ee9979bb70ce
-EBUILD actionlib-9999.ebuild 894 BLAKE2B 949f844f810ba8ca6c40778185588b4eaf9005957abf76017aab0d8bc64f898bf1f2ed5a7d11228e56a557321af314e97dd11e802299936af578c8f5b022ed7b SHA512 85390cfc23540ba05f41e6dc4a55df7233acedea3da3ff9142ee049ff87df15dfe93ed68fe646d6df0f5e67dbe1184f8b37dda7785a2260bc0f9ee9979bb70ce
-MISC metadata.xml 328 BLAKE2B 0db0c6945c7d655ca5a9c98a842ebbedeb095e0eedfdc418b94ba484ce9b172d857e235efdbbc869f1ee086c05fc125e60ce3bb3e5faebda633d823429aa994f SHA512 7e0cf51c44c512cf8e7194e6133c7c029aa03aa746f442c61bde2f41e8777ffb568d07c2c650b416f0b75c5052be4730bd0ae74efb5f9c4abcbc4a6b8f17b99d
diff --git a/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild b/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
deleted file mode 100644
index 2249140310b3..000000000000
--- a/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/actionlib"
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/actionlib/actionlib-9999.ebuild b/dev-ros/actionlib/actionlib-9999.ebuild
deleted file mode 100644
index 2249140310b3..000000000000
--- a/dev-ros/actionlib/actionlib-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/actionlib"
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/actionlib/metadata.xml b/dev-ros/actionlib/metadata.xml
deleted file mode 100644
index 40ffb31055e3..000000000000
--- a/dev-ros/actionlib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/actionlib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/actionlib_msgs/Manifest b/dev-ros/actionlib_msgs/Manifest
deleted file mode 100644
index 44c5e8df7b6f..000000000000
--- a/dev-ros/actionlib_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD actionlib_msgs-1.13.0.ebuild 446 BLAKE2B 83a38172da3b6eebc908c1d776b2155cb88a2f22a0d31c7d97cb2e6c9cbb4dac96eee76dd0189bff1dfe3003482e8978c32f4fb478568bad8fb6967fc63dc0d8 SHA512 c5ac8309bf3f715e44820a0ec0ee604688e4657324238d88537aee5172598592afe75ff2c93364ef7e6f44a6c0c6fff828f6ed5879585723c80c0a4c68be2124
-EBUILD actionlib_msgs-1.13.1.ebuild 446 BLAKE2B b349778b181a56cf9906a96ce823c6bf13d382ac7059794d4303474599389c7b62ab8c9c1ced09c3c5b86bd94c295c9982bb68cc4ca3a05afba7d9b1490bd8cd SHA512 cafeb20d424b5614b55ddbe7e826aa1fbf119a1cb9a0502de72ed7d8dce279d81039a8ba9276d73a1983d221bee0933753dde1e9d860ea321a9291748539a787
-EBUILD actionlib_msgs-9999.ebuild 446 BLAKE2B 83a38172da3b6eebc908c1d776b2155cb88a2f22a0d31c7d97cb2e6c9cbb4dac96eee76dd0189bff1dfe3003482e8978c32f4fb478568bad8fb6967fc63dc0d8 SHA512 c5ac8309bf3f715e44820a0ec0ee604688e4657324238d88537aee5172598592afe75ff2c93364ef7e6f44a6c0c6fff828f6ed5879585723c80c0a4c68be2124
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild
deleted file mode 100644
index 727f06efdf91..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages to interact with an action server and an action client"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.13.1.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.13.1.ebuild
deleted file mode 100644
index 2d6359493164..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages to interact with an action server and an action client"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
deleted file mode 100644
index 727f06efdf91..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages to interact with an action server and an action client"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_msgs/metadata.xml b/dev-ros/actionlib_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/actionlib_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/actionlib_tools/Manifest b/dev-ros/actionlib_tools/Manifest
deleted file mode 100644
index 38ccb6192125..000000000000
--- a/dev-ros/actionlib_tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST actionlib-1.13.2.tar.gz 101040 BLAKE2B 3c48ea46a5a6f91ead92c49870415f2e3addfb21190066a9b7d3e639a1dbe50a696b1cd61dc31dcb92d25a8e5a283a5c6184848ea7270e709a43b444398e4077 SHA512 f6186c8cdff916c5a13e635322fb915867b15fe175da1e0916713e4f2fd3c8e60f59dabc9dd9b31e1f0dcf699118a00e5a2d60db4a15bc65a731ba7a956147d9
-EBUILD actionlib_tools-1.13.2.ebuild 677 BLAKE2B f439ab8829e7b57388f65a3726907b558328008da72836224856d84496335f45ac88f7dc738df2e67bf2fed8dbc872a26d2ddf847f4b70397ab81df5abbdd88d SHA512 11d358644dd25cc66580cf5a15dd48abc3c36a978c943a5cc377274a8b713f02da30818e81f0e5b6a0c49bd1dbd7e732eb9bae1ce643a702e01bb0ecada8bd40
-EBUILD actionlib_tools-9999.ebuild 677 BLAKE2B f439ab8829e7b57388f65a3726907b558328008da72836224856d84496335f45ac88f7dc738df2e67bf2fed8dbc872a26d2ddf847f4b70397ab81df5abbdd88d SHA512 11d358644dd25cc66580cf5a15dd48abc3c36a978c943a5cc377274a8b713f02da30818e81f0e5b6a0c49bd1dbd7e732eb9bae1ce643a702e01bb0ecada8bd40
-MISC metadata.xml 328 BLAKE2B 0db0c6945c7d655ca5a9c98a842ebbedeb095e0eedfdc418b94ba484ce9b172d857e235efdbbc869f1ee086c05fc125e60ce3bb3e5faebda633d823429aa994f SHA512 7e0cf51c44c512cf8e7194e6133c7c029aa03aa746f442c61bde2f41e8777ffb568d07c2c650b416f0b75c5052be4730bd0ae74efb5f9c4abcbc4a6b8f17b99d
diff --git a/dev-ros/actionlib_tools/actionlib_tools-1.13.2.ebuild b/dev-ros/actionlib_tools/actionlib_tools-1.13.2.ebuild
deleted file mode 100644
index 6b5f4f44952f..000000000000
--- a/dev-ros/actionlib_tools/actionlib_tools-1.13.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/actionlib"
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for dealing with actionlib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
diff --git a/dev-ros/actionlib_tools/actionlib_tools-9999.ebuild b/dev-ros/actionlib_tools/actionlib_tools-9999.ebuild
deleted file mode 100644
index 6b5f4f44952f..000000000000
--- a/dev-ros/actionlib_tools/actionlib_tools-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/actionlib"
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for dealing with actionlib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
diff --git a/dev-ros/actionlib_tools/metadata.xml b/dev-ros/actionlib_tools/metadata.xml
deleted file mode 100644
index 40ffb31055e3..000000000000
--- a/dev-ros/actionlib_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/actionlib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/actionlib_tutorials/Manifest b/dev-ros/actionlib_tutorials/Manifest
deleted file mode 100644
index f41e18706f77..000000000000
--- a/dev-ros/actionlib_tutorials/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_tutorials-0.1.12.tar.gz 12609 BLAKE2B c570236517420685a4733d84694a03486798038f4b7a0e721179d602a6870b51afb558dedd64ed2ccf518bb0e37cccefcae701053eb4c5fe32ef3e2d5dc5d69b SHA512 37244290b0c84aff47172484e2f3c1eecfe3482856030a08e55f2d1b0cad903262be453e81780f58e250c4e1f24c06f6256da5ff1342617d7d5f501f38fc7527
-DIST common_tutorials-0.2.0.tar.gz 12624 BLAKE2B 051e8e980e23dc2ecac2bfb534a8d820b2d2ee3d84b7e42e7ebc538e82560a7ea7e84972a6d6ab5f0c441eba7cf8c7aa2b3b5aced00f73ffc0f0537a3df0c547 SHA512 a3f537199c3ed143ef6c44edaf3fe427374027ed33478f9d440adc62697ace7e69c09cc5b5cacc76d2062eabc32138cbb08314dfd3d4af6f45f0147cb39bf2d9
-EBUILD actionlib_tutorials-0.1.12-r1.ebuild 472 BLAKE2B 592037111ca49e59cd618eb2baed79c93c1d0a36d1533fb1b8efde00a8a98f20d8578688cd1f1067da43008988b2541f41298ea5af705be96aaf8ea3fb7d5308 SHA512 bc905708e28154cccfe7a0bf8043e23747ad6550e13078589920773f8443bbb3ebceb045e07dfefdc48e75d47dce388ed9010890ca1656438267585f5392aba5
-EBUILD actionlib_tutorials-0.2.0-r1.ebuild 472 BLAKE2B 592037111ca49e59cd618eb2baed79c93c1d0a36d1533fb1b8efde00a8a98f20d8578688cd1f1067da43008988b2541f41298ea5af705be96aaf8ea3fb7d5308 SHA512 bc905708e28154cccfe7a0bf8043e23747ad6550e13078589920773f8443bbb3ebceb045e07dfefdc48e75d47dce388ed9010890ca1656438267585f5392aba5
-EBUILD actionlib_tutorials-9999.ebuild 472 BLAKE2B 592037111ca49e59cd618eb2baed79c93c1d0a36d1533fb1b8efde00a8a98f20d8578688cd1f1067da43008988b2541f41298ea5af705be96aaf8ea3fb7d5308 SHA512 bc905708e28154cccfe7a0bf8043e23747ad6550e13078589920773f8443bbb3ebceb045e07dfefdc48e75d47dce388ed9010890ca1656438267585f5392aba5
-MISC metadata.xml 335 BLAKE2B a0188a143e0644b95b351037361ac43ba5392f4b919132542a72b35240697f665230056bdbcbb7ac72aaa83ad927d7dc6a476102a07ad0ccb321ba4f757b712c SHA512 e6e7a5d1e1ca928bcd3e14aa935369bd95f3d54811bde7df12e5878cd489a9d12b0f36c6294768e62286fdefd65109f100a46b7f10a4cc1cc2515b95733af841
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12-r1.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12-r1.ebuild
deleted file mode 100644
index 6879ca33529f..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Actionlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/actionlib
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.2.0-r1.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.2.0-r1.ebuild
deleted file mode 100644
index 6879ca33529f..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Actionlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/actionlib
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
deleted file mode 100644
index 6879ca33529f..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Actionlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/actionlib
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/metadata.xml b/dev-ros/actionlib_tutorials/metadata.xml
deleted file mode 100644
index 18730473acf0..000000000000
--- a/dev-ros/actionlib_tutorials/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest
deleted file mode 100644
index 7fd7ed6edb14..000000000000
--- a/dev-ros/amcl/Manifest
+++ /dev/null
@@ -1,34 +0,0 @@
-AUX cmake.patch 331 BLAKE2B 473d4915af835a5f374eddf6d24d8bb003b02aaabc43119fa1d4eb53ecc640ca0225d0be0a03f811414b729344d1218b264231b27cb77480ec613283b03db6b8 SHA512 c2bd6bf44eedf69c03de172b88d9b9471a78b7176d6a5d4db18564986780c9c05ce9d74a65ded689fe1480d2094a2c16feffe27f7797224f6f43d019a806c327
-DIST amcl-1.17.0-basic_localization_stage_indexed.bag 1168671 BLAKE2B 487e378ca985a011aca7aec07dda82859724625ae5f5b522902db91fdc2d63e69d2a031c41287c92867acbcf58d6c0016fd78397c4c78a974d0d86bc5729deef SHA512 2352cbe391a3fd36f325e3a0dc3b343dda8b7cbe21bd55a2c02fc5aed4dd1c187b4cb91ab289a53e52d19f790b3bbc2544781ee5cc1bf1fa8ef4ecd18d4a068f
-DIST amcl-1.17.0-global_localization_stage_indexed.bag 293838 BLAKE2B 29245f1603cd25b06345f3d9144170e2e661dac63ecb3649f70a9849e71f4568bc409ab9fc519895c653146a13c116b6eabf01689b329826673230e0faadf297 SHA512 7e9ebcb34917d3960dfbe3da1d363d53d527c9006ff3c62e05faadcbec4ba9599cb5704c7f55f04ddd5613d78f2e1be72ed78473786c98c8842f93844fc1d99f
-DIST amcl-1.17.0-rosie_localization_stage.bag 3544355 BLAKE2B 8c48d0222c51d11ad759ad217bc6896aed73e4c11ddf071dfb7287247fedfaf99a6f55ac8b2e0531c4444b11bbe1b98e9de0900008e02e652ce1328920aefeab SHA512 11dd7a3e410e4903cd50b73b3954f002f366eeed0376bd3930a59677f3a7c1523bcaeccbd596961dcacfd43747668df7e11b124db4fe7cb0f02dae89a5b873a4
-DIST amcl-1.17.0-small_loop_crazy_driving_prg_indexed.bag 11950050 BLAKE2B 4e9e5f822629ed8cd0b6e3f8f8335550edc458f10ac9d230b4dd691df6d76abeb39d5742d783ae1d2d404487eb9db17f90fe2be539b54b444a67927593679214 SHA512 c961cea0cfd5cc087ab91844f53f5d98509dd56fec5a257079c9f7b52236db5c6dafbe68035a42b91c0a99ec94fce23caf8e3c660ed609a89d7cba6c03a66fea
-DIST amcl-1.17.0-small_loop_prf_indexed.bag 8738741 BLAKE2B f28afe9c9fadd9998b61b9dc1e0bac4fe8c322a6e37d0f4195ef0f13e16fb13a78ebe9ad70d38fd979d1779c1d6117a05c376dcfc093fb2bf1252aa3437ea518 SHA512 039a4deb5533190d5502e02bd272188374d77d5e983116db80d87092a8a3c7bd1a81b9967e574c3362ab580eefceea8cdd5d8729d92a9f7c31a2b3b5eaf11a08
-DIST amcl-1.17.0-texas_greenroom_loop_indexed.bag 1793411 BLAKE2B 05f5d9e7882f020ef22b8f0aa75be158af57493c2ba0ed0cf4463a4de0f3b1cf705613779c82b8743260ce3b3800750240eed982d75a72058398e7370441d424 SHA512 ab83fcdfb673d605e0bddba659aa9e72fd1c1f360bf0b0bd916a13a015b893f78967cca2f33cf856574fdd7dddb86ff60f41b0a36addb77ac0e8ac5c60ce1d1a
-DIST amcl-1.17.0-texas_willow_hallway_loop_indexed.bag 4737937 BLAKE2B e22fe392aa5f8b393ad2a19ee95a5612f462935981278f3e6b2f0ee3ecb0ce31b02e19d342f1166abf0bcdb72c42df7482527e86e1e3dfcd65a7efdca6bb9d3a SHA512 69cdbf6542274f25988b44fda6a5b40a905d1b9e08ad6603ccb2e3fbdf2ea6d5a8b88519856e4d04adc39c2776862d6b666c776073e562f9ae0614bc897dab3c
-DIST amcl-1.17.0-willow-full-0.05.pgm 1100980 BLAKE2B 77a0295277a86679873d8788ef37161b3847ed05e385ddad2849c06c387326a1660aa98f384420a20e40f85c2ad7a221481c07944e6d47c7d6c70918140a5cb9 SHA512 88385ca1bfe4d1b1f66a1d81beb2fc31dd48e16547156a8ee5390aed37c6407b163441b0616b5a9bbab51d42dca67ecfbd5fafbd2ba1e0150d3d2e88c6f76f02
-DIST amcl-1.17.0-willow-full.pgm 307244 BLAKE2B 6e9c02275664bf6dca4cdd5990094452131672835a5cef8a7fdc382c6426791e57ecdf2dd73dee29a1ddc0caf751990c659e7a0d2f4aa7263e6fa37c12c43d04 SHA512 471c0aecf1dd32340f7df09121bf39564fab8a330f56b72e37d322e64a160dfa9099405688ec37b08340c148fda6c46ca302355f0d118cfcdb74a36de78c127d
-DIST amcl-1.17.1-basic_localization_stage_indexed.bag 1168671 BLAKE2B 487e378ca985a011aca7aec07dda82859724625ae5f5b522902db91fdc2d63e69d2a031c41287c92867acbcf58d6c0016fd78397c4c78a974d0d86bc5729deef SHA512 2352cbe391a3fd36f325e3a0dc3b343dda8b7cbe21bd55a2c02fc5aed4dd1c187b4cb91ab289a53e52d19f790b3bbc2544781ee5cc1bf1fa8ef4ecd18d4a068f
-DIST amcl-1.17.1-global_localization_stage_indexed.bag 293838 BLAKE2B 29245f1603cd25b06345f3d9144170e2e661dac63ecb3649f70a9849e71f4568bc409ab9fc519895c653146a13c116b6eabf01689b329826673230e0faadf297 SHA512 7e9ebcb34917d3960dfbe3da1d363d53d527c9006ff3c62e05faadcbec4ba9599cb5704c7f55f04ddd5613d78f2e1be72ed78473786c98c8842f93844fc1d99f
-DIST amcl-1.17.1-rosie_localization_stage.bag 3544355 BLAKE2B 8c48d0222c51d11ad759ad217bc6896aed73e4c11ddf071dfb7287247fedfaf99a6f55ac8b2e0531c4444b11bbe1b98e9de0900008e02e652ce1328920aefeab SHA512 11dd7a3e410e4903cd50b73b3954f002f366eeed0376bd3930a59677f3a7c1523bcaeccbd596961dcacfd43747668df7e11b124db4fe7cb0f02dae89a5b873a4
-DIST amcl-1.17.1-small_loop_crazy_driving_prg_indexed.bag 11950050 BLAKE2B 4e9e5f822629ed8cd0b6e3f8f8335550edc458f10ac9d230b4dd691df6d76abeb39d5742d783ae1d2d404487eb9db17f90fe2be539b54b444a67927593679214 SHA512 c961cea0cfd5cc087ab91844f53f5d98509dd56fec5a257079c9f7b52236db5c6dafbe68035a42b91c0a99ec94fce23caf8e3c660ed609a89d7cba6c03a66fea
-DIST amcl-1.17.1-small_loop_prf_indexed.bag 8738741 BLAKE2B f28afe9c9fadd9998b61b9dc1e0bac4fe8c322a6e37d0f4195ef0f13e16fb13a78ebe9ad70d38fd979d1779c1d6117a05c376dcfc093fb2bf1252aa3437ea518 SHA512 039a4deb5533190d5502e02bd272188374d77d5e983116db80d87092a8a3c7bd1a81b9967e574c3362ab580eefceea8cdd5d8729d92a9f7c31a2b3b5eaf11a08
-DIST amcl-1.17.1-texas_greenroom_loop_indexed.bag 1793411 BLAKE2B 05f5d9e7882f020ef22b8f0aa75be158af57493c2ba0ed0cf4463a4de0f3b1cf705613779c82b8743260ce3b3800750240eed982d75a72058398e7370441d424 SHA512 ab83fcdfb673d605e0bddba659aa9e72fd1c1f360bf0b0bd916a13a015b893f78967cca2f33cf856574fdd7dddb86ff60f41b0a36addb77ac0e8ac5c60ce1d1a
-DIST amcl-1.17.1-texas_willow_hallway_loop_indexed.bag 4737937 BLAKE2B e22fe392aa5f8b393ad2a19ee95a5612f462935981278f3e6b2f0ee3ecb0ce31b02e19d342f1166abf0bcdb72c42df7482527e86e1e3dfcd65a7efdca6bb9d3a SHA512 69cdbf6542274f25988b44fda6a5b40a905d1b9e08ad6603ccb2e3fbdf2ea6d5a8b88519856e4d04adc39c2776862d6b666c776073e562f9ae0614bc897dab3c
-DIST amcl-1.17.1-willow-full-0.05.pgm 1100980 BLAKE2B 77a0295277a86679873d8788ef37161b3847ed05e385ddad2849c06c387326a1660aa98f384420a20e40f85c2ad7a221481c07944e6d47c7d6c70918140a5cb9 SHA512 88385ca1bfe4d1b1f66a1d81beb2fc31dd48e16547156a8ee5390aed37c6407b163441b0616b5a9bbab51d42dca67ecfbd5fafbd2ba1e0150d3d2e88c6f76f02
-DIST amcl-1.17.1-willow-full.pgm 307244 BLAKE2B 6e9c02275664bf6dca4cdd5990094452131672835a5cef8a7fdc382c6426791e57ecdf2dd73dee29a1ddc0caf751990c659e7a0d2f4aa7263e6fa37c12c43d04 SHA512 471c0aecf1dd32340f7df09121bf39564fab8a330f56b72e37d322e64a160dfa9099405688ec37b08340c148fda6c46ca302355f0d118cfcdb74a36de78c127d
-DIST amcl-9999-basic_localization_stage_indexed.bag 1168671 BLAKE2B 487e378ca985a011aca7aec07dda82859724625ae5f5b522902db91fdc2d63e69d2a031c41287c92867acbcf58d6c0016fd78397c4c78a974d0d86bc5729deef SHA512 2352cbe391a3fd36f325e3a0dc3b343dda8b7cbe21bd55a2c02fc5aed4dd1c187b4cb91ab289a53e52d19f790b3bbc2544781ee5cc1bf1fa8ef4ecd18d4a068f
-DIST amcl-9999-global_localization_stage_indexed.bag 293838 BLAKE2B 29245f1603cd25b06345f3d9144170e2e661dac63ecb3649f70a9849e71f4568bc409ab9fc519895c653146a13c116b6eabf01689b329826673230e0faadf297 SHA512 7e9ebcb34917d3960dfbe3da1d363d53d527c9006ff3c62e05faadcbec4ba9599cb5704c7f55f04ddd5613d78f2e1be72ed78473786c98c8842f93844fc1d99f
-DIST amcl-9999-rosie_localization_stage.bag 3544355 BLAKE2B 8c48d0222c51d11ad759ad217bc6896aed73e4c11ddf071dfb7287247fedfaf99a6f55ac8b2e0531c4444b11bbe1b98e9de0900008e02e652ce1328920aefeab SHA512 11dd7a3e410e4903cd50b73b3954f002f366eeed0376bd3930a59677f3a7c1523bcaeccbd596961dcacfd43747668df7e11b124db4fe7cb0f02dae89a5b873a4
-DIST amcl-9999-small_loop_crazy_driving_prg_indexed.bag 11950050 BLAKE2B 4e9e5f822629ed8cd0b6e3f8f8335550edc458f10ac9d230b4dd691df6d76abeb39d5742d783ae1d2d404487eb9db17f90fe2be539b54b444a67927593679214 SHA512 c961cea0cfd5cc087ab91844f53f5d98509dd56fec5a257079c9f7b52236db5c6dafbe68035a42b91c0a99ec94fce23caf8e3c660ed609a89d7cba6c03a66fea
-DIST amcl-9999-small_loop_prf_indexed.bag 8738741 BLAKE2B f28afe9c9fadd9998b61b9dc1e0bac4fe8c322a6e37d0f4195ef0f13e16fb13a78ebe9ad70d38fd979d1779c1d6117a05c376dcfc093fb2bf1252aa3437ea518 SHA512 039a4deb5533190d5502e02bd272188374d77d5e983116db80d87092a8a3c7bd1a81b9967e574c3362ab580eefceea8cdd5d8729d92a9f7c31a2b3b5eaf11a08
-DIST amcl-9999-texas_greenroom_loop_indexed.bag 1793411 BLAKE2B 05f5d9e7882f020ef22b8f0aa75be158af57493c2ba0ed0cf4463a4de0f3b1cf705613779c82b8743260ce3b3800750240eed982d75a72058398e7370441d424 SHA512 ab83fcdfb673d605e0bddba659aa9e72fd1c1f360bf0b0bd916a13a015b893f78967cca2f33cf856574fdd7dddb86ff60f41b0a36addb77ac0e8ac5c60ce1d1a
-DIST amcl-9999-texas_willow_hallway_loop_indexed.bag 4737937 BLAKE2B e22fe392aa5f8b393ad2a19ee95a5612f462935981278f3e6b2f0ee3ecb0ce31b02e19d342f1166abf0bcdb72c42df7482527e86e1e3dfcd65a7efdca6bb9d3a SHA512 69cdbf6542274f25988b44fda6a5b40a905d1b9e08ad6603ccb2e3fbdf2ea6d5a8b88519856e4d04adc39c2776862d6b666c776073e562f9ae0614bc897dab3c
-DIST amcl-9999-willow-full-0.05.pgm 1100980 BLAKE2B 77a0295277a86679873d8788ef37161b3847ed05e385ddad2849c06c387326a1660aa98f384420a20e40f85c2ad7a221481c07944e6d47c7d6c70918140a5cb9 SHA512 88385ca1bfe4d1b1f66a1d81beb2fc31dd48e16547156a8ee5390aed37c6407b163441b0616b5a9bbab51d42dca67ecfbd5fafbd2ba1e0150d3d2e88c6f76f02
-DIST amcl-9999-willow-full.pgm 307244 BLAKE2B 6e9c02275664bf6dca4cdd5990094452131672835a5cef8a7fdc382c6426791e57ecdf2dd73dee29a1ddc0caf751990c659e7a0d2f4aa7263e6fa37c12c43d04 SHA512 471c0aecf1dd32340f7df09121bf39564fab8a330f56b72e37d322e64a160dfa9099405688ec37b08340c148fda6c46ca302355f0d118cfcdb74a36de78c127d
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD amcl-1.17.0.ebuild 1811 BLAKE2B 90e0627d3836a5a6049744084dfc59ea5176fd1ccbb5888d1c35665f9b8b7ab7054034dfbd2b2ea3209524973be65483cefca3cca77082f52838c2413cd8e714 SHA512 36db15257621e9700a745ac15d816d8b798e6d751d506e1f093cd3047a56d77f2cafc0acf2999da22d3534a790c4a642ca06be0935b81b00c8d493f9be775249
-EBUILD amcl-1.17.1.ebuild 1811 BLAKE2B 90e0627d3836a5a6049744084dfc59ea5176fd1ccbb5888d1c35665f9b8b7ab7054034dfbd2b2ea3209524973be65483cefca3cca77082f52838c2413cd8e714 SHA512 36db15257621e9700a745ac15d816d8b798e6d751d506e1f093cd3047a56d77f2cafc0acf2999da22d3534a790c4a642ca06be0935b81b00c8d493f9be775249
-EBUILD amcl-9999.ebuild 1811 BLAKE2B 90e0627d3836a5a6049744084dfc59ea5176fd1ccbb5888d1c35665f9b8b7ab7054034dfbd2b2ea3209524973be65483cefca3cca77082f52838c2413cd8e714 SHA512 36db15257621e9700a745ac15d816d8b798e6d751d506e1f093cd3047a56d77f2cafc0acf2999da22d3534a790c4a642ca06be0935b81b00c8d493f9be775249
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/amcl/amcl-1.17.0.ebuild b/dev-ros/amcl/amcl-1.17.0.ebuild
deleted file mode 100644
index a871a83d6448..000000000000
--- a/dev-ros/amcl/amcl-1.17.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-TEST_DATA="
-basic_localization_stage_indexed.bag
-global_localization_stage_indexed.bag
-small_loop_prf_indexed.bag
-small_loop_crazy_driving_prg_indexed.bag
-texas_greenroom_loop_indexed.bag
-texas_willow_hallway_loop_indexed.bag
-rosie_localization_stage.bag
-willow-full.pgm
-willow-full-0.05.pgm
-"
-
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/amcl/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/rosbag
-		dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-		dev-ros/map_server[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/cmake.patch" )
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${TEST_DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/amcl#file://${S}#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/amcl/amcl-1.17.1.ebuild b/dev-ros/amcl/amcl-1.17.1.ebuild
deleted file mode 100644
index a871a83d6448..000000000000
--- a/dev-ros/amcl/amcl-1.17.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-TEST_DATA="
-basic_localization_stage_indexed.bag
-global_localization_stage_indexed.bag
-small_loop_prf_indexed.bag
-small_loop_crazy_driving_prg_indexed.bag
-texas_greenroom_loop_indexed.bag
-texas_willow_hallway_loop_indexed.bag
-rosie_localization_stage.bag
-willow-full.pgm
-willow-full-0.05.pgm
-"
-
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/amcl/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/rosbag
-		dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-		dev-ros/map_server[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/cmake.patch" )
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${TEST_DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/amcl#file://${S}#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/amcl/amcl-9999.ebuild b/dev-ros/amcl/amcl-9999.ebuild
deleted file mode 100644
index a871a83d6448..000000000000
--- a/dev-ros/amcl/amcl-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-TEST_DATA="
-basic_localization_stage_indexed.bag
-global_localization_stage_indexed.bag
-small_loop_prf_indexed.bag
-small_loop_crazy_driving_prg_indexed.bag
-texas_greenroom_loop_indexed.bag
-texas_willow_hallway_loop_indexed.bag
-rosie_localization_stage.bag
-willow-full.pgm
-willow-full-0.05.pgm
-"
-
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/amcl/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/rosbag
-		dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-		dev-ros/map_server[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/cmake.patch" )
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${TEST_DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/amcl#file://${S}#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/amcl/files/cmake.patch b/dev-ros/amcl/files/cmake.patch
deleted file mode 100644
index da31fe79331d..000000000000
--- a/dev-ros/amcl/files/cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: amcl/CMakeLists.txt
-===================================================================
---- amcl.orig/CMakeLists.txt
-+++ amcl/CMakeLists.txt
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 3.1)
- project(amcl)
-+include(CheckSymbolExists)
-+include(CheckIncludeFile)
- 
- if(NOT CMAKE_CXX_STANDARD)
-   set(CMAKE_CXX_STANDARD 11)
diff --git a/dev-ros/amcl/metadata.xml b/dev-ros/amcl/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/amcl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
deleted file mode 100644
index 9cae9c427d61..000000000000
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_copyright-0.11.2.ebuild 1568 BLAKE2B 243d676367c8537715871917090df14b7cde209350d70171c9041331f68c502fc58385072d958cd5e00f51c4c55e6605a9a848dc661d622e5577e1b81052bb90 SHA512 5d6ebf3f981232e43672677d1ca7f7501683bf0ae908401c7259b003e35987be4fbc8496d90f9cf472361f530677f92a330c9fa47653a500173cd469fee1b31a
-EBUILD ament_cmake_copyright-0.12.1.ebuild 1568 BLAKE2B 243d676367c8537715871917090df14b7cde209350d70171c9041331f68c502fc58385072d958cd5e00f51c4c55e6605a9a848dc661d622e5577e1b81052bb90 SHA512 5d6ebf3f981232e43672677d1ca7f7501683bf0ae908401c7259b003e35987be4fbc8496d90f9cf472361f530677f92a330c9fa47653a500173cd469fee1b31a
-EBUILD ament_cmake_copyright-9999.ebuild 1568 BLAKE2B 243d676367c8537715871917090df14b7cde209350d70171c9041331f68c502fc58385072d958cd5e00f51c4c55e6605a9a848dc661d622e5577e1b81052bb90 SHA512 5d6ebf3f981232e43672677d1ca7f7501683bf0ae908401c7259b003e35987be4fbc8496d90f9cf472361f530677f92a330c9fa47653a500173cd469fee1b31a
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
deleted file mode 100644
index 22dd813497a3..000000000000
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_copyright
-	dev-ros/ament_cmake_test
-"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_test
-	dev-ros/ament_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
deleted file mode 100644
index 22dd813497a3..000000000000
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_copyright
-	dev-ros/ament_cmake_test
-"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_test
-	dev-ros/ament_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
deleted file mode 100644
index 22dd813497a3..000000000000
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_copyright
-	dev-ros/ament_cmake_test
-"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_test
-	dev-ros/ament_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_copyright/metadata.xml b/dev-ros/ament_cmake_copyright/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_cmake_copyright/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
deleted file mode 100644
index 2f6b9aa6c636..000000000000
--- a/dev-ros/ament_cmake_core/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX findpython.patch 543 BLAKE2B b5124bbbfdd97548aaf61bc5c0693bbd230a253302054103b83ae3136c4152f1b692b92a275dcb64713e1baaa0478a65a78a3e3bab9b8668fb14bf5e2c55ffac SHA512 1bd15b358230d43e7556536550287fa3b1e1eaf73fc852986ae7cec82bb13d883f08ac08b89de327465a76a0acdb94a1b09b4a80c4285f85224a2411ab712799
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_core-1.1.4.ebuild 1050 BLAKE2B 9cdb85b742bfd5368ca2f571d3eeb6b200ba11bbecef7789ab56edd0cf1b78d342bd92d050fce11ffb3b958874d126e9505d09b49d9c83a20bb87e33945931ad SHA512 06157304f0ac6ec68f755bbcd84b8bd6c3a2535beb462c0014e75097d5a7a81aecac7be0031b9320f4d6ac38a55de670ccc1650678687bda880ca36a71b46fd7
-EBUILD ament_cmake_core-1.3.0-r1.ebuild 1093 BLAKE2B 247716ee9425832ed61aeabc4c60e1c5eb198fd0228737838b0d5cbc0fbd85cc7f0cecd56fd8accc0b6cafbe4dbba2d568746874c8bfd242e9f38a37cae3a601 SHA512 40a33d37910f0a86407468d2c30a293a80816aa7f7b30d08fdc663ad166d23d6dedc9e45b7b94f84ff2a2f7aa1b2c63012c1954d3dd57802350c057c2fabf385
-EBUILD ament_cmake_core-1.3.0.ebuild 1050 BLAKE2B 9cdb85b742bfd5368ca2f571d3eeb6b200ba11bbecef7789ab56edd0cf1b78d342bd92d050fce11ffb3b958874d126e9505d09b49d9c83a20bb87e33945931ad SHA512 06157304f0ac6ec68f755bbcd84b8bd6c3a2535beb462c0014e75097d5a7a81aecac7be0031b9320f4d6ac38a55de670ccc1650678687bda880ca36a71b46fd7
-EBUILD ament_cmake_core-9999.ebuild 1093 BLAKE2B 247716ee9425832ed61aeabc4c60e1c5eb198fd0228737838b0d5cbc0fbd85cc7f0cecd56fd8accc0b6cafbe4dbba2d568746874c8bfd242e9f38a37cae3a601 SHA512 40a33d37910f0a86407468d2c30a293a80816aa7f7b30d08fdc663ad166d23d6dedc9e45b7b94f84ff2a2f7aa1b2c63012c1954d3dd57802350c057c2fabf385
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
deleted file mode 100644
index 691c18e12a79..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The core of the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-python/ament_package
-	dev-python/catkin_pkg
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
deleted file mode 100644
index 84ad884f486b..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The core of the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-PATCHES=( "${FILESDIR}/findpython.patch" )
-
-RDEPEND="
-	dev-python/ament_package
-	dev-python/catkin_pkg
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
deleted file mode 100644
index 691c18e12a79..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The core of the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-python/ament_package
-	dev-python/catkin_pkg
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
deleted file mode 100644
index 84ad884f486b..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The core of the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-PATCHES=( "${FILESDIR}/findpython.patch" )
-
-RDEPEND="
-	dev-python/ament_package
-	dev-python/catkin_pkg
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_core/files/findpython.patch b/dev-ros/ament_cmake_core/files/findpython.patch
deleted file mode 100644
index 790b0631b82c..000000000000
--- a/dev-ros/ament_cmake_core/files/findpython.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: ament_cmake_core/cmake/core/python.cmake
-===================================================================
---- ament_cmake_core.orig/cmake/core/python.cmake
-+++ ament_cmake_core/cmake/core/python.cmake
-@@ -17,6 +17,10 @@
- # Example:
- #   find_package(Python3 3.8 REQUIRED)
- #   find_package(ament_cmake REQUIRED)
-+ 
-+if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+  set(Python3_FIND_UNVERSIONED_NAMES FIRST)
-+endif()
- if(NOT TARGET Python3::Interpreter)
-   find_package(Python3 REQUIRED COMPONENTS Interpreter)
- endif()
diff --git a/dev-ros/ament_cmake_core/metadata.xml b/dev-ros/ament_cmake_core/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
deleted file mode 100644
index 06c38d29b886..000000000000
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1448 BLAKE2B 800c1f59bb9739026fbe383b1a3f2fc459a2d5485837a8b3074e324a30f07bfc30c37e843f260e2c6608196686496c76bad146022280eab0f71bf7cb360d2018 SHA512 822731a52bc303a21c5e8e00d4d07fd21ce84fb51baaa9402fd62e8600e77a976190fc018a53fd0ee2f74ae785bd3d9871f01cbe00ab2999b99b7d1022b729c1
-EBUILD ament_cmake_cppcheck-0.12.1.ebuild 1448 BLAKE2B 800c1f59bb9739026fbe383b1a3f2fc459a2d5485837a8b3074e324a30f07bfc30c37e843f260e2c6608196686496c76bad146022280eab0f71bf7cb360d2018 SHA512 822731a52bc303a21c5e8e00d4d07fd21ce84fb51baaa9402fd62e8600e77a976190fc018a53fd0ee2f74ae785bd3d9871f01cbe00ab2999b99b7d1022b729c1
-EBUILD ament_cmake_cppcheck-9999.ebuild 1448 BLAKE2B 800c1f59bb9739026fbe383b1a3f2fc459a2d5485837a8b3074e324a30f07bfc30c37e843f260e2c6608196686496c76bad146022280eab0f71bf7cb360d2018 SHA512 822731a52bc303a21c5e8e00d4d07fd21ce84fb51baaa9402fd62e8600e77a976190fc018a53fd0ee2f74ae785bd3d9871f01cbe00ab2999b99b7d1022b729c1
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
deleted file mode 100644
index 3cefa858663f..000000000000
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cppcheck
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
deleted file mode 100644
index 3cefa858663f..000000000000
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cppcheck
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
deleted file mode 100644
index 3cefa858663f..000000000000
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cppcheck
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cppcheck/metadata.xml b/dev-ros/ament_cmake_cppcheck/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_cmake_cppcheck/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
deleted file mode 100644
index f12d2e1eb79c..000000000000
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_cpplint-0.11.2.ebuild 1414 BLAKE2B 128ff85cb0a9efb7a5b6dd67fd9d89ef29bc56a8807a692d181aff765988301d93f7afa43d12b5eaf94a0507768754c9cc893e57745b855899dc341a19e8e1d7 SHA512 fcc7ca23784eda7cc1d64c16d36a18dcd77bcb2549aa4b9836404c54e197b04d69d4c088b13623fa3412a6f66bf733cb231ef23934aa776a0b70cb4bc551e1e6
-EBUILD ament_cmake_cpplint-0.12.1.ebuild 1414 BLAKE2B 128ff85cb0a9efb7a5b6dd67fd9d89ef29bc56a8807a692d181aff765988301d93f7afa43d12b5eaf94a0507768754c9cc893e57745b855899dc341a19e8e1d7 SHA512 fcc7ca23784eda7cc1d64c16d36a18dcd77bcb2549aa4b9836404c54e197b04d69d4c088b13623fa3412a6f66bf733cb231ef23934aa776a0b70cb4bc551e1e6
-EBUILD ament_cmake_cpplint-9999.ebuild 1414 BLAKE2B 128ff85cb0a9efb7a5b6dd67fd9d89ef29bc56a8807a692d181aff765988301d93f7afa43d12b5eaf94a0507768754c9cc893e57745b855899dc341a19e8e1d7 SHA512 fcc7ca23784eda7cc1d64c16d36a18dcd77bcb2549aa4b9836404c54e197b04d69d4c088b13623fa3412a6f66bf733cb231ef23934aa776a0b70cb4bc551e1e6
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
deleted file mode 100644
index edc142ac6100..000000000000
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake API for ament_cpplint to lint C / C++ code using cpplint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cpplint
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
deleted file mode 100644
index edc142ac6100..000000000000
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake API for ament_cpplint to lint C / C++ code using cpplint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cpplint
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
deleted file mode 100644
index edc142ac6100..000000000000
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake API for ament_cpplint to lint C / C++ code using cpplint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cpplint
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cpplint/metadata.xml b/dev-ros/ament_cmake_cpplint/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_cmake_cpplint/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
deleted file mode 100644
index 0a23a0af6526..000000000000
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1132 BLAKE2B 6d2d48b42c333ab6a8d1f446099d4927ed2f86bbd3e637351b753926121ae35f9aa96326d116bfe04eb9c311d52ee2a4f678c1804f4b727a4c33c72719de2860 SHA512 7e94c46077632376fe72d89c404022c3b78f4622cc22e4a4e9a6cf64265261c84a72d677a2de8afcd397ef2830aedf3440641753222d831c7b543464b8c369e9
-EBUILD ament_cmake_export_definitions-1.3.0.ebuild 1132 BLAKE2B 6d2d48b42c333ab6a8d1f446099d4927ed2f86bbd3e637351b753926121ae35f9aa96326d116bfe04eb9c311d52ee2a4f678c1804f4b727a4c33c72719de2860 SHA512 7e94c46077632376fe72d89c404022c3b78f4622cc22e4a4e9a6cf64265261c84a72d677a2de8afcd397ef2830aedf3440641753222d831c7b543464b8c369e9
-EBUILD ament_cmake_export_definitions-9999.ebuild 1132 BLAKE2B 6d2d48b42c333ab6a8d1f446099d4927ed2f86bbd3e637351b753926121ae35f9aa96326d116bfe04eb9c311d52ee2a4f678c1804f4b727a4c33c72719de2860 SHA512 7e94c46077632376fe72d89c404022c3b78f4622cc22e4a4e9a6cf64265261c84a72d677a2de8afcd397ef2830aedf3440641753222d831c7b543464b8c369e9
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
deleted file mode 100644
index a4110684bdce..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
deleted file mode 100644
index a4110684bdce..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
deleted file mode 100644
index a4110684bdce..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_definitions/metadata.xml b/dev-ros/ament_cmake_export_definitions/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_export_definitions/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
deleted file mode 100644
index b4084fb6826e..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1173 BLAKE2B 58109390939fd811888ac3480565af325e9be65ee9e63f4bef401019f4c9d49498df8d08b4f4a3aa9aacee4f386ecc7a6189387b6163506e565eecb60c59f80d SHA512 1ffea3db797fea96b90f95a38417b69eec44bda80935777b87dac89cff9a4b49f686154b15489e4b33896b53e7e42070bd44dc8f9c4c68d702b4ca951376406d
-EBUILD ament_cmake_export_dependencies-1.3.0-r1.ebuild 1208 BLAKE2B 7c28ebd7e95850790f01a1e55196825e2efee3a4a2a70488b26f7c14ceeff48025f3d052aa68ef0897f8452a188d9ab07c6c98c2624b98bf0fbcf079b63f5d92 SHA512 3959513e9c4384fb9c7138628f1f6a4bba753c9cf1df479d429b647756af8892e292940fbcbbee1996f9f626909f3717ee5f3408c5c34b6a4b48db4195f7cd39
-EBUILD ament_cmake_export_dependencies-9999.ebuild 1208 BLAKE2B 7c28ebd7e95850790f01a1e55196825e2efee3a4a2a70488b26f7c14ceeff48025f3d052aa68ef0897f8452a188d9ab07c6c98c2624b98bf0fbcf079b63f5d92 SHA512 3959513e9c4384fb9c7138628f1f6a4bba753c9cf1df479d429b647756af8892e292940fbcbbee1996f9f626909f3717ee5f3408c5c34b6a4b48db4195f7cd39
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
deleted file mode 100644
index ce2dab5c7c7b..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild
deleted file mode 100644
index 10634790838a..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_libraries
-	dev-ros/ament_cmake_gen_version_h
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
deleted file mode 100644
index 10634790838a..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_libraries
-	dev-ros/ament_cmake_gen_version_h
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_dependencies/metadata.xml b/dev-ros/ament_cmake_export_dependencies/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
deleted file mode 100644
index 7ba33d472f4a..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1140 BLAKE2B 0fbd3c73264a3ea3ced3f11f82a4d2102faef4ba172332bd985e24fca7d5e09ba690f04abe79222f1ef874c1bc90b3cbc85918d936edf4f4436561222f11fed2 SHA512 68ccdd0eee936e33f6745aaf4006d6dd4ed66c173fbd9f3181abb706fb4e3bc7b943c306a446e56c91340a23a3a5e00c9419b40ef3f6c2bf42beecf50f5c0dc5
-EBUILD ament_cmake_export_include_directories-1.3.0.ebuild 1140 BLAKE2B 0fbd3c73264a3ea3ced3f11f82a4d2102faef4ba172332bd985e24fca7d5e09ba690f04abe79222f1ef874c1bc90b3cbc85918d936edf4f4436561222f11fed2 SHA512 68ccdd0eee936e33f6745aaf4006d6dd4ed66c173fbd9f3181abb706fb4e3bc7b943c306a446e56c91340a23a3a5e00c9419b40ef3f6c2bf42beecf50f5c0dc5
-EBUILD ament_cmake_export_include_directories-9999.ebuild 1140 BLAKE2B 0fbd3c73264a3ea3ced3f11f82a4d2102faef4ba172332bd985e24fca7d5e09ba690f04abe79222f1ef874c1bc90b3cbc85918d936edf4f4436561222f11fed2 SHA512 68ccdd0eee936e33f6745aaf4006d6dd4ed66c173fbd9f3181abb706fb4e3bc7b943c306a446e56c91340a23a3a5e00c9419b40ef3f6c2bf42beecf50f5c0dc5
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
deleted file mode 100644
index dce943f19875..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
deleted file mode 100644
index dce943f19875..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
deleted file mode 100644
index dce943f19875..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_include_directories/metadata.xml b/dev-ros/ament_cmake_export_include_directories/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
deleted file mode 100644
index 7ec2171850d8..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1169 BLAKE2B f88c0184a9408b097a7b3aa94c511e1febc0ce3797b92e9905a6098cd19faa59bac4967c6ae83d4f990655c749bbdc37b4e472d60c71707e58085f1c757713cf SHA512 bbe3da111e8fac8f6ec53f46fd70abecdd4ca28803fd8351b9e4fadb055766ec7b3fd2471481a8439dc9c9d5257023ee3f951628bdbba926a08f01ed2fb0d767
-EBUILD ament_cmake_export_interfaces-1.3.0.ebuild 1169 BLAKE2B f88c0184a9408b097a7b3aa94c511e1febc0ce3797b92e9905a6098cd19faa59bac4967c6ae83d4f990655c749bbdc37b4e472d60c71707e58085f1c757713cf SHA512 bbe3da111e8fac8f6ec53f46fd70abecdd4ca28803fd8351b9e4fadb055766ec7b3fd2471481a8439dc9c9d5257023ee3f951628bdbba926a08f01ed2fb0d767
-EBUILD ament_cmake_export_interfaces-9999.ebuild 1169 BLAKE2B f88c0184a9408b097a7b3aa94c511e1febc0ce3797b92e9905a6098cd19faa59bac4967c6ae83d4f990655c749bbdc37b4e472d60c71707e58085f1c757713cf SHA512 bbe3da111e8fac8f6ec53f46fd70abecdd4ca28803fd8351b9e4fadb055766ec7b3fd2471481a8439dc9c9d5257023ee3f951628bdbba926a08f01ed2fb0d767
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
deleted file mode 100644
index cb49e72e665f..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_export_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
deleted file mode 100644
index cb49e72e665f..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_export_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
deleted file mode 100644
index cb49e72e665f..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_export_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_interfaces/metadata.xml b/dev-ros/ament_cmake_export_interfaces/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
deleted file mode 100644
index 573f96c3edf2..000000000000
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1130 BLAKE2B ddb3c7ecaaef3a6d59655569a6df018968310c277f48a725212551a8f19fb2b3d26bdc9e138f93656b485b3d5faa706a599c70098c27c50e658e84fce08ad21b SHA512 d661487519edcb250ed2ec8d0153d7c03db87b85ed01afa5523dddf622de28504e30a3bb3364ffff42654027b5a918f9de2e7af73f64e0b6171a0aa1c421078a
-EBUILD ament_cmake_export_libraries-1.3.0.ebuild 1130 BLAKE2B ddb3c7ecaaef3a6d59655569a6df018968310c277f48a725212551a8f19fb2b3d26bdc9e138f93656b485b3d5faa706a599c70098c27c50e658e84fce08ad21b SHA512 d661487519edcb250ed2ec8d0153d7c03db87b85ed01afa5523dddf622de28504e30a3bb3364ffff42654027b5a918f9de2e7af73f64e0b6171a0aa1c421078a
-EBUILD ament_cmake_export_libraries-9999.ebuild 1130 BLAKE2B ddb3c7ecaaef3a6d59655569a6df018968310c277f48a725212551a8f19fb2b3d26bdc9e138f93656b485b3d5faa706a599c70098c27c50e658e84fce08ad21b SHA512 d661487519edcb250ed2ec8d0153d7c03db87b85ed01afa5523dddf622de28504e30a3bb3364ffff42654027b5a918f9de2e7af73f64e0b6171a0aa1c421078a
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
deleted file mode 100644
index 3f491dcec33f..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
deleted file mode 100644
index 3f491dcec33f..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
deleted file mode 100644
index 3f491dcec33f..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_libraries/metadata.xml b/dev-ros/ament_cmake_export_libraries/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_export_libraries/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
deleted file mode 100644
index e4fbe4c1f929..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_link_flags-1.1.4.ebuild 1131 BLAKE2B ad529064982be6f3fc8178d88716aeb6874645db712c730005286d5f9f8b6930baee2cb9bcb0b3380f62bbfbe34fb7eb3e143ea64c59ac675fcca8fe3f719a8e SHA512 b0d801769cd47687768ea2a174d2d26f37d15bbd958e6dc00c0b67b7827cb75fd0d89f5ad4e85372312fd552355d5a1951f1833122f3ecc48565f45138b4085d
-EBUILD ament_cmake_export_link_flags-1.3.0.ebuild 1131 BLAKE2B ad529064982be6f3fc8178d88716aeb6874645db712c730005286d5f9f8b6930baee2cb9bcb0b3380f62bbfbe34fb7eb3e143ea64c59ac675fcca8fe3f719a8e SHA512 b0d801769cd47687768ea2a174d2d26f37d15bbd958e6dc00c0b67b7827cb75fd0d89f5ad4e85372312fd552355d5a1951f1833122f3ecc48565f45138b4085d
-EBUILD ament_cmake_export_link_flags-9999.ebuild 1131 BLAKE2B ad529064982be6f3fc8178d88716aeb6874645db712c730005286d5f9f8b6930baee2cb9bcb0b3380f62bbfbe34fb7eb3e143ea64c59ac675fcca8fe3f719a8e SHA512 b0d801769cd47687768ea2a174d2d26f37d15bbd958e6dc00c0b67b7827cb75fd0d89f5ad4e85372312fd552355d5a1951f1833122f3ecc48565f45138b4085d
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild
deleted file mode 100644
index b1ebb6da8e9b..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.3.0.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.3.0.ebuild
deleted file mode 100644
index b1ebb6da8e9b..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild
deleted file mode 100644
index b1ebb6da8e9b..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_link_flags/metadata.xml b/dev-ros/ament_cmake_export_link_flags/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
deleted file mode 100644
index a6aa75244545..000000000000
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_targets-1.1.4.ebuild 1166 BLAKE2B 8f47fd668a3f24d1a79dcce034fb9dc3b3cf90be7bcdcd207893d77af671f161cf9366a7a6c80049c7a7c57234ecf0e492b827b81f61fb0fd624d36f1b8552ea SHA512 27382bc78beaad7710362d861bc520d2d35a566e13124048d3accf3b9e663bd6526acb65fa2221f77d7fdca2044190d21f9ff8f88cd328c1dd1546694555b815
-EBUILD ament_cmake_export_targets-1.3.0.ebuild 1166 BLAKE2B 8f47fd668a3f24d1a79dcce034fb9dc3b3cf90be7bcdcd207893d77af671f161cf9366a7a6c80049c7a7c57234ecf0e492b827b81f61fb0fd624d36f1b8552ea SHA512 27382bc78beaad7710362d861bc520d2d35a566e13124048d3accf3b9e663bd6526acb65fa2221f77d7fdca2044190d21f9ff8f88cd328c1dd1546694555b815
-EBUILD ament_cmake_export_targets-9999.ebuild 1166 BLAKE2B 8f47fd668a3f24d1a79dcce034fb9dc3b3cf90be7bcdcd207893d77af671f161cf9366a7a6c80049c7a7c57234ecf0e492b827b81f61fb0fd624d36f1b8552ea SHA512 27382bc78beaad7710362d861bc520d2d35a566e13124048d3accf3b9e663bd6526acb65fa2221f77d7fdca2044190d21f9ff8f88cd328c1dd1546694555b815
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
deleted file mode 100644
index e36b388a8f64..000000000000
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export targets to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_export_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
deleted file mode 100644
index e36b388a8f64..000000000000
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export targets to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_export_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
deleted file mode 100644
index e36b388a8f64..000000000000
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export targets to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_export_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_targets/metadata.xml b/dev-ros/ament_cmake_export_targets/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_export_targets/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_gen_version_h/Manifest b/dev-ros/ament_cmake_gen_version_h/Manifest
deleted file mode 100644
index 00cc27c0e434..000000000000
--- a/dev-ros/ament_cmake_gen_version_h/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_gen_version_h-1.3.0.ebuild 1310 BLAKE2B 0e8df243f25e9a71c3aeb7a7fca6076034d109309bd600dc9d82cc262f6b7eb3eadeca64f20bba8f6143725951ba54330979c0bf84e9a19efba5363410d56f80 SHA512 7df56f0c8dd85de45410b9843892b8f3d056b119e858949d3bf47e7b10c42ef9f3e905e96574f363d7fd0b798ce62568f4609f947d3889d5932ff579046659d1
-EBUILD ament_cmake_gen_version_h-9999.ebuild 1310 BLAKE2B 0e8df243f25e9a71c3aeb7a7fca6076034d109309bd600dc9d82cc262f6b7eb3eadeca64f20bba8f6143725951ba54330979c0bf84e9a19efba5363410d56f80 SHA512 7df56f0c8dd85de45410b9843892b8f3d056b119e858949d3bf47e7b10c42ef9f3e905e96574f363d7fd0b798ce62568f4609f947d3889d5932ff579046659d1
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild
deleted file mode 100644
index d65b31310331..000000000000
--- a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Generate a C header containing the version number of the package"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_cmake_gtest
-	)"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-RESTRICT="test" # fixme
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild
deleted file mode 100644
index d65b31310331..000000000000
--- a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Generate a C header containing the version number of the package"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_cmake_gtest
-	)"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-RESTRICT="test" # fixme
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_gen_version_h/metadata.xml b/dev-ros/ament_cmake_gen_version_h/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_gen_version_h/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
deleted file mode 100644
index 086a4a2aa2b5..000000000000
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_gmock-1.1.4.ebuild 1133 BLAKE2B ff1c2c16e6e88985d3190029a40f511d1f13bd011b0db8298c971933e5219121defea7173aa8553e7daa04a20ce7546db73e7b5d4bdde6d6b58e7689703d8355 SHA512 392e54ae4b180ead282f81ac8f56c668b9788115b954526255ab62567c5be918c5a8997b3d758bf68409d89b65eb9515402057dbcff2af6f02c304f6b8b734a6
-EBUILD ament_cmake_gmock-1.3.0.ebuild 1133 BLAKE2B ff1c2c16e6e88985d3190029a40f511d1f13bd011b0db8298c971933e5219121defea7173aa8553e7daa04a20ce7546db73e7b5d4bdde6d6b58e7689703d8355 SHA512 392e54ae4b180ead282f81ac8f56c668b9788115b954526255ab62567c5be918c5a8997b3d758bf68409d89b65eb9515402057dbcff2af6f02c304f6b8b734a6
-EBUILD ament_cmake_gmock-9999.ebuild 1133 BLAKE2B ff1c2c16e6e88985d3190029a40f511d1f13bd011b0db8298c971933e5219121defea7173aa8553e7daa04a20ce7546db73e7b5d4bdde6d6b58e7689703d8355 SHA512 392e54ae4b180ead282f81ac8f56c668b9788115b954526255ab62567c5be918c5a8997b3d758bf68409d89b65eb9515402057dbcff2af6f02c304f6b8b734a6
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild
deleted file mode 100644
index 6ec2fa379db8..000000000000
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add Google mock-based tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.3.0.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.3.0.ebuild
deleted file mode 100644
index 6ec2fa379db8..000000000000
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add Google mock-based tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild
deleted file mode 100644
index 6ec2fa379db8..000000000000
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add Google mock-based tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_gmock/metadata.xml b/dev-ros/ament_cmake_gmock/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_gmock/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
deleted file mode 100644
index c245f3043d49..000000000000
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_gtest-1.1.4.ebuild 1127 BLAKE2B 8d88f0fb4ed358b8ccd29887e584afbc74ad23681e2a28705435d6cc0389a5beb53c8a077bcd1f7c78cb45ba7419db7e56b20a64f92e5d35c98f4a571ec60584 SHA512 828032f509f1c1df3030ed3275d4d225fab2bb20c3b5ee3cafb47c981fdf13ab194ebaf10552ff846a1ddf038bf3475bae82ce2d04c5d31ae3c55a4f663a2b2e
-EBUILD ament_cmake_gtest-1.3.0.ebuild 1127 BLAKE2B 8d88f0fb4ed358b8ccd29887e584afbc74ad23681e2a28705435d6cc0389a5beb53c8a077bcd1f7c78cb45ba7419db7e56b20a64f92e5d35c98f4a571ec60584 SHA512 828032f509f1c1df3030ed3275d4d225fab2bb20c3b5ee3cafb47c981fdf13ab194ebaf10552ff846a1ddf038bf3475bae82ce2d04c5d31ae3c55a4f663a2b2e
-EBUILD ament_cmake_gtest-9999.ebuild 1127 BLAKE2B 8d88f0fb4ed358b8ccd29887e584afbc74ad23681e2a28705435d6cc0389a5beb53c8a077bcd1f7c78cb45ba7419db7e56b20a64f92e5d35c98f4a571ec60584 SHA512 828032f509f1c1df3030ed3275d4d225fab2bb20c3b5ee3cafb47c981fdf13ab194ebaf10552ff846a1ddf038bf3475bae82ce2d04c5d31ae3c55a4f663a2b2e
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild
deleted file mode 100644
index b64f215fcf11..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.3.0.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.3.0.ebuild
deleted file mode 100644
index b64f215fcf11..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
deleted file mode 100644
index b64f215fcf11..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_gtest/metadata.xml b/dev-ros/ament_cmake_gtest/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_gtest/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
deleted file mode 100644
index b00a129a7480..000000000000
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_include_directories-1.1.4.ebuild 1140 BLAKE2B 0fbd3c73264a3ea3ced3f11f82a4d2102faef4ba172332bd985e24fca7d5e09ba690f04abe79222f1ef874c1bc90b3cbc85918d936edf4f4436561222f11fed2 SHA512 68ccdd0eee936e33f6745aaf4006d6dd4ed66c173fbd9f3181abb706fb4e3bc7b943c306a446e56c91340a23a3a5e00c9419b40ef3f6c2bf42beecf50f5c0dc5
-EBUILD ament_cmake_include_directories-1.3.0.ebuild 1140 BLAKE2B 0fbd3c73264a3ea3ced3f11f82a4d2102faef4ba172332bd985e24fca7d5e09ba690f04abe79222f1ef874c1bc90b3cbc85918d936edf4f4436561222f11fed2 SHA512 68ccdd0eee936e33f6745aaf4006d6dd4ed66c173fbd9f3181abb706fb4e3bc7b943c306a446e56c91340a23a3a5e00c9419b40ef3f6c2bf42beecf50f5c0dc5
-EBUILD ament_cmake_include_directories-9999.ebuild 1140 BLAKE2B 0fbd3c73264a3ea3ced3f11f82a4d2102faef4ba172332bd985e24fca7d5e09ba690f04abe79222f1ef874c1bc90b3cbc85918d936edf4f4436561222f11fed2 SHA512 68ccdd0eee936e33f6745aaf4006d6dd4ed66c173fbd9f3181abb706fb4e3bc7b943c306a446e56c91340a23a3a5e00c9419b40ef3f6c2bf42beecf50f5c0dc5
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild
deleted file mode 100644
index dce943f19875..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild
deleted file mode 100644
index dce943f19875..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
deleted file mode 100644
index dce943f19875..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_include_directories/metadata.xml b/dev-ros/ament_cmake_include_directories/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_include_directories/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
deleted file mode 100644
index 720439d53e2a..000000000000
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_libraries-1.1.4.ebuild 1133 BLAKE2B 3c3e2b9771029f3c9fde7b5b87504b8b8388510c4039128f5ca1a1f6a62861f63fb1d81b2c1bf38c384f75c22b32c6968edf8753ba17b7d15f7ccddade891bbd SHA512 71d6402517d1644623188c827242149c73fdda3a548fc7e4fe8de74d7475f5ecd4e4484e0f5b1fde679c3fa3a9391925da47a3befae7de18156dc1795e863b2a
-EBUILD ament_cmake_libraries-1.3.0.ebuild 1133 BLAKE2B 3c3e2b9771029f3c9fde7b5b87504b8b8388510c4039128f5ca1a1f6a62861f63fb1d81b2c1bf38c384f75c22b32c6968edf8753ba17b7d15f7ccddade891bbd SHA512 71d6402517d1644623188c827242149c73fdda3a548fc7e4fe8de74d7475f5ecd4e4484e0f5b1fde679c3fa3a9391925da47a3befae7de18156dc1795e863b2a
-EBUILD ament_cmake_libraries-9999.ebuild 1133 BLAKE2B 3c3e2b9771029f3c9fde7b5b87504b8b8388510c4039128f5ca1a1f6a62861f63fb1d81b2c1bf38c384f75c22b32c6968edf8753ba17b7d15f7ccddade891bbd SHA512 71d6402517d1644623188c827242149c73fdda3a548fc7e4fe8de74d7475f5ecd4e4484e0f5b1fde679c3fa3a9391925da47a3befae7de18156dc1795e863b2a
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild
deleted file mode 100644
index 38111f05a0dd..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild
deleted file mode 100644
index 38111f05a0dd..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
deleted file mode 100644
index 38111f05a0dd..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_libraries/metadata.xml b/dev-ros/ament_cmake_libraries/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_libraries/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_lint_cmake/Manifest b/dev-ros/ament_cmake_lint_cmake/Manifest
deleted file mode 100644
index 1b3fb5452c7b..000000000000
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_lint_cmake-0.11.2.ebuild 1158 BLAKE2B 3628137ee126dd2e41ddc06e55165dd7360ad040582a04a09de35e8598a3b47e701f3cff4ba2b510f11b93ab22cf9a1677ddc195006acc13f4623fd43a8b197f SHA512 d0566a35865696baa5a7974fad61e7e29ae3fef8a004bb5a498c4c8abf8649a46832bb0c138f3636d91dd05a66fc2834ea0a58b16a100855ef84d97dc3ae8b39
-EBUILD ament_cmake_lint_cmake-0.12.1.ebuild 1158 BLAKE2B 3628137ee126dd2e41ddc06e55165dd7360ad040582a04a09de35e8598a3b47e701f3cff4ba2b510f11b93ab22cf9a1677ddc195006acc13f4623fd43a8b197f SHA512 d0566a35865696baa5a7974fad61e7e29ae3fef8a004bb5a498c4c8abf8649a46832bb0c138f3636d91dd05a66fc2834ea0a58b16a100855ef84d97dc3ae8b39
-EBUILD ament_cmake_lint_cmake-9999.ebuild 1158 BLAKE2B 3628137ee126dd2e41ddc06e55165dd7360ad040582a04a09de35e8598a3b47e701f3cff4ba2b510f11b93ab22cf9a1677ddc195006acc13f4623fd43a8b197f SHA512 d0566a35865696baa5a7974fad61e7e29ae3fef8a004bb5a498c4c8abf8649a46832bb0c138f3636d91dd05a66fc2834ea0a58b16a100855ef84d97dc3ae8b39
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
deleted file mode 100644
index cd3b37dc8aa8..000000000000
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_lint_cmake
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild
deleted file mode 100644
index cd3b37dc8aa8..000000000000
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_lint_cmake
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
deleted file mode 100644
index cd3b37dc8aa8..000000000000
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_lint_cmake
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_lint_cmake/metadata.xml b/dev-ros/ament_cmake_lint_cmake/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_cmake_lint_cmake/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
deleted file mode 100644
index f7d6eeefedc9..000000000000
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_pytest-1.1.4.ebuild 1135 BLAKE2B 77a1c6695e1443bcebd5d57a4e05f57168b6945d2297641fd22433d7b2ecef63ac3a2909911b521a1a0c05d3109a56fcbad62a36ca23ddb9b70f8ed552666e3c SHA512 bb1d0e5f54213736ff1aae52465bf80bb66a2f2ac5e4dae3d7bae7de3cdf40a5c5702fa019be59c4f8aa31d8eb77a2ffea566c658ab93d2761e27fd7d817ed3a
-EBUILD ament_cmake_pytest-1.3.0.ebuild 1135 BLAKE2B 77a1c6695e1443bcebd5d57a4e05f57168b6945d2297641fd22433d7b2ecef63ac3a2909911b521a1a0c05d3109a56fcbad62a36ca23ddb9b70f8ed552666e3c SHA512 bb1d0e5f54213736ff1aae52465bf80bb66a2f2ac5e4dae3d7bae7de3cdf40a5c5702fa019be59c4f8aa31d8eb77a2ffea566c658ab93d2761e27fd7d817ed3a
-EBUILD ament_cmake_pytest-9999.ebuild 1135 BLAKE2B 77a1c6695e1443bcebd5d57a4e05f57168b6945d2297641fd22433d7b2ecef63ac3a2909911b521a1a0c05d3109a56fcbad62a36ca23ddb9b70f8ed552666e3c SHA512 bb1d0e5f54213736ff1aae52465bf80bb66a2f2ac5e4dae3d7bae7de3cdf40a5c5702fa019be59c4f8aa31d8eb77a2ffea566c658ab93d2761e27fd7d817ed3a
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild
deleted file mode 100644
index 755a786964a8..000000000000
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to run Python tests using pytest in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.3.0.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.3.0.ebuild
deleted file mode 100644
index 755a786964a8..000000000000
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to run Python tests using pytest in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild
deleted file mode 100644
index 755a786964a8..000000000000
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to run Python tests using pytest in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_pytest/metadata.xml b/dev-ros/ament_cmake_pytest/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_pytest/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
deleted file mode 100644
index 14607a862489..000000000000
--- a/dev-ros/ament_cmake_python/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX destdir.patch 1203 BLAKE2B fe4e783ea9d4802752d79d489e5b05d0ca9688a76d678521af41f232005da611c0286f594d15045dcae5610362ccc1bb878d29bddbeb86a9452b0289af347d67 SHA512 85e196c9777a6cc8b8b693e3825d5027c7a5db0a74008ad34d9be3714a088a9e651bb99ce53ee2bd95c47b2c1f8c2c657fa18cce0f13b11e4ea437cdd03ef0b3
-AUX destdir2.patch 1174 BLAKE2B dcf78cd8e36565677fbc688876a19a24a0df23b8dffbfa6dd230b935740c1ca4a6c57e3d9ad264b9b1b20be9794fafe1e3f59211f249f710016a9ce57058810e SHA512 75847abed87ee4e629682139f9cae789cfa0b02e6a08d941a6e1490ec966062f20326501d704afbfbd71dc24ab1e99479a02345a8118f14ba1264d171e85aeb0
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_python-1.1.4.ebuild 1156 BLAKE2B 0beff0590c2cd43fb2ae87394fa29839ac460936788d1964846c126c557fa5fcb50b24df6bec53dd0d16943fbb79675cc02fd9142adb780110defc78856712ff SHA512 c0604fc93b5dd4247c279eadc59a9cdcc81ea5a3202aea43391989cbcb66e5942d29ccc0fe1bee4419c8f0efb7d9ac66e4f30f36689750ba7887f48256994b32
-EBUILD ament_cmake_python-1.3.0.ebuild 1157 BLAKE2B db4895d43f85a16b6113d6edeff0b60c1b0a3ae3626f1c9bce974354619d58c63df5528eef2ceff3d8c511fd8df9c2b8bce4970fa084362008bf578112dcd70d SHA512 82162e78c8722136ba5a370953e2883c44831a93d7f6f0ba8ca7c1853ff6d7850098fb2f4f8b2f8fbbb059738fb155655e3134e73e452bc7dfa9fc9677d5bcb7
-EBUILD ament_cmake_python-9999.ebuild 1157 BLAKE2B db4895d43f85a16b6113d6edeff0b60c1b0a3ae3626f1c9bce974354619d58c63df5528eef2ceff3d8c511fd8df9c2b8bce4970fa084362008bf578112dcd70d SHA512 82162e78c8722136ba5a370953e2883c44831a93d7f6f0ba8ca7c1853ff6d7850098fb2f4f8b2f8fbbb059738fb155655e3134e73e452bc7dfa9fc9677d5bcb7
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
deleted file mode 100644
index fb55ccb7a202..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to use Python in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-PATCHES=( "${FILESDIR}/destdir.patch" )
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild
deleted file mode 100644
index 505cc4b0bd09..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to use Python in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-PATCHES=( "${FILESDIR}/destdir2.patch" )
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
deleted file mode 100644
index 505cc4b0bd09..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to use Python in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-PATCHES=( "${FILESDIR}/destdir2.patch" )
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_python/files/destdir.patch b/dev-ros/ament_cmake_python/files/destdir.patch
deleted file mode 100644
index 8e8f628afaf3..000000000000
--- a/dev-ros/ament_cmake_python/files/destdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ament_cmake_python/cmake/ament_python_install_module.cmake
-===================================================================
---- ament_cmake_python.orig/cmake/ament_python_install_module.cmake
-+++ ament_cmake_python/cmake/ament_python_install_module.cmake
-@@ -64,7 +64,7 @@ function(_ament_cmake_python_install_mod
-       "execute_process(
-         COMMAND
-         \"${PYTHON_EXECUTABLE}\" \"-m\" \"compileall\"
--        \"${CMAKE_INSTALL_PREFIX}/${destination}/${module_file}\"
-+	\"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${destination}/${module_file}\"
-       )"
-     )
-   endif()
-Index: ament_cmake_python/cmake/ament_python_install_package.cmake
-===================================================================
---- ament_cmake_python.orig/cmake/ament_python_install_package.cmake
-+++ ament_cmake_python/cmake/ament_python_install_package.cmake
-@@ -65,7 +65,7 @@ function(_ament_cmake_python_install_pac
-       "execute_process(
-         COMMAND
-         \"${PYTHON_EXECUTABLE}\" \"-m\" \"compileall\"
--        \"${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}/${package_name}\"
-+	\"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}/${package_name}\"
-       )"
-     )
-   endif()
diff --git a/dev-ros/ament_cmake_python/files/destdir2.patch b/dev-ros/ament_cmake_python/files/destdir2.patch
deleted file mode 100644
index 5278b6e17073..000000000000
--- a/dev-ros/ament_cmake_python/files/destdir2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ament_cmake_python/cmake/ament_python_install_module.cmake
-===================================================================
---- ament_cmake_python.orig/cmake/ament_python_install_module.cmake
-+++ ament_cmake_python/cmake/ament_python_install_module.cmake
-@@ -65,7 +65,7 @@ function(_ament_cmake_python_install_mod
-       "execute_process(
-         COMMAND
-         \"${python_interpreter}\" \"-m\" \"compileall\"
--        \"${CMAKE_INSTALL_PREFIX}/${destination}/${module_file}\"
-+	\"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${destination}/${module_file}\"
-       )"
-     )
-   endif()
-Index: ament_cmake_python/cmake/ament_python_install_package.cmake
-===================================================================
---- ament_cmake_python.orig/cmake/ament_python_install_package.cmake
-+++ ament_cmake_python/cmake/ament_python_install_package.cmake
-@@ -192,7 +192,7 @@ setup(
-       "execute_process(
-         COMMAND
-         \"${python_interpreter_config}\" \"-m\" \"compileall\"
--        \"${CMAKE_INSTALL_PREFIX}/${ARG_DESTINATION}/${package_name}\"
-+	\"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${ARG_DESTINATION}/${package_name}\"
-       )"
-     )
-   endif()
diff --git a/dev-ros/ament_cmake_python/metadata.xml b/dev-ros/ament_cmake_python/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_python/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_ros/Manifest b/dev-ros/ament_cmake_ros/Manifest
deleted file mode 100644
index b4525d6019a7..000000000000
--- a/dev-ros/ament_cmake_ros/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ament_cmake_ros-0.10.0.tar.gz 10411 BLAKE2B 8113da7c8dc04339b0c1a5aff89cc9e1eb0dcf453101fb9e65c0c95fc6275a3049f83c93ff83106d22dee20d6aa6b190a49b02a51336a3858db88cf3a39bce95 SHA512 1feaab1c1100587eec42bfd62a53baaa802d7de1c8d14e991615ab60b97a9350d268f9387998d2c05ee2742886a0b5805c3053eef6b517323e24fddfe5b7d4e8
-EBUILD ament_cmake_ros-0.10.0.ebuild 1009 BLAKE2B cbec4cc649656162792192ed51656bf7ad62d50386020850f2ce4fee709bbda37f11a3499588adf15027fde069f32ebcac6eec2a7eae9fcec18001ecaf50648a SHA512 16b5f8deeb859f5d55917fc21f283e2ceba054b85c24a6bf9f9fa2a605f06e8c3ab9afdd30649be6f12d40d308a415f26581ba0b8452f98396a036d0340aed54
-EBUILD ament_cmake_ros-9999.ebuild 1009 BLAKE2B cbec4cc649656162792192ed51656bf7ad62d50386020850f2ce4fee709bbda37f11a3499588adf15027fde069f32ebcac6eec2a7eae9fcec18001ecaf50648a SHA512 16b5f8deeb859f5d55917fc21f283e2ceba054b85c24a6bf9f9fa2a605f06e8c3ab9afdd30649be6f12d40d308a415f26581ba0b8452f98396a036d0340aed54
-MISC metadata.xml 335 BLAKE2B 34967a233f8a8a1a3d01283b7cf0021b2aa9830157998fdbed0365a4601c9c84159805fc1e70817a257c3786f9698ddbcf8b515fe4f2cdee3da1fde91dc014ad SHA512 00c7b588cde604a184c8d1a9a9c93eca62f83bb0c61928813998b8fc57c2f2936c29740ff2b15b34e25c13b8a107e722196d635c50d6e034d6dbe81e58e5395d
diff --git a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.10.0.ebuild b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.10.0.ebuild
deleted file mode 100644
index 7493e17e73e0..000000000000
--- a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake_ros"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/ament_cmake_ros"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ros2/ament_cmake_ros/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="ROS specific CMake bits in the ament buildsystem"
-HOMEPAGE="https://github.com/ros2/ament_cmake_ros"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	test? (
-		dev-ros/ament_lint_auto
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild b/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
deleted file mode 100644
index 7493e17e73e0..000000000000
--- a/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake_ros"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/ament_cmake_ros"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ros2/ament_cmake_ros/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="ROS specific CMake bits in the ament buildsystem"
-HOMEPAGE="https://github.com/ros2/ament_cmake_ros"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	test? (
-		dev-ros/ament_lint_auto
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_ros/metadata.xml b/dev-ros/ament_cmake_ros/metadata.xml
deleted file mode 100644
index cba09cedb988..000000000000
--- a/dev-ros/ament_cmake_ros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros2/ament_cmake_ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
deleted file mode 100644
index 85b7bee8a4ca..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_target_dependencies-1.1.4.ebuild 1206 BLAKE2B 6f8f8654992d9cca64a022ea6d8c793a386f6bfd2f9bfeef9a7d92970d60fb9d176d173445e6fca2433b763d365a3f3d32b4c2fe92afa5498484be110ea886d0 SHA512 28f4c4dfffc4bb303a500a754ffca1151dc03b96df80725aab40c87ceff1bf8ba3e0cbfc526f2e62ab73883e62aebd369df2d8761d3dbb9a922aefde4ead443a
-EBUILD ament_cmake_target_dependencies-1.3.0.ebuild 1206 BLAKE2B 6f8f8654992d9cca64a022ea6d8c793a386f6bfd2f9bfeef9a7d92970d60fb9d176d173445e6fca2433b763d365a3f3d32b4c2fe92afa5498484be110ea886d0 SHA512 28f4c4dfffc4bb303a500a754ffca1151dc03b96df80725aab40c87ceff1bf8ba3e0cbfc526f2e62ab73883e62aebd369df2d8761d3dbb9a922aefde4ead443a
-EBUILD ament_cmake_target_dependencies-9999.ebuild 1206 BLAKE2B 6f8f8654992d9cca64a022ea6d8c793a386f6bfd2f9bfeef9a7d92970d60fb9d176d173445e6fca2433b763d365a3f3d32b4c2fe92afa5498484be110ea886d0 SHA512 28f4c4dfffc4bb303a500a754ffca1151dc03b96df80725aab40c87ceff1bf8ba3e0cbfc526f2e62ab73883e62aebd369df2d8761d3dbb9a922aefde4ead443a
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
deleted file mode 100644
index a2cd7054576e..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_include_directories
-	dev-ros/ament_cmake_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild
deleted file mode 100644
index a2cd7054576e..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_include_directories
-	dev-ros/ament_cmake_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
deleted file mode 100644
index a2cd7054576e..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_include_directories
-	dev-ros/ament_cmake_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_target_dependencies/metadata.xml b/dev-ros/ament_cmake_target_dependencies/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
deleted file mode 100644
index 6867ec004635..000000000000
--- a/dev-ros/ament_cmake_test/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_test-1.1.4.ebuild 1230 BLAKE2B f3015a5b84391aa1c6b68afada2bb5a2ffe8293070c57f3e3cd3299689db59a689be8ddcc899b0f3ed4db8f0a5d77b39e504bd9abfd1dbb6bef3140d0f5e5c83 SHA512 a5fdcba94d2a9280b543ee493a93b4d24d58ae020978e3c32281a420c26db343bd0cf771eb4a40f74eab6cac6fac781f77c7153a8c7f3a1dc79b901ea3c56033
-EBUILD ament_cmake_test-1.3.0.ebuild 1230 BLAKE2B f3015a5b84391aa1c6b68afada2bb5a2ffe8293070c57f3e3cd3299689db59a689be8ddcc899b0f3ed4db8f0a5d77b39e504bd9abfd1dbb6bef3140d0f5e5c83 SHA512 a5fdcba94d2a9280b543ee493a93b4d24d58ae020978e3c32281a420c26db343bd0cf771eb4a40f74eab6cac6fac781f77c7153a8c7f3a1dc79b901ea3c56033
-EBUILD ament_cmake_test-9999.ebuild 1230 BLAKE2B f3015a5b84391aa1c6b68afada2bb5a2ffe8293070c57f3e3cd3299689db59a689be8ddcc899b0f3ed4db8f0a5d77b39e504bd9abfd1dbb6bef3140d0f5e5c83 SHA512 a5fdcba94d2a9280b543ee493a93b4d24d58ae020978e3c32281a420c26db343bd0cf771eb4a40f74eab6cac6fac781f77c7153a8c7f3a1dc79b901ea3c56033
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild
deleted file mode 100644
index e99dafaddb8b..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-DEPEND="
-	dev-ros/ament_cmake_core
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-ros/ament_cmake_python
-	${PYTHON_DEPS}
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	python_foreach_impl cmake_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake_src_install
-	python_foreach_impl python_optimize
-}
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.3.0.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.3.0.ebuild
deleted file mode 100644
index e99dafaddb8b..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-1.3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-DEPEND="
-	dev-ros/ament_cmake_core
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-ros/ament_cmake_python
-	${PYTHON_DEPS}
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	python_foreach_impl cmake_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake_src_install
-	python_foreach_impl python_optimize
-}
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
deleted file mode 100644
index e99dafaddb8b..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-DEPEND="
-	dev-ros/ament_cmake_core
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-ros/ament_cmake_python
-	${PYTHON_DEPS}
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	python_foreach_impl cmake_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake_src_install
-	python_foreach_impl python_optimize
-}
diff --git a/dev-ros/ament_cmake_test/metadata.xml b/dev-ros/ament_cmake_test/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_test/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_uncrustify/Manifest b/dev-ros/ament_cmake_uncrustify/Manifest
deleted file mode 100644
index 13391f814884..000000000000
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_uncrustify-0.11.2.ebuild 1428 BLAKE2B d83ee22732ab6bf2a14bf67abbb3e349dbed0bf36ed57e663c6e9f40f2d49f023ca006650231d934fb5f7a5906cb417f2e42b8ada09cfdad93ad8f684ed4063b SHA512 a8d4da908dc965bf077ba684ef77a33c7d8dbf9c57d9427534071c71c3a5a76c11bd3e51237e3354e44385fdda1d463765601d636155e473387ddd76435314f9
-EBUILD ament_cmake_uncrustify-0.12.1.ebuild 1428 BLAKE2B d83ee22732ab6bf2a14bf67abbb3e349dbed0bf36ed57e663c6e9f40f2d49f023ca006650231d934fb5f7a5906cb417f2e42b8ada09cfdad93ad8f684ed4063b SHA512 a8d4da908dc965bf077ba684ef77a33c7d8dbf9c57d9427534071c71c3a5a76c11bd3e51237e3354e44385fdda1d463765601d636155e473387ddd76435314f9
-EBUILD ament_cmake_uncrustify-9999.ebuild 1428 BLAKE2B d83ee22732ab6bf2a14bf67abbb3e349dbed0bf36ed57e663c6e9f40f2d49f023ca006650231d934fb5f7a5906cb417f2e42b8ada09cfdad93ad8f684ed4063b SHA512 a8d4da908dc965bf077ba684ef77a33c7d8dbf9c57d9427534071c71c3a5a76c11bd3e51237e3354e44385fdda1d463765601d636155e473387ddd76435314f9
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
deleted file mode 100644
index 90ccda1432f0..000000000000
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The CMake API for ament_uncrustify to check code against styleconventions"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_uncrustify
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
deleted file mode 100644
index 90ccda1432f0..000000000000
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The CMake API for ament_uncrustify to check code against styleconventions"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_uncrustify
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
deleted file mode 100644
index 90ccda1432f0..000000000000
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The CMake API for ament_uncrustify to check code against styleconventions"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_uncrustify
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-			"dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_uncrustify/metadata.xml b/dev-ros/ament_cmake_uncrustify/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_cmake_uncrustify/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_version/Manifest b/dev-ros/ament_cmake_version/Manifest
deleted file mode 100644
index 9d1e25f7642e..000000000000
--- a/dev-ros/ament_cmake_version/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
-DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_version-1.1.4.ebuild 1128 BLAKE2B d74d67f41474a2a83886201fb986707f66a123911b937a95b49b737a869a113ca24cd6a3ffbfa605b4966c4159b5134777b8675ffea5039670cc3cb71060ab17 SHA512 413bfc88e4ce514ae43f3fbe6b69c49ba9553adab7bef7b72d17bf2f8ae31dc1ce01fd9591087af5a155bd18dc248df8133967515ef5a43fec823fd678857160
-EBUILD ament_cmake_version-1.3.0.ebuild 1128 BLAKE2B d74d67f41474a2a83886201fb986707f66a123911b937a95b49b737a869a113ca24cd6a3ffbfa605b4966c4159b5134777b8675ffea5039670cc3cb71060ab17 SHA512 413bfc88e4ce514ae43f3fbe6b69c49ba9553adab7bef7b72d17bf2f8ae31dc1ce01fd9591087af5a155bd18dc248df8133967515ef5a43fec823fd678857160
-EBUILD ament_cmake_version-9999.ebuild 1128 BLAKE2B d74d67f41474a2a83886201fb986707f66a123911b937a95b49b737a869a113ca24cd6a3ffbfa605b4966c4159b5134777b8675ffea5039670cc3cb71060ab17 SHA512 413bfc88e4ce514ae43f3fbe6b69c49ba9553adab7bef7b72d17bf2f8ae31dc1ce01fd9591087af5a155bd18dc248df8133967515ef5a43fec823fd678857160
-MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild
deleted file mode 100644
index f46b08dae2b9..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Override the exported package version in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.3.0.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.3.0.ebuild
deleted file mode 100644
index f46b08dae2b9..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Override the exported package version in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
deleted file mode 100644
index f46b08dae2b9..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Override the exported package version in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_version/metadata.xml b/dev-ros/ament_cmake_version/metadata.xml
deleted file mode 100644
index 507777b6c9a3..000000000000
--- a/dev-ros/ament_cmake_version/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cmake_xmllint/Manifest b/dev-ros/ament_cmake_xmllint/Manifest
deleted file mode 100644
index 33b32f0e1b6c..000000000000
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_xmllint-0.11.2.ebuild 1350 BLAKE2B f25de23425a7edf29f08be7092680228bc86c2025ba6be006a6402c5c9d1cc0ded749f121a363fde6c19dda28936081f3cb0e9e1bbff02e7393feb628fd5660d SHA512 c0a42bffce07a91c214d63370f8d0a0101e41c62378ce816ae2d2d2f55543369e2522d066641ae8dcacdf459cd1164bbce9b2a7be9b5ffcc1152d126eea7f675
-EBUILD ament_cmake_xmllint-0.12.1.ebuild 1350 BLAKE2B f25de23425a7edf29f08be7092680228bc86c2025ba6be006a6402c5c9d1cc0ded749f121a363fde6c19dda28936081f3cb0e9e1bbff02e7393feb628fd5660d SHA512 c0a42bffce07a91c214d63370f8d0a0101e41c62378ce816ae2d2d2f55543369e2522d066641ae8dcacdf459cd1164bbce9b2a7be9b5ffcc1152d126eea7f675
-EBUILD ament_cmake_xmllint-9999.ebuild 1350 BLAKE2B f25de23425a7edf29f08be7092680228bc86c2025ba6be006a6402c5c9d1cc0ded749f121a363fde6c19dda28936081f3cb0e9e1bbff02e7393feb628fd5660d SHA512 c0a42bffce07a91c214d63370f8d0a0101e41c62378ce816ae2d2d2f55543369e2522d066641ae8dcacdf459cd1164bbce9b2a7be9b5ffcc1152d126eea7f675
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
deleted file mode 100644
index d1bf1f78ab0f..000000000000
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_copyright
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
deleted file mode 100644
index d1bf1f78ab0f..000000000000
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_copyright
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
deleted file mode 100644
index d1bf1f78ab0f..000000000000
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_copyright
-"
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-		dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
-		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_xmllint/metadata.xml b/dev-ros/ament_cmake_xmllint/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_cmake_xmllint/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_copyright/Manifest b/dev-ros/ament_copyright/Manifest
deleted file mode 100644
index 422e097b8ab2..000000000000
--- a/dev-ros/ament_copyright/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_copyright-0.11.2.ebuild 930 BLAKE2B c74b14e59a02a232d3202834ece6116470443db59788e80780707cefddbebc6312099d1e8d74796b11b4ca0210742cb379476272d982600e3b8c9da714e8d37a SHA512 77eec0796aa597c91dabae180df226d8978d39cc9ee7653ec45bdfb82d812d278b761fd72430bdea75c0e0b3fc323bf5e18fa6d5a9a88417d234ce551dad0335
-EBUILD ament_copyright-0.12.1.ebuild 930 BLAKE2B c74b14e59a02a232d3202834ece6116470443db59788e80780707cefddbebc6312099d1e8d74796b11b4ca0210742cb379476272d982600e3b8c9da714e8d37a SHA512 77eec0796aa597c91dabae180df226d8978d39cc9ee7653ec45bdfb82d812d278b761fd72430bdea75c0e0b3fc323bf5e18fa6d5a9a88417d234ce551dad0335
-EBUILD ament_copyright-9999.ebuild 930 BLAKE2B c74b14e59a02a232d3202834ece6116470443db59788e80780707cefddbebc6312099d1e8d74796b11b4ca0210742cb379476272d982600e3b8c9da714e8d37a SHA512 77eec0796aa597c91dabae180df226d8978d39cc9ee7653ec45bdfb82d812d278b761fd72430bdea75c0e0b3fc323bf5e18fa6d5a9a88417d234ce551dad0335
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild b/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
deleted file mode 100644
index a0846f9a8a84..000000000000
--- a/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check source files for copyright and license information"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-ros/ament_copyright/ament_copyright-0.12.1.ebuild b/dev-ros/ament_copyright/ament_copyright-0.12.1.ebuild
deleted file mode 100644
index a0846f9a8a84..000000000000
--- a/dev-ros/ament_copyright/ament_copyright-0.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check source files for copyright and license information"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-ros/ament_copyright/ament_copyright-9999.ebuild b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
deleted file mode 100644
index a0846f9a8a84..000000000000
--- a/dev-ros/ament_copyright/ament_copyright-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check source files for copyright and license information"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-ros/ament_copyright/metadata.xml b/dev-ros/ament_copyright/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_copyright/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
deleted file mode 100644
index 1f191ddad13a..000000000000
--- a/dev-ros/ament_cppcheck/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cppcheck-0.11.2.ebuild 929 BLAKE2B b1b70c094bad20ba0c6147e1415713897f58d2e1a3b5b5160021824c636a07f5791b9ece887315231e5a6cc46b0c62b6cdb6e032d0565ab393bed0395636631f SHA512 d0e8d29ff2b81f9ce9d79d895362e90cdbd7630ac844546a05843d874190da8f23281abbeb2f767e7784c4e8fefdf9cddf8723a5b99b65a22757f8b2ca42cc2c
-EBUILD ament_cppcheck-0.12.1.ebuild 929 BLAKE2B b1b70c094bad20ba0c6147e1415713897f58d2e1a3b5b5160021824c636a07f5791b9ece887315231e5a6cc46b0c62b6cdb6e032d0565ab393bed0395636631f SHA512 d0e8d29ff2b81f9ce9d79d895362e90cdbd7630ac844546a05843d874190da8f23281abbeb2f767e7784c4e8fefdf9cddf8723a5b99b65a22757f8b2ca42cc2c
-EBUILD ament_cppcheck-9999.ebuild 929 BLAKE2B b1b70c094bad20ba0c6147e1415713897f58d2e1a3b5b5160021824c636a07f5791b9ece887315231e5a6cc46b0c62b6cdb6e032d0565ab393bed0395636631f SHA512 d0e8d29ff2b81f9ce9d79d895362e90cdbd7630ac844546a05843d874190da8f23281abbeb2f767e7784c4e8fefdf9cddf8723a5b99b65a22757f8b2ca42cc2c
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.11.2.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.11.2.ebuild
deleted file mode 100644
index 7a2b556580d5..000000000000
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.11.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/cppcheck
-"
-DEPEND=""
-BDEPEND=""
-
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.12.1.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.12.1.ebuild
deleted file mode 100644
index 7a2b556580d5..000000000000
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/cppcheck
-"
-DEPEND=""
-BDEPEND=""
-
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
deleted file mode 100644
index 7a2b556580d5..000000000000
--- a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/cppcheck
-"
-DEPEND=""
-BDEPEND=""
-
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cppcheck/metadata.xml b/dev-ros/ament_cppcheck/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_cppcheck/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
deleted file mode 100644
index 6dcd91e8eb27..000000000000
--- a/dev-ros/ament_cpplint/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cpplint-0.11.2.ebuild 868 BLAKE2B 75a025a3afdce6613c18d3031a46998cde9ae34517e4d4d0b9f704350c6a870326a4db1513ee5340138edc36e877f46b9563e73acf099f1cc99720fff24605f3 SHA512 8a0ff2f9c890e287080b68db2000b3d6d61b8a45b9f81c4066e2b3e191550ebb772e9367fbe6a88057d81a1197a58706fafb4f70f930db1465dc186a3eb243de
-EBUILD ament_cpplint-0.12.1.ebuild 868 BLAKE2B 75a025a3afdce6613c18d3031a46998cde9ae34517e4d4d0b9f704350c6a870326a4db1513ee5340138edc36e877f46b9563e73acf099f1cc99720fff24605f3 SHA512 8a0ff2f9c890e287080b68db2000b3d6d61b8a45b9f81c4066e2b3e191550ebb772e9367fbe6a88057d81a1197a58706fafb4f70f930db1465dc186a3eb243de
-EBUILD ament_cpplint-9999.ebuild 868 BLAKE2B 75a025a3afdce6613c18d3031a46998cde9ae34517e4d4d0b9f704350c6a870326a4db1513ee5340138edc36e877f46b9563e73acf099f1cc99720fff24605f3 SHA512 8a0ff2f9c890e287080b68db2000b3d6d61b8a45b9f81c4066e2b3e191550ebb772e9367fbe6a88057d81a1197a58706fafb4f70f930db1465dc186a3eb243de
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
deleted file mode 100644
index cfa0fa72296f..000000000000
--- a/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND="
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.12.1.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.12.1.ebuild
deleted file mode 100644
index cfa0fa72296f..000000000000
--- a/dev-ros/ament_cpplint/ament_cpplint-0.12.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND="
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
deleted file mode 100644
index cfa0fa72296f..000000000000
--- a/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND="
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/metadata.xml b/dev-ros/ament_cpplint/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_cpplint/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
deleted file mode 100644
index 6edba50151a2..000000000000
--- a/dev-ros/ament_flake8/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_flake8-0.11.2.ebuild 819 BLAKE2B e74e08b2e9b790084ea7f512a1a9f9dfbf477ea00241554270c350488f2405071cd64dc7514dc9893b37de22a02062b80e760d7114be75dbd9f0046aa60fd016 SHA512 57ba3989e6bf1d6ea7b4eb2a50f37fdf5c3e0048f1459c2a622406e599953bd927f0c74baa9ddf52622974f8d3e84f8100797fb3d7650cf7d47616f9f1cb73f8
-EBUILD ament_flake8-0.12.1.ebuild 819 BLAKE2B e74e08b2e9b790084ea7f512a1a9f9dfbf477ea00241554270c350488f2405071cd64dc7514dc9893b37de22a02062b80e760d7114be75dbd9f0046aa60fd016 SHA512 57ba3989e6bf1d6ea7b4eb2a50f37fdf5c3e0048f1459c2a622406e599953bd927f0c74baa9ddf52622974f8d3e84f8100797fb3d7650cf7d47616f9f1cb73f8
-EBUILD ament_flake8-9999.ebuild 819 BLAKE2B e74e08b2e9b790084ea7f512a1a9f9dfbf477ea00241554270c350488f2405071cd64dc7514dc9893b37de22a02062b80e760d7114be75dbd9f0046aa60fd016 SHA512 57ba3989e6bf1d6ea7b4eb2a50f37fdf5c3e0048f1459c2a622406e599953bd927f0c74baa9ddf52622974f8d3e84f8100797fb3d7650cf7d47616f9f1cb73f8
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild b/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
deleted file mode 100644
index 52751e530235..000000000000
--- a/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/ament_flake8-0.12.1.ebuild b/dev-ros/ament_flake8/ament_flake8-0.12.1.ebuild
deleted file mode 100644
index 52751e530235..000000000000
--- a/dev-ros/ament_flake8/ament_flake8-0.12.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/ament_flake8-9999.ebuild b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
deleted file mode 100644
index 52751e530235..000000000000
--- a/dev-ros/ament_flake8/ament_flake8-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/metadata.xml b/dev-ros/ament_flake8/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_flake8/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
deleted file mode 100644
index 3ebff5ce45b7..000000000000
--- a/dev-ros/ament_lint/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_lint-0.11.2.ebuild 882 BLAKE2B efd5c601bde64a884732102f852b55d3fe37ef63bb63c1d4d8e171457b0a6bf76f0aa0072a6d98ddb0ebbbd18bb17712f2d77b712f73fe36d1171d6765dad300 SHA512 ac48ceed1d56f6169515ee461f7faaaba9c00f771b7c1fd6ea131a7a2952a0dfedf64f89d29d29dfb6e759a016c7d45f1da79261a123a74d3ea1dbda3c6d658f
-EBUILD ament_lint-0.12.1.ebuild 882 BLAKE2B efd5c601bde64a884732102f852b55d3fe37ef63bb63c1d4d8e171457b0a6bf76f0aa0072a6d98ddb0ebbbd18bb17712f2d77b712f73fe36d1171d6765dad300 SHA512 ac48ceed1d56f6169515ee461f7faaaba9c00f771b7c1fd6ea131a7a2952a0dfedf64f89d29d29dfb6e759a016c7d45f1da79261a123a74d3ea1dbda3c6d658f
-EBUILD ament_lint-9999.ebuild 882 BLAKE2B efd5c601bde64a884732102f852b55d3fe37ef63bb63c1d4d8e171457b0a6bf76f0aa0072a6d98ddb0ebbbd18bb17712f2d77b712f73fe36d1171d6765dad300 SHA512 ac48ceed1d56f6169515ee461f7faaaba9c00f771b7c1fd6ea131a7a2952a0dfedf64f89d29d29dfb6e759a016c7d45f1da79261a123a74d3ea1dbda3c6d658f
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_lint/ament_lint-0.11.2.ebuild b/dev-ros/ament_lint/ament_lint-0.11.2.ebuild
deleted file mode 100644
index 517d0c7f21a5..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.11.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Common API for ament linter packages"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/ament_lint-0.12.1.ebuild b/dev-ros/ament_lint/ament_lint-0.12.1.ebuild
deleted file mode 100644
index 517d0c7f21a5..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Common API for ament linter packages"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/ament_lint-9999.ebuild b/dev-ros/ament_lint/ament_lint-9999.ebuild
deleted file mode 100644
index 517d0c7f21a5..000000000000
--- a/dev-ros/ament_lint/ament_lint-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Common API for ament linter packages"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/metadata.xml b/dev-ros/ament_lint/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_lint/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
deleted file mode 100644
index a160e4856a41..000000000000
--- a/dev-ros/ament_lint_auto/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_lint_auto-0.11.2.ebuild 1086 BLAKE2B babc09192c8d436030001386b25c491f3c1b90ae491297a1a99c47f491046844504f3d669d0424ac60fcd1cebea3219d5fdd2a7a375482a83b0402eb42bdb2ad SHA512 b67e6d71d1044b3bc28182c0edd5777a7db5c368fe596d627fa7162ee94aab20420826dec663be9dc3d2849e648535d77b678dce800c37e943eda308fd377526
-EBUILD ament_lint_auto-0.12.1.ebuild 1086 BLAKE2B babc09192c8d436030001386b25c491f3c1b90ae491297a1a99c47f491046844504f3d669d0424ac60fcd1cebea3219d5fdd2a7a375482a83b0402eb42bdb2ad SHA512 b67e6d71d1044b3bc28182c0edd5777a7db5c368fe596d627fa7162ee94aab20420826dec663be9dc3d2849e648535d77b678dce800c37e943eda308fd377526
-EBUILD ament_lint_auto-9999.ebuild 1086 BLAKE2B babc09192c8d436030001386b25c491f3c1b90ae491297a1a99c47f491046844504f3d669d0424ac60fcd1cebea3219d5fdd2a7a375482a83b0402eb42bdb2ad SHA512 b67e6d71d1044b3bc28182c0edd5777a7db5c368fe596d627fa7162ee94aab20420826dec663be9dc3d2849e648535d77b678dce800c37e943eda308fd377526
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
deleted file mode 100644
index c69b1d327919..000000000000
--- a/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_test
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild
deleted file mode 100644
index c69b1d327919..000000000000
--- a/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_test
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild
deleted file mode 100644
index c69b1d327919..000000000000
--- a/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_test
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
-		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_lint_auto/metadata.xml b/dev-ros/ament_lint_auto/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_lint_auto/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_lint_cmake/Manifest b/dev-ros/ament_lint_cmake/Manifest
deleted file mode 100644
index e50a66110572..000000000000
--- a/dev-ros/ament_lint_cmake/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_lint_cmake-0.11.2.ebuild 860 BLAKE2B 1851da4aa5d510b417f3a51f54318d67e1e84ea287e516e18e2686fdeb261d6cdbca18179cb53c53a21d3273d1ed1e77304afbda57a327c75bcf6107f1cbce9c SHA512 fa241d8bc6f8227fe565875cf8bddb9bd3d87ea4a9059ccccda8a7b76d7f91d3db39f28c68a1149b02bfe27707e069ce87f552160a6db6acb6d3b33edae84efd
-EBUILD ament_lint_cmake-0.12.1.ebuild 854 BLAKE2B 1a283d1ee4c2a7aa6f37df39679575ca914c06b77a23a1189b760f1b1ffa1b3029a4634d2e540e3ab16864ba16992eea2cc30b2b14144f063be75dc96d48aee4 SHA512 c86743b97567433bf742b4098113a50b860675e834a9d2908fabf38032feb84f8fe6a190fc8b342e55d70c4eb239569f7bfcc96fd394431b964f7b6325a5d020
-EBUILD ament_lint_cmake-9999.ebuild 854 BLAKE2B 1a283d1ee4c2a7aa6f37df39679575ca914c06b77a23a1189b760f1b1ffa1b3029a4634d2e540e3ab16864ba16992eea2cc30b2b14144f063be75dc96d48aee4 SHA512 c86743b97567433bf742b4098113a50b860675e834a9d2908fabf38032feb84f8fe6a190fc8b342e55d70c4eb239569f7bfcc96fd394431b964f7b6325a5d020
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild
deleted file mode 100644
index a8aae5f51229..000000000000
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.12.1.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.12.1.ebuild
deleted file mode 100644
index ebaf1abbeeb3..000000000000
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.12.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
deleted file mode 100644
index ebaf1abbeeb3..000000000000
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint_cmake/metadata.xml b/dev-ros/ament_lint_cmake/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_lint_cmake/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_pep257/Manifest b/dev-ros/ament_pep257/Manifest
deleted file mode 100644
index 79943763c95b..000000000000
--- a/dev-ros/ament_pep257/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_pep257-0.11.2.ebuild 895 BLAKE2B 9fa1c763fb3bf4f5f287647773766d3dff8cb3bba5350493c40b19dc8fa9bb8d87d00b79d60631a3df83276fbf4b804b87d50f6e9db5f0f265cda10209fa60cb SHA512 24e65db1489cf66cf8a4e2c671b9884ba27ed8b8a9b1c22216eb02c0bf6c49306666640ceedfd84b774461ed2c490e5b0e4db736855131d0c2281f838b566851
-EBUILD ament_pep257-0.12.1.ebuild 895 BLAKE2B 9fa1c763fb3bf4f5f287647773766d3dff8cb3bba5350493c40b19dc8fa9bb8d87d00b79d60631a3df83276fbf4b804b87d50f6e9db5f0f265cda10209fa60cb SHA512 24e65db1489cf66cf8a4e2c671b9884ba27ed8b8a9b1c22216eb02c0bf6c49306666640ceedfd84b774461ed2c490e5b0e4db736855131d0c2281f838b566851
-EBUILD ament_pep257-9999.ebuild 895 BLAKE2B 9fa1c763fb3bf4f5f287647773766d3dff8cb3bba5350493c40b19dc8fa9bb8d87d00b79d60631a3df83276fbf4b804b87d50f6e9db5f0f265cda10209fa60cb SHA512 24e65db1489cf66cf8a4e2c671b9884ba27ed8b8a9b1c22216eb02c0bf6c49306666640ceedfd84b774461ed2c490e5b0e4db736855131d0c2281f838b566851
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild b/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild
deleted file mode 100644
index a2db76a02687..000000000000
--- a/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/pydocstyle[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/ament_pep257-0.12.1.ebuild b/dev-ros/ament_pep257/ament_pep257-0.12.1.ebuild
deleted file mode 100644
index a2db76a02687..000000000000
--- a/dev-ros/ament_pep257/ament_pep257-0.12.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/pydocstyle[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/ament_pep257-9999.ebuild b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
deleted file mode 100644
index a2db76a02687..000000000000
--- a/dev-ros/ament_pep257/ament_pep257-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/pydocstyle[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/metadata.xml b/dev-ros/ament_pep257/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_pep257/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_uncrustify/Manifest b/dev-ros/ament_uncrustify/Manifest
deleted file mode 100644
index 69806cc01690..000000000000
--- a/dev-ros/ament_uncrustify/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_uncrustify-0.11.2.ebuild 927 BLAKE2B 7a812136734737c1afd9f7bbb308d65e99a82f06279b00424fd149f482a81ac236a7dc5a409b46254100d6e8279d28f2a7590f0f61230b819d175be6b5be802e SHA512 59e59fa5df6e176e0ad0ee049acc2d7833948639f4ea7b2a730d62c70e1ad8e8243df59a7d0009af874a3c7fa7693ae08c748de93aea071f1ebfb7c89971afb7
-EBUILD ament_uncrustify-0.12.1.ebuild 927 BLAKE2B 7a812136734737c1afd9f7bbb308d65e99a82f06279b00424fd149f482a81ac236a7dc5a409b46254100d6e8279d28f2a7590f0f61230b819d175be6b5be802e SHA512 59e59fa5df6e176e0ad0ee049acc2d7833948639f4ea7b2a730d62c70e1ad8e8243df59a7d0009af874a3c7fa7693ae08c748de93aea071f1ebfb7c89971afb7
-EBUILD ament_uncrustify-9999.ebuild 927 BLAKE2B 7a812136734737c1afd9f7bbb308d65e99a82f06279b00424fd149f482a81ac236a7dc5a409b46254100d6e8279d28f2a7590f0f61230b819d175be6b5be802e SHA512 59e59fa5df6e176e0ad0ee049acc2d7833948639f4ea7b2a730d62c70e1ad8e8243df59a7d0009af874a3c7fa7693ae08c748de93aea071f1ebfb7c89971afb7
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.11.2.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.11.2.ebuild
deleted file mode 100644
index 1ca3b6d53444..000000000000
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.11.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check code against style conventions using uncrustify"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/uncrustify
-"
-DEPEND=""
-BDEPEND=""
-
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.12.1.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.12.1.ebuild
deleted file mode 100644
index 1ca3b6d53444..000000000000
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check code against style conventions using uncrustify"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/uncrustify
-"
-DEPEND=""
-BDEPEND=""
-
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
deleted file mode 100644
index 1ca3b6d53444..000000000000
--- a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check code against style conventions using uncrustify"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/uncrustify
-"
-DEPEND=""
-BDEPEND=""
-
-# pytest.ini is there but no tests are ran causing it to fail
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/metadata.xml b/dev-ros/ament_uncrustify/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_uncrustify/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
deleted file mode 100644
index 69808df5465a..000000000000
--- a/dev-ros/ament_xmllint/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
-DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_xmllint-0.11.2.ebuild 961 BLAKE2B 7be64b3eb5f0372da1a5a95c2879289d546f52f5ca33a923756bd9941b698af931c68c5060d7207f84e99798744934e32fa4151e8271bdd0a8fbd706600c9f0b SHA512 af637a537aac5d9b8428c4acfcef4859fcbedeab9803c10c84a49d83e9f13c3f8a22397f65893a9ce9b2f242a5de8e0ea9423a75247738189fed6216f75c6286
-EBUILD ament_xmllint-0.12.1.ebuild 961 BLAKE2B 7be64b3eb5f0372da1a5a95c2879289d546f52f5ca33a923756bd9941b698af931c68c5060d7207f84e99798744934e32fa4151e8271bdd0a8fbd706600c9f0b SHA512 af637a537aac5d9b8428c4acfcef4859fcbedeab9803c10c84a49d83e9f13c3f8a22397f65893a9ce9b2f242a5de8e0ea9423a75247738189fed6216f75c6286
-EBUILD ament_xmllint-9999.ebuild 961 BLAKE2B 7be64b3eb5f0372da1a5a95c2879289d546f52f5ca33a923756bd9941b698af931c68c5060d7207f84e99798744934e32fa4151e8271bdd0a8fbd706600c9f0b SHA512 af637a537aac5d9b8428c4acfcef4859fcbedeab9803c10c84a49d83e9f13c3f8a22397f65893a9ce9b2f242a5de8e0ea9423a75247738189fed6216f75c6286
-MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
deleted file mode 100644
index b383c292a9d4..000000000000
--- a/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Checks XML files like the package manifest using xmllint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.12.1.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.12.1.ebuild
deleted file mode 100644
index b383c292a9d4..000000000000
--- a/dev-ros/ament_xmllint/ament_xmllint-0.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Checks XML files like the package manifest using xmllint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
deleted file mode 100644
index b383c292a9d4..000000000000
--- a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Checks XML files like the package manifest using xmllint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/metadata.xml b/dev-ros/ament_xmllint/metadata.xml
deleted file mode 100644
index e997622e1d3a..000000000000
--- a/dev-ros/ament_xmllint/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ament/ament_lint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/angles/Manifest b/dev-ros/angles/Manifest
deleted file mode 100644
index 56f3e41227bc..000000000000
--- a/dev-ros/angles/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST angles-1.9.13.tar.gz 10511 BLAKE2B b38a330e8dda296cf68db152a52e046a2925a1b45e6c9e1a508c3b2f030f93bbef15b5b6d54f95a0dc93a28e109f583466b007117847e5a42e93322c8705e042 SHA512 fe2f2bd3f415b41db2f8c1d40d5277589dd1225bfb784c03bae4560104d5696a83912a2a3bd8d612ced9884e4016e5ed9490b4c66a4da089dbe4477bb2b188a4
-EBUILD angles-1.9.13.ebuild 370 BLAKE2B 77d77f1cea34e498d6e44406726d2d871f158735810aaef199ff8e88234cff4163ce6e9f98ce00df14cbd1a0d771833e02ac2dac99586280ee7a733046d88858 SHA512 a72a921132671f468629ffb9648f6f59f66cc169d2044dd74c135a808e4af510daaff934a186a9ff4209f11ad502bb143f27a30d89306798306556173084aa84
-EBUILD angles-9999.ebuild 370 BLAKE2B 77d77f1cea34e498d6e44406726d2d871f158735810aaef199ff8e88234cff4163ce6e9f98ce00df14cbd1a0d771833e02ac2dac99586280ee7a733046d88858 SHA512 a72a921132671f468629ffb9648f6f59f66cc169d2044dd74c135a808e4af510daaff934a186a9ff4209f11ad502bb143f27a30d89306798306556173084aa84
-MISC metadata.xml 325 BLAKE2B 370a9e01273278d2ec9e5de8ad700debef45afafab5edbde9f1a6b996b90c5e5f0d55d4153027e3c5988d4d6a477d51a5d5e1ccbd53b1cb19a49698475df784f SHA512 3f62bee921b2cde084bec1b66056da5c9fd18a707c4df437d70bfd53fdad1f6276412bb7db622196b776439e33e0ed0a4af070e8f6ff13d6329093670016b4e2
diff --git a/dev-ros/angles/angles-1.9.13.ebuild b/dev-ros/angles/angles-1.9.13.ebuild
deleted file mode 100644
index 5c99989816b3..000000000000
--- a/dev-ros/angles/angles-1.9.13.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/angles"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of simple math utilities to work with angles"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/angles/angles-9999.ebuild b/dev-ros/angles/angles-9999.ebuild
deleted file mode 100644
index 5c99989816b3..000000000000
--- a/dev-ros/angles/angles-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/angles"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of simple math utilities to work with angles"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/angles/metadata.xml b/dev-ros/angles/metadata.xml
deleted file mode 100644
index 31da1307036c..000000000000
--- a/dev-ros/angles/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/angles</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
deleted file mode 100644
index 781d30961203..000000000000
--- a/dev-ros/audio_capture/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST audio_common-0.3.11.tar.gz 191655 BLAKE2B 01d07027523632eb61fbcc9e20b40da27a923e596da94bd60411cf02400b37e2e7b307f1ac9da819c17184de521c689968e47d28274ba3f6ee5fe47dcea24e15 SHA512 95caeaa4a73a1d71f8f1329f7e3c94a9762e71608ac54ed60f5f01beb92f4ce2fe75ac944dadb0ffb9db69da5d2f6de3b22be452a394260317ed1ee9ac0e894e
-EBUILD audio_capture-0.3.11-r1.ebuild 631 BLAKE2B ca53d0a0482582c6492437535e3408ee05d6a5cbc063f8a6199724256255391bfe0893f89c7ff545d5ab75ee07a6ac6f839bb6f0c761e884735e7c7d15aeb9e6 SHA512 676f7094b01d9a6315d34790ebe47749498de711739eb6edeea5392d0952f16218986cf8edf5de3525ac6a8896e04931240652c983c86fab6d217c77d097d51a
-EBUILD audio_capture-9999.ebuild 631 BLAKE2B ca53d0a0482582c6492437535e3408ee05d6a5cbc063f8a6199724256255391bfe0893f89c7ff545d5ab75ee07a6ac6f839bb6f0c761e884735e7c7d15aeb9e6 SHA512 676f7094b01d9a6315d34790ebe47749498de711739eb6edeea5392d0952f16218986cf8edf5de3525ac6a8896e04931240652c983c86fab6d217c77d097d51a
-MISC metadata.xml 339 BLAKE2B b73e54b78b899cc7c17c27887913c97bfd9baa9ccde0e7a6f83f1b2ed9e7ceca0b9d0e5ac984a5631cbb42cd0fe4c9d741baeb4a3bab8c2911bfff2068bb9300 SHA512 bbd7d141736d876e3c78f99bd56e47c142bf4b7f2b223909a5b26e6fecb54a560a778dc03095214cb08a2e4f6194a90931201d5bdc8ea6d19dea117b2cab2a91
diff --git a/dev-ros/audio_capture/audio_capture-0.3.11-r1.ebuild b/dev-ros/audio_capture/audio_capture-0.3.11-r1.ebuild
deleted file mode 100644
index 978ada9fb7ce..000000000000
--- a/dev-ros/audio_capture/audio_capture-0.3.11-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transports audio from a source to a destination"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-RDEPEND="${RDEPEND}
-	media-plugins/gst-plugins-lame:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
-BDEPEND="
-	virtual/pkgconfig"
diff --git a/dev-ros/audio_capture/audio_capture-9999.ebuild b/dev-ros/audio_capture/audio_capture-9999.ebuild
deleted file mode 100644
index 978ada9fb7ce..000000000000
--- a/dev-ros/audio_capture/audio_capture-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transports audio from a source to a destination"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-RDEPEND="${RDEPEND}
-	media-plugins/gst-plugins-lame:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
-BDEPEND="
-	virtual/pkgconfig"
diff --git a/dev-ros/audio_capture/metadata.xml b/dev-ros/audio_capture/metadata.xml
deleted file mode 100644
index 4d7bd90c7707..000000000000
--- a/dev-ros/audio_capture/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/audio_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
deleted file mode 100644
index b01f73b6e11b..000000000000
--- a/dev-ros/audio_common_msgs/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST audio_common-0.3.10.tar.gz 191615 BLAKE2B 6d0247859099bda3c0edde109681364490654dbffb167a4aa252d7c1406dc8b77da6055d22b46b9fd0df10e3f8617b15544632ce1012d9a302c06a5732a217e6 SHA512 79a2bbc5cd9f837b9262d6a1a397b6bb5f2bf926959c44b05b6e2815862f0b32f430396cdf0f8960c9e5780fdfff3815285c037f82ca9b654c16c772fb732e66
-DIST audio_common-0.3.11.tar.gz 191655 BLAKE2B 01d07027523632eb61fbcc9e20b40da27a923e596da94bd60411cf02400b37e2e7b307f1ac9da819c17184de521c689968e47d28274ba3f6ee5fe47dcea24e15 SHA512 95caeaa4a73a1d71f8f1329f7e3c94a9762e71608ac54ed60f5f01beb92f4ce2fe75ac944dadb0ffb9db69da5d2f6de3b22be452a394260317ed1ee9ac0e894e
-DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
-DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
-DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
-EBUILD audio_common_msgs-0.3.10.ebuild 373 BLAKE2B 40955f5c75bef9dd1625d378d8a0c6386c81d31e2907ee378067d9ad6028a5afd06eefb8bbedb8aa44bf17c6eb4d51cd3387343412bcd5cb961ed7626d6cd180 SHA512 ad23345648502ba68717e2d759dc89fd03611d77f7ad47b1dafb31476f19b1579f25dc126d1779eaa28328ca8d92bc8ee4224eb55c2e84311ce24691f7f24e74
-EBUILD audio_common_msgs-0.3.11.ebuild 373 BLAKE2B 40955f5c75bef9dd1625d378d8a0c6386c81d31e2907ee378067d9ad6028a5afd06eefb8bbedb8aa44bf17c6eb4d51cd3387343412bcd5cb961ed7626d6cd180 SHA512 ad23345648502ba68717e2d759dc89fd03611d77f7ad47b1dafb31476f19b1579f25dc126d1779eaa28328ca8d92bc8ee4224eb55c2e84311ce24691f7f24e74
-EBUILD audio_common_msgs-0.3.6.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
-EBUILD audio_common_msgs-0.3.7.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
-EBUILD audio_common_msgs-0.3.8.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
-EBUILD audio_common_msgs-9999.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
-MISC metadata.xml 339 BLAKE2B b73e54b78b899cc7c17c27887913c97bfd9baa9ccde0e7a6f83f1b2ed9e7ceca0b9d0e5ac984a5631cbb42cd0fe4c9d741baeb4a3bab8c2911bfff2068bb9300 SHA512 bbd7d141736d876e3c78f99bd56e47c142bf4b7f2b223909a5b26e6fecb54a560a778dc03095214cb08a2e4f6194a90931201d5bdc8ea6d19dea117b2cab2a91
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.10.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.10.ebuild
deleted file mode 100644
index 7be554e1915f..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.10.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for transmitting audio via ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.11.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.11.ebuild
deleted file mode 100644
index 7be554e1915f..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.11.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for transmitting audio via ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.6.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.6.ebuild
deleted file mode 100644
index 468a27192cda..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for transmitting audio via ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.7.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.7.ebuild
deleted file mode 100644
index 468a27192cda..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for transmitting audio via ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.8.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.8.ebuild
deleted file mode 100644
index 468a27192cda..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for transmitting audio via ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
deleted file mode 100644
index 468a27192cda..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for transmitting audio via ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_common_msgs/metadata.xml b/dev-ros/audio_common_msgs/metadata.xml
deleted file mode 100644
index 4d7bd90c7707..000000000000
--- a/dev-ros/audio_common_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/audio_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
deleted file mode 100644
index 99edfc7e48fc..000000000000
--- a/dev-ros/audio_play/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST audio_common-0.3.10.tar.gz 191615 BLAKE2B 6d0247859099bda3c0edde109681364490654dbffb167a4aa252d7c1406dc8b77da6055d22b46b9fd0df10e3f8617b15544632ce1012d9a302c06a5732a217e6 SHA512 79a2bbc5cd9f837b9262d6a1a397b6bb5f2bf926959c44b05b6e2815862f0b32f430396cdf0f8960c9e5780fdfff3815285c037f82ca9b654c16c772fb732e66
-DIST audio_common-0.3.11.tar.gz 191655 BLAKE2B 01d07027523632eb61fbcc9e20b40da27a923e596da94bd60411cf02400b37e2e7b307f1ac9da819c17184de521c689968e47d28274ba3f6ee5fe47dcea24e15 SHA512 95caeaa4a73a1d71f8f1329f7e3c94a9762e71608ac54ed60f5f01beb92f4ce2fe75ac944dadb0ffb9db69da5d2f6de3b22be452a394260317ed1ee9ac0e894e
-DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
-DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
-DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
-EBUILD audio_play-0.3.10-r1.ebuild 594 BLAKE2B 8c0f2d8ab4403e5fb22a21f3f30eda5db9f4635ced70dc33c63b135ffce83d6d2c85f49ae088f3576a9009f7a9d9b5a4ba6b0acfc196c2aa46989fcbcf728c19 SHA512 32919f7c66326f0f11c31bee5f80f34020ce485c4b788f7c60265b56c738f81b07357af3582ea41fd48c06212c72e726262def7300cd84f563056c41e33c1228
-EBUILD audio_play-0.3.11-r1.ebuild 594 BLAKE2B 8c0f2d8ab4403e5fb22a21f3f30eda5db9f4635ced70dc33c63b135ffce83d6d2c85f49ae088f3576a9009f7a9d9b5a4ba6b0acfc196c2aa46989fcbcf728c19 SHA512 32919f7c66326f0f11c31bee5f80f34020ce485c4b788f7c60265b56c738f81b07357af3582ea41fd48c06212c72e726262def7300cd84f563056c41e33c1228
-EBUILD audio_play-0.3.6-r1.ebuild 594 BLAKE2B 8c0f2d8ab4403e5fb22a21f3f30eda5db9f4635ced70dc33c63b135ffce83d6d2c85f49ae088f3576a9009f7a9d9b5a4ba6b0acfc196c2aa46989fcbcf728c19 SHA512 32919f7c66326f0f11c31bee5f80f34020ce485c4b788f7c60265b56c738f81b07357af3582ea41fd48c06212c72e726262def7300cd84f563056c41e33c1228
-EBUILD audio_play-0.3.7-r1.ebuild 594 BLAKE2B 8c0f2d8ab4403e5fb22a21f3f30eda5db9f4635ced70dc33c63b135ffce83d6d2c85f49ae088f3576a9009f7a9d9b5a4ba6b0acfc196c2aa46989fcbcf728c19 SHA512 32919f7c66326f0f11c31bee5f80f34020ce485c4b788f7c60265b56c738f81b07357af3582ea41fd48c06212c72e726262def7300cd84f563056c41e33c1228
-EBUILD audio_play-0.3.8-r1.ebuild 594 BLAKE2B 8c0f2d8ab4403e5fb22a21f3f30eda5db9f4635ced70dc33c63b135ffce83d6d2c85f49ae088f3576a9009f7a9d9b5a4ba6b0acfc196c2aa46989fcbcf728c19 SHA512 32919f7c66326f0f11c31bee5f80f34020ce485c4b788f7c60265b56c738f81b07357af3582ea41fd48c06212c72e726262def7300cd84f563056c41e33c1228
-EBUILD audio_play-9999.ebuild 594 BLAKE2B 8c0f2d8ab4403e5fb22a21f3f30eda5db9f4635ced70dc33c63b135ffce83d6d2c85f49ae088f3576a9009f7a9d9b5a4ba6b0acfc196c2aa46989fcbcf728c19 SHA512 32919f7c66326f0f11c31bee5f80f34020ce485c4b788f7c60265b56c738f81b07357af3582ea41fd48c06212c72e726262def7300cd84f563056c41e33c1228
-MISC metadata.xml 339 BLAKE2B b73e54b78b899cc7c17c27887913c97bfd9baa9ccde0e7a6f83f1b2ed9e7ceca0b9d0e5ac984a5631cbb42cd0fe4c9d741baeb4a3bab8c2911bfff2068bb9300 SHA512 bbd7d141736d876e3c78f99bd56e47c142bf4b7f2b223909a5b26e6fecb54a560a778dc03095214cb08a2e4f6194a90931201d5bdc8ea6d19dea117b2cab2a91
diff --git a/dev-ros/audio_play/audio_play-0.3.10-r1.ebuild b/dev-ros/audio_play/audio_play-0.3.10-r1.ebuild
deleted file mode 100644
index 89e6144ca0fd..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Outputs audio to a speaker from a source node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.11-r1.ebuild b/dev-ros/audio_play/audio_play-0.3.11-r1.ebuild
deleted file mode 100644
index 89e6144ca0fd..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.11-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Outputs audio to a speaker from a source node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.6-r1.ebuild b/dev-ros/audio_play/audio_play-0.3.6-r1.ebuild
deleted file mode 100644
index 89e6144ca0fd..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.6-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Outputs audio to a speaker from a source node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.7-r1.ebuild b/dev-ros/audio_play/audio_play-0.3.7-r1.ebuild
deleted file mode 100644
index 89e6144ca0fd..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Outputs audio to a speaker from a source node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.8-r1.ebuild b/dev-ros/audio_play/audio_play-0.3.8-r1.ebuild
deleted file mode 100644
index 89e6144ca0fd..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Outputs audio to a speaker from a source node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/audio_play/audio_play-9999.ebuild b/dev-ros/audio_play/audio_play-9999.ebuild
deleted file mode 100644
index 89e6144ca0fd..000000000000
--- a/dev-ros/audio_play/audio_play-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Outputs audio to a speaker from a source node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/audio_play/metadata.xml b/dev-ros/audio_play/metadata.xml
deleted file mode 100644
index 4d7bd90c7707..000000000000
--- a/dev-ros/audio_play/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/audio_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest
deleted file mode 100644
index 21f13c77280e..000000000000
--- a/dev-ros/base_local_planner/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD base_local_planner-1.17.1-r2.ebuild 1142 BLAKE2B 6768a48171594832722ba13fa6c487111cbdc870717d077864fd6b57f9999ebc84749914faa84a91a5b921150243e9468a9607325841c442b7ce293f6cc05c2e SHA512 2330c26493e610c76e4a166e0d2f14c97b8be8d82dc2d958e71db2a73dc54853884db206f13f36c2eed96c3e3a3abb19886acc509b18f627da45517ff3d85ba0
-EBUILD base_local_planner-9999.ebuild 1142 BLAKE2B 6768a48171594832722ba13fa6c487111cbdc870717d077864fd6b57f9999ebc84749914faa84a91a5b921150243e9468a9607325841c442b7ce293f6cc05c2e SHA512 2330c26493e610c76e4a166e0d2f14c97b8be8d82dc2d958e71db2a73dc54853884db206f13f36c2eed96c3e3a3abb19886acc509b18f627da45517ff3d85ba0
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/base_local_planner/base_local_planner-1.17.1-r2.ebuild b/dev-ros/base_local_planner/base_local_planner-1.17.1-r2.ebuild
deleted file mode 100644
index 9d4439aaeb9c..000000000000
--- a/dev-ros/base_local_planner/base_local_planner-1.17.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-cpp/eigen:3
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/voxel_grid
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] )
-"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/base_local_planner/base_local_planner-9999.ebuild b/dev-ros/base_local_planner/base_local_planner-9999.ebuild
deleted file mode 100644
index 9d4439aaeb9c..000000000000
--- a/dev-ros/base_local_planner/base_local_planner-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-cpp/eigen:3
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/voxel_grid
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] )
-"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/base_local_planner/metadata.xml b/dev-ros/base_local_planner/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/base_local_planner/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/bond/Manifest b/dev-ros/bond/Manifest
deleted file mode 100644
index c46afd335111..000000000000
--- a/dev-ros/bond/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
-DIST bond_core-1.8.6.tar.gz 33915 BLAKE2B 7d75a9fce73974f1ca131807b9f7e9084dc8204861d85a10f8bf38dacbbe2b25bdbad6d8719374b95f6fffb18f7078cdbabd3353487e8a96420b7afd7498fdcd SHA512 862f3779e7b63c462118b8d0d17ed405c914792bd6293e12b4dbf2499f459566669cb60d8c207e29e386e32a2065c5c0ac7a98c4372d4eded4f107c8537c9bbf
-EBUILD bond-1.8.5.ebuild 449 BLAKE2B d3c80d012695869c859fbebe7408949776e4bfd58212db5558e74f7a51babd26d98aaf08a6d3f7eb106001f484a50a1e7772a4320590db3996ec30837678101a SHA512 9ed5d1522408a2ac0d2595931f4a4dee07667bfd637ebfc7c33a61da826ee882ecc2d5d493669780718b52f19004930aac09abb28699c548d3bfbbada65e82f5
-EBUILD bond-1.8.6.ebuild 449 BLAKE2B d3c80d012695869c859fbebe7408949776e4bfd58212db5558e74f7a51babd26d98aaf08a6d3f7eb106001f484a50a1e7772a4320590db3996ec30837678101a SHA512 9ed5d1522408a2ac0d2595931f4a4dee07667bfd637ebfc7c33a61da826ee882ecc2d5d493669780718b52f19004930aac09abb28699c548d3bfbbada65e82f5
-EBUILD bond-9999.ebuild 449 BLAKE2B d3c80d012695869c859fbebe7408949776e4bfd58212db5558e74f7a51babd26d98aaf08a6d3f7eb106001f484a50a1e7772a4320590db3996ec30837678101a SHA512 9ed5d1522408a2ac0d2595931f4a4dee07667bfd637ebfc7c33a61da826ee882ecc2d5d493669780718b52f19004930aac09abb28699c548d3bfbbada65e82f5
-MISC metadata.xml 328 BLAKE2B 5ed9601fcd46b742df6972b9d4e6af0263afbe4e0e273d34b4a9f9cdf16e0dae073408d43cf361fd79c04e136d369fe64d16b90ec57e06871780aa9761bd6091 SHA512 cc8310ee68b4b4e23ff680d14afb426aa8ea41cf1ff6b4d779778d4e882ea30e1de65d08049fb4f9a7bdd95d7d02b66be4d48113eb512c6843f6d3d9e80dc131
diff --git a/dev-ros/bond/bond-1.8.5.ebuild b/dev-ros/bond/bond-1.8.5.ebuild
deleted file mode 100644
index 16f4aac71766..000000000000
--- a/dev-ros/bond/bond-1.8.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/bond-1.8.6.ebuild b/dev-ros/bond/bond-1.8.6.ebuild
deleted file mode 100644
index 16f4aac71766..000000000000
--- a/dev-ros/bond/bond-1.8.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/bond-9999.ebuild b/dev-ros/bond/bond-9999.ebuild
deleted file mode 100644
index 16f4aac71766..000000000000
--- a/dev-ros/bond/bond-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bond/metadata.xml b/dev-ros/bond/metadata.xml
deleted file mode 100644
index 9ae2e2f3192e..000000000000
--- a/dev-ros/bond/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/bond_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/bondcpp/Manifest b/dev-ros/bondcpp/Manifest
deleted file mode 100644
index a39d95894470..000000000000
--- a/dev-ros/bondcpp/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
-DIST bond_core-1.8.6.tar.gz 33915 BLAKE2B 7d75a9fce73974f1ca131807b9f7e9084dc8204861d85a10f8bf38dacbbe2b25bdbad6d8719374b95f6fffb18f7078cdbabd3353487e8a96420b7afd7498fdcd SHA512 862f3779e7b63c462118b8d0d17ed405c914792bd6293e12b4dbf2499f459566669cb60d8c207e29e386e32a2065c5c0ac7a98c4372d4eded4f107c8537c9bbf
-EBUILD bondcpp-1.8.5.ebuild 493 BLAKE2B f723924109ba22387ae651b4115c07ddd4591241ae2f846512539754c24947fab4390bb9a269eb4d612725a23d23199b389a98f963a69cc1f129b377788e5e26 SHA512 c6bf1ed01b3e3eae3b078071ad1919013da0ceea4045b8a6cb38f39fc874b060c002bd9bd4d7e56bb74103524362d3d2228a90986757004df12d3d2fcb1b17ce
-EBUILD bondcpp-1.8.6.ebuild 493 BLAKE2B f723924109ba22387ae651b4115c07ddd4591241ae2f846512539754c24947fab4390bb9a269eb4d612725a23d23199b389a98f963a69cc1f129b377788e5e26 SHA512 c6bf1ed01b3e3eae3b078071ad1919013da0ceea4045b8a6cb38f39fc874b060c002bd9bd4d7e56bb74103524362d3d2228a90986757004df12d3d2fcb1b17ce
-EBUILD bondcpp-9999.ebuild 493 BLAKE2B f723924109ba22387ae651b4115c07ddd4591241ae2f846512539754c24947fab4390bb9a269eb4d612725a23d23199b389a98f963a69cc1f129b377788e5e26 SHA512 c6bf1ed01b3e3eae3b078071ad1919013da0ceea4045b8a6cb38f39fc874b060c002bd9bd4d7e56bb74103524362d3d2228a90986757004df12d3d2fcb1b17ce
-MISC metadata.xml 328 BLAKE2B 5ed9601fcd46b742df6972b9d4e6af0263afbe4e0e273d34b4a9f9cdf16e0dae073408d43cf361fd79c04e136d369fe64d16b90ec57e06871780aa9761bd6091 SHA512 cc8310ee68b4b4e23ff680d14afb426aa8ea41cf1ff6b4d779778d4e882ea30e1de65d08049fb4f9a7bdd95d7d02b66be4d48113eb512c6843f6d3d9e80dc131
diff --git a/dev-ros/bondcpp/bondcpp-1.8.5.ebuild b/dev-ros/bondcpp/bondcpp-1.8.5.ebuild
deleted file mode 100644
index dc38b47180d5..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond
-	dev-ros/cmake_modules
-	>=dev-ros/roscpp-1.13.6
-	dev-ros/smclib
-	dev-libs/boost:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.8.6.ebuild b/dev-ros/bondcpp/bondcpp-1.8.6.ebuild
deleted file mode 100644
index dc38b47180d5..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond
-	dev-ros/cmake_modules
-	>=dev-ros/roscpp-1.13.6
-	dev-ros/smclib
-	dev-libs/boost:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-9999.ebuild b/dev-ros/bondcpp/bondcpp-9999.ebuild
deleted file mode 100644
index dc38b47180d5..000000000000
--- a/dev-ros/bondcpp/bondcpp-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond
-	dev-ros/cmake_modules
-	>=dev-ros/roscpp-1.13.6
-	dev-ros/smclib
-	dev-libs/boost:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/metadata.xml b/dev-ros/bondcpp/metadata.xml
deleted file mode 100644
index 9ae2e2f3192e..000000000000
--- a/dev-ros/bondcpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/bond_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/bondpy/Manifest b/dev-ros/bondpy/Manifest
deleted file mode 100644
index 32ee9e82cf55..000000000000
--- a/dev-ros/bondpy/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
-DIST bond_core-1.8.6.tar.gz 33915 BLAKE2B 7d75a9fce73974f1ca131807b9f7e9084dc8204861d85a10f8bf38dacbbe2b25bdbad6d8719374b95f6fffb18f7078cdbabd3353487e8a96420b7afd7498fdcd SHA512 862f3779e7b63c462118b8d0d17ed405c914792bd6293e12b4dbf2499f459566669cb60d8c207e29e386e32a2065c5c0ac7a98c4372d4eded4f107c8537c9bbf
-EBUILD bondpy-1.8.5.ebuild 495 BLAKE2B 89873364ce6f188e4db0249cbd9c9e4225089d439975a165549fc87f1bc9c16847dd3d37e388152d09c2a83b9d45003820c7755f5114899885f0633649c28eae SHA512 489d9df5471298df2a01ae9805acfc4e27df6be25a0dc990cbdf268424a231997fac1757f74f25ba1d70df068aa85524aad3316466a2d80f9c7cdf9fe5c0ea65
-EBUILD bondpy-1.8.6.ebuild 495 BLAKE2B 89873364ce6f188e4db0249cbd9c9e4225089d439975a165549fc87f1bc9c16847dd3d37e388152d09c2a83b9d45003820c7755f5114899885f0633649c28eae SHA512 489d9df5471298df2a01ae9805acfc4e27df6be25a0dc990cbdf268424a231997fac1757f74f25ba1d70df068aa85524aad3316466a2d80f9c7cdf9fe5c0ea65
-EBUILD bondpy-9999.ebuild 495 BLAKE2B 89873364ce6f188e4db0249cbd9c9e4225089d439975a165549fc87f1bc9c16847dd3d37e388152d09c2a83b9d45003820c7755f5114899885f0633649c28eae SHA512 489d9df5471298df2a01ae9805acfc4e27df6be25a0dc990cbdf268424a231997fac1757f74f25ba1d70df068aa85524aad3316466a2d80f9c7cdf9fe5c0ea65
-MISC metadata.xml 328 BLAKE2B 5ed9601fcd46b742df6972b9d4e6af0263afbe4e0e273d34b4a9f9cdf16e0dae073408d43cf361fd79c04e136d369fe64d16b90ec57e06871780aa9761bd6091 SHA512 cc8310ee68b4b4e23ff680d14afb426aa8ea41cf1ff6b4d779778d4e882ea30e1de65d08049fb4f9a7bdd95d7d02b66be4d48113eb512c6843f6d3d9e80dc131
diff --git a/dev-ros/bondpy/bondpy-1.8.5.ebuild b/dev-ros/bondpy/bondpy-1.8.5.ebuild
deleted file mode 100644
index 5e193376f61a..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.6.ebuild b/dev-ros/bondpy/bondpy-1.8.6.ebuild
deleted file mode 100644
index 5e193376f61a..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-9999.ebuild b/dev-ros/bondpy/bondpy-9999.ebuild
deleted file mode 100644
index 5e193376f61a..000000000000
--- a/dev-ros/bondpy/bondpy-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/metadata.xml b/dev-ros/bondpy/metadata.xml
deleted file mode 100644
index 9ae2e2f3192e..000000000000
--- a/dev-ros/bondpy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/bond_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/calibration_estimation/Manifest b/dev-ros/calibration_estimation/Manifest
deleted file mode 100644
index 929cfd8ff5ff..000000000000
--- a/dev-ros/calibration_estimation/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX py3.patch 3416 BLAKE2B 7f879cee3a10359d5988fe8ee04ccfb9c2d30fff7609e52950c7a61c3f02ad571363094f47e841ef9796c49c0d14f75c275cf3ba7534a5a0c1c0680ec48a2c70 SHA512 6200c57aa4f6f95338eba80342efcdd026b971d3b373a946fd45ce92bddc67f329c1fcafcedc74f2169ce871565a91b1d442a862cd5f87cd99f9aa225304b15f
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD calibration_estimation-0.10.14.ebuild 1371 BLAKE2B 2dd06306d99468d2670da4c706ed3cea54239a01cf3a4311c0364a0f0b50dbc171fc4bac4950d145b15ea6bf720a06fdc2377276b3966f3acc96a569e985b2a9 SHA512 6e001af223d114e5cfbd1ad5f96e4bdaab495e6a6fd766ac4f553670b6d3eb18a05d0665ccb10181cbe7914e088ab73152b9347003c4408697499702820b9afb
-EBUILD calibration_estimation-0.10.15-r1.ebuild 1290 BLAKE2B 2c55614ae0f194d14688da243dd158e89dbb0c8646c7ac0f4db95513af5e545aa5294a19a0ba084de4df18f5815d4bb8b44c764f4e2b40debba7de216316abcc SHA512 b3e3c18ac47fc36a9f0a72902a6113955e6f3774c51cb38c66fc99db1e0541dab1a5d52e0791658015d192f4b3e0fffb20c14d22bef33d04eefdd76240fc5bd8
-EBUILD calibration_estimation-9999.ebuild 1290 BLAKE2B 2c55614ae0f194d14688da243dd158e89dbb0c8646c7ac0f4db95513af5e545aa5294a19a0ba084de4df18f5815d4bb8b44c764f4e2b40debba7de216316abcc SHA512 b3e3c18ac47fc36a9f0a72902a6113955e6f3774c51cb38c66fc99db1e0541dab1a5d52e0791658015d192f4b3e0fffb20c14d22bef33d04eefdd76240fc5bd8
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
deleted file mode 100644
index d445cebc3fda..000000000000
--- a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/scipy[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/py3.patch" )
-
-src_prepare() {
-	ros-catkin_src_prepare
-	sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
-	2to3 -w src/*/*.py src/*/*/*.py test/*.py || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.15-r1.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.15-r1.ebuild
deleted file mode 100644
index 860c62b9d87d..000000000000
--- a/dev-ros/calibration_estimation/calibration_estimation-0.10.15-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/urdf_parser_py[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	2to3 -n -w --no-diffs test/*.py src/${PN}/{,sensors/}*.py || die
-	sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	python_optimize
-}
diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
deleted file mode 100644
index 860c62b9d87d..000000000000
--- a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/urdf_parser_py[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	2to3 -n -w --no-diffs test/*.py src/${PN}/{,sensors/}*.py || die
-	sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	python_optimize
-}
diff --git a/dev-ros/calibration_estimation/files/py3.patch b/dev-ros/calibration_estimation/files/py3.patch
deleted file mode 100644
index ad680c7a7c60..000000000000
--- a/dev-ros/calibration_estimation/files/py3.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: calibration_estimation/src/calibration_estimation/sensors/chain_sensor.py
-===================================================================
---- calibration_estimation.orig/src/calibration_estimation/sensors/chain_sensor.py
-+++ calibration_estimation/src/calibration_estimation/sensors/chain_sensor.py
-@@ -135,7 +135,7 @@ class ChainSensor:
-         cov_angles = [x*x for x in self._full_chain.calc_block._chain._cov_dict['joint_angles']]
-         cov = matrix(Jt).T * matrix(diag(cov_angles)) * matrix(Jt)
-         
--        if ( self._full_chain.calc_block._chain._cov_dict.has_key('translation') ):
-+        if ( 'translation' in self._full_chain.calc_block._chain._cov_dict ):
-             translation_var = self._full_chain.calc_block._chain._cov_dict['translation'];
-             translation_cov = numpy.diag(translation_var*(self.get_residual_length()/3))
-             cov = cov + translation_cov
-Index: calibration_estimation/src/calibration_estimation/sensors/tilting_laser_sensor.py
-===================================================================
---- calibration_estimation.orig/src/calibration_estimation/sensors/tilting_laser_sensor.py
-+++ calibration_estimation/src/calibration_estimation/sensors/tilting_laser_sensor.py
-@@ -99,7 +99,7 @@ class TiltingLaserSensor:
-         gamma = matrix(zeros(cov.shape))
-         num_pts = self.get_residual_length()/3
- 
--        for k in range(num_pts):
-+        for k in range(int(num_pts)):
-             first = 3*k
-             last = 3*k+3
-             sub_cov = matrix(cov[first:last, first:last])
-Index: calibration_estimation/test/chain_sensor_unittest.py
-===================================================================
---- calibration_estimation.orig/test/chain_sensor_unittest.py
-+++ calibration_estimation/test/chain_sensor_unittest.py
-@@ -59,7 +59,7 @@ from numpy import *
- 
- def loadSystem():
-     urdf = '''
--<robot>
-+<robot name="test">
-   <link name="base_link"/>
-   <joint name="j0" type="fixed">
-     <origin xyz="0 0 0" rpy="0 0 0"/>
-Index: calibration_estimation/test/full_chain_unittest.py
-===================================================================
---- calibration_estimation.orig/test/full_chain_unittest.py
-+++ calibration_estimation/test/full_chain_unittest.py
-@@ -50,7 +50,7 @@ import numpy
- 
- def loadSystem1():
-     urdf = '''
--<robot>
-+<robot name="test">
-   <link name="base_link"/>
-   <joint name="j0" type="fixed">
-     <origin xyz="10 0 0" rpy="0 0 0"/>
-Index: calibration_estimation/test/tilting_laser_sensor_unittest.py
-===================================================================
---- calibration_estimation.orig/test/tilting_laser_sensor_unittest.py
-+++ calibration_estimation/test/tilting_laser_sensor_unittest.py
-@@ -74,7 +74,7 @@ class TestTiltingLaserBundler(unittest.T
- 
- def loadSystem():
-     urdf = '''
--<robot>
-+<robot name="test">
-   <link name="base_link"/>
-   <joint name="j0" type="fixed">
-     <origin xyz="0 0 0" rpy="0 0 0"/>
-Index: calibration_estimation/test/tilting_laser_unittest.py
-===================================================================
---- calibration_estimation.orig/test/tilting_laser_unittest.py
-+++ calibration_estimation/test/tilting_laser_unittest.py
-@@ -47,7 +47,7 @@ from numpy import *
- 
- def loadSystem1():
-     urdf = '''
--<robot>
-+<robot name="test">
-   <link name="base_link"/>
-   <joint name="j0" type="fixed">
-     <origin xyz="0 0 10" rpy="0 0 0"/>
diff --git a/dev-ros/calibration_estimation/metadata.xml b/dev-ros/calibration_estimation/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/calibration_estimation/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/calibration_launch/Manifest b/dev-ros/calibration_launch/Manifest
deleted file mode 100644
index c83465c6e453..000000000000
--- a/dev-ros/calibration_launch/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX py3.patch 608 BLAKE2B 8f9b52a959979d34b939536177d2e3f542046d3013ccaef79e6cc758385d3122fc220bcc81fae50ee73a0cccbab931cd5acbf173ed24ccd13ee6f064883cbd29 SHA512 2fa478d9389676d1d0e1a2a1d7720f871e5eff464be195ada8fc6093958e5bf3d893e8a90a89a60daa5443230b9a10f307e363de16e88206f79c1af60bc04fb2
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD calibration_launch-0.10.15-r1.ebuild 560 BLAKE2B d80874bd54105a9ab2478a2f9f57eb3305455948475b871c591decb96d86de5fae498eca90b0033950ae5f06d214a266ca4477c205990e626652016168cc3b86 SHA512 990416151166bcaa2b77882f0b56ffb895f3f5503fff832a543734d3231092729221b9d2a952cda64979e4c35c7e0f9636ee1aa9caa2a4a87d88aee223ed3c9a
-EBUILD calibration_launch-9999.ebuild 560 BLAKE2B d80874bd54105a9ab2478a2f9f57eb3305455948475b871c591decb96d86de5fae498eca90b0033950ae5f06d214a266ca4477c205990e626652016168cc3b86 SHA512 990416151166bcaa2b77882f0b56ffb895f3f5503fff832a543734d3231092729221b9d2a952cda64979e4c35c7e0f9636ee1aa9caa2a4a87d88aee223ed3c9a
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.15-r1.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.15-r1.ebuild
deleted file mode 100644
index 2ea52c5982a2..000000000000
--- a/dev-ros/calibration_launch/calibration_launch-0.10.15-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for configuring the calibration stack to run on your robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/interval_intersection
-	dev-ros/joint_states_settler
-	dev-ros/laser_cb_detector
-	dev-ros/monocam_settler
-	dev-ros/roslaunch
-	dev-libs/urdfdom
-"
-PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/calibration_launch/calibration_launch-9999.ebuild b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
deleted file mode 100644
index 2ea52c5982a2..000000000000
--- a/dev-ros/calibration_launch/calibration_launch-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for configuring the calibration stack to run on your robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/interval_intersection
-	dev-ros/joint_states_settler
-	dev-ros/laser_cb_detector
-	dev-ros/monocam_settler
-	dev-ros/roslaunch
-	dev-libs/urdfdom
-"
-PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/calibration_launch/files/py3.patch b/dev-ros/calibration_launch/files/py3.patch
deleted file mode 100644
index ee9aa2c41f34..000000000000
--- a/dev-ros/calibration_launch/files/py3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: calibration_launch/src/capture_executive/robot_measurement_cache.py
-===================================================================
---- calibration_launch.orig/src/capture_executive/robot_measurement_cache.py
-+++ calibration_launch/src/capture_executive/robot_measurement_cache.py
-@@ -174,7 +174,7 @@ class RobotMeasurementCache:
-            return m
- 
-         # TODO: eliminate print statement or convert to rospy.log*
--        print "Received everything!"
-+        print("Received everything!")
- 
-         # Push everything into a RobotMeasurement message
-         m_robot = RobotMeasurement()
diff --git a/dev-ros/calibration_launch/metadata.xml b/dev-ros/calibration_launch/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/calibration_launch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/calibration_msgs/Manifest b/dev-ros/calibration_msgs/Manifest
deleted file mode 100644
index 185758dfdf2b..000000000000
--- a/dev-ros/calibration_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD calibration_msgs-0.10.14.ebuild 506 BLAKE2B 286bea7d10840fe5bcf037a516d1449b8a89af9df43d50a5fb68506b4866751a6ee924f1bb80ca2ae8ec6d6276e93b37396168f6b79ee218ac8ac057d7432be5 SHA512 18c8009c537a446fc318b9120a4fe8c34ab116ad4f3b0fa988399b2cc6c8fae24a3d6b187eb336866b24097ab87485d3cda04635df07ac39193350beb4949ec2
-EBUILD calibration_msgs-0.10.15.ebuild 506 BLAKE2B ab8e3f3d6283667e3363aa212b2339103323650ff8baca68b401b66ebcb859b0adb0bec22fd74c2272469746b8a6c6825dfcbe151effaf776520b18b66f93183 SHA512 52656b1c3d86cbaecb49b10f8a10bcb30c92b2dbe7ddd09fcd4c9329c1c71718eeb3daf613e299e0231f659a4869f98a3f1b8bec072b7cd9ea3a7f006a9d9b68
-EBUILD calibration_msgs-9999.ebuild 506 BLAKE2B 286bea7d10840fe5bcf037a516d1449b8a89af9df43d50a5fb68506b4866751a6ee924f1bb80ca2ae8ec6d6276e93b37396168f6b79ee218ac8ac057d7432be5 SHA512 18c8009c537a446fc318b9120a4fe8c34ab116ad4f3b0fa988399b2cc6c8fae24a3d6b187eb336866b24097ab87485d3cda04635df07ac39193350beb4949ec2
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild b/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild
deleted file mode 100644
index ad6751d37f33..000000000000
--- a/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_msgs/calibration_msgs-0.10.15.ebuild b/dev-ros/calibration_msgs/calibration_msgs-0.10.15.ebuild
deleted file mode 100644
index 84fc5ca3dc67..000000000000
--- a/dev-ros/calibration_msgs/calibration_msgs-0.10.15.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
deleted file mode 100644
index ad6751d37f33..000000000000
--- a/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_msgs/metadata.xml b/dev-ros/calibration_msgs/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/calibration_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/calibration_setup_helper/Manifest b/dev-ros/calibration_setup_helper/Manifest
deleted file mode 100644
index 383e251849a7..000000000000
--- a/dev-ros/calibration_setup_helper/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD calibration_setup_helper-0.10.14.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
-EBUILD calibration_setup_helper-0.10.15.ebuild 403 BLAKE2B 707bd613ab618f42e0b1042b77ee019ce7b533e6de779fd35478dd1e255c0cb67846c99371f00853ddfae760790ca086bf3344adef3d9fb56a197f5fab8e9deb SHA512 e738a9467c2a7fb8d981a7a2d7d75e42b0b99613ae037d85857e46840d768c60a0c5c9071d1c11f14fd0515417b94fbea0fd0e8b861b3193683390bfb3263874
-EBUILD calibration_setup_helper-9999.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.14.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.14.ebuild
deleted file mode 100644
index 58b1a15eaf9d..000000000000
--- a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.14.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild
deleted file mode 100644
index 6fd09bcbc177..000000000000
--- a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
deleted file mode 100644
index 58b1a15eaf9d..000000000000
--- a/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/calibration_setup_helper/metadata.xml b/dev-ros/calibration_setup_helper/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/calibration_setup_helper/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/camera_calibration/Manifest b/dev-ros/camera_calibration/Manifest
deleted file mode 100644
index 1a71d1450102..000000000000
--- a/dev-ros/camera_calibration/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-DIST camera_calibration-1.15.2-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381 SHA512 e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
-DIST camera_calibration-1.15.2-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
-DIST camera_calibration-1.15.3-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381 SHA512 e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
-DIST camera_calibration-1.15.3-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
-DIST camera_calibration-1.16.0-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381 SHA512 e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
-DIST camera_calibration-1.16.0-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
-DIST camera_calibration-1.17.0-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381 SHA512 e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
-DIST camera_calibration-1.17.0-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
-DIST camera_calibration-9999-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381 SHA512 e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
-DIST camera_calibration-9999-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
-DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
-DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
-DIST image_pipeline-1.17.0.tar.gz 154211 BLAKE2B 221c549d6794f3567706e724a48d52fa4d7f395b30f477a12750f4707d70782496a0110df9f89e83aa11ea95dbd65acab18eff13a8beb026091abd209370cbd4 SHA512 c5bc227f13415f6fe31eb2cee015f8671433b427044b8f8842d0e5d1ef19aff21f66e40945bb09227442ab5c4c49aae3217b56dac03b358804567cff4189efeb
-EBUILD camera_calibration-1.15.2.ebuild 1535 BLAKE2B b91a64293e934d4ab15e34bafffab04cb1739778b6cc9451c261760f2c695cfc80d447c83595d7637273ae8aa50d6bec3622176690daff112b79aaf39c5a6b84 SHA512 fec6c9d5589a6f174a2d2f9ee77de64e62f6c7c50f7a486f6258542495aae63578f155484e9d3df651689d625e326b973a00909c38fb0d669cc8e6539b495b58
-EBUILD camera_calibration-1.15.3.ebuild 1535 BLAKE2B a569ea156f4005f832fd41b436a3f10820c00c5f2d702d0d5fd2c648465c5e01746adf4f0d97199ebfea93795b41937f295611fe822bbc602510911d75175f6a SHA512 d480efcda271251c5a91bed1ab918d3f47f7391c0a856d8795eba2be5261359e7d64aabf4a016d901874a2aee3af82d04638c7cb616f1d9681fb33868cf82fb3
-EBUILD camera_calibration-1.16.0.ebuild 1535 BLAKE2B 215b78bea62d1c46a973687babe7bc7a22e3ff1c5e56b6216b2f6cd971d74f421526d2a27a100dbe0c2c993d7d8b322dcba5e363f599813e414fdfebd9d40160 SHA512 1e11586d993fda35942039e146e7bfa574814856914eec5c0bc63873d6b0820cc2301303384a96ecf6b1eae8f543da7f290aa4d11f3c31e04d02e1bfa5a9bfa3
-EBUILD camera_calibration-1.17.0.ebuild 1535 BLAKE2B 215b78bea62d1c46a973687babe7bc7a22e3ff1c5e56b6216b2f6cd971d74f421526d2a27a100dbe0c2c993d7d8b322dcba5e363f599813e414fdfebd9d40160 SHA512 1e11586d993fda35942039e146e7bfa574814856914eec5c0bc63873d6b0820cc2301303384a96ecf6b1eae8f543da7f290aa4d11f3c31e04d02e1bfa5a9bfa3
-EBUILD camera_calibration-9999.ebuild 1535 BLAKE2B b91a64293e934d4ab15e34bafffab04cb1739778b6cc9451c261760f2c695cfc80d447c83595d7637273ae8aa50d6bec3622176690daff112b79aaf39c5a6b84 SHA512 fec6c9d5589a6f174a2d2f9ee77de64e62f6c7c50f7a486f6258542495aae63578f155484e9d3df651689d625e326b973a00909c38fb0d669cc8e6539b495b58
-MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild b/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
deleted file mode 100644
index 8fc8e9b9136c..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-SRC_URI="${SRC_URI}
-	http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> ${P}-camera_calibration.tar.gz
-	http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> ${P}-multi_board_calibration.tar.gz
-"
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	# Avoid external downloads during tests
-	cp "${DISTDIR}/${P}-camera_calibration.tar.gz" "${S}/camera_calibration.tar.gz" || die
-	cp "${DISTDIR}/${P}-multi_board_calibration.tar.gz" "${S}/multi_board_calibration.tar.gz" || die
-	sed -e "s#http://download.ros.org/data/camera_calibration/#file://${S}/#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/camera_calibration/camera_calibration-1.15.3.ebuild b/dev-ros/camera_calibration/camera_calibration-1.15.3.ebuild
deleted file mode 100644
index d1e700a9d872..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.15.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-SRC_URI="${SRC_URI}
-	http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> ${P}-camera_calibration.tar.gz
-	http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> ${P}-multi_board_calibration.tar.gz
-"
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	# Avoid external downloads during tests
-	cp "${DISTDIR}/${P}-camera_calibration.tar.gz" "${S}/camera_calibration.tar.gz" || die
-	cp "${DISTDIR}/${P}-multi_board_calibration.tar.gz" "${S}/multi_board_calibration.tar.gz" || die
-	sed -e "s#http://download.ros.org/data/camera_calibration/#file://${S}/#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/camera_calibration/camera_calibration-1.16.0.ebuild b/dev-ros/camera_calibration/camera_calibration-1.16.0.ebuild
deleted file mode 100644
index 171a2e648322..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.16.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-SRC_URI="${SRC_URI}
-	http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> ${P}-camera_calibration.tar.gz
-	http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> ${P}-multi_board_calibration.tar.gz
-"
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	# Avoid external downloads during tests
-	cp "${DISTDIR}/${P}-camera_calibration.tar.gz" "${S}/camera_calibration.tar.gz" || die
-	cp "${DISTDIR}/${P}-multi_board_calibration.tar.gz" "${S}/multi_board_calibration.tar.gz" || die
-	sed -e "s#http://download.ros.org/data/camera_calibration/#file://${S}/#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/camera_calibration/camera_calibration-1.17.0.ebuild b/dev-ros/camera_calibration/camera_calibration-1.17.0.ebuild
deleted file mode 100644
index 171a2e648322..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.17.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-SRC_URI="${SRC_URI}
-	http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> ${P}-camera_calibration.tar.gz
-	http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> ${P}-multi_board_calibration.tar.gz
-"
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	# Avoid external downloads during tests
-	cp "${DISTDIR}/${P}-camera_calibration.tar.gz" "${S}/camera_calibration.tar.gz" || die
-	cp "${DISTDIR}/${P}-multi_board_calibration.tar.gz" "${S}/multi_board_calibration.tar.gz" || die
-	sed -e "s#http://download.ros.org/data/camera_calibration/#file://${S}/#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/camera_calibration/camera_calibration-9999.ebuild b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
deleted file mode 100644
index 8fc8e9b9136c..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-SRC_URI="${SRC_URI}
-	http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> ${P}-camera_calibration.tar.gz
-	http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> ${P}-multi_board_calibration.tar.gz
-"
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	# Avoid external downloads during tests
-	cp "${DISTDIR}/${P}-camera_calibration.tar.gz" "${S}/camera_calibration.tar.gz" || die
-	cp "${DISTDIR}/${P}-multi_board_calibration.tar.gz" "${S}/multi_board_calibration.tar.gz" || die
-	sed -e "s#http://download.ros.org/data/camera_calibration/#file://${S}/#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/camera_calibration/metadata.xml b/dev-ros/camera_calibration/metadata.xml
deleted file mode 100644
index a96f24591a70..000000000000
--- a/dev-ros/camera_calibration/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest
deleted file mode 100644
index 569841a52c07..000000000000
--- a/dev-ros/camera_calibration_parsers/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX boostpython.patch 766 BLAKE2B 80cdc502a4a8c0a7d31b7b196069422ef5e4ce773168f4d3065d986f27c82f3865336db304a86e528c830711ae7c0360ae8c2c30121cf030d7c7018ef3d6890c SHA512 37481eb10d2c924387079479c73530821884d8486dfe83356dbaf618c3b9014b0e2afcb9272bc9f3be33eaccfe538e194c874cb06847bb2ffff9479c2b9ad2a8
-DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
-EBUILD camera_calibration_parsers-1.12.0.ebuild 901 BLAKE2B b74dd735a17509b48e991fe2968e36681c67455b864fe057da7e1d0647dec8a3429df93ed81e83b5684b5b2727e6038e55db66a4c1133f51e00f5e167347825d SHA512 d580a9395e478cca08d55a1bdc9933da92906ccc0a2613b5cd6a75f1aa8b78d0618188ce08af8767d8a5a6a4bda37a0317807dc1bcc0f97d7073361081ca6747
-EBUILD camera_calibration_parsers-9999.ebuild 901 BLAKE2B b74dd735a17509b48e991fe2968e36681c67455b864fe057da7e1d0647dec8a3429df93ed81e83b5684b5b2727e6038e55db66a4c1133f51e00f5e167347825d SHA512 d580a9395e478cca08d55a1bdc9933da92906ccc0a2613b5cd6a75f1aa8b78d0618188ce08af8767d8a5a6a4bda37a0317807dc1bcc0f97d7073361081ca6747
-MISC metadata.xml 342 BLAKE2B 27accf100ff3b311ee478a43cb1b34f6a0f2116d780d4e4be9799dc68fda47d82bbd535766174d30097486e526c1275a3f55d41e477fe7f1058c10df85e132ca SHA512 da80f03ec79feaf642b2a1e32386b2b38c0b2942985214171bbb12fb1bf730eb934f1575f49d0d8d85b35ad226556ad1b426dfebfeb9ab5cd61fbc8cd96547e2
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild
deleted file mode 100644
index 9e586eb4d9df..000000000000
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Routines for reading and writing camera calibration parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-libs/boost:=[python,\${PYTHON_USEDEP}]")
-	dev-ros/rosconsole
-	>=dev-cpp/yaml-cpp-0.5:=
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosbash
-	)
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/boostpython.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
deleted file mode 100644
index 9e586eb4d9df..000000000000
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Routines for reading and writing camera calibration parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-libs/boost:=[python,\${PYTHON_USEDEP}]")
-	dev-ros/rosconsole
-	>=dev-cpp/yaml-cpp-0.5:=
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosbash
-	)
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/boostpython.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/camera_calibration_parsers/files/boostpython.patch b/dev-ros/camera_calibration_parsers/files/boostpython.patch
deleted file mode 100644
index 30840401c0df..000000000000
--- a/dev-ros/camera_calibration_parsers/files/boostpython.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Revert special handling not needed on Gentoo.
-https://bugs.gentoo.org/show_bug.cgi?id=608330
-
-Index: camera_calibration_parsers/CMakeLists.txt
-===================================================================
---- camera_calibration_parsers.orig/CMakeLists.txt
-+++ camera_calibration_parsers/CMakeLists.txt
-@@ -4,7 +4,7 @@ project(camera_calibration_parsers)
- find_package(catkin REQUIRED sensor_msgs rosconsole roscpp roscpp_serialization)
- 
- find_package(PythonLibs REQUIRED)
--find_package(Boost REQUIRED COMPONENTS filesystem python)
-+find_package(Boost REQUIRED COMPONENTS filesystem python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
- include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
- 
- catkin_python_setup()
diff --git a/dev-ros/camera_calibration_parsers/metadata.xml b/dev-ros/camera_calibration_parsers/metadata.xml
deleted file mode 100644
index 80ca28d8d9f4..000000000000
--- a/dev-ros/camera_calibration_parsers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/camera_info_manager/Manifest b/dev-ros/camera_info_manager/Manifest
deleted file mode 100644
index fbb870425313..000000000000
--- a/dev-ros/camera_info_manager/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
-EBUILD camera_info_manager-1.12.0.ebuild 567 BLAKE2B 3365d2fabe365de2f97933ed0c4bea9b9ea4a9745252c8e441dbfc29bbe391350a734ac403d98f31cbf0fa09b808f63349177ca32d37bdba3c3b905021ab8f28 SHA512 74470c129cb7f6b906e7a94da90c37a86fb6df03bf4cb237376eaa1e64b29b0a395b919c53a7a4b5b8cb12e01cf6c2f431d33bdd8d7ef667d728b3115034789d
-EBUILD camera_info_manager-9999.ebuild 567 BLAKE2B 3365d2fabe365de2f97933ed0c4bea9b9ea4a9745252c8e441dbfc29bbe391350a734ac403d98f31cbf0fa09b808f63349177ca32d37bdba3c3b905021ab8f28 SHA512 74470c129cb7f6b906e7a94da90c37a86fb6df03bf4cb237376eaa1e64b29b0a395b919c53a7a4b5b8cb12e01cf6c2f431d33bdd8d7ef667d728b3115034789d
-MISC metadata.xml 342 BLAKE2B 27accf100ff3b311ee478a43cb1b34f6a0f2116d780d4e4be9799dc68fda47d82bbd535766174d30097486e526c1275a3f55d41e477fe7f1058c10df85e132ca SHA512 da80f03ec79feaf642b2a1e32386b2b38c0b2942985214171bbb12fb1bf730eb934f1575f49d0d8d85b35ad226556ad1b426dfebfeb9ab5cd61fbc8cd96547e2
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.12.0.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.12.0.ebuild
deleted file mode 100644
index 107f1950267f..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ interface for camera calibration information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/image_transport
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild b/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
deleted file mode 100644
index 107f1950267f..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ interface for camera calibration information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/image_transport
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/camera_info_manager/metadata.xml b/dev-ros/camera_info_manager/metadata.xml
deleted file mode 100644
index 80ca28d8d9f4..000000000000
--- a/dev-ros/camera_info_manager/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/carrot_planner/Manifest b/dev-ros/carrot_planner/Manifest
deleted file mode 100644
index 8b053c77f946..000000000000
--- a/dev-ros/carrot_planner/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD carrot_planner-1.17.0-r1.ebuild 633 BLAKE2B d69298e2372b61114bd6315dda1f5f03380aaa4ff3732f67b26d42c904576ac32cea8f4b10ffbcc220f2714bd82913e5887fdc5c5cb09be8f922f491ac00ba54 SHA512 56bb321ff22818b6b1b85c942985d879cd7e66300c2f350d69094e9d08ba92471df2a2529635b4148182430a9b92ec2c26f25eccb3e27fcebdf255266cc3ccb7
-EBUILD carrot_planner-1.17.1.ebuild 633 BLAKE2B d69298e2372b61114bd6315dda1f5f03380aaa4ff3732f67b26d42c904576ac32cea8f4b10ffbcc220f2714bd82913e5887fdc5c5cb09be8f922f491ac00ba54 SHA512 56bb321ff22818b6b1b85c942985d879cd7e66300c2f350d69094e9d08ba92471df2a2529635b4148182430a9b92ec2c26f25eccb3e27fcebdf255266cc3ccb7
-EBUILD carrot_planner-9999.ebuild 633 BLAKE2B d69298e2372b61114bd6315dda1f5f03380aaa4ff3732f67b26d42c904576ac32cea8f4b10ffbcc220f2714bd82913e5887fdc5c5cb09be8f922f491ac00ba54 SHA512 56bb321ff22818b6b1b85c942985d879cd7e66300c2f350d69094e9d08ba92471df2a2529635b4148182430a9b92ec2c26f25eccb3e27fcebdf255266cc3ccb7
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/carrot_planner/carrot_planner-1.17.0-r1.ebuild b/dev-ros/carrot_planner/carrot_planner-1.17.0-r1.ebuild
deleted file mode 100644
index 988e46d33c04..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-
-	dev-libs/console_bridge:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/carrot_planner/carrot_planner-1.17.1.ebuild b/dev-ros/carrot_planner/carrot_planner-1.17.1.ebuild
deleted file mode 100644
index 988e46d33c04..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.17.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-
-	dev-libs/console_bridge:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/carrot_planner/carrot_planner-9999.ebuild b/dev-ros/carrot_planner/carrot_planner-9999.ebuild
deleted file mode 100644
index 988e46d33c04..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-
-	dev-libs/console_bridge:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/carrot_planner/metadata.xml b/dev-ros/carrot_planner/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/carrot_planner/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/class_loader/Manifest b/dev-ros/class_loader/Manifest
deleted file mode 100644
index 83b1e984fe68..000000000000
--- a/dev-ros/class_loader/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST class_loader-0.5.0.tar.gz 34165 BLAKE2B 117b93bf263ac616947386a43413682cd4bf1eb4e0150673fa8803ba2af17df3f5137d38f26774a51f1974bd12237f35c36d5824c0ddbe66062a608a0518dc08 SHA512 94070562f164c4532e0da5df245125eae8af0f1d33574f7692a608f3a7bcf5cbac147828600c51457f4f3585b723dd86c8c5cbeea22764c75e6f670383be5308
-EBUILD class_loader-0.5.0-r1.ebuild 431 BLAKE2B 35ddebb5b314b917393d5733c6d906d1d1a887540d98ed07d0d066c3a14c904575a061138845e1a071eae31319e137c23ac47d567f578d40e32ecf22cc0d94ed SHA512 2472542c4d8bedc863746087809f6b9d7d065bc0d5de4f05aa471c8f79f8cf93aa40f5e05e3d5eff70a10a9d606bc8c8d115887c1dfdc417844d7d20ece7363d
-EBUILD class_loader-9999.ebuild 431 BLAKE2B 35ddebb5b314b917393d5733c6d906d1d1a887540d98ed07d0d066c3a14c904575a061138845e1a071eae31319e137c23ac47d567f578d40e32ecf22cc0d94ed SHA512 2472542c4d8bedc863746087809f6b9d7d065bc0d5de4f05aa471c8f79f8cf93aa40f5e05e3d5eff70a10a9d606bc8c8d115887c1dfdc417844d7d20ece7363d
-MISC metadata.xml 331 BLAKE2B 4633560bce0cab0f6e8066849fae0b14f5514e3ebc6a751a7d3bdeecf5d4d7c67ea06750e081ea16dd40762352e4cc9b4c76ee2127dbbc5c0f12d7b456896134 SHA512 d98c9f6142507ebb93f9d8089d67f0110ed27ca7f64481755cea9d8b2720027472d38266c0b84b782a08f7950d1a0dea90c5b07c6217efaa5528ba22fd4a96c6
diff --git a/dev-ros/class_loader/class_loader-0.5.0-r1.ebuild b/dev-ros/class_loader/class_loader-0.5.0-r1.ebuild
deleted file mode 100644
index 838d06c5120f..000000000000
--- a/dev-ros/class_loader/class_loader-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/class_loader"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-independent package for loading plugins"
-LICENSE="BSD"
-SLOT="0/melodic2"
-IUSE=""
-
-RDEPEND="dev-libs/poco
-	dev-libs/boost:=
-	dev-libs/console_bridge:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/class_loader/class_loader-9999.ebuild b/dev-ros/class_loader/class_loader-9999.ebuild
deleted file mode 100644
index 838d06c5120f..000000000000
--- a/dev-ros/class_loader/class_loader-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/class_loader"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-independent package for loading plugins"
-LICENSE="BSD"
-SLOT="0/melodic2"
-IUSE=""
-
-RDEPEND="dev-libs/poco
-	dev-libs/boost:=
-	dev-libs/console_bridge:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/class_loader/metadata.xml b/dev-ros/class_loader/metadata.xml
deleted file mode 100644
index 2b8592c9496b..000000000000
--- a/dev-ros/class_loader/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/class_loader</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
deleted file mode 100644
index d9d3f9eb13cc..000000000000
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD clear_costmap_recovery-1.17.1-r1.ebuild 698 BLAKE2B 16cc3c8f4e0132e466bddcc837573391bbd65660f62f460132f96c11f7e127d0cf5a028ceda1ef65536fe9b36af0009ce606d3d371d61b44c8839bd29ce557ed SHA512 abab49763c25eb64e2d59c81a91490e118476a2aa01326dac474efa7e6ba82ce91c36db7bc00a91fb4df8ac23c940787abc5755f2f5184ac75beba831f561ed3
-EBUILD clear_costmap_recovery-9999.ebuild 698 BLAKE2B 16cc3c8f4e0132e466bddcc837573391bbd65660f62f460132f96c11f7e127d0cf5a028ceda1ef65536fe9b36af0009ce606d3d371d61b44c8839bd29ce557ed SHA512 abab49763c25eb64e2d59c81a91490e118476a2aa01326dac474efa7e6ba82ce91c36db7bc00a91fb4df8ac23c940787abc5755f2f5184ac75beba831f561ed3
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild
deleted file mode 100644
index ffda17afb297..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16.3
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
deleted file mode 100644
index ffda17afb297..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16.3
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/clear_costmap_recovery/metadata.xml b/dev-ros/clear_costmap_recovery/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/clear_costmap_recovery/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/cmake_modules/Manifest b/dev-ros/cmake_modules/Manifest
deleted file mode 100644
index e27595f4c3d7..000000000000
--- a/dev-ros/cmake_modules/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cmake_modules-0.5.0.tar.gz 18605 BLAKE2B 5be0a6f7e69806347eea03796b06679618c071dfdf72bce73d040c3788983f95c967586c800b4429df80ac6996439a0f59c2827dfb96aa50f5fe09169dc3d6e6 SHA512 a7920a094f3b3d8e480c16fd279d960e0c4d919bc4a337ba4f37ad82005805cac0e313a758e0b823986a280a8d3536a5dc36ac9603b7cd43bc0e965e9dfdd028
-EBUILD cmake_modules-0.5.0.ebuild 340 BLAKE2B 4fe361dc29348f8ce71a68880915b2a7a73dd94efb4737db8d8a7294580b5aa249e4cbf7994d3a9752f427915d341594ffb4802b6d1f0ace789e0f786338ca3c SHA512 ebecfb2f53766e51af39b112c2506972c6e43ccbfd83ac854e154cb79d2f71f0c9bb2b29b4a4e02aa34006b24ca92cf2771db87a1be32828f6e288eb62038ce8
-EBUILD cmake_modules-9999.ebuild 340 BLAKE2B 4fe361dc29348f8ce71a68880915b2a7a73dd94efb4737db8d8a7294580b5aa249e4cbf7994d3a9752f427915d341594ffb4802b6d1f0ace789e0f786338ca3c SHA512 ebecfb2f53766e51af39b112c2506972c6e43ccbfd83ac854e154cb79d2f71f0c9bb2b29b4a4e02aa34006b24ca92cf2771db87a1be32828f6e288eb62038ce8
-MISC metadata.xml 332 BLAKE2B 4ba46950d59f60b00475a3c8508ba5b96deb7d12d721e66d9979b56b8c691a73dd6357d7dcff2a5da1511ea32a6dcc937a4eb8a56ac3c7831c359cf1d91aaf08 SHA512 1500bd805aa18c3106e87d7d6c426cc3ba07ec495cbe991bf6148a5248fc2b3097237275879067b53a8cf2e3c42b1eeb2f54dbfd006d6eed148e3f9b9aa240f9
diff --git a/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild b/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
deleted file mode 100644
index fd800aebb7d3..000000000000
--- a/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/cmake_modules"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="CMake Modules which are commonly used by ROS packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cmake_modules/cmake_modules-9999.ebuild b/dev-ros/cmake_modules/cmake_modules-9999.ebuild
deleted file mode 100644
index fd800aebb7d3..000000000000
--- a/dev-ros/cmake_modules/cmake_modules-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/cmake_modules"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="CMake Modules which are commonly used by ROS packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cmake_modules/metadata.xml b/dev-ros/cmake_modules/metadata.xml
deleted file mode 100644
index a4c2a639bdbf..000000000000
--- a/dev-ros/cmake_modules/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/cmake_modules</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
deleted file mode 100644
index 95b4c1f8aa17..000000000000
--- a/dev-ros/collada_parser/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST collada_urdf-1.12.13.tar.gz 73633 BLAKE2B 5c3458f9b245dc6b21dde8c78938712316dba25694847fa54e422cfc5b7802f4dd10a79f6fe62c7b9f553d215ddb0b9276e33651d7e75f3d11a78efa3f031a08 SHA512 ec1063b124727bb51d0ce6d19f5203ae8a1d368d3ab21b80fcb1f699022008a639638e9ebccf7d24587c7ff6b88c33e0c81cc9adc3e00334960f830248293e0b
-EBUILD collada_parser-1.12.13.ebuild 553 BLAKE2B 8388f8830821b31faa08f8afbcfa186e4b154a53c27c87272c6e80bc113a296b34a0ee336db270c48e01d0a6a073ec9ac1b2b8fa096f0ad7e58ed60af1b6955b SHA512 b64918f714f27739e222db1ab439c69ed064b47c33ae71fd15b8946a2d9f56ede884f1c0ecd7fe983d787c929b319dc9ee52153de6b03c1e7e8cf810a3cee332
-EBUILD collada_parser-9999.ebuild 553 BLAKE2B 8388f8830821b31faa08f8afbcfa186e4b154a53c27c87272c6e80bc113a296b34a0ee336db270c48e01d0a6a073ec9ac1b2b8fa096f0ad7e58ed60af1b6955b SHA512 b64918f714f27739e222db1ab439c69ed064b47c33ae71fd15b8946a2d9f56ede884f1c0ecd7fe983d787c929b319dc9ee52153de6b03c1e7e8cf810a3cee332
-MISC metadata.xml 331 BLAKE2B b9ec6a01851ded686f7f0b06a6bf7de4da48f2129e027867203b1ab9f14899053a3aaedacd2bb77437c93829b3bc344fa7f050f0fb2ac9dea8a2f7d5462d9934 SHA512 ef026d0f4a5b29f8ac8a2bd1099abb9ac7050487a005289446ed058091746bba9cd54d764ef84c3b9d35adbdb124f6868339100ad4da0798fa7c856ce457987a
diff --git a/dev-ros/collada_parser/collada_parser-1.12.13.ebuild b/dev-ros/collada_parser/collada_parser-1.12.13.ebuild
deleted file mode 100644
index 8cb7ca4bd889..000000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/collada_urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Collada robot description format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-ros/urdf_parser_plugin-1.12.6
-	dev-ros/class_loader:=
-	dev-libs/urdfdom_headers
-	dev-libs/collada-dom:=
-	>=dev-ros/urdf-1.12.6
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_parser/collada_parser-9999.ebuild b/dev-ros/collada_parser/collada_parser-9999.ebuild
deleted file mode 100644
index 8cb7ca4bd889..000000000000
--- a/dev-ros/collada_parser/collada_parser-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/collada_urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Collada robot description format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-ros/urdf_parser_plugin-1.12.6
-	dev-ros/class_loader:=
-	dev-libs/urdfdom_headers
-	dev-libs/collada-dom:=
-	>=dev-ros/urdf-1.12.6
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_parser/metadata.xml b/dev-ros/collada_parser/metadata.xml
deleted file mode 100644
index 1a3414b4a538..000000000000
--- a/dev-ros/collada_parser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/collada_urdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest
deleted file mode 100644
index d7995e9dce64..000000000000
--- a/dev-ros/collada_urdf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST collada_urdf-1.12.13.tar.gz 73633 BLAKE2B 5c3458f9b245dc6b21dde8c78938712316dba25694847fa54e422cfc5b7802f4dd10a79f6fe62c7b9f553d215ddb0b9276e33651d7e75f3d11a78efa3f031a08 SHA512 ec1063b124727bb51d0ce6d19f5203ae8a1d368d3ab21b80fcb1f699022008a639638e9ebccf7d24587c7ff6b88c33e0c81cc9adc3e00334960f830248293e0b
-EBUILD collada_urdf-1.12.13-r2.ebuild 657 BLAKE2B 196a55a892fc5bd7c03d7c1913579782b7cba6150ffaeca2693d2c1972e5e280e30d4b57acc4f8d01e5fe93829209027b61b2b7c8c508ca0f92176827ebbb1c2 SHA512 53cfe809ad0f5d036d5443a3569e875655a7a4961f1b5bd2c8ed926cefcaa1ad10a009b15aa1f7d4bba0e627d3a7c29d6aaf9c7d86c94170ad399a3dcb0c6a8b
-EBUILD collada_urdf-9999.ebuild 657 BLAKE2B 196a55a892fc5bd7c03d7c1913579782b7cba6150ffaeca2693d2c1972e5e280e30d4b57acc4f8d01e5fe93829209027b61b2b7c8c508ca0f92176827ebbb1c2 SHA512 53cfe809ad0f5d036d5443a3569e875655a7a4961f1b5bd2c8ed926cefcaa1ad10a009b15aa1f7d4bba0e627d3a7c29d6aaf9c7d86c94170ad399a3dcb0c6a8b
-MISC metadata.xml 331 BLAKE2B b9ec6a01851ded686f7f0b06a6bf7de4da48f2129e027867203b1ab9f14899053a3aaedacd2bb77437c93829b3bc344fa7f050f0fb2ac9dea8a2f7d5462d9934 SHA512 ef026d0f4a5b29f8ac8a2bd1099abb9ac7050487a005289446ed058091746bba9cd54d764ef84c3b9d35adbdb124f6868339100ad4da0798fa7c856ce457987a
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.13-r2.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.13-r2.ebuild
deleted file mode 100644
index 0c59340cadf6..000000000000
--- a/dev-ros/collada_urdf/collada_urdf-1.12.13-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/collada_urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convert Unified Robot Description Format (URDF) documents into COLLADA documents"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles:0
-	dev-ros/collada_parser
-	dev-ros/resource_retriever
-	dev-ros/rosconsole
-	dev-ros/urdf
-	dev-ros/geometric_shapes
-	media-libs/assimp:=
-	dev-libs/collada-dom:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	test? (
-		dev-cpp/gtest
-	)
-"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/collada_urdf/collada_urdf-9999.ebuild b/dev-ros/collada_urdf/collada_urdf-9999.ebuild
deleted file mode 100644
index 0c59340cadf6..000000000000
--- a/dev-ros/collada_urdf/collada_urdf-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/collada_urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convert Unified Robot Description Format (URDF) documents into COLLADA documents"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles:0
-	dev-ros/collada_parser
-	dev-ros/resource_retriever
-	dev-ros/rosconsole
-	dev-ros/urdf
-	dev-ros/geometric_shapes
-	media-libs/assimp:=
-	dev-libs/collada-dom:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	test? (
-		dev-cpp/gtest
-	)
-"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/collada_urdf/metadata.xml b/dev-ros/collada_urdf/metadata.xml
deleted file mode 100644
index 1a3414b4a538..000000000000
--- a/dev-ros/collada_urdf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/collada_urdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/combined_robot_hw/Manifest b/dev-ros/combined_robot_hw/Manifest
deleted file mode 100644
index 31b394ccf243..000000000000
--- a/dev-ros/combined_robot_hw/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD combined_robot_hw-0.19.1.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
-EBUILD combined_robot_hw-0.19.2.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
-EBUILD combined_robot_hw-0.19.3.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
-EBUILD combined_robot_hw-0.19.4.ebuild 466 BLAKE2B 4fa7e7c8dfbe348f1f925de94af95400525ea76c10bde1b74368a84397dff9fd222c06fb146e3278aaf639569748ecf7b03a75d9d4ba42869556e0a01371be9e SHA512 a25657753c6c449c007e2c8fb05ee817ef3bad069ca0c6f17a3a03bd85427a43f154b34f2f38a75495a0651c863b82115d22d4b79e5e8a54669283355000397b
-EBUILD combined_robot_hw-0.19.5.ebuild 466 BLAKE2B 4fa7e7c8dfbe348f1f925de94af95400525ea76c10bde1b74368a84397dff9fd222c06fb146e3278aaf639569748ecf7b03a75d9d4ba42869556e0a01371be9e SHA512 a25657753c6c449c007e2c8fb05ee817ef3bad069ca0c6f17a3a03bd85427a43f154b34f2f38a75495a0651c863b82115d22d4b79e5e8a54669283355000397b
-EBUILD combined_robot_hw-9999.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild
deleted file mode 100644
index 321a5d7c964b..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/hardware_interface-0.15
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.2.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.2.ebuild
deleted file mode 100644
index 321a5d7c964b..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/hardware_interface-0.15
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.3.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.3.ebuild
deleted file mode 100644
index 321a5d7c964b..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/hardware_interface-0.15
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.4.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.4.ebuild
deleted file mode 100644
index d1ef9a1b84bc..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/hardware_interface-0.15
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild
deleted file mode 100644
index d1ef9a1b84bc..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/hardware_interface-0.15
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
deleted file mode 100644
index 321a5d7c964b..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/hardware_interface-0.15
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw/metadata.xml b/dev-ros/combined_robot_hw/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/combined_robot_hw/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
deleted file mode 100644
index d3aca323d014..000000000000
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD combined_robot_hw_tests-0.19.1.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
-EBUILD combined_robot_hw_tests-0.19.2.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
-EBUILD combined_robot_hw_tests-0.19.3.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
-EBUILD combined_robot_hw_tests-0.19.4.ebuild 827 BLAKE2B d7a4eb4a9fb523fe8afdf973b541e04bf608fc51d6d1255f1a4ed4a6f3e05706b88b332b53209cd4bbf1f614e2e5ace3adb2ec41638bca5dd9c9862ec90d343e SHA512 dab4795383815b36ac64319a9397646dabc207768872c489ab1b549982ae5b4e23232ce83d5478161b27c39edde9b315d8a550a6d50ed061a498763acc09d3ed
-EBUILD combined_robot_hw_tests-0.19.5.ebuild 827 BLAKE2B d7a4eb4a9fb523fe8afdf973b541e04bf608fc51d6d1255f1a4ed4a6f3e05706b88b332b53209cd4bbf1f614e2e5ace3adb2ec41638bca5dd9c9862ec90d343e SHA512 dab4795383815b36ac64319a9397646dabc207768872c489ab1b549982ae5b4e23232ce83d5478161b27c39edde9b315d8a550a6d50ed061a498763acc09d3ed
-EBUILD combined_robot_hw_tests-9999.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
deleted file mode 100644
index c38e64568c99..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/combined_robot_hw
-	dev-ros/controller_manager
-	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/controller_manager_tests
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.2.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.2.ebuild
deleted file mode 100644
index c38e64568c99..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/combined_robot_hw
-	dev-ros/controller_manager
-	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/controller_manager_tests
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.3.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.3.ebuild
deleted file mode 100644
index c38e64568c99..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/combined_robot_hw
-	dev-ros/controller_manager
-	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/controller_manager_tests
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.4.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.4.ebuild
deleted file mode 100644
index b52a335bd58b..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/combined_robot_hw
-	dev-ros/controller_manager
-	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/controller_manager_tests
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.5.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.5.ebuild
deleted file mode 100644
index b52a335bd58b..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/combined_robot_hw
-	dev-ros/controller_manager
-	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/controller_manager_tests
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
deleted file mode 100644
index c38e64568c99..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Combined Robot HW class tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/combined_robot_hw
-	dev-ros/controller_manager
-	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/controller_manager_tests
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/combined_robot_hw_tests/metadata.xml b/dev-ros/combined_robot_hw_tests/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/combined_robot_hw_tests/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest
deleted file mode 100644
index 885f4cfc1c8c..000000000000
--- a/dev-ros/compressed_depth_image_transport/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ocv_leak.patch 604 BLAKE2B c7d937c796415a1f4f3f131b0006b6674ca4033428c66fc12530e5c588530e59c99c80d25e26881c39fe92c3c8c273c44f9ec57cb33319cb895d007bc77e2982 SHA512 e78c666b44de6e42bce51e20531d0883c38caabbd39149998654e58b35b2f1a05acc386c8bafa0ceb9a657730e0e44f1b016b2aba5b29b2c675ee51ad79d58fc
-DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
-EBUILD compressed_depth_image_transport-1.14.0-r1.ebuild 626 BLAKE2B 919acd6e6a1bdf0c2cb4ac66befc67212b3abd17298cadb7fa614385f5e922f923b1e3b571eb350a86b64d262d67576298bf03b1932d7c37f84b89647dcedf40 SHA512 4a048d043172009958a688d1683515c325f41b6e5d1ab8269287bf92f871d9473c20ade73783d974d5f0e0f9c86b16810f2045f7e28623c55788dc83c281029c
-EBUILD compressed_depth_image_transport-9999.ebuild 626 BLAKE2B 919acd6e6a1bdf0c2cb4ac66befc67212b3abd17298cadb7fa614385f5e922f923b1e3b571eb350a86b64d262d67576298bf03b1932d7c37f84b89647dcedf40 SHA512 4a048d043172009958a688d1683515c325f41b6e5d1ab8269287bf92f871d9473c20ade73783d974d5f0e0f9c86b16810f2045f7e28623c55788dc83c281029c
-MISC metadata.xml 353 BLAKE2B 7f332f592b523257e6ac30fe1b079b1d954cbb2bc691b4ad0293bb10e6930b226e2e9864a280c27c12a90a9b6b80c083a87cca0f3fc239c0cc206602563379e8 SHA512 aa3bd03ae6d8c3288bc2bdf48520f484e46dbb586cd9e2b918b66aa10d5a14b553f120bf7b85e22647d20ffd7ee56cd743750265d730a01ed23dafb3aef68af7
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild
deleted file mode 100644
index ee76a3e1f2b2..000000000000
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin for transparently sending depth images using PNG compression"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_transport
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
deleted file mode 100644
index ee76a3e1f2b2..000000000000
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin for transparently sending depth images using PNG compression"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_transport
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch b/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch
deleted file mode 100644
index 8e1f81ae32fa..000000000000
--- a/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: compressed_depth_image_transport/CMakeLists.txt
-===================================================================
---- compressed_depth_image_transport.orig/CMakeLists.txt
-+++ compressed_depth_image_transport/CMakeLists.txt
-@@ -5,7 +5,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
- #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
- endif()
- 
--find_package(OpenCV REQUIRED)
-+find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgcodecs opencv_highgui)
- find_package(catkin REQUIRED cv_bridge dynamic_reconfigure image_transport)
- 
- # generate the dynamic_reconfigure config file
diff --git a/dev-ros/compressed_depth_image_transport/metadata.xml b/dev-ros/compressed_depth_image_transport/metadata.xml
deleted file mode 100644
index 76ac742a0d7e..000000000000
--- a/dev-ros/compressed_depth_image_transport/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/compressed_image_transport/Manifest b/dev-ros/compressed_image_transport/Manifest
deleted file mode 100644
index b12b4a2d1848..000000000000
--- a/dev-ros/compressed_image_transport/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ocv_leak.patch 578 BLAKE2B 1d14251eee0ceb84e323e512677b877720d30c624ebe031869239386076054346d0ea8e8c9a80652880cf3cb80807ceaecca636468606e58b1181ba53ecd02e9 SHA512 008e4aa02a6f796c8149c0620bd4eb2a4988a4ac8c50ee3b208df22da7af555974240ff79a262605ccced72eee0eae6e8ce21514fcbdcaaf05bcf36befdf6f4f
-DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
-EBUILD compressed_image_transport-1.14.0-r1.ebuild 592 BLAKE2B c794f97401f7b18669ed5e7f059b9f18c3f7f4aba98618b47b20ff3ba6c96b920e036e2905896a53ec6a73431c021892aef188e3be6f643ced531cdc53db01d7 SHA512 b4e0548662d8e3d46fa421646b76414c6144840f9fc70ba1aaab44177f55dedf6e9f49567803cc26bc5885ee61d6185ed0d8c92775a94900e86408ae2c88c5fe
-EBUILD compressed_image_transport-9999.ebuild 592 BLAKE2B c794f97401f7b18669ed5e7f059b9f18c3f7f4aba98618b47b20ff3ba6c96b920e036e2905896a53ec6a73431c021892aef188e3be6f643ced531cdc53db01d7 SHA512 b4e0548662d8e3d46fa421646b76414c6144840f9fc70ba1aaab44177f55dedf6e9f49567803cc26bc5885ee61d6185ed0d8c92775a94900e86408ae2c88c5fe
-MISC metadata.xml 353 BLAKE2B 7f332f592b523257e6ac30fe1b079b1d954cbb2bc691b4ad0293bb10e6930b226e2e9864a280c27c12a90a9b6b80c083a87cca0f3fc239c0cc206602563379e8 SHA512 aa3bd03ae6d8c3288bc2bdf48520f484e46dbb586cd9e2b918b66aa10d5a14b553f120bf7b85e22647d20ffd7ee56cd743750265d730a01ed23dafb3aef68af7
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
deleted file mode 100644
index 310a1c7220be..000000000000
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin for transparently sending images encoded as JPEG or PNG"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_transport
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
deleted file mode 100644
index 310a1c7220be..000000000000
--- a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin for transparently sending images encoded as JPEG or PNG"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_transport
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_image_transport/files/ocv_leak.patch b/dev-ros/compressed_image_transport/files/ocv_leak.patch
deleted file mode 100644
index cdc103bb0a2d..000000000000
--- a/dev-ros/compressed_image_transport/files/ocv_leak.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: compressed_image_transport/CMakeLists.txt
-===================================================================
---- compressed_image_transport.orig/CMakeLists.txt
-+++ compressed_image_transport/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 3.0.2)
- project(compressed_image_transport)
- 
--find_package(OpenCV REQUIRED)
-+find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_imgcodecs opencv_highgui)
- find_package(catkin REQUIRED COMPONENTS cv_bridge dynamic_reconfigure image_transport)
- 
- # generate the dynamic_reconfigure config file
diff --git a/dev-ros/compressed_image_transport/metadata.xml b/dev-ros/compressed_image_transport/metadata.xml
deleted file mode 100644
index 76ac742a0d7e..000000000000
--- a/dev-ros/compressed_image_transport/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/console_bridge_vendor/Manifest b/dev-ros/console_bridge_vendor/Manifest
deleted file mode 100644
index 323ce9383c0b..000000000000
--- a/dev-ros/console_bridge_vendor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST console_bridge_vendor-1.2.2.tar.gz 7570 BLAKE2B 2b690d20851cf38554fcfa8645eb0c8bd7b226dcdf1e43ac379f5164d1aa8133bd4e75654b3354153985015d46a7cb2b71195cf123a982eadd1a91bbf6172624 SHA512 e44090cec050af7681892bfc4cb71d7f127b467845a1ec0d103678322c9482ce6ede0b5e914fd472380381906e350b3f64ead4d67e4c514a3c7c7e4d6fc24c22
-EBUILD console_bridge_vendor-1.2.2.ebuild 972 BLAKE2B 65122eeade8a9a9271baa61a9b47003d5fcb4bad8f2e183d80017d7a42a3655265f51816f23d2b875fb65af039f9ed0162b9d4b2fe3284b702a7bc2f0c8fad89 SHA512 cdc151e6abe6f3ae5e57f1f1a1c9cb42909271b3a4dcf969cd64b02dcb6b24de102c50895bfd7f6ff0c60af010b9f3127e3cc18bf0e8ac8bb8c37dfb7ad392d7
-EBUILD console_bridge_vendor-9999.ebuild 972 BLAKE2B 65122eeade8a9a9271baa61a9b47003d5fcb4bad8f2e183d80017d7a42a3655265f51816f23d2b875fb65af039f9ed0162b9d4b2fe3284b702a7bc2f0c8fad89 SHA512 cdc151e6abe6f3ae5e57f1f1a1c9cb42909271b3a4dcf969cd64b02dcb6b24de102c50895bfd7f6ff0c60af010b9f3127e3cc18bf0e8ac8bb8c37dfb7ad392d7
-MISC metadata.xml 341 BLAKE2B b799ae238b59b7d78f3f044af907f3598d6f85e89167150551af57853376c77f28f1221811d4e1e8864256d1189dfd92fdc6d47ddd181cf9b1606945759ddcd4 SHA512 8d716639e08062e601f547912ee7dcdfdb3f6eb0fb8f5a53311b1a759eda4bd06d91f6823c78440dd99a2c81e67f4aaef87f6d5882dc59b7d9de9924020fac8f
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
deleted file mode 100644
index 46086d1c19a9..000000000000
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/console_bridge_vendor"
-else
-	SRC_URI="https://github.com/ros2/console_bridge_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Wrapper around console_bridge"
-HOMEPAGE="https://github.com/ros2/console_bridge_vendor"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/console_bridge-1.0.1
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	test? ( dev-ros/ament_lint_auto )
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
deleted file mode 100644
index 46086d1c19a9..000000000000
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/console_bridge_vendor"
-else
-	SRC_URI="https://github.com/ros2/console_bridge_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Wrapper around console_bridge"
-HOMEPAGE="https://github.com/ros2/console_bridge_vendor"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/console_bridge-1.0.1
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	test? ( dev-ros/ament_lint_auto )
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/console_bridge_vendor/metadata.xml b/dev-ros/console_bridge_vendor/metadata.xml
deleted file mode 100644
index 2e7e6c42d9de..000000000000
--- a/dev-ros/console_bridge_vendor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros2/console_bridge_vendor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/control_msgs/Manifest b/dev-ros/control_msgs/Manifest
deleted file mode 100644
index 06aef2838522..000000000000
--- a/dev-ros/control_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST control_msgs-1.5.2.tar.gz 4850 BLAKE2B 4e601815ba16763695df13d9de6de22d0695d130b7f27b2150d1cdaaf72e73ba0720ac8889ae1c4811e2c5100dbd7c4b0312d1aabb75ed602b4131c1796d167c SHA512 2d892153280d4522b64e9aca3d8da7edf89eaf8cb416aed031a73aefd065533a8c03f4ed7fc6576a2a873603ed47ab35b474e1f48ffe238c184dd2bb9218726f
-EBUILD control_msgs-1.5.2.ebuild 511 BLAKE2B e5da41eda7c6f1f45004a69709bf941037f3bfc1f14d9d4f381eabaf72214a6d539837f9ad04ba993f8a44391ae53580d2d0e32e9b8cad841da8b9cceaddd16d SHA512 abfd5203491156f54cf5169fb2e4303a79b79ed24c9da91a35f2d70789cad833ba6ddb474b32cb07098f67f41a1edab0fa0f27a6813115f7aab977a08059f939
-EBUILD control_msgs-9999.ebuild 511 BLAKE2B e5da41eda7c6f1f45004a69709bf941037f3bfc1f14d9d4f381eabaf72214a6d539837f9ad04ba993f8a44391ae53580d2d0e32e9b8cad841da8b9cceaddd16d SHA512 abfd5203491156f54cf5169fb2e4303a79b79ed24c9da91a35f2d70789cad833ba6ddb474b32cb07098f67f41a1edab0fa0f27a6813115f7aab977a08059f939
-MISC metadata.xml 340 BLAKE2B 03e860721b7010cd2d3211c7a93e9aa44e9166c71a62a49c822d7b299b519ca6520f4efeaaadae3010698521e8668e9b891620c91c3d985a14ee1291e8363631 SHA512 0d0daec15cd00b70794334c3dcc2b5a4073065ef787a0536f90e272c2b1dbf4586aaf48bac9d66b17e7f4eb8e2db318257bab4bd6078639e75c51e158f366227
diff --git a/dev-ros/control_msgs/control_msgs-1.5.2.ebuild b/dev-ros/control_msgs/control_msgs-1.5.2.ebuild
deleted file mode 100644
index 2b3e66de6c4e..000000000000
--- a/dev-ros/control_msgs/control_msgs-1.5.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-controls/control_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/trajectory_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Base messages and actions useful for controlling robots"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_msgs/control_msgs-9999.ebuild b/dev-ros/control_msgs/control_msgs-9999.ebuild
deleted file mode 100644
index 2b3e66de6c4e..000000000000
--- a/dev-ros/control_msgs/control_msgs-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-controls/control_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/trajectory_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Base messages and actions useful for controlling robots"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_msgs/metadata.xml b/dev-ros/control_msgs/metadata.xml
deleted file mode 100644
index 9d031866efa8..000000000000
--- a/dev-ros/control_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/control_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/control_toolbox/Manifest b/dev-ros/control_toolbox/Manifest
deleted file mode 100644
index c21d735d34a5..000000000000
--- a/dev-ros/control_toolbox/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST control_toolbox-1.18.2.tar.gz 24244 BLAKE2B 13c4d4d6991db496ea6223c6cc33c9b0b7fa7b3e18c13cc330cf032ac67b185a596ca2eb118678faf6f0a3106458e3ce20635dfd99fbc1acf176ee2844e6ec99 SHA512 0b8bbd0fec88b1679260d9b5d5c5762f52fd14f4156be45ea07a410a7967571136a65115f530ae4f7a84e456e56c363616e23d0b54d8c092a38a80fad691c705
-EBUILD control_toolbox-1.18.2-r1.ebuild 623 BLAKE2B 81fa39b71cc9b692995d08989b5fa2b07fa7f26e8490482090727837ce9c39f4261d4426caae4990e43c807a653adff6be46ded3a4fea713bcbd11c33601003e SHA512 c3cd856a2f7d396d438f9e71c422d2f6e26848c2d98174623bb79c3832c1469083eeec1e5fd66d1dfe354582b9a1639daa2f3e6f37470b9a245cb021a42615c6
-EBUILD control_toolbox-9999.ebuild 623 BLAKE2B 81fa39b71cc9b692995d08989b5fa2b07fa7f26e8490482090727837ce9c39f4261d4426caae4990e43c807a653adff6be46ded3a4fea713bcbd11c33601003e SHA512 c3cd856a2f7d396d438f9e71c422d2f6e26848c2d98174623bb79c3832c1469083eeec1e5fd66d1dfe354582b9a1639daa2f3e6f37470b9a245cb021a42615c6
-MISC metadata.xml 343 BLAKE2B b9e5f2273e5e0b3c0ad364f49d625a5a7629333fdfd6c880ad9102bb061df7d2e97d4b3a3bd1f3e698883545137ed9616f902a7dd3dc8d82d3bc292faf97180b SHA512 8ed4ca9345dd399142e41f2240c67aaca4e28564eab362890f08354ca7aa622c85c1cdc191f538b7271fd4a053174b165758d922b4f1eb820c03de567844817c
diff --git a/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild b/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild
deleted file mode 100644
index 1e446a94e7f1..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/realtime_tools
-	dev-libs/boost:=
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/control_toolbox/control_toolbox-9999.ebuild b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
deleted file mode 100644
index 1e446a94e7f1..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/realtime_tools
-	dev-libs/boost:=
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/control_toolbox/metadata.xml b/dev-ros/control_toolbox/metadata.xml
deleted file mode 100644
index bea9325f8cf3..000000000000
--- a/dev-ros/control_toolbox/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/control_toolbox</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/controller_interface/Manifest b/dev-ros/controller_interface/Manifest
deleted file mode 100644
index cdff3c9110c3..000000000000
--- a/dev-ros/controller_interface/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD controller_interface-0.19.1-r1.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
-EBUILD controller_interface-0.19.2.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
-EBUILD controller_interface-0.19.3.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
-EBUILD controller_interface-0.19.4.ebuild 433 BLAKE2B b9e597cfaf5fd2201a44d63655609fbcb9f04b334f2ba039321bc6eea08f2d8343a4bf24ea4d753bdb00bf15c416368c6f3d24481a746e4afaa44d52961921be SHA512 fd7dc7cb7e862433cb8791b249677e2de28cab0a781825b642f218974d90bd5ce0b13dfddb3da7458abb02a49ed4e845f8d6953063169441d869826ee89cecbb
-EBUILD controller_interface-0.19.5.ebuild 433 BLAKE2B b9e597cfaf5fd2201a44d63655609fbcb9f04b334f2ba039321bc6eea08f2d8343a4bf24ea4d753bdb00bf15c416368c6f3d24481a746e4afaa44d52961921be SHA512 fd7dc7cb7e862433cb8791b249677e2de28cab0a781825b642f218974d90bd5ce0b13dfddb3da7458abb02a49ed4e845f8d6953063169441d869826ee89cecbb
-EBUILD controller_interface-9999.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/controller_interface/controller_interface-0.19.1-r1.ebuild b/dev-ros/controller_interface/controller_interface-0.19.1-r1.ebuild
deleted file mode 100644
index f86635bda8b3..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-ros/pluginlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/controller_interface/controller_interface-0.19.2.ebuild b/dev-ros/controller_interface/controller_interface-0.19.2.ebuild
deleted file mode 100644
index f86635bda8b3..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.19.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-ros/pluginlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/controller_interface/controller_interface-0.19.3.ebuild b/dev-ros/controller_interface/controller_interface-0.19.3.ebuild
deleted file mode 100644
index f86635bda8b3..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.19.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-ros/pluginlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/controller_interface/controller_interface-0.19.4.ebuild b/dev-ros/controller_interface/controller_interface-0.19.4.ebuild
deleted file mode 100644
index 62002566d3e9..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.19.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-ros/pluginlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/controller_interface/controller_interface-0.19.5.ebuild b/dev-ros/controller_interface/controller_interface-0.19.5.ebuild
deleted file mode 100644
index 62002566d3e9..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.19.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-ros/pluginlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/controller_interface/controller_interface-9999.ebuild b/dev-ros/controller_interface/controller_interface-9999.ebuild
deleted file mode 100644
index f86635bda8b3..000000000000
--- a/dev-ros/controller_interface/controller_interface-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface base class for controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-ros/pluginlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/controller_interface/metadata.xml b/dev-ros/controller_interface/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/controller_interface/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
deleted file mode 100644
index 3b6e7154ef75..000000000000
--- a/dev-ros/controller_manager/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD controller_manager-0.19.4.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
-EBUILD controller_manager-0.19.5.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
-EBUILD controller_manager-9999.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/controller_manager/controller_manager-0.19.4.ebuild b/dev-ros/controller_manager/controller_manager-0.19.4.ebuild
deleted file mode 100644
index e039c57a8218..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.19.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager/controller_manager-0.19.5.ebuild b/dev-ros/controller_manager/controller_manager-0.19.5.ebuild
deleted file mode 100644
index e039c57a8218..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.19.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager/controller_manager-9999.ebuild b/dev-ros/controller_manager/controller_manager-9999.ebuild
deleted file mode 100644
index e039c57a8218..000000000000
--- a/dev-ros/controller_manager/controller_manager-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager/metadata.xml b/dev-ros/controller_manager/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/controller_manager/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/controller_manager_msgs/Manifest b/dev-ros/controller_manager_msgs/Manifest
deleted file mode 100644
index 38bd56574bf1..000000000000
--- a/dev-ros/controller_manager_msgs/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD controller_manager_msgs-0.19.1.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
-EBUILD controller_manager_msgs-0.19.2.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
-EBUILD controller_manager_msgs-0.19.3.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
-EBUILD controller_manager_msgs-0.19.4.ebuild 440 BLAKE2B 2c780d5d1e17615eabf6dee08037b0ee99cb17b1737785f2a98be197a60c86f3af1539282d468619237f79a338733345cf44910f9fc627c198a2ba253b452f76 SHA512 84105726da609158ec97a81c41b6c8dafcd3d2a07248c82e1e4d9ca40f203b23d94ce3dcecb68314698af7bbe3da1c12ef54bddd1a5ed8a128290a50b158c543
-EBUILD controller_manager_msgs-0.19.5.ebuild 440 BLAKE2B 2c780d5d1e17615eabf6dee08037b0ee99cb17b1737785f2a98be197a60c86f3af1539282d468619237f79a338733345cf44910f9fc627c198a2ba253b452f76 SHA512 84105726da609158ec97a81c41b6c8dafcd3d2a07248c82e1e4d9ca40f203b23d94ce3dcecb68314698af7bbe3da1c12ef54bddd1a5ed8a128290a50b158c543
-EBUILD controller_manager_msgs-9999.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.1.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.1.ebuild
deleted file mode 100644
index 96b14aee266a..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.2.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.2.ebuild
deleted file mode 100644
index 96b14aee266a..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.3.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.3.ebuild
deleted file mode 100644
index 96b14aee266a..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.4.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.4.ebuild
deleted file mode 100644
index dcfdcd21f983..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.ebuild
deleted file mode 100644
index dcfdcd21f983..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
deleted file mode 100644
index 96b14aee266a..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/metadata.xml b/dev-ros/controller_manager_msgs/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/controller_manager_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
deleted file mode 100644
index 66eeeacf38f3..000000000000
--- a/dev-ros/controller_manager_tests/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD controller_manager_tests-0.19.5.ebuild 932 BLAKE2B 3688839251bbcdcab09703ba8bd395137b84995f397a3f2b0204d3e3c0ead08579bc4c2f48be2b68a5cf5897f57e68a33a408f45da8332c471d924f096c7faf7 SHA512 db2936ee1c76c759a31eca899f1c2d129fce2044335321a00dd80bf7f00d54117d4d15a7a607d7d8874fe0797a55c5df6f1cf976783a3ca87a0c3232b0dea47e
-EBUILD controller_manager_tests-9999.ebuild 932 BLAKE2B 3688839251bbcdcab09703ba8bd395137b84995f397a3f2b0204d3e3c0ead08579bc4c2f48be2b68a5cf5897f57e68a33a408f45da8332c471d924f096c7faf7 SHA512 db2936ee1c76c759a31eca899f1c2d129fce2044335321a00dd80bf7f00d54117d4d15a7a607d7d8874fe0797a55c5df6f1cf976783a3ca87a0c3232b0dea47e
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild
deleted file mode 100644
index c28c2b9f697c..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/rosbash
-	)
-"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
deleted file mode 100644
index c28c2b9f697c..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/rosbash
-	)
-"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/metadata.xml b/dev-ros/controller_manager_tests/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/controller_manager_tests/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/convex_decomposition/Manifest b/dev-ros/convex_decomposition/Manifest
deleted file mode 100644
index bc747da3b204..000000000000
--- a/dev-ros/convex_decomposition/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST convex_decomposition-0.1.12.tar.gz 76216 BLAKE2B fda1e88cb3efffe3ae7e384216b4f2af072ca25c407efc07eaa8cc7a84c64b723aeb729be05cedb5ef6f82f51292aef1ec6acd48282742a02e9ec6fb49d78e6f SHA512 c6c502e66259983e3462b27253ff8483d56baaa71b8c42037b43fd11aa0c226851d5c6dcf5745b814a3601083b5b85662268db2a1af99e1bdbc8f237c6ff2704
-EBUILD convex_decomposition-0.1.12.ebuild 343 BLAKE2B 1a2a99d1a896c1dfd3d1408a608041860e3f21db8e4a5967133a2473da94b269ea7b66749a5467f4376ac5f145f716d7132de99f20a12e2fc183f81441fa39ca SHA512 213cfa7c83b8ec476331b4043c524e49e2f94ee6aebf46176b62cbb223d29c22c692a1c8f3c55687e5f47c9a6b1ee47d2b61e88c6958f3972610215b7ea82ffd
-EBUILD convex_decomposition-9999.ebuild 343 BLAKE2B 1a2a99d1a896c1dfd3d1408a608041860e3f21db8e4a5967133a2473da94b269ea7b66749a5467f4376ac5f145f716d7132de99f20a12e2fc183f81441fa39ca SHA512 213cfa7c83b8ec476331b4043c524e49e2f94ee6aebf46176b62cbb223d29c22c692a1c8f3c55687e5f47c9a6b1ee47d2b61e88c6958f3972610215b7ea82ffd
-MISC metadata.xml 339 BLAKE2B 12c14a33e30a9714423c4d59ebfa565d9e3a7cf1becb1364056fa30ab6467623bb0d51293de430312fc43586aef129d8790d893cd46fcea60e2c05cd22e8fa35 SHA512 74f4f69aa413131fe88a4892ab40d831fc8aa6e66943c6a053f9b64634d8f5a77b685eebec64052c25fb89df1fb1c0256b45a05206426d45ff70d901a3040133
diff --git a/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild b/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
deleted file mode 100644
index 26c6262a0b60..000000000000
--- a/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/convex_decomposition"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Convex Decomposition Tool for Robot Model"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/unzip"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild b/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
deleted file mode 100644
index 26c6262a0b60..000000000000
--- a/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/convex_decomposition"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Convex Decomposition Tool for Robot Model"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/unzip"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/convex_decomposition/metadata.xml b/dev-ros/convex_decomposition/metadata.xml
deleted file mode 100644
index a3e5c201eebc..000000000000
--- a/dev-ros/convex_decomposition/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/convex_decomposition</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest
deleted file mode 100644
index 761c683b24bc..000000000000
--- a/dev-ros/costmap_2d/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST costmap_2d-1.17.0-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463
-DIST costmap_2d-1.17.0-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee
-DIST costmap_2d-1.17.1-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463
-DIST costmap_2d-1.17.1-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee
-DIST costmap_2d-9999-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463
-DIST costmap_2d-9999-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD costmap_2d-1.17.0-r2.ebuild 1721 BLAKE2B 2b60a0b7766ef162d5edd93f0335e29c4598707f5b22b7a3d1ef0763e9f9ed4fcd607d0fdfb3f84eec490b3f62ffbf2288cd3418ceaac4aa5409612c606c1702 SHA512 5553a7c9c2c3f67237b00be559b733e26200e4738cd3bb3dc5360cac08df46310a46f349ee566ddb2780f6bdb08e58fc4b90036b871073e7e189f45a6e90f78f
-EBUILD costmap_2d-1.17.1-r1.ebuild 1721 BLAKE2B 2b60a0b7766ef162d5edd93f0335e29c4598707f5b22b7a3d1ef0763e9f9ed4fcd607d0fdfb3f84eec490b3f62ffbf2288cd3418ceaac4aa5409612c606c1702 SHA512 5553a7c9c2c3f67237b00be559b733e26200e4738cd3bb3dc5360cac08df46310a46f349ee566ddb2780f6bdb08e58fc4b90036b871073e7e189f45a6e90f78f
-EBUILD costmap_2d-9999.ebuild 1721 BLAKE2B 2b60a0b7766ef162d5edd93f0335e29c4598707f5b22b7a3d1ef0763e9f9ed4fcd607d0fdfb3f84eec490b3f62ffbf2288cd3418ceaac4aa5409612c606c1702 SHA512 5553a7c9c2c3f67237b00be559b733e26200e4738cd3bb3dc5360cac08df46310a46f349ee566ddb2780f6bdb08e58fc4b90036b871073e7e189f45a6e90f78f
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/costmap_2d/costmap_2d-1.17.0-r2.ebuild b/dev-ros/costmap_2d/costmap_2d-1.17.0-r2.ebuild
deleted file mode 100644
index be0867b0f765..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.17.0-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-DATA="simple_driving_test_indexed.bag willow-full-0.025.pgm"
-for i in ${DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/costmap_2d/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	>=dev-ros/pluginlib-1.13.0-r1
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/voxel_grid
-
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-	test? (
-		dev-ros/map_server
-		dev-ros/rosbag
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		dev-ros/rosunit
-	)"
-BDEPEND="
-	dev-ros/cmake_modules
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/costmap_2d/#file://${S}/#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/costmap_2d/costmap_2d-1.17.1-r1.ebuild b/dev-ros/costmap_2d/costmap_2d-1.17.1-r1.ebuild
deleted file mode 100644
index be0867b0f765..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.17.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-DATA="simple_driving_test_indexed.bag willow-full-0.025.pgm"
-for i in ${DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/costmap_2d/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	>=dev-ros/pluginlib-1.13.0-r1
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/voxel_grid
-
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-	test? (
-		dev-ros/map_server
-		dev-ros/rosbag
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		dev-ros/rosunit
-	)"
-BDEPEND="
-	dev-ros/cmake_modules
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/costmap_2d/#file://${S}/#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/costmap_2d/costmap_2d-9999.ebuild b/dev-ros/costmap_2d/costmap_2d-9999.ebuild
deleted file mode 100644
index be0867b0f765..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-DATA="simple_driving_test_indexed.bag willow-full-0.025.pgm"
-for i in ${DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/costmap_2d/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	>=dev-ros/pluginlib-1.13.0-r1
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/voxel_grid
-
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-	test? (
-		dev-ros/map_server
-		dev-ros/rosbag
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		dev-ros/rosunit
-	)"
-BDEPEND="
-	dev-ros/cmake_modules
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/costmap_2d/#file://${S}/#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/costmap_2d/metadata.xml b/dev-ros/costmap_2d/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/costmap_2d/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/cpp_common/Manifest b/dev-ros/cpp_common/Manifest
deleted file mode 100644
index a5871e92eff6..000000000000
--- a/dev-ros/cpp_common/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST roscpp_core-0.7.2.tar.gz 35095 BLAKE2B 065f81f514becd2ea1586735c759be79765eeee1c8a9606261ebd2086cf406c87276b143ace4ac43eeb7f8ee6dccc07812c614e6e185f2354d64b1dfe401b849 SHA512 fb04ee37db14d31b7c06ae3484f5aa414563e96a90b820b7d6e23e921bcd831a8bf1d66c723aef65a617b2da92456345cb796271409c8dc155ef1084926659ef
-EBUILD cpp_common-0.7.2-r1.ebuild 408 BLAKE2B 9f03bb7e5e5c999eed8593a27b1f3780bdbb73a87c86892d700b408e45f93db4a704f3290e718399a00055fe03fc306f09a0fc0dc2ab0b31725796707f13133f SHA512 188653f86b5981adca50926fd549117b6f603b80bdf761323810531ea2d3b444cab8656dbcea833f290debea39df98bc0965febb57492a2fab3be7e0102d58d4
-EBUILD cpp_common-9999.ebuild 408 BLAKE2B 9f03bb7e5e5c999eed8593a27b1f3780bdbb73a87c86892d700b408e45f93db4a704f3290e718399a00055fe03fc306f09a0fc0dc2ab0b31725796707f13133f SHA512 188653f86b5981adca50926fd549117b6f603b80bdf761323810531ea2d3b444cab8656dbcea833f290debea39df98bc0965febb57492a2fab3be7e0102d58d4
-MISC metadata.xml 330 BLAKE2B 29b9adee2c65256491b9192e5d15f2398d839b011ab15a5383db9472455c8adcc3f4ead321f65943dd8fd6b010514b001248af026b1f5a708316e9ad4a699fb9 SHA512 cfdf921ea410ba8db72aa8bae017f699948dbc789c3068cec5798b5320c1e574bd3c854e05e04053fca24fb6bd6bbf6c847b742b8e636c3c1a4dc920a7262183
diff --git a/dev-ros/cpp_common/cpp_common-0.7.2-r1.ebuild b/dev-ros/cpp_common/cpp_common-0.7.2-r1.ebuild
deleted file mode 100644
index db0deaacaf2e..000000000000
--- a/dev-ros/cpp_common/cpp_common-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-9999.ebuild b/dev-ros/cpp_common/cpp_common-9999.ebuild
deleted file mode 100644
index db0deaacaf2e..000000000000
--- a/dev-ros/cpp_common/cpp_common-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/metadata.xml b/dev-ros/cpp_common/metadata.xml
deleted file mode 100644
index 4e0c376ad93e..000000000000
--- a/dev-ros/cpp_common/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/roscpp_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
deleted file mode 100644
index 67fd902a7384..000000000000
--- a/dev-ros/cv_bridge/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX boostpython.patch 599 BLAKE2B 5076c2efdfd06afa9dbc9e3ad344774c1fca54ef172a4808e4ba7b40f4770250d49b1e478abcee1ac973c3a1012579694499a1dd48fd84c19f996441920c329c SHA512 21c5a6589a1ee19d5f586b535807c35f5eef77da6dae614deb7542d8cb1cf850902b5d7de197d6060016f43dcbef8d6d69d104abc5f5fa0af6131a415a43ba64
-AUX ocv_leak.patch 535 BLAKE2B b1088e87735e44087aa7fba347459c6117cac2026fcab6c9a222baba9b6514bb58c8a38d3e3e9543002fc79d6590cecbfc032fec30d5fbd2649e9f2dce1c70c5 SHA512 0204b0a1fa6242e0c77e5f375ced38550780fb7f22d65a35a3edd10e4711fdbb0235d10d765cb29550d0324e1ca00cfcc90621bc1686159f10eb51ed2da3e875
-DIST vision_opencv-1.16.0.tar.gz 85452 BLAKE2B 5f167898cef4bbc753e32af87174b7f668b3eff00357a22e8c454d181116a925059d4837210086d445ceaf74819fdb9a527eb5667321df8a7c1fe84549dbe5b6 SHA512 affd61f0d933cc57d5d23e840f0708e8ffdc0033eee22a21fe5c0099a2ab75d4c3fdcc41705167ab3615f5388ce47641faf5b21e6c6365a4e540abe69dfad3fe
-DIST vision_opencv-1.16.2.tar.gz 86615 BLAKE2B e3078be4a865aed4317db7dc422a71661a52e8b42c52aaab92c524cdb14ad08ab85ac523d55b76b5ebc6201400a832d0ea9c3203ed5ff2af342a58be5ab0ef49 SHA512 c1fd4b402cc970797c0b01573d111cec041ea59598897256ed26ad01624e15300cc2147deaf701af1d12bc921ac9892917d927d17325d4086c0724633d96b3c5
-EBUILD cv_bridge-1.16.0.ebuild 822 BLAKE2B 047950a049557dd9b0a47b795d633b99ad752ac1b03ff2fd63550336d6b0473ea3ea493d6cbb6c66724cf8f00a85aaa280114a8449f9969602c6610362a774c4 SHA512 b479f9ae5f7c948a020efef3b95c43acfe6309254bb361a1c5dc5250ab1a2c32668f64f6d0c385e2cef69c3e30f61252e623b8cc3c92844a3369705b210ba4cc
-EBUILD cv_bridge-1.16.2.ebuild 822 BLAKE2B 047950a049557dd9b0a47b795d633b99ad752ac1b03ff2fd63550336d6b0473ea3ea493d6cbb6c66724cf8f00a85aaa280114a8449f9969602c6610362a774c4 SHA512 b479f9ae5f7c948a020efef3b95c43acfe6309254bb361a1c5dc5250ab1a2c32668f64f6d0c385e2cef69c3e30f61252e623b8cc3c92844a3369705b210ba4cc
-EBUILD cv_bridge-9999.ebuild 822 BLAKE2B 047950a049557dd9b0a47b795d633b99ad752ac1b03ff2fd63550336d6b0473ea3ea493d6cbb6c66724cf8f00a85aaa280114a8449f9969602c6610362a774c4 SHA512 b479f9ae5f7c948a020efef3b95c43acfe6309254bb361a1c5dc5250ab1a2c32668f64f6d0c385e2cef69c3e30f61252e623b8cc3c92844a3369705b210ba4cc
-MISC metadata.xml 343 BLAKE2B 4c8ada208d6cb4fb1e99ee7839cc4c20275e86a8b351169790c54c8df90a8cb381d9d71b2ebfdf2306aa7f2d66581144d61dff8adb5aa0e7ddc13696d8f17aa5 SHA512 932ed7ee027c275e3be014ee0a048c16dbec1b7108777fb2150cab84678cc31d560f1b88d6ac3fd890357512239c85951c48819a31f2e0174dac68beef44d1b2
diff --git a/dev-ros/cv_bridge/cv_bridge-1.16.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.16.0.ebuild
deleted file mode 100644
index b1563eb9a061..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.16.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff]
-	$(python_gen_cond_dep "dev-libs/boost:=[python,\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-1.16.2.ebuild b/dev-ros/cv_bridge/cv_bridge-1.16.2.ebuild
deleted file mode 100644
index b1563eb9a061..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.16.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff]
-	$(python_gen_cond_dep "dev-libs/boost:=[python,\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
deleted file mode 100644
index b1563eb9a061..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff]
-	$(python_gen_cond_dep "dev-libs/boost:=[python,\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/cv_bridge/files/boostpython.patch b/dev-ros/cv_bridge/files/boostpython.patch
deleted file mode 100644
index a6192f98be24..000000000000
--- a/dev-ros/cv_bridge/files/boostpython.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: cv_bridge/CMakeLists.txt
-===================================================================
---- cv_bridge.orig/CMakeLists.txt
-+++ cv_bridge/CMakeLists.txt
-@@ -5,14 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
- 
- if(NOT ANDROID)
-   find_package(PythonLibs)
--
--  if(PYTHONLIBS_VERSION_STRING VERSION_LESS "3.8")
--    # Debian Buster
--    find_package(Boost REQUIRED python37)
--  else()
--    # Ubuntu Focal
--    find_package(Boost REQUIRED python)
--  endif()
-+  find_package(Boost REQUIRED python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
- else()
- find_package(Boost REQUIRED)
- endif()
diff --git a/dev-ros/cv_bridge/files/ocv_leak.patch b/dev-ros/cv_bridge/files/ocv_leak.patch
deleted file mode 100644
index dab21616fc89..000000000000
--- a/dev-ros/cv_bridge/files/ocv_leak.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: cv_bridge/CMakeLists.txt
-===================================================================
---- cv_bridge.orig/CMakeLists.txt
-+++ cv_bridge/CMakeLists.txt
-@@ -17,14 +17,7 @@ else()
- find_package(Boost REQUIRED)
- endif()
- 
--set(_opencv_version 4)
--find_package(OpenCV 4 QUIET)
--if(NOT OpenCV_FOUND)
--  message(STATUS "Did not find OpenCV 4, trying OpenCV 3")
--  set(_opencv_version 3)
--endif()
--
--find_package(OpenCV ${_opencv_version} REQUIRED
-+find_package(OpenCV 4 REQUIRED
-   COMPONENTS
-     opencv_core
-     opencv_imgproc
diff --git a/dev-ros/cv_bridge/metadata.xml b/dev-ros/cv_bridge/metadata.xml
deleted file mode 100644
index 6fad310c965b..000000000000
--- a/dev-ros/cv_bridge/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/vision_opencv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/depth_image_proc/Manifest b/dev-ros/depth_image_proc/Manifest
deleted file mode 100644
index 8f87f536ff92..000000000000
--- a/dev-ros/depth_image_proc/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
-DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
-DIST image_pipeline-1.17.0.tar.gz 154211 BLAKE2B 221c549d6794f3567706e724a48d52fa4d7f395b30f477a12750f4707d70782496a0110df9f89e83aa11ea95dbd65acab18eff13a8beb026091abd209370cbd4 SHA512 c5bc227f13415f6fe31eb2cee015f8671433b427044b8f8842d0e5d1ef19aff21f66e40945bb09227442ab5c4c49aae3217b56dac03b358804567cff4189efeb
-EBUILD depth_image_proc-1.15.2.ebuild 730 BLAKE2B 3482014f0562d3a1ffe9ea79d603afd968c3b111a976413718fea27465e35226e3abc23922fb3224938fd047dd2d6564798171329195de8082b7e95750f6303c SHA512 48717a00873856350bc0002e9b76d4f1a077bde06653331e54c99de80772532899e0c656a149d4762ef699c519b4e59bac5539d8921a29d946cd39f6598c454c
-EBUILD depth_image_proc-1.15.3.ebuild 730 BLAKE2B 3884743f3eb82d4cdcbd81803321a23b1dfaf768f32f1743a8a556710ee75cce30faf875f8e08aa18cc42977f04f63b5d7aa4ba57ad1cf75a6404fd7bf93c6bb SHA512 41eaa4dcbc21bdec77a1a7b3a6449da0710d24b97ac2b03fcfbfce69ce90c89d1afb656fa87067a8fb6de899541ec545e7cbe2a5502bba4d7fbd63e6a607b174
-EBUILD depth_image_proc-1.16.0.ebuild 730 BLAKE2B 95bfdf070f0cc57be5f32584d514ca3fd4dc91950fb5b8ee8a5aa5e4253304d2c63438211c3eb931fd4ea3658fa7124cf78777ed5c1266930740a418dcf6a3d0 SHA512 9fb1ab1a5987cf5c2b28a195c04d68c3356489204ca700f15aa4202bc7aecd025a0794b05012ce2268430e5fc1880bd194a031166db96f5d1605cca2d18fb3a6
-EBUILD depth_image_proc-1.17.0.ebuild 730 BLAKE2B 95bfdf070f0cc57be5f32584d514ca3fd4dc91950fb5b8ee8a5aa5e4253304d2c63438211c3eb931fd4ea3658fa7124cf78777ed5c1266930740a418dcf6a3d0 SHA512 9fb1ab1a5987cf5c2b28a195c04d68c3356489204ca700f15aa4202bc7aecd025a0794b05012ce2268430e5fc1880bd194a031166db96f5d1605cca2d18fb3a6
-EBUILD depth_image_proc-9999.ebuild 730 BLAKE2B 3482014f0562d3a1ffe9ea79d603afd968c3b111a976413718fea27465e35226e3abc23922fb3224938fd047dd2d6564798171329195de8082b7e95750f6303c SHA512 48717a00873856350bc0002e9b76d4f1a077bde06653331e54c99de80772532899e0c656a149d4762ef699c519b4e59bac5539d8921a29d946cd39f6598c454c
-MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild
deleted file mode 100644
index 4cbfec1b77ae..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/eigen_conversions
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.15.3.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.15.3.ebuild
deleted file mode 100644
index c47b47023e74..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.15.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/eigen_conversions
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.16.0.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.16.0.ebuild
deleted file mode 100644
index 583df987bc50..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.16.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/eigen_conversions
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.17.0.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.17.0.ebuild
deleted file mode 100644
index 583df987bc50..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.17.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/eigen_conversions
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild b/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
deleted file mode 100644
index 4cbfec1b77ae..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/eigen_conversions
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/depth_image_proc/metadata.xml b/dev-ros/depth_image_proc/metadata.xml
deleted file mode 100644
index a96f24591a70..000000000000
--- a/dev-ros/depth_image_proc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/depthimage_to_laserscan/Manifest b/dev-ros/depthimage_to_laserscan/Manifest
deleted file mode 100644
index 7cd8a7f11c2d..000000000000
--- a/dev-ros/depthimage_to_laserscan/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX isnan.patch 672 BLAKE2B 714348340fb583106891e467fb24815cb95e389ef863b39c8ed5d6250c2fc5d5467cf565590b0fa1e163c440fd6e282f6320d77395b676876bd51526a755e454 SHA512 c4993894868cbfbd66374b4062f43e7d58ef8e3d725024b06146144809cd059d6a01ba502626876089847688a58f1f069f8dfb788e657ac7c1a79e9cb8200a7b
-DIST depthimage_to_laserscan-1.0.8.tar.gz 12189 BLAKE2B 78668e8768bf9f402b5d94af71045677ce35b9b680c1b298f48a8a0c55f3920880eef24d0ab334150b967fd1378b9e4ada8069965057238e59116adb2f803d32 SHA512 50472016630d10b5a8544c7a2391c215de307dc5b0d8445cdc05d8e2f251651221bf18b18e389d000adacf79324569bb6ad7a23c6c6cce901d5ae1c966b4533d
-EBUILD depthimage_to_laserscan-1.0.8.ebuild 709 BLAKE2B ea3a787ef86eb9968b561b9c2e36fd9e388705558912daf7dd23615795dc53355b203e7089968d82201421b2d5bb42be1e0210dba86cdd64bc1a17b263525367 SHA512 67c244026540b77ec4d2584a19c61be7b4663d10e96916349e4ebceeded03fd5800d8c06da783474c72f987cb224ed823508efab3c3904f76ff037f6225dbc5f
-EBUILD depthimage_to_laserscan-9999.ebuild 709 BLAKE2B ea3a787ef86eb9968b561b9c2e36fd9e388705558912daf7dd23615795dc53355b203e7089968d82201421b2d5bb42be1e0210dba86cdd64bc1a17b263525367 SHA512 67c244026540b77ec4d2584a19c61be7b4663d10e96916349e4ebceeded03fd5800d8c06da783474c72f987cb224ed823508efab3c3904f76ff037f6225dbc5f
-MISC metadata.xml 353 BLAKE2B 762ca50613369470a5fb9c13dab85be3412dce99c3c14a3929d0c65d4622de682e29c08117af4cc91fafd8d1c7943c725aceaa6a90d7d0d4eb486916485a28a1 SHA512 5b066d1594dffbeff528e0f6ae5f87c31611b5a28e64284ecf0e77e6829e6353f73e00edbd593d7dbdb127f6dcecee25ca523a8bb8111c2b532d6379228fe8b7
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
deleted file mode 100644
index bee85b1f78d7..000000000000
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Converts a depth image to a laser scan for use with navigation and localization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/roscpp
-
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-	)
-"
-PATCHES=( "${FILESDIR}/isnan.patch" )
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
deleted file mode 100644
index bee85b1f78d7..000000000000
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Converts a depth image to a laser scan for use with navigation and localization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/roscpp
-
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-	)
-"
-PATCHES=( "${FILESDIR}/isnan.patch" )
diff --git a/dev-ros/depthimage_to_laserscan/files/isnan.patch b/dev-ros/depthimage_to_laserscan/files/isnan.patch
deleted file mode 100644
index 11254904e945..000000000000
--- a/dev-ros/depthimage_to_laserscan/files/isnan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScan.cpp
-===================================================================
---- depthimage_to_laserscan-1.0.7.orig/src/DepthImageToLaserScan.cpp
-+++ depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScan.cpp
-@@ -59,7 +59,7 @@ bool DepthImageToLaserScan::use_point(co
-   
-   // Infs are preferable over NaNs (more information)
-   if(!new_finite && !old_finite){ // Both are not NaN or Inf.
--    if(!isnan(new_value)){ // new is not NaN, so use it's +-Inf value.
-+    if(!std::isnan(new_value)){ // new is not NaN, so use it's +-Inf value.
-       return true;
-     }
-     return false; // Do not replace old_value
diff --git a/dev-ros/depthimage_to_laserscan/metadata.xml b/dev-ros/depthimage_to_laserscan/metadata.xml
deleted file mode 100644
index 708bad7124c2..000000000000
--- a/dev-ros/depthimage_to_laserscan/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/depthimage_to_laserscan</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/diagnostic_aggregator/Manifest b/dev-ros/diagnostic_aggregator/Manifest
deleted file mode 100644
index 3d4ef31ea343..000000000000
--- a/dev-ros/diagnostic_aggregator/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
-DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
-DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
-DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
-DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
-EBUILD diagnostic_aggregator-1.10.1.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
-EBUILD diagnostic_aggregator-1.10.2.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
-EBUILD diagnostic_aggregator-1.10.3.ebuild 808 BLAKE2B 9892664dec34c98ee9854d5301804e592aa68e6c72d2cc74e6313f9d76af04cf1b626e34c622a6c7c1b756b6090706d69abf0b5eaa2d3b08e0f05286dd3b0d0b SHA512 85ab8ee8c9ade277b7a8db461e8f8e8830f6f2c4dfcf597ce063858d40f44f06be6dfb01d4883ed4b3a12403f68fc5923ffb4c4ec3f51e82bcf4eb2832144b60
-EBUILD diagnostic_aggregator-1.10.4.ebuild 808 BLAKE2B 9892664dec34c98ee9854d5301804e592aa68e6c72d2cc74e6313f9d76af04cf1b626e34c622a6c7c1b756b6090706d69abf0b5eaa2d3b08e0f05286dd3b0d0b SHA512 85ab8ee8c9ade277b7a8db461e8f8e8830f6f2c4dfcf597ce063858d40f44f06be6dfb01d4883ed4b3a12403f68fc5923ffb4c4ec3f51e82bcf4eb2832144b60
-EBUILD diagnostic_aggregator-1.11.0.ebuild 808 BLAKE2B 6878649a70d7b68513a82a63f6276c06496e0503ac5f6ff1074bcd630f16fc27f62a48e0505db41dfd6a78f1ecdc27f97d7c532ceb66b9c1c8e359fe6e631980 SHA512 b5e6f66e8446eb4aabda9e588a7bf426bf89c93e9a7c56d45514aa6701bcf38a1744f528167a2b30edca227cb74da93b8428cf9d6ef39d353c20c1f9bdf9e9dd
-EBUILD diagnostic_aggregator-9999.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
-MISC metadata.xml 330 BLAKE2B a856cefc508ebf638d764bbfad848bae8140bb8f4f8e0fcde5ade3d168cff85647d3f803f92fd05824d459cd1e723d86ff48b21c07211b27527d251bb7eb90fd SHA512 d6abd3b4af2ba8eb1de110f8b59296f327e83ced62d9618e1dd2be6d39e04e4bad27a32aa78f9e7358b2f22f872aa96bbdac1da860c6af37ebff054d6e5c7f67
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.1.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.1.ebuild
deleted file mode 100644
index 76db5fae27db..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-	dev-ros/xmlrpcpp
-	dev-ros/bondcpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.2.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.2.ebuild
deleted file mode 100644
index 76db5fae27db..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-	dev-ros/xmlrpcpp
-	dev-ros/bondcpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.3.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.3.ebuild
deleted file mode 100644
index b43991e89535..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-	dev-ros/xmlrpcpp
-	dev-ros/bondcpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.4.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.4.ebuild
deleted file mode 100644
index b43991e89535..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-	dev-ros/xmlrpcpp
-	dev-ros/bondcpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.11.0.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.11.0.ebuild
deleted file mode 100644
index 6d2eff254e5e..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.11.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-	dev-ros/xmlrpcpp
-	dev-ros/bondcpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
deleted file mode 100644
index 76db5fae27db..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-	dev-ros/xmlrpcpp
-	dev-ros/bondcpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_aggregator/metadata.xml b/dev-ros/diagnostic_aggregator/metadata.xml
deleted file mode 100644
index dd82416e0b4a..000000000000
--- a/dev-ros/diagnostic_aggregator/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/diagnostics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/diagnostic_analysis/Manifest b/dev-ros/diagnostic_analysis/Manifest
deleted file mode 100644
index 8b86056c25cc..000000000000
--- a/dev-ros/diagnostic_analysis/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
-DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
-DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
-DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
-DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
-DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
-DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
-EBUILD diagnostic_analysis-1.10.1.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
-EBUILD diagnostic_analysis-1.10.2.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
-EBUILD diagnostic_analysis-1.10.3.ebuild 697 BLAKE2B e8b0db107fec8a77be9bcf76c39fdb2b0a5ea89879c5493bb43cc5a99d93f6bf2c6ad5ab67109f437612ad8fd441c2dd479c44a8b7fc3704b7e613871b43485a SHA512 5b1020bf88de8122ba476e004a3ea13593f12f8aac51022defda9eb7055537696017c820e78b4273e5a271c8466f2a40ac497df207c3dc49bbd9f017e3278f40
-EBUILD diagnostic_analysis-1.10.4.ebuild 697 BLAKE2B e8b0db107fec8a77be9bcf76c39fdb2b0a5ea89879c5493bb43cc5a99d93f6bf2c6ad5ab67109f437612ad8fd441c2dd479c44a8b7fc3704b7e613871b43485a SHA512 5b1020bf88de8122ba476e004a3ea13593f12f8aac51022defda9eb7055537696017c820e78b4273e5a271c8466f2a40ac497df207c3dc49bbd9f017e3278f40
-EBUILD diagnostic_analysis-1.11.0.ebuild 697 BLAKE2B 846e1533c6d33ee1864899f31116acf8174db85c5fc8b10c458121b1842772565e2ff68b23c36ab2c552d915737fd42c3657f17e10e9420bb4dc2cc589d5923d SHA512 8c6e8b7bf1c54b776f9fd0310293afc9f8ac7df3ccd37c209b22b6d8c364dc5dc0ac20aceb9376e0885945ba8d39fb242ebc3e97203c9acedf5f532fe400e974
-EBUILD diagnostic_analysis-1.9.4.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
-EBUILD diagnostic_analysis-1.9.6.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
-EBUILD diagnostic_analysis-9999.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
-MISC metadata.xml 330 BLAKE2B a856cefc508ebf638d764bbfad848bae8140bb8f4f8e0fcde5ade3d168cff85647d3f803f92fd05824d459cd1e723d86ff48b21c07211b27527d251bb7eb90fd SHA512 d6abd3b4af2ba8eb1de110f8b59296f327e83ced62d9618e1dd2be6d39e04e4bad27a32aa78f9e7358b2f22f872aa96bbdac1da860c6af37ebff054d6e5c7f67
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.1.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.1.ebuild
deleted file mode 100644
index fdc2bbe90d68..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.2.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.2.ebuild
deleted file mode 100644
index fdc2bbe90d68..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.3.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.3.ebuild
deleted file mode 100644
index b96b519a3ed1..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.4.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.4.ebuild
deleted file mode 100644
index b96b519a3ed1..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.11.0.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.11.0.ebuild
deleted file mode 100644
index 1a13d767813b..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.11.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild
deleted file mode 100644
index fdc2bbe90d68..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.6.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.6.ebuild
deleted file mode 100644
index fdc2bbe90d68..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild
deleted file mode 100644
index fdc2bbe90d68..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts diagnostics data into a series of CSV files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_analysis/metadata.xml b/dev-ros/diagnostic_analysis/metadata.xml
deleted file mode 100644
index dd82416e0b4a..000000000000
--- a/dev-ros/diagnostic_analysis/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/diagnostics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/diagnostic_common_diagnostics/Manifest b/dev-ros/diagnostic_common_diagnostics/Manifest
deleted file mode 100644
index 5c8fdeb470a4..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
-DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
-DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
-DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
-DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
-DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
-DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
-EBUILD diagnostic_common_diagnostics-1.10.1.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
-EBUILD diagnostic_common_diagnostics-1.10.2.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
-EBUILD diagnostic_common_diagnostics-1.10.3.ebuild 734 BLAKE2B 6f17888cc4985fd26a841725f08fbb6b3e8be96aef218a1278b19f963f6010e1b6bb8ca689a244999b41794fffc3592a0c53c29b032b1cb95aa2ee0fef5b58b0 SHA512 75e937609d08c2390b3943d9fa32029ab1afec87d01881134adab7617f7a92fa30cd0c609e9ae02568e3e2b1c4249ddc85baf3afb4c14a497cff652b56cabcdb
-EBUILD diagnostic_common_diagnostics-1.10.4.ebuild 734 BLAKE2B 6f17888cc4985fd26a841725f08fbb6b3e8be96aef218a1278b19f963f6010e1b6bb8ca689a244999b41794fffc3592a0c53c29b032b1cb95aa2ee0fef5b58b0 SHA512 75e937609d08c2390b3943d9fa32029ab1afec87d01881134adab7617f7a92fa30cd0c609e9ae02568e3e2b1c4249ddc85baf3afb4c14a497cff652b56cabcdb
-EBUILD diagnostic_common_diagnostics-1.11.0.ebuild 734 BLAKE2B af73da5e8aa6508a65460beec7724fc2df9d3d7b0ec0e600d7229dd0913acfa73eba2df2bffa856d731a783b07d44539fed1caa242d735408dc795c132b18dd1 SHA512 99d7eec9256239619739a74805817400734cb37ce4d280ae27da53ce9c966bb2c8da37ea8472fba0ff9fbcfc0c76a2e5552be0448d020b8ba3ac30d81d203abf
-EBUILD diagnostic_common_diagnostics-1.9.4.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
-EBUILD diagnostic_common_diagnostics-1.9.6.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
-EBUILD diagnostic_common_diagnostics-9999.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
-MISC metadata.xml 330 BLAKE2B a856cefc508ebf638d764bbfad848bae8140bb8f4f8e0fcde5ade3d168cff85647d3f803f92fd05824d459cd1e723d86ff48b21c07211b27527d251bb7eb90fd SHA512 d6abd3b4af2ba8eb1de110f8b59296f327e83ced62d9618e1dd2be6d39e04e4bad27a32aa78f9e7358b2f22f872aa96bbdac1da860c6af37ebff054d6e5c7f67
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.1.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.1.ebuild
deleted file mode 100644
index 7d94a89560d9..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	app-admin/hddtemp"
-DEPEND="${DEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.2.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.2.ebuild
deleted file mode 100644
index 7d94a89560d9..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	app-admin/hddtemp"
-DEPEND="${DEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.3.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.3.ebuild
deleted file mode 100644
index 6c5a6781f6eb..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	app-admin/hddtemp"
-DEPEND="${DEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.4.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.4.ebuild
deleted file mode 100644
index 6c5a6781f6eb..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	app-admin/hddtemp"
-DEPEND="${DEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.11.0.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.11.0.ebuild
deleted file mode 100644
index 9cba778ce8ac..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.11.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	app-admin/hddtemp"
-DEPEND="${DEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild
deleted file mode 100644
index 7d94a89560d9..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	app-admin/hddtemp"
-DEPEND="${DEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.6.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.6.ebuild
deleted file mode 100644
index 7d94a89560d9..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	app-admin/hddtemp"
-DEPEND="${DEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
deleted file mode 100644
index 7d94a89560d9..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	app-admin/hddtemp"
-DEPEND="${DEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)
-"
diff --git a/dev-ros/diagnostic_common_diagnostics/metadata.xml b/dev-ros/diagnostic_common_diagnostics/metadata.xml
deleted file mode 100644
index dd82416e0b4a..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/diagnostics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/diagnostic_msgs/Manifest b/dev-ros/diagnostic_msgs/Manifest
deleted file mode 100644
index dea6334e709a..000000000000
--- a/dev-ros/diagnostic_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD diagnostic_msgs-1.13.0.ebuild 455 BLAKE2B ad3b54387c724d20c5e19aea39fb995eed5c4bfce202e79482dbb12fee0e870a225242718fbf0b5a2ee3c71f3cace17b2c29e7053aeb4c5f37e492b71dd3e0ae SHA512 0c69cb5ae42c5196a3a23b09a4d8a5afdf368415e734def1c1ee5e4fd2565bd495efd0fba915198cbc44ec95313b0fe9f6b508b3177e01f2db23f2c588e6acc9
-EBUILD diagnostic_msgs-1.13.1.ebuild 455 BLAKE2B d827da731f8573963462d29068c5d5e964b99d73b7a4d537d0808d1210220661f0b6be01a45d603bafb470f438dd3c1c8565b3707aa490380ae99563aadf2f0f SHA512 887167adc684c1d976904c9fc15566e58c578c13a2b2b21ed8ac90e88ceba374a58f634ff7ddff55f374392ae820c5f2a841453b4ef99e1eff7f543d8ba27ebb
-EBUILD diagnostic_msgs-9999.ebuild 455 BLAKE2B ad3b54387c724d20c5e19aea39fb995eed5c4bfce202e79482dbb12fee0e870a225242718fbf0b5a2ee3c71f3cace17b2c29e7053aeb4c5f37e492b71dd3e0ae SHA512 0c69cb5ae42c5196a3a23b09a4d8a5afdf368415e734def1c1ee5e4fd2565bd495efd0fba915198cbc44ec95313b0fe9f6b508b3177e01f2db23f2c588e6acc9
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.0.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.0.ebuild
deleted file mode 100644
index 8dca48c249b7..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Standardized interface for the diagnostic and runtime monitoring systems in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.1.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.1.ebuild
deleted file mode 100644
index 91ebe4b5b50d..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Standardized interface for the diagnostic and runtime monitoring systems in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
deleted file mode 100644
index 8dca48c249b7..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Standardized interface for the diagnostic and runtime monitoring systems in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_msgs/metadata.xml b/dev-ros/diagnostic_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/diagnostic_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/diagnostic_updater/Manifest b/dev-ros/diagnostic_updater/Manifest
deleted file mode 100644
index 0330acbf5492..000000000000
--- a/dev-ros/diagnostic_updater/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
-DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
-DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
-DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
-DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
-DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
-DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
-EBUILD diagnostic_updater-1.10.1.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
-EBUILD diagnostic_updater-1.10.2.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
-EBUILD diagnostic_updater-1.10.3.ebuild 804 BLAKE2B 614b2f84980c339de46fbe7cabb641b1f52c6a7bb5316045e45db5a7cddd218d3855a1b24f3f11e3ead8d52b8afb220a6b10ec467b5df200e9c9054debc9b103 SHA512 1f38b6d963c0955eed66b62407e53e377ec7a3a4d577fcd438e8868485f7696dc8055f4103c6e647a9c811343211f44c7d05ff6b552e858023ec64d368f123ad
-EBUILD diagnostic_updater-1.10.4.ebuild 804 BLAKE2B 614b2f84980c339de46fbe7cabb641b1f52c6a7bb5316045e45db5a7cddd218d3855a1b24f3f11e3ead8d52b8afb220a6b10ec467b5df200e9c9054debc9b103 SHA512 1f38b6d963c0955eed66b62407e53e377ec7a3a4d577fcd438e8868485f7696dc8055f4103c6e647a9c811343211f44c7d05ff6b552e858023ec64d368f123ad
-EBUILD diagnostic_updater-1.11.0.ebuild 804 BLAKE2B 9fd23ae0d497a3b2f396915d580949f7e0d1ec205c89d237c62ebd8e3ed251914b5a7c69694d0894d3fd96d0c5978aabe80399e88a812bf6eda43059a479622c SHA512 5fe503f3b9b141b64dea53a38ed0a0c37d5121636cfdc8ece9a9b9ece9da249d48f9ce8ed1e56cd987c1353d95039c846fdfdd1c69e718d7e6f2c15e9231b485
-EBUILD diagnostic_updater-1.9.4.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
-EBUILD diagnostic_updater-1.9.6.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
-EBUILD diagnostic_updater-9999.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
-MISC metadata.xml 330 BLAKE2B a856cefc508ebf638d764bbfad848bae8140bb8f4f8e0fcde5ade3d168cff85647d3f803f92fd05824d459cd1e723d86ff48b21c07211b27527d251bb7eb90fd SHA512 d6abd3b4af2ba8eb1de110f8b59296f327e83ced62d9618e1dd2be6d39e04e4bad27a32aa78f9e7358b2f22f872aa96bbdac1da860c6af37ebff054d6e5c7f67
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.1.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.1.ebuild
deleted file mode 100644
index 26dc8c7e62f7..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.2.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.2.ebuild
deleted file mode 100644
index 26dc8c7e62f7..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.3.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.3.ebuild
deleted file mode 100644
index bf60fb838cfb..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.4.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.4.ebuild
deleted file mode 100644
index bf60fb838cfb..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.11.0.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.11.0.ebuild
deleted file mode 100644
index 09a5b5c30f80..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.11.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild
deleted file mode 100644
index 26dc8c7e62f7..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.6.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.6.ebuild
deleted file mode 100644
index 26dc8c7e62f7..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild
deleted file mode 100644
index 26dc8c7e62f7..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/diagnostic_updater/metadata.xml b/dev-ros/diagnostic_updater/metadata.xml
deleted file mode 100644
index dd82416e0b4a..000000000000
--- a/dev-ros/diagnostic_updater/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/diagnostics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/driver_base/Manifest b/dev-ros/driver_base/Manifest
deleted file mode 100644
index 2499d6c5e191..000000000000
--- a/dev-ros/driver_base/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST driver_common-1.6.8.tar.gz 15055 BLAKE2B 2d9a4c23d65b8e2f60343f5e3b454e1cc41334d34e0246891b533f216acb743df628d95dd2c0087b06284a85e0ea872baad495a7ed7b59c03e8f8ff32eba4ed8 SHA512 b698143d08785088ac13e62f5b96676bd590a84e4ffb147fa3698be6a8ded510f648d043ecdc1d31ba7b95fb3041d06ee1a39b224c359b8612adebdba259d188
-DIST driver_common-1.6.9.tar.gz 15374 BLAKE2B 88bcba03596d9a641091d37db8329807cfa0d4dd766298a25f8e41b6da567eb246fdd8c4c8a39698b60a47a118b81b15c3ac93154490a1258d93d3e2fbd5c049 SHA512 1a5f7d261a3e754b380824256d35432cee521b7d255a7f152b6a69d5181ea45a2bbca7a7c6d4e0bea753c8f3c59018a63357c87d2535a9cb55ba311f11e5d749
-EBUILD driver_base-1.6.8.ebuild 431 BLAKE2B a1c686c72ad08b5b38eaa150994282ed95a5e8ce5498d009f3288cf82be3347d83794c7a425eb37d9b8c1ee37616e219ce4a79ba4dc247b3543ed2a95fb1759f SHA512 7023a565d9447a317b0411748bc72c1b9d918fcfc834db8a4af4f22584779c428790d648af71f75034104286faf5ca4f4697a76126c1d3b625aae4cc556fe1cb
-EBUILD driver_base-1.6.9.ebuild 431 BLAKE2B 71b0ae02523ba49bc4eb93298c29cd751aea1cef93db9373489d4591d2a06ff1774ecf1e46025fdcb07421085a09916827179b0011eddf3b09ef4e6359c22692 SHA512 72ae8613b9997c486329672ddccee5e6a76be4e5d2557c27f174cad2001debcc5914a2ccf73ec6d23aaecd8e2ef61f67088d45da11318b557eed0e216ece186f
-EBUILD driver_base-9999.ebuild 431 BLAKE2B a1c686c72ad08b5b38eaa150994282ed95a5e8ce5498d009f3288cf82be3347d83794c7a425eb37d9b8c1ee37616e219ce4a79ba4dc247b3543ed2a95fb1759f SHA512 7023a565d9447a317b0411748bc72c1b9d918fcfc834db8a4af4f22584779c428790d648af71f75034104286faf5ca4f4697a76126c1d3b625aae4cc556fe1cb
-MISC metadata.xml 340 BLAKE2B e50014d12cb0b21d5216163c1d9fd9822407c47af9460ab0d840f8aa130783ea9f5f5ca0027cb498307eaaae90c4b29691e9e140c0db675c7c503f73b12dfff3 SHA512 86f03cd767867cd7abb2c35ff6793bc66cd8c3a0c90cabd1b55699207974d49963a93e0cebffcfaa017acc2cf432a6bdb1f7532797f0d33cbc04966cc2697efe
diff --git a/dev-ros/driver_base/driver_base-1.6.8.ebuild b/dev-ros/driver_base/driver_base-1.6.8.ebuild
deleted file mode 100644
index 6f9cd6b125e7..000000000000
--- a/dev-ros/driver_base/driver_base-1.6.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Framework for writing drivers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/driver_base/driver_base-1.6.9.ebuild b/dev-ros/driver_base/driver_base-1.6.9.ebuild
deleted file mode 100644
index 1931a276ceea..000000000000
--- a/dev-ros/driver_base/driver_base-1.6.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-drivers/driver_common"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Framework for writing drivers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/driver_base/driver_base-9999.ebuild b/dev-ros/driver_base/driver_base-9999.ebuild
deleted file mode 100644
index 6f9cd6b125e7..000000000000
--- a/dev-ros/driver_base/driver_base-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Framework for writing drivers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/driver_base/metadata.xml b/dev-ros/driver_base/metadata.xml
deleted file mode 100644
index a6e8cff19b00..000000000000
--- a/dev-ros/driver_base/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/driver_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/dwa_local_planner/Manifest b/dev-ros/dwa_local_planner/Manifest
deleted file mode 100644
index 661858f7456a..000000000000
--- a/dev-ros/dwa_local_planner/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD dwa_local_planner-1.17.1-r2.ebuild 797 BLAKE2B d8b8d40723e3a7b1f167cd62a204081c68ab982ceb8c3337b327764bb0b476ff2abf0fd0fc0773c332023d7deffab2b8f0117b599f620ac12b6028aaa2095642 SHA512 e07e15cbea9fa0ed83c88a55ec9fd973d78da2745a9d6750378c4d18bd06367c9e53a19d3bbd93e5fb324c709104ff2ebde0636f56a9dadf8ab6df225634a40c
-EBUILD dwa_local_planner-9999.ebuild 797 BLAKE2B d8b8d40723e3a7b1f167cd62a204081c68ab982ceb8c3337b327764bb0b476ff2abf0fd0fc0773c332023d7deffab2b8f0117b599f620ac12b6028aaa2095642 SHA512 e07e15cbea9fa0ed83c88a55ec9fd973d78da2745a9d6750378c4d18bd06367c9e53a19d3bbd93e5fb324c709104ff2ebde0636f56a9dadf8ab6df225634a40c
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.17.1-r2.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.17.1-r2.ebuild
deleted file mode 100644
index 574fee801054..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-1.17.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-ros/tf2
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
deleted file mode 100644
index 574fee801054..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-ros/tf2
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/dwa_local_planner/metadata.xml b/dev-ros/dwa_local_planner/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/dwa_local_planner/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/dynamic_reconfigure/Manifest b/dev-ros/dynamic_reconfigure/Manifest
deleted file mode 100644
index 70123ac13040..000000000000
--- a/dev-ros/dynamic_reconfigure/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST dynamic_reconfigure-1.7.3.tar.gz 40783 BLAKE2B 22e00a3fb792a408129f2a1d166f0a0e83a03bdef86dc4474817e6c00a6f06557019ed77d957bb9d7f7da090d37e4b1388c58d80bcd7a70e10a1867dd8d7b5aa SHA512 2be635a1028395cb56a45409564959cd20ac413644f90c3c12e290c4b8ff3e470e110d6f814bd31ecbee23900c62d8fe8deb58a15397618d10cd44d592f0a7f6
-EBUILD dynamic_reconfigure-1.7.3.ebuild 676 BLAKE2B 2c0b1c25da6cba63396256a032515a61e00eaa3b129c469ce7808e2af26f6da47f66b82b812546fbc437a9207fba67eb357a15def29902cde92bf49421e3e191 SHA512 1e81f85546df11d2d1da99b6c9a9878b572d84ce44baca96fae5caec571f9c77c0aae648909b5526509d3ebfdb736c948d3945008aa7c69b312663d4a61d29d5
-EBUILD dynamic_reconfigure-9999.ebuild 676 BLAKE2B 2c0b1c25da6cba63396256a032515a61e00eaa3b129c469ce7808e2af26f6da47f66b82b812546fbc437a9207fba67eb357a15def29902cde92bf49421e3e191 SHA512 1e81f85546df11d2d1da99b6c9a9878b572d84ce44baca96fae5caec571f9c77c0aae648909b5526509d3ebfdb736c948d3945008aa7c69b312663d4a61d29d5
-MISC metadata.xml 338 BLAKE2B 47fff4375a5a4769e700c1f4e90b9bcbbd7879bae54c9dd77bf8a53d666e5f6ff90292d6010e2255dedc2c65409261502066fa68b5def0511199675bd761a795 SHA512 618b15c675cfda27c4f890d8997788d0fc163c544b3c5d2127c3db93ac9ddd62b5095d3e0624ec0114917237369892c2714374ebb7a751cb1575194dddeb9281
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.3.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.3.ebuild
deleted file mode 100644
index 17e6c3b2f07d..000000000000
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a means to change node parameters at runtime"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		dev-ros/roslaunch
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
deleted file mode 100644
index 17e6c3b2f07d..000000000000
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a means to change node parameters at runtime"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		dev-ros/roslaunch
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/dynamic_reconfigure/metadata.xml b/dev-ros/dynamic_reconfigure/metadata.xml
deleted file mode 100644
index 443875616795..000000000000
--- a/dev-ros/dynamic_reconfigure/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/dynamic_reconfigure</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/eigen_conversions/Manifest b/dev-ros/eigen_conversions/Manifest
deleted file mode 100644
index 3fb00730ada2..000000000000
--- a/dev-ros/eigen_conversions/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
-EBUILD eigen_conversions-1.13.2.ebuild 560 BLAKE2B baf19aaaa0bd264c55b6a759a982c409c7e0a33c97e8292b4135592a996edd8c4d4c1228d348549f18cfdfed8d1c98a7a7d1f90a5bcd6e07c71378433b85d13e SHA512 fcd62b46d9a3657ea9513babe27b42984067247a0d217b0ef2f8ff7a8a4e30e86c4240417c3ac6cfaafdfc52dfc18bad42d7fd9e4741d9069a6937c86ad1c9ff
-EBUILD eigen_conversions-9999.ebuild 560 BLAKE2B baf19aaaa0bd264c55b6a759a982c409c7e0a33c97e8292b4135592a996edd8c4d4c1228d348549f18cfdfed8d1c98a7a7d1f90a5bcd6e07c71378433b85d13e SHA512 fcd62b46d9a3657ea9513babe27b42984067247a0d217b0ef2f8ff7a8a4e30e86c4240417c3ac6cfaafdfc52dfc18bad42d7fd9e4741d9069a6937c86ad1c9ff
-MISC metadata.xml 327 BLAKE2B 566ab6c75daafd1554630fd8762bebc05fa3a002b3f785b59a69d77653167d6d2c0cce2e20067ead12cd5075da7c7d6e40f70e21b4628e419c43252c6d878500 SHA512 fd1f0d017b6a422df2fcdd7797ec631ac8b2afaa706338848b941c39e4d3d82549969f0018162da22cb9499a114a4a4a58a945b284585b30c7eff589ecf975d5
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild
deleted file mode 100644
index c6eeb55ec947..000000000000
--- a/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between Eigen and KDL and Eigen and geometry_msgs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/orocos_kdl:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild b/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
deleted file mode 100644
index c6eeb55ec947..000000000000
--- a/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between Eigen and KDL and Eigen and geometry_msgs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/orocos_kdl:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/eigen_conversions/metadata.xml b/dev-ros/eigen_conversions/metadata.xml
deleted file mode 100644
index 0717de2e0623..000000000000
--- a/dev-ros/eigen_conversions/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/eigen_stl_containers/Manifest b/dev-ros/eigen_stl_containers/Manifest
deleted file mode 100644
index 41f33c4fa2c2..000000000000
--- a/dev-ros/eigen_stl_containers/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST eigen_stl_containers-0.1.8.tar.gz 3242 BLAKE2B 8ca2544eb541a6641c20e417ca5574de85181e3c5f0428d862e7fb9b60ee2f70c2851cc8b01e29a6010358014769add42a5d251eb0b5cf2efb6a935463ed47b9 SHA512 1a964aaca26fda9aefe393f6bd6a875633e3b2824d073b7bab035b4199be3513402ed90034192caa9c3e6a5f8a5640ef5aa924e2cc7cef5dc30e4bfdd93526b9
-EBUILD eigen_stl_containers-0.1.8.ebuild 387 BLAKE2B b6790f310cecfeb1ff07f01c14a88bfd81ad927ecd85cfe3621d38e935b0ec13789a8866ca6021aa3bef473916ca71edf671035e732b051dbd4ccc5e33911ed1 SHA512 82bd1c0e45d0086e947a067041d4250f6d481c6840204779aadd3bc4ba2d33ce73486939145afe15740d0bd1a64fcbb9b6c13f2a2da53cf796fd77d6c808ea79
-EBUILD eigen_stl_containers-9999.ebuild 387 BLAKE2B b6790f310cecfeb1ff07f01c14a88bfd81ad927ecd85cfe3621d38e935b0ec13789a8866ca6021aa3bef473916ca71edf671035e732b051dbd4ccc5e33911ed1 SHA512 82bd1c0e45d0086e947a067041d4250f6d481c6840204779aadd3bc4ba2d33ce73486939145afe15740d0bd1a64fcbb9b6c13f2a2da53cf796fd77d6c808ea79
-MISC metadata.xml 339 BLAKE2B a860d05495f9e5332befa27f659d63e39656636dc5df32832b66d0645b1bbac126188370cfbb4c7ce89b6b05272c757a00444dff09bc52fd4cf09bf9060e3b27 SHA512 522f5a69e43a9ec8628ec63811027120f0e927ead28606d652669967ff4a957965a94cd80178d0e6841fd483eef14fafc2f8902c779cd4322ff6437a94cfe2f5
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
deleted file mode 100644
index d64a546a919d..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a set of typedef's that allow using Eigen datatypes in STL containers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
deleted file mode 100644
index d64a546a919d..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a set of typedef's that allow using Eigen datatypes in STL containers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_stl_containers/metadata.xml b/dev-ros/eigen_stl_containers/metadata.xml
deleted file mode 100644
index 5f83721da69f..000000000000
--- a/dev-ros/eigen_stl_containers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/eigen_stl_containers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
deleted file mode 100644
index c0065433f31c..000000000000
--- a/dev-ros/fake_localization/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD fake_localization-1.17.1-r1.ebuild 787 BLAKE2B 99f64ecfea0b13d9acf827b981eac1c9d4b1c2c694ac91f6a39b750f32ce0d417e1eb26a8df856163c6e7aea44564ba7caf92acd4046c99b55967dfe515576e4 SHA512 8ccb4693742c4df13dc01c292b0843efb650055c19ecc47d4bf8128331a3d785fa9d26214cd94f1fcf2425e35cff35f07c4020f3588be935d40dc23de2412fc4
-EBUILD fake_localization-9999.ebuild 787 BLAKE2B 99f64ecfea0b13d9acf827b981eac1c9d4b1c2c694ac91f6a39b750f32ce0d417e1eb26a8df856163c6e7aea44564ba7caf92acd4046c99b55967dfe515576e4 SHA512 8ccb4693742c4df13dc01c292b0843efb650055c19ecc47d4bf8128331a3d785fa9d26214cd94f1fcf2425e35cff35f07c4020f3588be935d40dc23de2412fc4
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/fake_localization/fake_localization-1.17.1-r1.ebuild b/dev-ros/fake_localization/fake_localization-1.17.1-r1.ebuild
deleted file mode 100644
index 30d6188cb635..000000000000
--- a/dev-ros/fake_localization/fake_localization-1.17.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="A ROS node that simply forwards odometry information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles:0
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/message_filters
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/fake_localization/fake_localization-9999.ebuild b/dev-ros/fake_localization/fake_localization-9999.ebuild
deleted file mode 100644
index 30d6188cb635..000000000000
--- a/dev-ros/fake_localization/fake_localization-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="A ROS node that simply forwards odometry information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles:0
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/message_filters
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/fake_localization/metadata.xml b/dev-ros/fake_localization/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/fake_localization/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/filters/Manifest b/dev-ros/filters/Manifest
deleted file mode 100644
index 98b72f5a020f..000000000000
--- a/dev-ros/filters/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST filters-1.9.1.tar.gz 19633 BLAKE2B 1ce27734145e04546d90cd802721aa5b8003b366227161e64451d7ac656628d0178b3ea5cab5f9ca5b054bc81ff5cefd00beaeea855c5c6507ecabc40bc27985 SHA512 ed66211b6e66d7c303a72bce4b9b06abd29d9101ae46b9bd4cb5dee26867d7d7e8b9bfcc6feffc83ac15a4780e62577665e9ce9881f836931f361258a12cf127
-EBUILD filters-1.9.1-r1.ebuild 627 BLAKE2B d0b3f1d6caef3738999bdc4d7cb09706a63ff83455f816e6eaa24cf72907858bd5ac9125cc17fd92b1a7681a77ef523393d6558ad968541502f15f296bdceebd SHA512 9c1809c838892f05d8c71620d45af34e5cd4a42217c86eea6007879549e305fd51260aa4e3e41c13eadf7c3da24930f4d2923bcea65c4f5869a5b898eb227402
-EBUILD filters-9999.ebuild 627 BLAKE2B d0b3f1d6caef3738999bdc4d7cb09706a63ff83455f816e6eaa24cf72907858bd5ac9125cc17fd92b1a7681a77ef523393d6558ad968541502f15f296bdceebd SHA512 9c1809c838892f05d8c71620d45af34e5cd4a42217c86eea6007879549e305fd51260aa4e3e41c13eadf7c3da24930f4d2923bcea65c4f5869a5b898eb227402
-MISC metadata.xml 326 BLAKE2B 4a6685b5132aabddec2e1f53cbb7ebfd59aeb42460d351572d1a014bf8e994ca5a48c7f08d79b0d6bb9edf64f9f82b608550d05628de4e46393a9418ced95dbd SHA512 281bef33dedbc7e9df97cc214804e8073759cd9334edeced945ebda323307ea492ffcb68bc5c019de11efdd20e287c38b29e99b86bf8f3623ee6241341199a78
diff --git a/dev-ros/filters/filters-1.9.1-r1.ebuild b/dev-ros/filters/filters-1.9.1-r1.ebuild
deleted file mode 100644
index f861e2a643d4..000000000000
--- a/dev-ros/filters/filters-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/filters"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Standardized interface for processing data as a sequence of filters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/filters/filters-9999.ebuild b/dev-ros/filters/filters-9999.ebuild
deleted file mode 100644
index f861e2a643d4..000000000000
--- a/dev-ros/filters/filters-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/filters"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Standardized interface for processing data as a sequence of filters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/filters/metadata.xml b/dev-ros/filters/metadata.xml
deleted file mode 100644
index f179f98ba254..000000000000
--- a/dev-ros/filters/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/filters</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/gazebo_dev/Manifest b/dev-ros/gazebo_dev/Manifest
deleted file mode 100644
index 573904ceef62..000000000000
--- a/dev-ros/gazebo_dev/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
-DIST gazebo_ros_pkgs-2.9.2.tar.gz 1864333 BLAKE2B d8a777594624fe6ae38f1ae27ea49f9629a59f507ec5e8512f50dbf8ae551e6b171dd47eff308ab1badc4e07de7183fe512ff8179637169896f6cb1dbf3d50ba SHA512 38ca70b44a229d8ca87bf9cb2ed3e0eaf7855f5711a81891986a985b7ff4218cdd6c914c1d25352da47a3fb52a3df5638af36990264e5241d17bb43ae0fa6f0b
-EBUILD gazebo_dev-2.9.1.ebuild 414 BLAKE2B c5293e395a3351ed6241633d009f1ca3dae36fb1210788d6de62f296cac9b2b31f3bafd60417caf1360445414104b68c1a388eae2757fac594ee78970634e58b SHA512 ea3e7dfc7259d74da1f464cbe3695af5458ccd2f47a3b977769a92d75b903ae84328504f6fd70c14b1bbcb9b2308fcb300918e3063b6b6f754912d2e6f177bc7
-EBUILD gazebo_dev-2.9.2.ebuild 414 BLAKE2B 1e34ca2243d475d054b29b4344370ddd2bf4800e4991b478472d8ecd991d2adda57f38eab706371d6db879bbd9c0b49223a263837212502172773f42792e5c2d SHA512 e26529e16e00cf897f7c9cb22f1692f056433d3cc992490f7bb3ccbc92866c3d98e7b21b01be98a0e891b0b60239371e311ee4630232c767f1474c211a882a7e
-EBUILD gazebo_dev-9999.ebuild 414 BLAKE2B c5293e395a3351ed6241633d009f1ca3dae36fb1210788d6de62f296cac9b2b31f3bafd60417caf1360445414104b68c1a388eae2757fac594ee78970634e58b SHA512 ea3e7dfc7259d74da1f464cbe3695af5458ccd2f47a3b977769a92d75b903ae84328504f6fd70c14b1bbcb9b2308fcb300918e3063b6b6f754912d2e6f177bc7
-MISC metadata.xml 345 BLAKE2B 08b7cc62e86965c19c6f9180644fe507220457d62fbbe53d113f6c5ee1cd0e1edcf8bbd54600c98d23e1adccb99e5b91800ee63e1cdf00f38c8416c9f7c3bce3 SHA512 9994ccce9770281027e828b83082d72e098c21539197242d10df4ba13a77b7a002a1edeb98bfadee2c6711d3d99cf23701c6370bc2c35f009fab392f3475cbc4
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild
deleted file mode 100644
index 07c8fa9a0db0..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cmake config for the default version of Gazebo for the ROS distribution"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-electronics/gazebo
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.9.2.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.9.2.ebuild
deleted file mode 100644
index 51ba07cc4d62..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cmake config for the default version of Gazebo for the ROS distribution"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-electronics/gazebo
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild b/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
deleted file mode 100644
index 07c8fa9a0db0..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cmake config for the default version of Gazebo for the ROS distribution"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-electronics/gazebo
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_dev/metadata.xml b/dev-ros/gazebo_dev/metadata.xml
deleted file mode 100644
index 18c5ebcc4636..000000000000
--- a/dev-ros/gazebo_dev/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/gazebo_msgs/Manifest b/dev-ros/gazebo_msgs/Manifest
deleted file mode 100644
index fcce4e3a91b1..000000000000
--- a/dev-ros/gazebo_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
-DIST gazebo_ros_pkgs-2.9.2.tar.gz 1864333 BLAKE2B d8a777594624fe6ae38f1ae27ea49f9629a59f507ec5e8512f50dbf8ae551e6b171dd47eff308ab1badc4e07de7183fe512ff8179637169896f6cb1dbf3d50ba SHA512 38ca70b44a229d8ca87bf9cb2ed3e0eaf7855f5711a81891986a985b7ff4218cdd6c914c1d25352da47a3fb52a3df5638af36990264e5241d17bb43ae0fa6f0b
-EBUILD gazebo_msgs-2.9.1.ebuild 541 BLAKE2B 8640653d846d95b7b2c50820f4528cde68a76b5ff80fad6eeaa9e7f0d921efd13c53db863652af58042612707e62ba7775be916a35f048862221c601169f6c2c SHA512 49bcb8f3dd29b78374ba122f5c89091cafa11d94e190c3bfbae5e027633ee78282deba3d5e699fa1b6b7574c125d8cc26f2f42749b38d87b254065023775b1b8
-EBUILD gazebo_msgs-2.9.2.ebuild 541 BLAKE2B 27895ddba09bd194c992a99b57abb71d08fe28e363aba7875f2567787a4ba7bbfbaf7d2f608f179aa02380d3a819ac813f15c628c24df7a630dae1560ea8dd2c SHA512 fe7252f320eaceb025114f6856bc28d38127cd38caac081194c8882ea4237a6eeb59fb5220cb8a374fbe66f08a6f356151542df200f8b58e737afc09d8d3563d
-EBUILD gazebo_msgs-9999.ebuild 541 BLAKE2B 8640653d846d95b7b2c50820f4528cde68a76b5ff80fad6eeaa9e7f0d921efd13c53db863652af58042612707e62ba7775be916a35f048862221c601169f6c2c SHA512 49bcb8f3dd29b78374ba122f5c89091cafa11d94e190c3bfbae5e027633ee78282deba3d5e699fa1b6b7574c125d8cc26f2f42749b38d87b254065023775b1b8
-MISC metadata.xml 345 BLAKE2B 08b7cc62e86965c19c6f9180644fe507220457d62fbbe53d113f6c5ee1cd0e1edcf8bbd54600c98d23e1adccb99e5b91800ee63e1cdf00f38c8416c9f7c3bce3 SHA512 9994ccce9770281027e828b83082d72e098c21539197242d10df4ba13a77b7a002a1edeb98bfadee2c6711d3d99cf23701c6370bc2c35f009fab392f3475cbc4
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild
deleted file mode 100644
index 8e7fc5d60e03..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
-
-inherit ros-catkin
-
-DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.9.2.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.9.2.ebuild
deleted file mode 100644
index 658fd5c67d14..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
-
-inherit ros-catkin
-
-DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
deleted file mode 100644
index 8e7fc5d60e03..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
-
-inherit ros-catkin
-
-DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/metadata.xml b/dev-ros/gazebo_msgs/metadata.xml
deleted file mode 100644
index 18c5ebcc4636..000000000000
--- a/dev-ros/gazebo_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
deleted file mode 100644
index 2546d52d6c5b..000000000000
--- a/dev-ros/gazebo_plugins/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gazebo_ros_pkgs-2.9.2.tar.gz 1864333 BLAKE2B d8a777594624fe6ae38f1ae27ea49f9629a59f507ec5e8512f50dbf8ae551e6b171dd47eff308ab1badc4e07de7183fe512ff8179637169896f6cb1dbf3d50ba SHA512 38ca70b44a229d8ca87bf9cb2ed3e0eaf7855f5711a81891986a985b7ff4218cdd6c914c1d25352da47a3fb52a3df5638af36990264e5241d17bb43ae0fa6f0b
-EBUILD gazebo_plugins-2.9.2-r1.ebuild 1531 BLAKE2B b210fd7dc351e1ff7435264ff8fb57f266f31973635b80cf7117cf8015d6c99f5275fa933603fc701038ab1b30b287f2caa68fa554300a77026e9c2a63e31046 SHA512 30241d75dcafd00c4b69efba2fe5ccb40878d314319b3bb8a07166aa1a9651449e3ea6dc2e5ccdac917488aea6e05a60bb7790db4b57e2af724e82a49e42edcc
-EBUILD gazebo_plugins-9999.ebuild 1531 BLAKE2B b210fd7dc351e1ff7435264ff8fb57f266f31973635b80cf7117cf8015d6c99f5275fa933603fc701038ab1b30b287f2caa68fa554300a77026e9c2a63e31046 SHA512 30241d75dcafd00c4b69efba2fe5ccb40878d314319b3bb8a07166aa1a9651449e3ea6dc2e5ccdac917488aea6e05a60bb7790db4b57e2af724e82a49e42edcc
-MISC metadata.xml 345 BLAKE2B 08b7cc62e86965c19c6f9180644fe507220457d62fbbe53d113f6c5ee1cd0e1edcf8bbd54600c98d23e1adccb99e5b91800ee63e1cdf00f38c8416c9f7c3bce3 SHA512 9994ccce9770281027e828b83082d72e098c21539197242d10df4ba13a77b7a002a1edeb98bfadee2c6711d3d99cf23701c6370bc2c35f009fab392f3475cbc4
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2-r1.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2-r1.ebuild
deleted file mode 100644
index 59b660f7aa81..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/nodelet
-	dev-ros/angles:0
-	dev-ros/std_srvs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-ros/tf
-	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/driver_base[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/pcl_conversions
-	dev-ros/image_transport
-	dev-ros/rosconsole
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/polled_camera
-	dev-ros/diagnostic_updater
-	dev-ros/camera_info_manager
-	dev-libs/libxml2
-	>=sci-electronics/gazebo-7:=
-	dev-libs/protobuf:=
-	dev-games/ogre
-	sci-libs/pcl
-	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
deleted file mode 100644
index 59b660f7aa81..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/nodelet
-	dev-ros/angles:0
-	dev-ros/std_srvs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-ros/tf
-	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/driver_base[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/pcl_conversions
-	dev-ros/image_transport
-	dev-ros/rosconsole
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/polled_camera
-	dev-ros/diagnostic_updater
-	dev-ros/camera_info_manager
-	dev-libs/libxml2
-	>=sci-electronics/gazebo-7:=
-	dev-libs/protobuf:=
-	dev-games/ogre
-	sci-libs/pcl
-	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/gazebo_plugins/metadata.xml b/dev-ros/gazebo_plugins/metadata.xml
deleted file mode 100644
index 18c5ebcc4636..000000000000
--- a/dev-ros/gazebo_plugins/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
deleted file mode 100644
index 2f30ee3c75da..000000000000
--- a/dev-ros/gazebo_ros/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
-DIST gazebo_ros_pkgs-2.9.2.tar.gz 1864333 BLAKE2B d8a777594624fe6ae38f1ae27ea49f9629a59f507ec5e8512f50dbf8ae551e6b171dd47eff308ab1badc4e07de7183fe512ff8179637169896f6cb1dbf3d50ba SHA512 38ca70b44a229d8ca87bf9cb2ed3e0eaf7855f5711a81891986a985b7ff4218cdd6c914c1d25352da47a3fb52a3df5638af36990264e5241d17bb43ae0fa6f0b
-EBUILD gazebo_ros-2.9.1-r1.ebuild 1076 BLAKE2B 5c50d00fd27ea7fa548b308e97ac82e890b0e1023dd56f764e33e3aa372ac0e5dec87f0733e5634b20f40d9ff3733cd04a093b881fa28e6867ab4d1415fc6782 SHA512 81b232aeef89613972d0c1f3cc65ed4706a7b5e588eb56246d36774a7233f9ed2dd29958b04e3757f99c9399f746794859617d065004aca30d3e51d60517d898
-EBUILD gazebo_ros-2.9.2-r1.ebuild 1076 BLAKE2B 5c50d00fd27ea7fa548b308e97ac82e890b0e1023dd56f764e33e3aa372ac0e5dec87f0733e5634b20f40d9ff3733cd04a093b881fa28e6867ab4d1415fc6782 SHA512 81b232aeef89613972d0c1f3cc65ed4706a7b5e588eb56246d36774a7233f9ed2dd29958b04e3757f99c9399f746794859617d065004aca30d3e51d60517d898
-EBUILD gazebo_ros-9999.ebuild 1076 BLAKE2B 5c50d00fd27ea7fa548b308e97ac82e890b0e1023dd56f764e33e3aa372ac0e5dec87f0733e5634b20f40d9ff3733cd04a093b881fa28e6867ab4d1415fc6782 SHA512 81b232aeef89613972d0c1f3cc65ed4706a7b5e588eb56246d36774a7233f9ed2dd29958b04e3757f99c9399f746794859617d065004aca30d3e51d60517d898
-MISC metadata.xml 345 BLAKE2B 08b7cc62e86965c19c6f9180644fe507220457d62fbbe53d113f6c5ee1cd0e1edcf8bbd54600c98d23e1adccb99e5b91800ee63e1cdf00f38c8416c9f7c3bce3 SHA512 9994ccce9770281027e828b83082d72e098c21539197242d10df4ba13a77b7a002a1edeb98bfadee2c6711d3d99cf23701c6370bc2c35f009fab392f3475cbc4
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.9.1-r1.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.9.1-r1.ebuild
deleted file mode 100644
index b33093473320..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer messages and services for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.9.2-r1.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.9.2-r1.ebuild
deleted file mode 100644
index b33093473320..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer messages and services for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild b/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
deleted file mode 100644
index b33093473320..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer messages and services for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/gazebo_ros/metadata.xml b/dev-ros/gazebo_ros/metadata.xml
deleted file mode 100644
index 18c5ebcc4636..000000000000
--- a/dev-ros/gazebo_ros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
deleted file mode 100644
index 7b5c99cef8d5..000000000000
--- a/dev-ros/gazebo_ros_control/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
-DIST gazebo_ros_pkgs-2.9.2.tar.gz 1864333 BLAKE2B d8a777594624fe6ae38f1ae27ea49f9629a59f507ec5e8512f50dbf8ae551e6b171dd47eff308ab1badc4e07de7183fe512ff8179637169896f6cb1dbf3d50ba SHA512 38ca70b44a229d8ca87bf9cb2ed3e0eaf7855f5711a81891986a985b7ff4218cdd6c914c1d25352da47a3fb52a3df5638af36990264e5241d17bb43ae0fa6f0b
-EBUILD gazebo_ros_control-2.9.1-r1.ebuild 710 BLAKE2B c15c15f503e123a15a32e152565d5ff3839ba35b0899525dc516bb7a9306bed750507922931060a798fc749c9433d11021f63b60250659e7f8321334987daf57 SHA512 8cd0af9ad3be26e1fd1919019cf363ca3a2d3c51efea7ac0154508387e67c18b816fa3ef61bdcd48400b77ceb25aad1a4e5baa0923dfe8930fcf20052e3480bd
-EBUILD gazebo_ros_control-2.9.2-r1.ebuild 710 BLAKE2B c15c15f503e123a15a32e152565d5ff3839ba35b0899525dc516bb7a9306bed750507922931060a798fc749c9433d11021f63b60250659e7f8321334987daf57 SHA512 8cd0af9ad3be26e1fd1919019cf363ca3a2d3c51efea7ac0154508387e67c18b816fa3ef61bdcd48400b77ceb25aad1a4e5baa0923dfe8930fcf20052e3480bd
-EBUILD gazebo_ros_control-9999.ebuild 710 BLAKE2B c15c15f503e123a15a32e152565d5ff3839ba35b0899525dc516bb7a9306bed750507922931060a798fc749c9433d11021f63b60250659e7f8321334987daf57 SHA512 8cd0af9ad3be26e1fd1919019cf363ca3a2d3c51efea7ac0154508387e67c18b816fa3ef61bdcd48400b77ceb25aad1a4e5baa0923dfe8930fcf20052e3480bd
-MISC metadata.xml 345 BLAKE2B 08b7cc62e86965c19c6f9180644fe507220457d62fbbe53d113f6c5ee1cd0e1edcf8bbd54600c98d23e1adccb99e5b91800ee63e1cdf00f38c8416c9f7c3bce3 SHA512 9994ccce9770281027e828b83082d72e098c21539197242d10df4ba13a77b7a002a1edeb98bfadee2c6711d3d99cf23701c6370bc2c35f009fab392f3475cbc4
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1-r1.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1-r1.ebuild
deleted file mode 100644
index 53acf53f0f24..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.2-r1.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.2-r1.ebuild
deleted file mode 100644
index 53acf53f0f24..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
deleted file mode 100644
index 53acf53f0f24..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/metadata.xml b/dev-ros/gazebo_ros_control/metadata.xml
deleted file mode 100644
index 18c5ebcc4636..000000000000
--- a/dev-ros/gazebo_ros_control/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/gencpp/Manifest b/dev-ros/gencpp/Manifest
deleted file mode 100644
index 1a436b0dd90b..000000000000
--- a/dev-ros/gencpp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gencpp-0.7.0.tar.gz 9914 BLAKE2B 79a259768be409d4d05a6b7f71a709761ac9c49aeb82a2910045c205eb6600a08e20c6457c36cb3d7b27865c8fcb4e90f65e5c622ee24567c36d6fc04ca0dff7 SHA512 5fc73ef7e03b1712ddb071ba3d6f49b6657eca3ebadb8384f19efe457f3de2fb799c02a603ea32960c265acd2bd752a0a020db753bf0f2c4d00fdd102da4519f
-EBUILD gencpp-0.7.0.ebuild 419 BLAKE2B bf93d5cfe1f10bf53d1b7388ca73f9c0575fdf808d5032a151b2f252dad757904577ed8223102c6e1130f2f1d83a78a72b17c3616008ad11eda6ac5a15075df1 SHA512 826d3ab1fe58f46630b3d8321e81c49e59b80ef06fc144d2debad1ece8c0caceab2e320893c41183c40670e618c60fc2ae13c4af07a6c9717882d4fee2ca5c08
-EBUILD gencpp-9999.ebuild 419 BLAKE2B e9ee054671d8be3df2d2a8f652ca7610add0b067843a51a4916009e8455c5b92cd77d871979d114c95ba3e19b8fcf71f02fc23d869b8d08ea195c912c11bf609 SHA512 09ae8a02e185c3c6a3ec3698169d2cde259e0359c5167f4e463d7b9ede123675b9f3167dc72eb9270524121588c3401e3de5f61bf583c42bdb1564bd09c67791
-MISC metadata.xml 325 BLAKE2B bd01d794167f45d5860b3022b18d57a360570f6863c45b8d1d6c5f3f6c7ae024fad4407fec94c3ad5030bfa2f67d58b5fc8ce3cc093432adabab2a890697e79d SHA512 f5adf69f5c684d1bcbdbede7c27ce5c20aa2b53c16a1d62c45b415a9b8993ab4ce9e46edf5146ab3108f5794e5f03b2ecc9b2dfc6644db99a5c0c6fd667bd09e
diff --git a/dev-ros/gencpp/gencpp-0.7.0.ebuild b/dev-ros/gencpp/gencpp-0.7.0.ebuild
deleted file mode 100644
index 44bc8f1377ba..000000000000
--- a/dev-ros/gencpp/gencpp-0.7.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/gencpp"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS C++ message definition and serialization generators"
-HOMEPAGE="https://wiki.ros.org/gencpp"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gencpp/gencpp-9999.ebuild b/dev-ros/gencpp/gencpp-9999.ebuild
deleted file mode 100644
index dca06b5f534d..000000000000
--- a/dev-ros/gencpp/gencpp-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/gencpp"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS C++ message definition and serialization generators"
-HOMEPAGE="https://wiki.ros.org/gencpp"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gencpp/metadata.xml b/dev-ros/gencpp/metadata.xml
deleted file mode 100644
index d84535538460..000000000000
--- a/dev-ros/gencpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/gencpp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/geneus/Manifest b/dev-ros/geneus/Manifest
deleted file mode 100644
index 349fc7e9b10d..000000000000
--- a/dev-ros/geneus/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX allow_dupes.patch 777 BLAKE2B c2972b303dbff81c8b18420dde90d63f3c133b55a9e05e4e4cd12a9645fde9c9b2d56e1c33c9081ae64f7baa158346d2b4900b0060c5a9ace94a6d85a68f13d7 SHA512 6e317b791ea5db181baba06b2e113a2b4c3b35ee758bd5e388cc79c1198fe8bd1b6e606ae7cde3758bed3dacfab54b092f1d2c0e833f0c281a65cd28e19ab646
-DIST geneus-3.0.0.tar.gz 21401 BLAKE2B 4e7b779956e8c03676ea315664bb7e669cef31112f4b45fb3cd784cdca78e7c344dcd34ab0c6ad42940cc8c1a7648385334ecb84d9a41379bf033aa60ff7baf5 SHA512 f97cd44628d11fd9be4a369dac931b94e4789b032a6f22cf11f84666a0f6750326581146821e995ffa44c3bfcfbff6ac7075c50af0ead9682620fbdf75e84da1
-EBUILD geneus-3.0.0-r1.ebuild 419 BLAKE2B c161e8edf7fcfc68bae6c26c7f037c9c22b6ae766f9fd9de40d16fe2b4fc5910836714e8e14e37460aeeae8a3af58b80f9f75c3444b6fcf307748fa1e7ecc1a7 SHA512 9d81d74a68bc8053ff7083690eab62141819b4513ea10de5e9d5610c2c39af9f6278422c69c042b4e2e087269fbcce508a6ba45e037c67e345876f322427e94c
-EBUILD geneus-9999.ebuild 419 BLAKE2B c161e8edf7fcfc68bae6c26c7f037c9c22b6ae766f9fd9de40d16fe2b4fc5910836714e8e14e37460aeeae8a3af58b80f9f75c3444b6fcf307748fa1e7ecc1a7 SHA512 9d81d74a68bc8053ff7083690eab62141819b4513ea10de5e9d5610c2c39af9f6278422c69c042b4e2e087269fbcce508a6ba45e037c67e345876f322427e94c
-MISC metadata.xml 333 BLAKE2B 970db0c552514e0297968249ee3063cfbc3d3313c6de9d88b3740764e370ee2d5b300ce67d38049c62f772892f4b569ed3e9012ab6b5aa0adfe27e31e563b8b9 SHA512 204fb93d6c346012658a3efe569d8770bf0c938f88b5c33429c73fd279e2d8e75dce232cb12b54e63bceefbef52434321fc589e01a76432d950022cd67755c69
diff --git a/dev-ros/geneus/files/allow_dupes.patch b/dev-ros/geneus/files/allow_dupes.patch
deleted file mode 100644
index 60c79b7fb8d4..000000000000
--- a/dev-ros/geneus/files/allow_dupes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: geneus-3.0.0/src/geneus/geneus_main.py
-===================================================================
---- geneus-3.0.0.orig/src/geneus/geneus_main.py
-+++ geneus-3.0.0/src/geneus/geneus_main.py
-@@ -53,7 +53,7 @@ def usage(progname):
- def get_pkg_map():
-     pkg_map = {}
-     for ws in workspaces.get_spaces():
--        pkgs = packages.find_packages(ws)
-+        pkgs = packages.find_packages_allowing_duplicates(ws)
-         for pkg in pkgs.values():
-             # packages.find_packages(workspaces.get_spaces()) returns package in high-priority-first-order, so we should not overwirte package map which is already found
-             # https://github.com/ros-infrastructure/catkin_pkg/blob/fa4b136b16e2d2886ab97257684f6bff243edefb/src/catkin_pkg/workspaces.py#L43
diff --git a/dev-ros/geneus/geneus-3.0.0-r1.ebuild b/dev-ros/geneus/geneus-3.0.0-r1.ebuild
deleted file mode 100644
index 6143a01472c4..000000000000
--- a/dev-ros/geneus/geneus-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="EusLisp ROS message and service generators"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/allow_dupes.patch" )
diff --git a/dev-ros/geneus/geneus-9999.ebuild b/dev-ros/geneus/geneus-9999.ebuild
deleted file mode 100644
index 6143a01472c4..000000000000
--- a/dev-ros/geneus/geneus-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="EusLisp ROS message and service generators"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/allow_dupes.patch" )
diff --git a/dev-ros/geneus/metadata.xml b/dev-ros/geneus/metadata.xml
deleted file mode 100644
index 4dc8ae9b18f4..000000000000
--- a/dev-ros/geneus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">jsk-ros-pkg/geneus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/genlisp/Manifest b/dev-ros/genlisp/Manifest
deleted file mode 100644
index 36f747f4151c..000000000000
--- a/dev-ros/genlisp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST genlisp-0.4.18.tar.gz 10243 BLAKE2B 437fcb5de19d543cf0b34466260541f9d64bfda96ad6521e3300a020faddb57c5fc625ecc7d7d2e25c336569f0cf7b32e79dfa61b1971105cad524458926efd9 SHA512 300c4c84d96d80fa20d8c8ea01def4f3eaec41d06b4c57b6d8a7885f22a1e38259a7526542bc13dfdde6276b5e51ecc7f59bed2a5092883f5494e3aba439c45d
-EBUILD genlisp-0.4.18.ebuild 372 BLAKE2B 25d67c1bd6e13d6f8641dead34a04aeae83070f723aca6a9701067d0d6e5d535a74e174e405f9236c61f98efd22df143bbfa2f326c3d4862efb4b3e52d52746b SHA512 3dcb8ecf53b464d6daeda6b897bf5fe20e65b521127d2b75f8bfa609bb4257e706fa2c3bcd1026b024cadb7240e402af1a2b2566e8e9951fe127cfe78a09ebec
-EBUILD genlisp-9999.ebuild 372 BLAKE2B 25d67c1bd6e13d6f8641dead34a04aeae83070f723aca6a9701067d0d6e5d535a74e174e405f9236c61f98efd22df143bbfa2f326c3d4862efb4b3e52d52746b SHA512 3dcb8ecf53b464d6daeda6b897bf5fe20e65b521127d2b75f8bfa609bb4257e706fa2c3bcd1026b024cadb7240e402af1a2b2566e8e9951fe127cfe78a09ebec
-MISC metadata.xml 326 BLAKE2B eee4519162b8362b377064bfc765bd6f4648149e438f68aec2ed3fd9bee17b75505e95132d7e929f00408cf2e5f4f151be1133ea23ddcb391002418391100956 SHA512 a1e3c1adb4f8cf5bbf2a07eed47bd41187e6f194ef9657f2a105f70f91fa55dc09268b0d26ba1a007df4c2a2fadb876d581aa31e98097bfbe3e7df20909de64a
diff --git a/dev-ros/genlisp/genlisp-0.4.18.ebuild b/dev-ros/genlisp/genlisp-0.4.18.ebuild
deleted file mode 100644
index 606bc537fd79..000000000000
--- a/dev-ros/genlisp/genlisp-0.4.18.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/genlisp"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Common-Lisp ROS message and service generators"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/genlisp/genlisp-9999.ebuild b/dev-ros/genlisp/genlisp-9999.ebuild
deleted file mode 100644
index 606bc537fd79..000000000000
--- a/dev-ros/genlisp/genlisp-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/genlisp"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Common-Lisp ROS message and service generators"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/genlisp/metadata.xml b/dev-ros/genlisp/metadata.xml
deleted file mode 100644
index 13d99e24e2d5..000000000000
--- a/dev-ros/genlisp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/genlisp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/genmsg/Manifest b/dev-ros/genmsg/Manifest
deleted file mode 100644
index 7f9659d30511..000000000000
--- a/dev-ros/genmsg/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST genmsg-0.6.0.tar.gz 60465 BLAKE2B d4b3fb69b540d5ae152ea9ba99f8a95f3ec0f2327abc3358c3f7e98710791d6cef7537a1c1de2229e103ffe80e7c67fadcbc1b781e3df2430dc379a14cc9a5a2 SHA512 73e0f16dfa0096c358c7b19fb5d5126af32ea24240611c4b45857a79d44d5a4aa77f34e4f0b4e2f38592f23b127ac1ffe74794be0b622921fd76353d9e42ea0d
-EBUILD genmsg-0.6.0.ebuild 420 BLAKE2B eb2bff8a10c307d298249bea738d89389518f762a89a53df427a212275f117c4e63ab8d69decb4c9800bf468548082843433751a0e9e358fce0f3eaf764e8994 SHA512 fa2612c88b0d1fb53852ae819c76994ed165cfc2b2b8fe2cdd8fe8f632660efc4b883feac1e32ed34bae4d199ada90edfe5661c9140d2978475eabc51430b9d0
-EBUILD genmsg-9999.ebuild 420 BLAKE2B ca149b07462e5685ecb165a60dc5051390fd0a2b571eff994e1676515ca007054d315ffb4897fa6d89f5447a4e3265feb4815b8b87a836d9fef92b35a1bcbcc2 SHA512 00ee8810e797c1b4525310e3a19e8071a58f4339441ce4826541fc9065cd08e7b5d447e086f83045851ac5302d3f34b1445c3d9e6b2e7efa6a45decd98e99021
-MISC metadata.xml 325 BLAKE2B 3e3786038456f5b774bc801719a505629abf8f617388d983cac1b976649593dbbbedd6e3037b92297b030f3fc7f28df8d599c0a340f8bd00c80372848908e426 SHA512 f219d532fbb81af5b68f9800c3ec3c285d628cc2830c94e2efa5e16299f8ad66929c0816220cb6659b1aa9f4e35549039f91433bf0614e951aa0e804003e546c
diff --git a/dev-ros/genmsg/genmsg-0.6.0.ebuild b/dev-ros/genmsg/genmsg-0.6.0.ebuild
deleted file mode 100644
index 7747d17bdcd2..000000000000
--- a/dev-ros/genmsg/genmsg-0.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/genmsg"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Python library for generating ROS message and service data structures"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/genmsg/genmsg-9999.ebuild b/dev-ros/genmsg/genmsg-9999.ebuild
deleted file mode 100644
index 7ae92b459ca2..000000000000
--- a/dev-ros/genmsg/genmsg-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/genmsg"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Python library for generating ROS message and service data structures"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/genmsg/metadata.xml b/dev-ros/genmsg/metadata.xml
deleted file mode 100644
index 1a6f5558317a..000000000000
--- a/dev-ros/genmsg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/genmsg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/gennodejs/Manifest b/dev-ros/gennodejs/Manifest
deleted file mode 100644
index 78221bce192e..000000000000
--- a/dev-ros/gennodejs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gennodejs-2.0.1.tar.gz 14902 BLAKE2B 36e2531addf02cf16c75e8186aaa3722c973b5ae9a70377d1e8b59cc4f5f5e33214198736c432fbbca14cd44c065d637009764a16ae4c4ada0bf1288a68f76cd SHA512 53a518e494235b5858497385a31407fee06337ab01fd0733201af2cf916a76a3b81098f12a12e38ac0945b04a5ddabb1a155d14f4fd3023591d3e478e31d3648
-EBUILD gennodejs-2.0.1.ebuild 445 BLAKE2B e224bf930d025570527c10a2c36e7e72de6948cbcabdc45149dc2cb037566f2ed3dff6ece9e45f93d9695e42ecf90f3b72087e9797fb7cb359d3e5cfd5b07541 SHA512 ef442ffb9fa4a2874d32c4b7f7a386528b0ee592da1cdfa4d43eeace32c00795f971752826ef15050c63cca8ba5f56b5225ef5082efad0069292de7a9187c509
-EBUILD gennodejs-9999.ebuild 445 BLAKE2B e224bf930d025570527c10a2c36e7e72de6948cbcabdc45149dc2cb037566f2ed3dff6ece9e45f93d9695e42ecf90f3b72087e9797fb7cb359d3e5cfd5b07541 SHA512 ef442ffb9fa4a2874d32c4b7f7a386528b0ee592da1cdfa4d43eeace32c00795f971752826ef15050c63cca8ba5f56b5225ef5082efad0069292de7a9187c509
-MISC metadata.xml 351 BLAKE2B 698bb787db5d06767bbd2adf355d3c8936a9d0513605d629ebb6791ae63883245ab3b2b3394d59d56db4e63e25c53692654db77e31b236d3bc28dc2e65275537 SHA512 c35779a88cc0fe73da9630f892579630aa34cd8066adc1a817a1d0ae55b7c1a73156bc76f50e8e0219acfd865d4ae710f09ee805175a599c835eb200ff84672c
diff --git a/dev-ros/gennodejs/gennodejs-2.0.1.ebuild b/dev-ros/gennodejs/gennodejs-2.0.1.ebuild
deleted file mode 100644
index 28a1ae194541..000000000000
--- a/dev-ros/gennodejs/gennodejs-2.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/RethinkRobotics-opensource/gennodejs"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Javascript ROS message and service generators"
-HOMEPAGE="https://wiki.ros.org/gennodejs"
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gennodejs/gennodejs-9999.ebuild b/dev-ros/gennodejs/gennodejs-9999.ebuild
deleted file mode 100644
index 28a1ae194541..000000000000
--- a/dev-ros/gennodejs/gennodejs-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/RethinkRobotics-opensource/gennodejs"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Javascript ROS message and service generators"
-HOMEPAGE="https://wiki.ros.org/gennodejs"
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gennodejs/metadata.xml b/dev-ros/gennodejs/metadata.xml
deleted file mode 100644
index 5ec4a482b7f3..000000000000
--- a/dev-ros/gennodejs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">RethinkRobotics-opensource/gennodejs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
deleted file mode 100644
index 8cd8c51f524f..000000000000
--- a/dev-ros/genpy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yaml.patch 543 BLAKE2B c476c582c2363bd5bdf9b472dc784726eb2bd65081d3629f7d822decbb92ecfe0c695691219c661b7bad850521346eb591c9c00498c3ab1e0f85597b8497c3a8 SHA512 4fc53e0c904d5dfa637476b833e8a5038305ebd0672f5acf08f81b2ae97970b0e4996df483ff087a2eb16957b659d0a528545fe8704cc26f1f6029105a2aea87
-DIST genpy-0.6.16.tar.gz 55296 BLAKE2B 061b7c761a8a8892ffbd27073812ffd375bbeabe1606efdd5d43082f693968cad1fbbdf87ec87b0f4ddc6cef81c22c6e562455885a4b8b82519f544bd5d1c672 SHA512 e87a368d6d966ca681d8abfa0fb16ce1f827aaa9cc0649ffd88ccb849fd3c479db0a36f7a82e16e386e83d471e2a75c38afebe33975a1cf6d42b98804ec7a1bd
-EBUILD genpy-0.6.16.ebuild 644 BLAKE2B 43a28a61284c990a47dcf5785434488f7573339f0bf7879672a1d5061dccd0c5cce40070a5c94ad6014f8b334e1fc9b517845a3e1a1b252a2dbccf229c1ab749 SHA512 fa52ea8e7a11a2975a681be28cd79769d31702ffa369d6780cf1116ca313fcd71bc65b411e343baa314b9087c58ba092a8a7fdf4c3d52d880d9eccdf7d47aa26
-EBUILD genpy-9999.ebuild 644 BLAKE2B 43a28a61284c990a47dcf5785434488f7573339f0bf7879672a1d5061dccd0c5cce40070a5c94ad6014f8b334e1fc9b517845a3e1a1b252a2dbccf229c1ab749 SHA512 fa52ea8e7a11a2975a681be28cd79769d31702ffa369d6780cf1116ca313fcd71bc65b411e343baa314b9087c58ba092a8a7fdf4c3d52d880d9eccdf7d47aa26
-MISC metadata.xml 324 BLAKE2B ebfeceb4242e7a118217ac0a45988859ac977f15f31ddd28156256fa7dfa0da56ac878b896a8a14c237202717495f5ad26f1c0635e20731287c0f3eac61f2a5b SHA512 1d104f18c82b8471d1a61fb1d5f65cab04b9dd457ed5e8ed8d2582ceb4d55e05c7c4ae64cd747e825d7dc095c10557786bf0a2f0fc538b60c48df6197c1e5c3b
diff --git a/dev-ros/genpy/files/yaml.patch b/dev-ros/genpy/files/yaml.patch
deleted file mode 100644
index f4959213f356..000000000000
--- a/dev-ros/genpy/files/yaml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: genpy-0.6.11/test/test_genpy_message.py
-===================================================================
---- genpy-0.6.11.orig/test/test_genpy_message.py
-+++ genpy-0.6.11/test/test_genpy_message.py
-@@ -612,7 +612,7 @@ d: """ + """
-         def roundtrip(m):
-             yaml_text = strify_message(m)
-             print(yaml_text)
--            loaded = yaml.load(yaml_text)
-+            loaded = yaml.safe_load(yaml_text)
-             print('loaded', loaded)
-             new_inst = m.__class__()
-             if loaded is not None:
diff --git a/dev-ros/genpy/genpy-0.6.16.ebuild b/dev-ros/genpy/genpy-0.6.16.ebuild
deleted file mode 100644
index a0323669d201..000000000000
--- a/dev-ros/genpy/genpy-0.6.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/genpy"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="https://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/genpy-9999.ebuild b/dev-ros/genpy/genpy-9999.ebuild
deleted file mode 100644
index a0323669d201..000000000000
--- a/dev-ros/genpy/genpy-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/genpy"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="https://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/metadata.xml b/dev-ros/genpy/metadata.xml
deleted file mode 100644
index 901fe1b45da5..000000000000
--- a/dev-ros/genpy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/genpy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/geodesy/Manifest b/dev-ros/geodesy/Manifest
deleted file mode 100644
index 1b791063ceb0..000000000000
--- a/dev-ros/geodesy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX py3.patch 524 BLAKE2B 68d93bc01ddd03660820d5e5ea6284ee595f18d0272423f9ddbb1357e18ecdb6280acfde2e00e62a921225d2a48837f289732b3321877be16102a21ea9e75371 SHA512 f854f820acc878c95bec1eca186c027ec0f3763195f6fd63a4a357aaf7affe3c20c640b3afecfa7ecce1702922904820d2a82c1d9caddfeace022478e4c5e91d
-DIST geographic_info-0.5.6.tar.gz 28130 BLAKE2B 4d7013543db91c02c470c6b6dcb6e00070d5356f91ace20b3bb97aafa71eff2b525fc11994796f2de103b1df40efe8358d19a7e8fc0b1290c73cc28c791f22ce SHA512 d2f41320d2b094c2ea04593941e35d2b5581b84cc2f599099880dd671255dd59bc8787ad4a5640539cc25a13592df2ec7a887e3ea171398cfeafeccc669bd7f0
-EBUILD geodesy-0.5.6-r1.ebuild 1010 BLAKE2B 5008b3fa19ac954243d29a0992502f5009195fc9b14fdc2fddd39fc408129b9c1e72886401c359d2b122873e7b8552b0aa5746733aac3e77d91154e447303c6f SHA512 97d18184cf8a3e18e4a8c985a56f07503df453ae8f5a14ea39ffb341822a261f8af4152532d20d0c9d038154d75b774f58144ba16f00c8055628699bf020f398
-EBUILD geodesy-9999.ebuild 1010 BLAKE2B 5008b3fa19ac954243d29a0992502f5009195fc9b14fdc2fddd39fc408129b9c1e72886401c359d2b122873e7b8552b0aa5746733aac3e77d91154e447303c6f SHA512 97d18184cf8a3e18e4a8c985a56f07503df453ae8f5a14ea39ffb341822a261f8af4152532d20d0c9d038154d75b774f58144ba16f00c8055628699bf020f398
-MISC metadata.xml 350 BLAKE2B 393a7bc196d9197ab8baaee44e8af2239cc50c5b6a4863d05104000c43e16799007159bbd02d69673808956723b846c38070e7fb1877632cb4c59dda84e4dbb8 SHA512 67d9fd11e93f1087c466fd1689b1429e8dd5372ae5c31ef48b23b18e64f8d7d5ee3c75682ca032138d5df46dc8f317ddb18056a9c05ddc56b661cb0ca87da6e7
diff --git a/dev-ros/geodesy/files/py3.patch b/dev-ros/geodesy/files/py3.patch
deleted file mode 100644
index 66ef4e5dd3ca..000000000000
--- a/dev-ros/geodesy/files/py3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: geodesy/tests/test_wu_point.py
-===================================================================
---- geodesy.orig/tests/test_wu_point.py
-+++ geodesy/tests/test_wu_point.py
-@@ -127,7 +127,7 @@ class TestWuPoint(unittest.TestCase):
-         self.assertEqual(wupts.get(uu).uuid(), uu)
- 
-         # test index() function
--        for i in xrange(len(uuids)):
-+        for i in range(len(uuids)):
-             self.assertEqual(wupts.index(uuids[i]), i)
-             self.assertEqual(wupts.points[i].id.uuid, uuids[i])
- 
diff --git a/dev-ros/geodesy/geodesy-0.5.6-r1.ebuild b/dev-ros/geodesy/geodesy-0.5.6-r1.ebuild
deleted file mode 100644
index 291dd8ef6a56..000000000000
--- a/dev-ros/geodesy/geodesy-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-geographic-info/geographic_info"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/unique_id
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyproj[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/geodesy/geodesy-9999.ebuild b/dev-ros/geodesy/geodesy-9999.ebuild
deleted file mode 100644
index 291dd8ef6a56..000000000000
--- a/dev-ros/geodesy/geodesy-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-geographic-info/geographic_info"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/unique_id
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyproj[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/geodesy/metadata.xml b/dev-ros/geodesy/metadata.xml
deleted file mode 100644
index 790827b81dc3..000000000000
--- a/dev-ros/geodesy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/geographic_msgs/Manifest b/dev-ros/geographic_msgs/Manifest
deleted file mode 100644
index 0be007ba8014..000000000000
--- a/dev-ros/geographic_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
-DIST geographic_info-0.5.6.tar.gz 28130 BLAKE2B 4d7013543db91c02c470c6b6dcb6e00070d5356f91ace20b3bb97aafa71eff2b525fc11994796f2de103b1df40efe8358d19a7e8fc0b1290c73cc28c791f22ce SHA512 d2f41320d2b094c2ea04593941e35d2b5581b84cc2f599099880dd671255dd59bc8787ad4a5640539cc25a13592df2ec7a887e3ea171398cfeafeccc669bd7f0
-EBUILD geographic_msgs-0.5.5.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
-EBUILD geographic_msgs-0.5.6.ebuild 483 BLAKE2B a831785a84fc14793883abf78f730e628a2c3da6490bf63c1892e66cb08522fadf5270889921246c68bded3487fbbf19ef956c8b4c70e2c79d39a005ca0d9368 SHA512 5cf66dbdc67beaeb42b48da0955c7cecc912a1d33aa4b0fb54ae59fe31998f6eddf78de32759f5d17645e9b6dfc6e822ecda34fe59113b4f0bf410d53c2d8b44
-EBUILD geographic_msgs-9999.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
-MISC metadata.xml 350 BLAKE2B 393a7bc196d9197ab8baaee44e8af2239cc50c5b6a4863d05104000c43e16799007159bbd02d69673808956723b846c38070e7fb1877632cb4c59dda84e4dbb8 SHA512 67d9fd11e93f1087c466fd1689b1429e8dd5372ae5c31ef48b23b18e64f8d7d5ee3c75682ca032138d5df46dc8f317ddb18056a9c05ddc56b661cb0ca87da6e7
diff --git a/dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild
deleted file mode 100644
index f04fb523fac4..000000000000
--- a/dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS messages for Geographic Information Systems"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild
deleted file mode 100644
index a299373688ff..000000000000
--- a/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS messages for Geographic Information Systems"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild b/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
deleted file mode 100644
index f04fb523fac4..000000000000
--- a/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS messages for Geographic Information Systems"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geographic_msgs/metadata.xml b/dev-ros/geographic_msgs/metadata.xml
deleted file mode 100644
index 790827b81dc3..000000000000
--- a/dev-ros/geographic_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
deleted file mode 100644
index 85147ed26833..000000000000
--- a/dev-ros/geometric_shapes/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST geometric_shapes-0.7.3.tar.gz 85830 BLAKE2B 2e5475a55e389ccd0cf2819c268efdf6e8764daadc7adae48d89d636b8155c49b892ec7204f2ecedc2e01948f6fa31fcaa88a14709d2ab63f850aee9352f5b1b SHA512 bd35a3aa23243d1bf85e7c9cc8b2263cbc1e5af626ae80950fd0867222bd5aaa29ac7fed6c1d5e28943916314ab941b182ba343114452b98c6f18b33a570123c
-EBUILD geometric_shapes-0.7.3-r1.ebuild 964 BLAKE2B 692daf88a07d746d1934651f79c0dab356b9ccf111d921724bd62e6e362b2bad3acfddab93c48ab210098a089b63580546a2014fc064729c57a345b347b31453 SHA512 11f3cf878bc9bb28ce236af5d51e6bd6b628f8b42d9255a378a9362c26a75f4905cad160d100210bf1e4125c61e5aeba03a11327d3fcc4fa81bb1b4c8e459c3e
-EBUILD geometric_shapes-9999.ebuild 964 BLAKE2B 692daf88a07d746d1934651f79c0dab356b9ccf111d921724bd62e6e362b2bad3acfddab93c48ab210098a089b63580546a2014fc064729c57a345b347b31453 SHA512 11f3cf878bc9bb28ce236af5d51e6bd6b628f8b42d9255a378a9362c26a75f4905cad160d100210bf1e4125c61e5aeba03a11327d3fcc4fa81bb1b4c8e459c3e
-MISC metadata.xml 344 BLAKE2B eb25f5d8d67b1c21474afb2d2b71998ded581ba296decbb6cb382b4e7e8c28ee88d5da3cfc45bcd4d4a8ae632d49f6108199a5bd13e284260849f5105b23cac4 SHA512 a595dfc3c8e08b85e4af946d85bc6a2684c028a247da10941aaa041236ac7a03276ca7322c4d45ec34d57305d87b611c283c116a602f15116f9613bc021092d3
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.3-r1.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.3-r1.ebuild
deleted file mode 100644
index a27b5a9e338e..000000000000
--- a/dev-ros/geometric_shapes/geometric_shapes-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
-KEYWORDS="~amd64 ~arm"
-
-inherit flag-o-matic ros-catkin
-
-DESCRIPTION="Generic definitions of geometric shapes and bodies"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	media-libs/qhull
-	media-libs/assimp:=
-	sci-libs/octomap
-	dev-ros/random_numbers
-	dev-ros/resource_retriever
-	dev-ros/eigen_stl_containers
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rosunit )
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	# https://bugs.gentoo.org/738556
-	# http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html
-	append-cxxflags '-std=c++17'
-	sed -e 's/add_compile_options(/#\0/g' -i CMakeLists.txt || die
-}
diff --git a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
deleted file mode 100644
index a27b5a9e338e..000000000000
--- a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
-KEYWORDS="~amd64 ~arm"
-
-inherit flag-o-matic ros-catkin
-
-DESCRIPTION="Generic definitions of geometric shapes and bodies"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	media-libs/qhull
-	media-libs/assimp:=
-	sci-libs/octomap
-	dev-ros/random_numbers
-	dev-ros/resource_retriever
-	dev-ros/eigen_stl_containers
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rosunit )
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	# https://bugs.gentoo.org/738556
-	# http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html
-	append-cxxflags '-std=c++17'
-	sed -e 's/add_compile_options(/#\0/g' -i CMakeLists.txt || die
-}
diff --git a/dev-ros/geometric_shapes/metadata.xml b/dev-ros/geometric_shapes/metadata.xml
deleted file mode 100644
index f29a98e33d97..000000000000
--- a/dev-ros/geometric_shapes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/geometric_shapes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/geometry_msgs/Manifest b/dev-ros/geometry_msgs/Manifest
deleted file mode 100644
index 31e1b0b8eaa7..000000000000
--- a/dev-ros/geometry_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD geometry_msgs-1.13.0.ebuild 451 BLAKE2B 39a05e85cab199e2453dc34695bbd609db63d8dc510d737c9d776ea64f61f94a40660fd630700e903d828ee6941c580cfa1b3fb73cfbd8a4dbed7a8d0e6ac0fd SHA512 2e8682b8dd369f01515f289dba73ad2ef975feb2b97277b89935b850657c83748e1eb380e132552d8ea229f87fd757b5d0196b1b9e81203dc87538d60b6e3365
-EBUILD geometry_msgs-1.13.1.ebuild 451 BLAKE2B d01891ed22604be48eafd3c865a328b73723a6d24b28552312794d623847d44d2b5c44777ef1c11d91c5365892cb744f5eb07ca9091fa90b796792ebd38423ca SHA512 3d94e9e422f7f885ef2926e54d5b9296c15fa0463b662e88f597d5b39e008b29b97d92e1813603799a5d31ee4fe40a12081e8476c1c8898a5b1e2a0e7a2dd7d9
-EBUILD geometry_msgs-9999.ebuild 451 BLAKE2B 39a05e85cab199e2453dc34695bbd609db63d8dc510d737c9d776ea64f61f94a40660fd630700e903d828ee6941c580cfa1b3fb73cfbd8a4dbed7a8d0e6ac0fd SHA512 2e8682b8dd369f01515f289dba73ad2ef975feb2b97277b89935b850657c83748e1eb380e132552d8ea229f87fd757b5d0196b1b9e81203dc87538d60b6e3365
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild
deleted file mode 100644
index ccebfac4361b..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for common geometric primitives such as points, vectors, and poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.13.1.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.13.1.ebuild
deleted file mode 100644
index d94b1990ee12..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for common geometric primitives such as points, vectors, and poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
deleted file mode 100644
index ccebfac4361b..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for common geometric primitives such as points, vectors, and poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/metadata.xml b/dev-ros/geometry_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/geometry_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/global_planner/Manifest b/dev-ros/global_planner/Manifest
deleted file mode 100644
index 7fd7fd6de00a..000000000000
--- a/dev-ros/global_planner/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD global_planner-1.17.1-r1.ebuild 732 BLAKE2B a1f73e9d632dd45018206071b4b557ade4e39fa19d63dc9b2fa5fe303070396110680a8a5a65f802d579b2af9652ef884d36325f86a0cf16b531a4da0e20d2b0 SHA512 259f2b0ffe25108f0eb24678cc85a284d66d3ad55e78e69d1228da3e3922f84ea8589cbc5bd121285d089c51e9d706a6bd46fd40036daf766b7ac31529b3602b
-EBUILD global_planner-9999.ebuild 732 BLAKE2B a1f73e9d632dd45018206071b4b557ade4e39fa19d63dc9b2fa5fe303070396110680a8a5a65f802d579b2af9652ef884d36325f86a0cf16b531a4da0e20d2b0 SHA512 259f2b0ffe25108f0eb24678cc85a284d66d3ad55e78e69d1228da3e3922f84ea8589cbc5bd121285d089c51e9d706a6bd46fd40036daf766b7ac31529b3602b
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/global_planner/global_planner-1.17.1-r1.ebuild b/dev-ros/global_planner/global_planner-1.17.1-r1.ebuild
deleted file mode 100644
index 3858fdca1c1a..000000000000
--- a/dev-ros/global_planner/global_planner-1.17.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Path planner library and node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/angles:0
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/global_planner/global_planner-9999.ebuild b/dev-ros/global_planner/global_planner-9999.ebuild
deleted file mode 100644
index 3858fdca1c1a..000000000000
--- a/dev-ros/global_planner/global_planner-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Path planner library and node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/angles:0
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/global_planner/metadata.xml b/dev-ros/global_planner/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/global_planner/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
deleted file mode 100644
index 81777c75a6dd..000000000000
--- a/dev-ros/gmapping/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST gmapping-1.4.2-basic_localization_stage_groundtruth.pgm 16000058 BLAKE2B 4bf5494b34be09f4dcf63c26c8bcfd29b63e96a11d667dd8083dee6a2f8352b67c84ffa5603ec262a5af3e7fcbb7ca71ca77563df92f8cf72d3e4cdb2f817226 SHA512 32be0d40c84b2a5320215efee317d97e25131aa4ce2f39e6dbdb4481b4782ba8d437dd8d086a60728ee215d6243ea9ff0693c6bffd2cae542977d5bd55c91fad
-DIST gmapping-1.4.2-basic_localization_stage_indexed.bag 8554014 BLAKE2B 56605fc2642ee7dfe93379c620e8888da56260e23155dc68b3026c59d219cbd287ea04e9387bf3105a1089f8d930976d2a9875775d63646def090f2fdfa3f9e5 SHA512 2060ad1f65150043b254f820357eafe179483e3fd12bd0d85721841bfc9a15bf702dfbb34f99cb9b1566bafe64b79b8777d6e7c2ee77bc33ca7e87eb4b6fb240
-DIST gmapping-1.4.2-hallway_slow_2011-03-04-21-41-33.bag 43648223 BLAKE2B 93d733a8ed4e959c0a786369ce95c51698849591de200b99da01cd4a3acd22dd2faeb0e532c0a29add1b04f0de88384df171bcc404cefb772a19171949d71a77 SHA512 dd97fa6a0c22a2802473d343ad9f9b26ba8ebd119c8baa6ae3bcf19e913742a1456aa2879aef64c1bd6aab987d5b164f6cb4c251a3fd0736a290465b7f0f92bc
-DIST gmapping-1.4.2-test_replay_crash.bag 191247 BLAKE2B 348b6b1766cc2e2909106a544936538ced8a7d33536f5a964de03155df531ca57733386834804f81071b40a09c188e32ee23ef6d14f8436849e0d20a84bd7297 SHA512 e94b351d2a3406ee01c14b09237e9108812a0e65f3cbfceeb4b7def514f61ca934545764962b36804e28fc9cac8ce17f3f6d18a7cb7574dcb0a2f169cd7a1014
-DIST gmapping-1.4.2-test_turtlebot.bag 3003517 BLAKE2B d5d9f468aa5ac700bc3a3f819fe3ab1bd2ea7a28fb468dac9ac82c0bbbc1d59146bce132482baf81cfd763c25e82f9fa5cfbac28c6cc2fea6e114063b0daaf17 SHA512 8a9d9a0d63da607a2fc220e15e37ea339a254433dcb9b91e3b3041f032924177078ddeaef50df00e2ca0e5a9bd80ec17eadd8bfb4f0f879faab62de54a0555a4
-DIST gmapping-1.4.2-test_upside_down.bag 9353464 BLAKE2B e4835be6d70595e67c25eac28803857c6d14375b63e5c11991d50b7e47614e093728a628281241cfd5678e4ed84a776890ab68ccf129ddcdcb2b4c693afa4c5c SHA512 c8e193fd65c049b436c24677ba26e1e2e29f5ea744ea4e50f311224c4dbca685ba7da1804bcf3a41cea41ae79a1848158c8fdb0c4954cfa4ec4130089adfc7b4
-DIST gmapping-9999-basic_localization_stage_groundtruth.pgm 16000058 BLAKE2B 4bf5494b34be09f4dcf63c26c8bcfd29b63e96a11d667dd8083dee6a2f8352b67c84ffa5603ec262a5af3e7fcbb7ca71ca77563df92f8cf72d3e4cdb2f817226 SHA512 32be0d40c84b2a5320215efee317d97e25131aa4ce2f39e6dbdb4481b4782ba8d437dd8d086a60728ee215d6243ea9ff0693c6bffd2cae542977d5bd55c91fad
-DIST gmapping-9999-basic_localization_stage_indexed.bag 8554014 BLAKE2B 56605fc2642ee7dfe93379c620e8888da56260e23155dc68b3026c59d219cbd287ea04e9387bf3105a1089f8d930976d2a9875775d63646def090f2fdfa3f9e5 SHA512 2060ad1f65150043b254f820357eafe179483e3fd12bd0d85721841bfc9a15bf702dfbb34f99cb9b1566bafe64b79b8777d6e7c2ee77bc33ca7e87eb4b6fb240
-DIST gmapping-9999-hallway_slow_2011-03-04-21-41-33.bag 43648223 BLAKE2B 93d733a8ed4e959c0a786369ce95c51698849591de200b99da01cd4a3acd22dd2faeb0e532c0a29add1b04f0de88384df171bcc404cefb772a19171949d71a77 SHA512 dd97fa6a0c22a2802473d343ad9f9b26ba8ebd119c8baa6ae3bcf19e913742a1456aa2879aef64c1bd6aab987d5b164f6cb4c251a3fd0736a290465b7f0f92bc
-DIST gmapping-9999-test_replay_crash.bag 191247 BLAKE2B 348b6b1766cc2e2909106a544936538ced8a7d33536f5a964de03155df531ca57733386834804f81071b40a09c188e32ee23ef6d14f8436849e0d20a84bd7297 SHA512 e94b351d2a3406ee01c14b09237e9108812a0e65f3cbfceeb4b7def514f61ca934545764962b36804e28fc9cac8ce17f3f6d18a7cb7574dcb0a2f169cd7a1014
-DIST gmapping-9999-test_turtlebot.bag 3003517 BLAKE2B d5d9f468aa5ac700bc3a3f819fe3ab1bd2ea7a28fb468dac9ac82c0bbbc1d59146bce132482baf81cfd763c25e82f9fa5cfbac28c6cc2fea6e114063b0daaf17 SHA512 8a9d9a0d63da607a2fc220e15e37ea339a254433dcb9b91e3b3041f032924177078ddeaef50df00e2ca0e5a9bd80ec17eadd8bfb4f0f879faab62de54a0555a4
-DIST gmapping-9999-test_upside_down.bag 9353464 BLAKE2B e4835be6d70595e67c25eac28803857c6d14375b63e5c11991d50b7e47614e093728a628281241cfd5678e4ed84a776890ab68ccf129ddcdcb2b4c693afa4c5c SHA512 c8e193fd65c049b436c24677ba26e1e2e29f5ea744ea4e50f311224c4dbca685ba7da1804bcf3a41cea41ae79a1848158c8fdb0c4954cfa4ec4130089adfc7b4
-DIST slam_gmapping-1.4.2.tar.gz 21721 BLAKE2B 63ac4ccc1238cc4fecbf416e2fb716d1b679b4ae4d2d94508887ede8894402d77564af0f60a3b8d0b1661c91d755a5276aabd3894826af436ce11bd6119619b2 SHA512 d21810149ffe09cf57730e8657298f0d5c7aaa2cd6257b4e891ef990e2b6c727f2246d22d7272969a11604e33887e245d8d66980cb0c158f875810f4ff17072a
-EBUILD gmapping-1.4.2.ebuild 1461 BLAKE2B 6d20a4f7a076515fdd49730e6e707ed3da608e2a33837d9e092e03f76ad8c599851a1e87f9e5ffe4fcaf2cf0bb032224e5eab77f8c7b8ca2b38aebb4a1c75355 SHA512 945b40b16a934e12ddf993c732a68797a69039794fa345ea2574b2a6c02780ac7168d6a7241e549e253d3dcfcbbaca082544028456e8bf1347e6c20610e4280a
-EBUILD gmapping-9999.ebuild 1461 BLAKE2B 6d20a4f7a076515fdd49730e6e707ed3da608e2a33837d9e092e03f76ad8c599851a1e87f9e5ffe4fcaf2cf0bb032224e5eab77f8c7b8ca2b38aebb4a1c75355 SHA512 945b40b16a934e12ddf993c732a68797a69039794fa345ea2574b2a6c02780ac7168d6a7241e549e253d3dcfcbbaca082544028456e8bf1347e6c20610e4280a
-MISC metadata.xml 343 BLAKE2B 36b2bb8a3e1eeba9115c117deba744c420ee6c89ac1658b7c47f301ee3c00f94514ab40dd687de3722e097df044ba84dffefe65b2286614323572d6cda92dbf0 SHA512 1f6024ff982ff5af165beaa067561abb69c30a56656d79501421bc2e597af7ca1a1aeb75eea70dd2e09e35814978d3c20684329e12746bf218b114650a25c764
diff --git a/dev-ros/gmapping/gmapping-1.4.2.ebuild b/dev-ros/gmapping/gmapping-1.4.2.ebuild
deleted file mode 100644
index b68005106277..000000000000
--- a/dev-ros/gmapping/gmapping-1.4.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-	dev-ros/nodelet
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-TEST_DATA="
-	basic_localization_stage_indexed.bag
-	hallway_slow_2011-03-04-21-41-33.bag
-	basic_localization_stage_groundtruth.pgm
-"
-PERCEPTION_TEST_DATA="
-	test_replay_crash.bag
-	test_turtlebot.bag
-	test_upside_down.bag
-"
-SRC_URI="${SRC_URI} test? ( "
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI} http://download.ros.org/data/gmapping/${i} -> ${P}-${i}"
-done
-for i in ${PERCEPTION_TEST_DATA}; do
-	SRC_URI="${SRC_URI} https://github.com/ros-perception/slam_gmapping_test_data/raw/master/${i} -> ${P}-${i}"
-done
-SRC_URI="${SRC_URI} )"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	if use test; then
-		for i in ${TEST_DATA} ${PERCEPTION_TEST_DATA}; do
-			cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-		done
-		sed \
-			-e "s#http://download.ros.org/data/gmapping#file://${S}#" \
-			-e "s#https://github.com/ros-perception/slam_gmapping_test_data/raw/master#file://${S}#" \
-			-i CMakeLists.txt || die
-	fi
-}
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
deleted file mode 100644
index b68005106277..000000000000
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-	dev-ros/nodelet
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-TEST_DATA="
-	basic_localization_stage_indexed.bag
-	hallway_slow_2011-03-04-21-41-33.bag
-	basic_localization_stage_groundtruth.pgm
-"
-PERCEPTION_TEST_DATA="
-	test_replay_crash.bag
-	test_turtlebot.bag
-	test_upside_down.bag
-"
-SRC_URI="${SRC_URI} test? ( "
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI} http://download.ros.org/data/gmapping/${i} -> ${P}-${i}"
-done
-for i in ${PERCEPTION_TEST_DATA}; do
-	SRC_URI="${SRC_URI} https://github.com/ros-perception/slam_gmapping_test_data/raw/master/${i} -> ${P}-${i}"
-done
-SRC_URI="${SRC_URI} )"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	if use test; then
-		for i in ${TEST_DATA} ${PERCEPTION_TEST_DATA}; do
-			cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-		done
-		sed \
-			-e "s#http://download.ros.org/data/gmapping#file://${S}#" \
-			-e "s#https://github.com/ros-perception/slam_gmapping_test_data/raw/master#file://${S}#" \
-			-i CMakeLists.txt || die
-	fi
-}
diff --git a/dev-ros/gmapping/metadata.xml b/dev-ros/gmapping/metadata.xml
deleted file mode 100644
index 08c24a643bd0..000000000000
--- a/dev-ros/gmapping/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/slam_gmapping</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
deleted file mode 100644
index 8f662d0c2835..000000000000
--- a/dev-ros/hardware_interface/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD hardware_interface-0.19.1.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
-EBUILD hardware_interface-0.19.2.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
-EBUILD hardware_interface-0.19.3.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
-EBUILD hardware_interface-0.19.4.ebuild 389 BLAKE2B 74cc5e3320c34aa5fe7c11258689e2e95ee506230f0a8d92d5dc6afc0973771214798cb765454f63d76895df4ed151073ba7a0eae1184bd0cbc92f9d7b9b0fa3 SHA512 69e3028d77a905a356cedb5d95bbee836d5d5f3732cbaba71b50dd1cae3fae2e0bf09244bce00959de06f715d87f362917a2b419d678989fa6e9d3d1306b6293
-EBUILD hardware_interface-0.19.5.ebuild 389 BLAKE2B 74cc5e3320c34aa5fe7c11258689e2e95ee506230f0a8d92d5dc6afc0973771214798cb765454f63d76895df4ed151073ba7a0eae1184bd0cbc92f9d7b9b0fa3 SHA512 69e3028d77a905a356cedb5d95bbee836d5d5f3732cbaba71b50dd1cae3fae2e0bf09244bce00959de06f715d87f362917a2b419d678989fa6e9d3d1306b6293
-EBUILD hardware_interface-9999.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild
deleted file mode 100644
index 534f5a3f8d25..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.2.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.2.ebuild
deleted file mode 100644
index 534f5a3f8d25..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.19.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.3.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.3.ebuild
deleted file mode 100644
index 534f5a3f8d25..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.19.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.4.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.4.ebuild
deleted file mode 100644
index 3cbf6c2cb246..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.19.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild
deleted file mode 100644
index 3cbf6c2cb246..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-9999.ebuild b/dev-ros/hardware_interface/hardware_interface-9999.ebuild
deleted file mode 100644
index 534f5a3f8d25..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/metadata.xml b/dev-ros/hardware_interface/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/hardware_interface/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_compressed_map_transport/Manifest b/dev-ros/hector_compressed_map_transport/Manifest
deleted file mode 100644
index 6f27dab95a6f..000000000000
--- a/dev-ros/hector_compressed_map_transport/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_compressed_map_transport-0.5.1.ebuild 678 BLAKE2B 209013a02cf08a9271b4d0ae30d8a8c0b55d6ee831fb8fccf6acf4f96148341478145951e5c7bf9be06667062678bc8f6ef6dc2014ab2c960d38152eca396fdb SHA512 ad68777e963b47bddf6fa20f6b58a4e09d6a457b8a01385fd6a2a4364db521fa35168d61ea311960f7c1f21c087c6f618c209c8fa54dc47a2c5a6e43b9f65a57
-EBUILD hector_compressed_map_transport-0.5.2.ebuild 678 BLAKE2B 209013a02cf08a9271b4d0ae30d8a8c0b55d6ee831fb8fccf6acf4f96148341478145951e5c7bf9be06667062678bc8f6ef6dc2014ab2c960d38152eca396fdb SHA512 ad68777e963b47bddf6fa20f6b58a4e09d6a457b8a01385fd6a2a4364db521fa35168d61ea311960f7c1f21c087c6f618c209c8fa54dc47a2c5a6e43b9f65a57
-EBUILD hector_compressed_map_transport-9999.ebuild 678 BLAKE2B 347105c139dad0aefe18fb25051b778e61e332e15e9a47c6bd5241f2e074d51ec40b4c78f2d5212e78e11390def6ac4a251bf4e3f7e3c3e274d17cc8d4c83e73 SHA512 9f60acb8ecb6fa9dfed30e7bdd986c37941b9c4e8b2bc8dc16503bc68a43ffbaf60a1bad6679e6d67b4698b67ae08661c57b5ebc96a51ab762dd47c955d52c2b
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.1.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.1.ebuild
deleted file mode 100644
index b17d75bdeaca..000000000000
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/hector_map_tools
-	dev-ros/image_transport
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.ebuild
deleted file mode 100644
index b17d75bdeaca..000000000000
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/hector_map_tools
-	dev-ros/image_transport
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild
deleted file mode 100644
index 74e246177533..000000000000
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/hector_map_tools
-	dev-ros/image_transport
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_compressed_map_transport/metadata.xml b/dev-ros/hector_compressed_map_transport/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_compressed_map_transport/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
deleted file mode 100644
index 4ba18d3570f1..000000000000
--- a/dev-ros/hector_geotiff/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_geotiff-0.5.1.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
-EBUILD hector_geotiff-0.5.2.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
-EBUILD hector_geotiff-9999.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.5.1.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.5.1.ebuild
deleted file mode 100644
index 5dedc3aec918..000000000000
--- a/dev-ros/hector_geotiff/hector_geotiff-0.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Saves occupancy grid map, robot trajectory and object data to GeoTiff images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_map_tools
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.5.2.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.5.2.ebuild
deleted file mode 100644
index 5dedc3aec918..000000000000
--- a/dev-ros/hector_geotiff/hector_geotiff-0.5.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Saves occupancy grid map, robot trajectory and object data to GeoTiff images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_map_tools
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild b/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
deleted file mode 100644
index 5dedc3aec918..000000000000
--- a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Saves occupancy grid map, robot trajectory and object data to GeoTiff images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_map_tools
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff/metadata.xml b/dev-ros/hector_geotiff/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_geotiff/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_geotiff_launch/Manifest b/dev-ros/hector_geotiff_launch/Manifest
deleted file mode 100644
index 03ef4d53034f..000000000000
--- a/dev-ros/hector_geotiff_launch/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_geotiff_launch-0.5.1.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
-EBUILD hector_geotiff_launch-0.5.2.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
-EBUILD hector_geotiff_launch-9999.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.1.ebuild b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.1.ebuild
deleted file mode 100644
index 1a0d1f94dc3f..000000000000
--- a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for the hector_geotiff mapper"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-	dev-ros/hector_trajectory_server
-"
-DEPEND=""
diff --git a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.ebuild b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.ebuild
deleted file mode 100644
index 1a0d1f94dc3f..000000000000
--- a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for the hector_geotiff mapper"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-	dev-ros/hector_trajectory_server
-"
-DEPEND=""
diff --git a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-9999.ebuild b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-9999.ebuild
deleted file mode 100644
index 1a0d1f94dc3f..000000000000
--- a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for the hector_geotiff mapper"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-	dev-ros/hector_trajectory_server
-"
-DEPEND=""
diff --git a/dev-ros/hector_geotiff_launch/metadata.xml b/dev-ros/hector_geotiff_launch/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_geotiff_launch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_geotiff_plugins/Manifest b/dev-ros/hector_geotiff_plugins/Manifest
deleted file mode 100644
index 317f0934ff47..000000000000
--- a/dev-ros/hector_geotiff_plugins/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_geotiff_plugins-0.4.1.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
-EBUILD hector_geotiff_plugins-0.5.0.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
-EBUILD hector_geotiff_plugins-0.5.1.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
-EBUILD hector_geotiff_plugins-0.5.2.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
-EBUILD hector_geotiff_plugins-9999.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild
deleted file mode 100644
index 0ca7feb396de..000000000000
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.0.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.0.ebuild
deleted file mode 100644
index b45c4e15ac25..000000000000
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.1.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.1.ebuild
deleted file mode 100644
index b45c4e15ac25..000000000000
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.ebuild
deleted file mode 100644
index b45c4e15ac25..000000000000
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
deleted file mode 100644
index 0ca7feb396de..000000000000
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_geotiff_plugins/metadata.xml b/dev-ros/hector_geotiff_plugins/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_geotiff_plugins/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_imu_attitude_to_tf/Manifest b/dev-ros/hector_imu_attitude_to_tf/Manifest
deleted file mode 100644
index 2334e0c6f3b6..000000000000
--- a/dev-ros/hector_imu_attitude_to_tf/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_imu_attitude_to_tf-0.5.1.ebuild 489 BLAKE2B 87ae6a5a1329bf0dcaac0641fcfd4a51ba389f7c36b25a1cdc65da62787b603c004f54bd357a9c465416a31459da5f12ac7010e8cb743cc2c06819253a59380e SHA512 8ab2f10403298a8b34c849c3156a01c7d8f0fc1e3813f6ec86bd11d8fbd245db8f443bc8192e6b05367b72c402085cb1cf00872eff96c791bf1ed5a138e4bee9
-EBUILD hector_imu_attitude_to_tf-0.5.2.ebuild 489 BLAKE2B 87ae6a5a1329bf0dcaac0641fcfd4a51ba389f7c36b25a1cdc65da62787b603c004f54bd357a9c465416a31459da5f12ac7010e8cb743cc2c06819253a59380e SHA512 8ab2f10403298a8b34c849c3156a01c7d8f0fc1e3813f6ec86bd11d8fbd245db8f443bc8192e6b05367b72c402085cb1cf00872eff96c791bf1ed5a138e4bee9
-EBUILD hector_imu_attitude_to_tf-9999.ebuild 489 BLAKE2B a24246dc0be0680b78059fd194246a0ba24b92ab2b83b087345f2263e5abe7bf319fca117b5af771604a745bc7ef4066cc38af154a25b81fdabc8c089485dd06 SHA512 a448d96cbdc03f40c676489151ef8fdc4197f50f063fe1c3b2b9a07788465155a561502cacd2a17eaef167664aa73b62cca98c1a12fe99cd8a78b627633bbaa1
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.1.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.1.ebuild
deleted file mode 100644
index bf058d3517e9..000000000000
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.ebuild
deleted file mode 100644
index bf058d3517e9..000000000000
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild
deleted file mode 100644
index ae76fd8031f7..000000000000
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_imu_attitude_to_tf/metadata.xml b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_imu_attitude_to_tf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_imu_tools/Manifest b/dev-ros/hector_imu_tools/Manifest
deleted file mode 100644
index 1f8b5cba7c64..000000000000
--- a/dev-ros/hector_imu_tools/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_imu_tools-0.4.1.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
-EBUILD hector_imu_tools-0.5.0.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
-EBUILD hector_imu_tools-0.5.1.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
-EBUILD hector_imu_tools-0.5.2.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
-EBUILD hector_imu_tools-9999.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild
deleted file mode 100644
index 2bdbee5df273..000000000000
--- a/dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing IMU messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.5.0.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.0.ebuild
deleted file mode 100644
index 45f66eda01ab..000000000000
--- a/dev-ros/hector_imu_tools/hector_imu_tools-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing IMU messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.5.1.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.1.ebuild
deleted file mode 100644
index 45f66eda01ab..000000000000
--- a/dev-ros/hector_imu_tools/hector_imu_tools-0.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing IMU messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.ebuild
deleted file mode 100644
index 45f66eda01ab..000000000000
--- a/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing IMU messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
deleted file mode 100644
index 2bdbee5df273..000000000000
--- a/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing IMU messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_imu_tools/metadata.xml b/dev-ros/hector_imu_tools/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_imu_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_map_server/Manifest b/dev-ros/hector_map_server/Manifest
deleted file mode 100644
index 3698be03ba5d..000000000000
--- a/dev-ros/hector_map_server/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_map_server-0.4.1.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
-EBUILD hector_map_server-0.5.0.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
-EBUILD hector_map_server-0.5.1.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
-EBUILD hector_map_server-0.5.2.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
-EBUILD hector_map_server-9999.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild b/dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild
deleted file mode 100644
index d315b87686ab..000000000000
--- a/dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/hector_marker_drawing
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_map_server/hector_map_server-0.5.0.ebuild b/dev-ros/hector_map_server/hector_map_server-0.5.0.ebuild
deleted file mode 100644
index c3cd30cb4ede..000000000000
--- a/dev-ros/hector_map_server/hector_map_server-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/hector_marker_drawing
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_map_server/hector_map_server-0.5.1.ebuild b/dev-ros/hector_map_server/hector_map_server-0.5.1.ebuild
deleted file mode 100644
index c3cd30cb4ede..000000000000
--- a/dev-ros/hector_map_server/hector_map_server-0.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/hector_marker_drawing
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_map_server/hector_map_server-0.5.2.ebuild b/dev-ros/hector_map_server/hector_map_server-0.5.2.ebuild
deleted file mode 100644
index c3cd30cb4ede..000000000000
--- a/dev-ros/hector_map_server/hector_map_server-0.5.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/hector_marker_drawing
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_map_server/hector_map_server-9999.ebuild b/dev-ros/hector_map_server/hector_map_server-9999.ebuild
deleted file mode 100644
index d315b87686ab..000000000000
--- a/dev-ros/hector_map_server/hector_map_server-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/hector_marker_drawing
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_map_server/metadata.xml b/dev-ros/hector_map_server/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_map_server/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_map_tools/Manifest b/dev-ros/hector_map_tools/Manifest
deleted file mode 100644
index 15c79275ae5b..000000000000
--- a/dev-ros/hector_map_tools/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_map_tools-0.4.1.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
-EBUILD hector_map_tools-0.5.0.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
-EBUILD hector_map_tools-0.5.1.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
-EBUILD hector_map_tools-0.5.2.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
-EBUILD hector_map_tools-9999.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.4.1.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.4.1.ebuild
deleted file mode 100644
index a1602d9cd84b..000000000000
--- a/dev-ros/hector_map_tools/hector_map_tools-0.4.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.5.0.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.5.0.ebuild
deleted file mode 100644
index 85ada002eff2..000000000000
--- a/dev-ros/hector_map_tools/hector_map_tools-0.5.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.5.1.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.5.1.ebuild
deleted file mode 100644
index 85ada002eff2..000000000000
--- a/dev-ros/hector_map_tools/hector_map_tools-0.5.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.5.2.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.5.2.ebuild
deleted file mode 100644
index 85ada002eff2..000000000000
--- a/dev-ros/hector_map_tools/hector_map_tools-0.5.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
diff --git a/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild b/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
deleted file mode 100644
index a1602d9cd84b..000000000000
--- a/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
diff --git a/dev-ros/hector_map_tools/metadata.xml b/dev-ros/hector_map_tools/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_map_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
deleted file mode 100644
index 837b1d4cb262..000000000000
--- a/dev-ros/hector_mapping/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_mapping-0.4.1-r1.ebuild 636 BLAKE2B 526940f82394bd8ccc26131a4a178d40b1c95617ba14db85f3ffe609b967133def01840288c238853cbb6362bc1f11914b804bdcabe73ca6150f45dc39ed97e5 SHA512 97ef784ad704ad45609e2fcb845ea20199146bd14db202f4bf668e5b1f0427eadc7214d22b2bf44c39b90eb92f5b4540354ef1deec73435e4d98e882b67e4b63
-EBUILD hector_mapping-0.5.0-r1.ebuild 636 BLAKE2B 526940f82394bd8ccc26131a4a178d40b1c95617ba14db85f3ffe609b967133def01840288c238853cbb6362bc1f11914b804bdcabe73ca6150f45dc39ed97e5 SHA512 97ef784ad704ad45609e2fcb845ea20199146bd14db202f4bf668e5b1f0427eadc7214d22b2bf44c39b90eb92f5b4540354ef1deec73435e4d98e882b67e4b63
-EBUILD hector_mapping-0.5.1-r1.ebuild 636 BLAKE2B 526940f82394bd8ccc26131a4a178d40b1c95617ba14db85f3ffe609b967133def01840288c238853cbb6362bc1f11914b804bdcabe73ca6150f45dc39ed97e5 SHA512 97ef784ad704ad45609e2fcb845ea20199146bd14db202f4bf668e5b1f0427eadc7214d22b2bf44c39b90eb92f5b4540354ef1deec73435e4d98e882b67e4b63
-EBUILD hector_mapping-0.5.2.ebuild 636 BLAKE2B 526940f82394bd8ccc26131a4a178d40b1c95617ba14db85f3ffe609b967133def01840288c238853cbb6362bc1f11914b804bdcabe73ca6150f45dc39ed97e5 SHA512 97ef784ad704ad45609e2fcb845ea20199146bd14db202f4bf668e5b1f0427eadc7214d22b2bf44c39b90eb92f5b4540354ef1deec73435e4d98e882b67e4b63
-EBUILD hector_mapping-9999.ebuild 636 BLAKE2B 526940f82394bd8ccc26131a4a178d40b1c95617ba14db85f3ffe609b967133def01840288c238853cbb6362bc1f11914b804bdcabe73ca6150f45dc39ed97e5 SHA512 97ef784ad704ad45609e2fcb845ea20199146bd14db202f4bf668e5b1f0427eadc7214d22b2bf44c39b90eb92f5b4540354ef1deec73435e4d98e882b67e4b63
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_mapping/hector_mapping-0.4.1-r1.ebuild b/dev-ros/hector_mapping/hector_mapping-0.4.1-r1.ebuild
deleted file mode 100644
index aa5deaea5573..000000000000
--- a/dev-ros/hector_mapping/hector_mapping-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/tf_conversions
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_mapping/hector_mapping-0.5.0-r1.ebuild b/dev-ros/hector_mapping/hector_mapping-0.5.0-r1.ebuild
deleted file mode 100644
index aa5deaea5573..000000000000
--- a/dev-ros/hector_mapping/hector_mapping-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/tf_conversions
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_mapping/hector_mapping-0.5.1-r1.ebuild b/dev-ros/hector_mapping/hector_mapping-0.5.1-r1.ebuild
deleted file mode 100644
index aa5deaea5573..000000000000
--- a/dev-ros/hector_mapping/hector_mapping-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/tf_conversions
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_mapping/hector_mapping-0.5.2.ebuild b/dev-ros/hector_mapping/hector_mapping-0.5.2.ebuild
deleted file mode 100644
index aa5deaea5573..000000000000
--- a/dev-ros/hector_mapping/hector_mapping-0.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/tf_conversions
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_mapping/hector_mapping-9999.ebuild b/dev-ros/hector_mapping/hector_mapping-9999.ebuild
deleted file mode 100644
index aa5deaea5573..000000000000
--- a/dev-ros/hector_mapping/hector_mapping-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/tf_conversions
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_mapping/metadata.xml b/dev-ros/hector_mapping/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_mapping/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_marker_drawing/Manifest b/dev-ros/hector_marker_drawing/Manifest
deleted file mode 100644
index 5dbd3a8f6fe0..000000000000
--- a/dev-ros/hector_marker_drawing/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_marker_drawing-0.4.1.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
-EBUILD hector_marker_drawing-0.5.0.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
-EBUILD hector_marker_drawing-0.5.1.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
-EBUILD hector_marker_drawing-0.5.2.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
-EBUILD hector_marker_drawing-9999.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild
deleted file mode 100644
index 1e9c4c56ec4f..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.0.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.0.ebuild
deleted file mode 100644
index 693076a81b34..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.1.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.1.ebuild
deleted file mode 100644
index 693076a81b34..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.ebuild
deleted file mode 100644
index 693076a81b34..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
deleted file mode 100644
index 1e9c4c56ec4f..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/metadata.xml b/dev-ros/hector_marker_drawing/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_marker_drawing/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_nav_msgs/Manifest b/dev-ros/hector_nav_msgs/Manifest
deleted file mode 100644
index 4b4edd56538c..000000000000
--- a/dev-ros/hector_nav_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_nav_msgs-0.5.1.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
-EBUILD hector_nav_msgs-0.5.2.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
-EBUILD hector_nav_msgs-9999.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.1.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.1.ebuild
deleted file mode 100644
index 44844ddc3e42..000000000000
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages and services used in the hector_slam stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.ebuild
deleted file mode 100644
index 44844ddc3e42..000000000000
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages and services used in the hector_slam stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
deleted file mode 100644
index 44844ddc3e42..000000000000
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages and services used in the hector_slam stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_nav_msgs/metadata.xml b/dev-ros/hector_nav_msgs/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_nav_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_pose_estimation/Manifest b/dev-ros/hector_pose_estimation/Manifest
deleted file mode 100644
index 9ed053961b3e..000000000000
--- a/dev-ros/hector_pose_estimation/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX hector_pose_estimation-0.3.0-pluginlib.patch 1010 BLAKE2B 965ccd5e1c74b30d2e5ceae57c10be15762ad8c2a9cc1a542eb8d1d54183feee71aab9f30392e459e9b20edcaa1c07da900d88a06d419f53e94ce5bf4c78976d SHA512 2e5bee3ab8d3a27dc6d68e005d358badbf99a5fb17ff60fd9592ad94a89cdc218cfce5719c7710d9a8cd0725c9df7845334dad55eecea456e886a94d382a4d7f
-DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
-DIST hector_localization-0.4.0.tar.gz 75100 BLAKE2B afb6acb1444299c7ca47f25da7d7ad83a2363c98a6b1ed21756cdd5cf63e758b7e4e9d7ea806c7c748dc5e3606bafbe62df612a42597e86ec556696211dc8af9 SHA512 18fc8cb2f51ec978e309a627f12b896aff984fdbe2f2038c47369bd44479b3c739fad586b325c6962bb17c49e46eb7568f8af5af085fbc87749ddb2616ad34c3
-EBUILD hector_pose_estimation-0.3.0-r1.ebuild 763 BLAKE2B 64a0eec66ca9a4de09f2e63630c32e19f1000d54266316dcd638fe91a9b7b0c68e6636af6bf534728d3e6efcd01e131bc1a5ae1a6cb707a09d39cf6780f55c88 SHA512 fcc228e912fdf46b58489cc455d14cf3ef1734c7a770511add1efe19b0c745d275c8e7b0122cd03c85a1bcae874ab762178c9a0075f472a4ed2e8a0e2b07cf6b
-EBUILD hector_pose_estimation-0.4.0.ebuild 709 BLAKE2B 0de9e9c50939d4dfa4ae7e4ba61509f9470428917aaea6dfd17f5baf8122daf9d1ff054464588195d1387b74a13cdcf9a709fe5ac8aadecc953e063cf1a351e8 SHA512 dc9c8be04ef0a40c4b44720182cac6da306e0fb67f9cbb067bd349d6c8ebf6fc9c56df13a6ccfe4388d2628d4aa18de17c051d763ea8c8576fbf734e0bae28c3
-EBUILD hector_pose_estimation-9999.ebuild 709 BLAKE2B 47c1f5e8aaa989553422e72b3f0e416dc125b9e1dd09e7d93314d94090153cd18df953287829bb62185870252774266c810d2d5eb518ef1dc09d57f0282fab34 SHA512 c058f013576bc391ae21444177d03ec8c63a3719aab9ec0957ac9f9865eaa9b39515c28a796d2dca045c9ea0d1fa30680a5d8a7a6910fd5f8bdfe9921251c47b
-MISC metadata.xml 355 BLAKE2B f78c18ce1f7ee54b516270d7471e0df581a05048a420ce79b5cdd25b96d3e65059efc2d8fb9dc0597ad2a1ea4ef807297bda05a77ac7b825e46233ac38a15685 SHA512 263b343d6cc5bb7afba128f07c28549d60301e103563cdf839877ef98066d3f231f4688d83907f7777e5fbc8836760446f069846bd395cc5927b6e9ab91fd3a9
diff --git a/dev-ros/hector_pose_estimation/files/hector_pose_estimation-0.3.0-pluginlib.patch b/dev-ros/hector_pose_estimation/files/hector_pose_estimation-0.3.0-pluginlib.patch
deleted file mode 100644
index 59349bbfe02f..000000000000
--- a/dev-ros/hector_pose_estimation/files/hector_pose_estimation-0.3.0-pluginlib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 6743fbe859981c2b52a2ab413175d7d2eaf33b47 Mon Sep 17 00:00:00 2001
-From: Mikael Arguedas <mikael@osrfoundation.org>
-Date: Fri, 27 Oct 2017 15:08:45 -0700
-Subject: [PATCH] update to use non deprecated pluginlib macro
-
----
- hector_pose_estimation/src/pose_estimation_nodelet.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hector_pose_estimation/src/pose_estimation_nodelet.cpp b/hector_pose_estimation/src/pose_estimation_nodelet.cpp
-index 7da3ca6..97ba5b0 100644
---- hector_pose_estimation/src/pose_estimation_nodelet.cpp
-+++ hector_pose_estimation/src/pose_estimation_nodelet.cpp
-@@ -55,4 +55,4 @@ class PoseEstimationNodelet : public PoseEstimationNode, public nodelet::Nodelet
- } // namespace hector_pose_estimation
- 
- #include <pluginlib/class_list_macros.h>
--PLUGINLIB_DECLARE_CLASS(hector_pose_estimation, PoseEstimation, hector_pose_estimation::PoseEstimationNodelet, nodelet::Nodelet)
-+PLUGINLIB_EXPORT_CLASS(hector_pose_estimation::PoseEstimationNodelet, nodelet::Nodelet)
diff --git a/dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild b/dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild
deleted file mode 100644
index 783aaeb2225c..000000000000
--- a/dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="hector_pose_estimation node and the hector_pose_estimation nodelet"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_pose_estimation_core
-	dev-ros/nodelet
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-# dev-ros/hector_timing
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-PATCHES=( "${FILESDIR}"/${PN}-0.3.0-pluginlib.patch )
diff --git a/dev-ros/hector_pose_estimation/hector_pose_estimation-0.4.0.ebuild b/dev-ros/hector_pose_estimation/hector_pose_estimation-0.4.0.ebuild
deleted file mode 100644
index 3b54213a6b1a..000000000000
--- a/dev-ros/hector_pose_estimation/hector_pose_estimation-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="hector_pose_estimation node and the hector_pose_estimation nodelet"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_pose_estimation_core
-	dev-ros/nodelet
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-# dev-ros/hector_timing
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild b/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
deleted file mode 100644
index 8bfff8077200..000000000000
--- a/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="hector_pose_estimation node and the hector_pose_estimation nodelet"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_pose_estimation_core
-	dev-ros/nodelet
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-# dev-ros/hector_timing
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_pose_estimation/metadata.xml b/dev-ros/hector_pose_estimation/metadata.xml
deleted file mode 100644
index b2ed6142a736..000000000000
--- a/dev-ros/hector_pose_estimation/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_pose_estimation_core/Manifest b/dev-ros/hector_pose_estimation_core/Manifest
deleted file mode 100644
index c0b81b3cbbcd..000000000000
--- a/dev-ros/hector_pose_estimation_core/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX eigen.patch 892 BLAKE2B 68b8df118a6d2a644ee1bd8407144f50fc270bc767984093e146cf537799e9dee11db670006c5cf467bd98c3ffd3f6c2cb1db6c9e8ab81618bb6a29489cf6bf1 SHA512 302e4fecdfb674b66d737d93d427b61e5fb00932469190c3b631c6e2fc4647c2622591ec83975b42d9e1bb71b70f8d942c3fe4101d9927ce2c909c1baef38d35
-AUX gcc6.patch 1597 BLAKE2B 9df1a297741dbcb957ef9bc910332e237a84ffcef87547f0d29573c4a3aa4255a0d65fb0f2eb7b404a8c9ecf4441b2a9dee60dd1d832b7690baceb2b1ae39951 SHA512 7ef60982584cf5021d9a8c084492de84d54dc0150ad0cd5acfc9c709641935c5a9ee649e5546cae6d2da061a0e3a887e5f1ea97e1fa3848ad9dd4de7ff3ee817
-AUX includes.patch 506 BLAKE2B 40b3b640324f8ae1b36f3ee3f760384e4365500f8e29a1111376a0bcb8206e77429565ba9ed9dacb4420543378963d5c6b3798151a3eb4672f28bff6fb5d620c SHA512 2d02b76c2ee1032527582ae32685014b815fcc5cb6fd2e02de84299d2c634a2e54c2d3b7d7307442f972259db44f84d4ae35ca6a38369207e29639fd15cda08f
-DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
-DIST hector_localization-0.4.0.tar.gz 75100 BLAKE2B afb6acb1444299c7ca47f25da7d7ad83a2363c98a6b1ed21756cdd5cf63e758b7e4e9d7ea806c7c748dc5e3606bafbe62df612a42597e86ec556696211dc8af9 SHA512 18fc8cb2f51ec978e309a627f12b896aff984fdbe2f2038c47369bd44479b3c739fad586b325c6962bb17c49e46eb7568f8af5af085fbc87749ddb2616ad34c3
-EBUILD hector_pose_estimation_core-0.3.0-r1.ebuild 800 BLAKE2B 8767f45674f3455c9722432d93f70d364a815f9f74cbee89b6391e79d94ea470576a94f9da228c969e71c9daa47385e087785a78f9cc97ba6d5e92d88637b039 SHA512 5a3906fef2e106c51b06e54e3202e74e58204c1eabdd690a4297acfa66797a587fc7fc5b62c086332cf0044a1b7df754205f7e097e281736f701c65fdba0bf34
-EBUILD hector_pose_estimation_core-0.4.0.ebuild 708 BLAKE2B 482ca9b07d45bd213152e5d11ef41c603cc9087e47b0eeebabd4a17c31a2546e3e1a1c282b25a37f7708961eaad5bf27e288fb80bc50be22984b93dde94f29c4 SHA512 3f616baa90c9c0cb8f299f29169d4554b59f15addc48836473575b4e23ef536c3bacaf4437d80580015090a9fc3a0bea4247fb2fd238f47cb025b7b0dfe74822
-EBUILD hector_pose_estimation_core-9999.ebuild 708 BLAKE2B 4c7dcfb1673f5a3e1c016441ca85ba0000874ee6a9c63296069187841a3b60398787340f793d46103e01462786571484d91b461a344ba37efb73c924477af8a4 SHA512 637c5cdb5da52e3634356e15c70dbc9fe089e8111ac8511bb54af2cf9b9cf4ed3592ad1f104be12b610720ee2b81f19d202e03881f5a05dfc083673646a7ae58
-MISC metadata.xml 355 BLAKE2B f78c18ce1f7ee54b516270d7471e0df581a05048a420ce79b5cdd25b96d3e65059efc2d8fb9dc0597ad2a1ea4ef807297bda05a77ac7b825e46233ac38a15685 SHA512 263b343d6cc5bb7afba128f07c28549d60301e103563cdf839877ef98066d3f231f4688d83907f7777e5fbc8836760446f069846bd395cc5927b6e9ab91fd3a9
diff --git a/dev-ros/hector_pose_estimation_core/files/eigen.patch b/dev-ros/hector_pose_estimation_core/files/eigen.patch
deleted file mode 100644
index b58bb9e8ca3d..000000000000
--- a/dev-ros/hector_pose_estimation_core/files/eigen.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hector_pose_estimation_core/src/measurements/poseupdate.cpp
-===================================================================
---- hector_pose_estimation_core.orig/src/measurements/poseupdate.cpp
-+++ hector_pose_estimation_core/src/measurements/poseupdate.cpp
-@@ -382,7 +382,7 @@ double PoseUpdate::updateInternal(State
-   ROS_DEBUG_STREAM_NAMED("poseupdate", "alpha = " << alpha << ", beta = " << beta);
- 
-   if (max_error > 0.0) {
--    double error2 = error.transpose() * Ix * (Ix + Iy).inverse() * Iy * error;
-+    double error2 = error.transpose().dot( Ix * (Ix + Iy).inverse() * Iy * error);
-     if (error2 > max_error * max_error) {
-       if (!jump_on_max_error_ || !jump_function) {
-         ROS_WARN_STREAM_NAMED("poseupdate", "Ignoring poseupdate for " << text << " as the error [ " << error.transpose() << " ], |error| = " << sqrt(error2) << " sigma exceeds max_error!");
diff --git a/dev-ros/hector_pose_estimation_core/files/gcc6.patch b/dev-ros/hector_pose_estimation_core/files/gcc6.patch
deleted file mode 100644
index 42862915244b..000000000000
--- a/dev-ros/hector_pose_estimation_core/files/gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: hector_pose_estimation_core/include/hector_pose_estimation/input.h
-===================================================================
---- hector_pose_estimation_core.orig/include/hector_pose_estimation/input.h
-+++ hector_pose_estimation_core/include/hector_pose_estimation/input.h
-@@ -79,7 +79,7 @@ public:
-     return *variance_;
-   }
- 
--  virtual bool hasVariance() const { return variance_; }
-+  virtual bool hasVariance() const { return variance_ != NULL; }
-   virtual Variance const &getVariance() { if (!variance_) variance_.reset(new Variance); return *variance_; }
-   virtual Variance const &getVariance() const { return *variance_; }
-   virtual Variance& variance() { if (!variance_) variance_.reset(new Variance); return *variance_; }
-Index: hector_pose_estimation_core/src/system/imu_model.cpp
-===================================================================
---- hector_pose_estimation_core.orig/src/system/imu_model.cpp
-+++ hector_pose_estimation_core/src/system/imu_model.cpp
-@@ -51,7 +51,7 @@ GyroModel::~GyroModel()
- bool GyroModel::init(PoseEstimation& estimator, System &system, State& state)
- {
-   bias_ = state.addSubState<3,3>(this, system.getName() + "_bias");
--  return bias_;
-+  return bias_ != NULL;
- }
- 
- void GyroModel::getPrior(State &state)
-@@ -113,7 +113,7 @@ AccelerometerModel::~AccelerometerModel(
- bool AccelerometerModel::init(PoseEstimation& estimator, System &system, State& state)
- {
-   bias_ = state.addSubState<3,3>(this, system.getName() + "_bias");
--  return bias_;
-+  return bias_ != NULL;
- }
- 
- void AccelerometerModel::getPrior(State &state)
diff --git a/dev-ros/hector_pose_estimation_core/files/includes.patch b/dev-ros/hector_pose_estimation_core/files/includes.patch
deleted file mode 100644
index 2b530f18633c..000000000000
--- a/dev-ros/hector_pose_estimation_core/files/includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: hector_localization-0.3.0/hector_pose_estimation_core/include/hector_pose_estimation/state.h
-===================================================================
---- hector_localization-0.3.0.orig/include/hector_pose_estimation/state.h
-+++ hector_localization-0.3.0/include/hector_pose_estimation/state.h
-@@ -29,6 +29,7 @@
- #ifndef HECTOR_POSE_ESTIMATION_STATE_H
- #define HECTOR_POSE_ESTIMATION_STATE_H
- 
-+#include <vector>
- #include <hector_pose_estimation/types.h>
- 
- #include <boost/function.hpp>
diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
deleted file mode 100644
index 19defd1cae45..000000000000
--- a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rostime
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
-PATCHES=( "${FILESDIR}/includes.patch" "${FILESDIR}/gcc6.patch" "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.4.0.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.4.0.ebuild
deleted file mode 100644
index f40cd89d6546..000000000000
--- a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rostime
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild
deleted file mode 100644
index 3464c3898757..000000000000
--- a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rostime
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_pose_estimation_core/metadata.xml b/dev-ros/hector_pose_estimation_core/metadata.xml
deleted file mode 100644
index b2ed6142a736..000000000000
--- a/dev-ros/hector_pose_estimation_core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_slam_launch/Manifest b/dev-ros/hector_slam_launch/Manifest
deleted file mode 100644
index 63f3e860875b..000000000000
--- a/dev-ros/hector_slam_launch/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_slam_launch-0.5.1.ebuild 519 BLAKE2B 856ffe79ddd20a5f0615bb9bd3c41472cecf848ee2fb50170b77aeb4f949dcda7a24e34733e6eeb407f9a4824f4e96422f488998785cd8f181b13da499c76709 SHA512 aebddccbb45ffe300f449718a1515eb21324fef3a12a5b67ae969b5a25e0a0dc191a780b3daa6fe24bc7de0204f6f90b1b344f9f6d07cc562cbabffbc1dc50de
-EBUILD hector_slam_launch-0.5.2.ebuild 519 BLAKE2B 856ffe79ddd20a5f0615bb9bd3c41472cecf848ee2fb50170b77aeb4f949dcda7a24e34733e6eeb407f9a4824f4e96422f488998785cd8f181b13da499c76709 SHA512 aebddccbb45ffe300f449718a1515eb21324fef3a12a5b67ae969b5a25e0a0dc191a780b3daa6fe24bc7de0204f6f90b1b344f9f6d07cc562cbabffbc1dc50de
-EBUILD hector_slam_launch-9999.ebuild 519 BLAKE2B 53190caf679c2f36115cb1c74a21ec8d8c967797d708071d14442f60e86fc9ef74d1e091da8f532a79b9f0b6f2763ec2caf7e77b359f4b5ffd1b7400ff3c17b5 SHA512 c718a7784284dc5de1b80f9c3f5ff7813f13fb473beb4defb739a31bd88ebf82b7dd4a095cb78cc2f6186ee8eaae61f0739034579ddef903a38dfb6b96f94720
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.5.1.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.5.1.ebuild
deleted file mode 100644
index aaf43b374170..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.5.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.ebuild
deleted file mode 100644
index aaf43b374170..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
deleted file mode 100644
index a3654d956875..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/metadata.xml b/dev-ros/hector_slam_launch/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_slam_launch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/hector_trajectory_server/Manifest b/dev-ros/hector_trajectory_server/Manifest
deleted file mode 100644
index da177115ea83..000000000000
--- a/dev-ros/hector_trajectory_server/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
-DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
-DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
-EBUILD hector_trajectory_server-0.4.1.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
-EBUILD hector_trajectory_server-0.5.0.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
-EBUILD hector_trajectory_server-0.5.1.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
-EBUILD hector_trajectory_server-0.5.2.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
-EBUILD hector_trajectory_server-9999.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
-MISC metadata.xml 347 BLAKE2B 58f270059c6035efb98d8ab5f277514197c5cc8867fa2328e10e13199cbf3b02a7cc9b90abf9d8055fd2c17cff7514d6e9671f064e4ba0ff1201efa7b587a7d4 SHA512 d69a7ba950b05e4f7ac53940ff9df6c3b9c9df1231ac566422b5039d718544a0a7950cc5a65874b7e0b8645db2426e8fff131ebe8c38d760218309f3f73efb76
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild
deleted file mode 100644
index 37fc87495b5d..000000000000
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.0.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.0.ebuild
deleted file mode 100644
index 0a7151550c78..000000000000
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.1.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.1.ebuild
deleted file mode 100644
index 0a7151550c78..000000000000
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.ebuild
deleted file mode 100644
index 0a7151550c78..000000000000
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
deleted file mode 100644
index 37fc87495b5d..000000000000
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/hector_trajectory_server/metadata.xml b/dev-ros/hector_trajectory_server/metadata.xml
deleted file mode 100644
index 22316d4658e8..000000000000
--- a/dev-ros/hector_trajectory_server/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
deleted file mode 100644
index e81fdec48b5c..000000000000
--- a/dev-ros/image_cb_detector/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX c11.patch 587 BLAKE2B 2cf07b3b5eebf9840bd45aa419283cc53e03dc45c5cf4eab6cd5894143983c7cb05146c9242c91ac105c90bba8d878ff8da4776629f04fc3f32b5290aa59fd87 SHA512 1ae09e987fb231400594019832f8a6d42ca1ebd07eafaca151d08812d8a4b62f95d4fadac0227c96d115c69da24bc3889f7d30af27000347ee000a937ae2b498
-AUX gcc6.patch 495 BLAKE2B 50ac60a74148e3e32b2a69750cad6d98ce2ecef22ed4462431821075f6e247290e28b8d57b58b4b86a7cb9600988a8e22ea2aa5508da6dd6ac85a93aac197ad1 SHA512 5b99edada624eabd4830997677ebb4916c6a9a3c631eead6ae723985e3ce5a0f3b77c484777182a34e727dba869181d11002ba38cfb49cf20eb0832aca67f6bb
-AUX py3.patch 747 BLAKE2B 73764cc8fbf4d8bd418a1c632a2b24bd5c1a80c7de94f5e06fb8d8ad30fb62947d7a349a3deb717669ced272c7c88edf5b5aa48ad3101e1ec67c5747cb099bec SHA512 d4009bc0fd12c597356351cb12d0bf95c963c41b9fe339dcd24c0230c21fe2d0b1a17f1de389eed13fc99ac950eeb8446170199c166067f2c7bcfd2daabb34e2
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD image_cb_detector-0.10.15-r1.ebuild 961 BLAKE2B 342f2a0bc184e2f3156b7556b19b85bc127afed32cc40a21b0392d344fa44579241b01ea6df5df7c28b6c2912321e45f39b1d40ac22dd14ef57f9a3eda518384 SHA512 a439141779e09473333aea70c3e30b2e62ec81f0f087b656a795d58315c237015dfa57bf1d79dc2fb2fa798ca7b57b421ce984678d9ee4547938112f0e74383a
-EBUILD image_cb_detector-9999.ebuild 961 BLAKE2B 342f2a0bc184e2f3156b7556b19b85bc127afed32cc40a21b0392d344fa44579241b01ea6df5df7c28b6c2912321e45f39b1d40ac22dd14ef57f9a3eda518384 SHA512 a439141779e09473333aea70c3e30b2e62ec81f0f087b656a795d58315c237015dfa57bf1d79dc2fb2fa798ca7b57b421ce984678d9ee4547938112f0e74383a
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/image_cb_detector/files/c11.patch b/dev-ros/image_cb_detector/files/c11.patch
deleted file mode 100644
index bddbce93725f..000000000000
--- a/dev-ros/image_cb_detector/files/c11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: image_cb_detector/src/rgbd_cb_detector_action.cpp
-===================================================================
---- image_cb_detector.orig/src/rgbd_cb_detector_action.cpp
-+++ image_cb_detector/src/rgbd_cb_detector_action.cpp
-@@ -143,7 +143,7 @@ public:
-       for(size_t i = 0; i< features.image_points.size(); i++){
-         geometry_msgs::Point pixel = features.image_points[i];
-         float depth = *(depth_ptr+width*(unsigned int)pixel.y+(unsigned int)pixel.x);
--        if ( isnan(depth) )
-+        if ( std::isnan(depth) )
-         {
-           continue;
-         }
diff --git a/dev-ros/image_cb_detector/files/gcc6.patch b/dev-ros/image_cb_detector/files/gcc6.patch
deleted file mode 100644
index af68c1e654ca..000000000000
--- a/dev-ros/image_cb_detector/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: image_cb_detector/CMakeLists.txt
-===================================================================
---- image_cb_detector.orig/CMakeLists.txt
-+++ image_cb_detector/CMakeLists.txt
-@@ -24,7 +24,7 @@ catkin_package(INCLUDE_DIRS include
- 
- # define some includes
- include_directories(include)
--include_directories(SYSTEM ${Boost_INCLUDE_DIRS}
-+include_directories(${Boost_INCLUDE_DIRS}
-                            ${catkin_INCLUDE_DIRS}
-                            ${OpenCV_INCLUDE_DIRS}
- )
diff --git a/dev-ros/image_cb_detector/files/py3.patch b/dev-ros/image_cb_detector/files/py3.patch
deleted file mode 100644
index 54475afd66dc..000000000000
--- a/dev-ros/image_cb_detector/files/py3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: image_cb_detector/src/image_cb_detector/cb_detector.py
-===================================================================
---- image_cb_detector.orig/src/image_cb_detector/cb_detector.py
-+++ image_cb_detector/src/image_cb_detector/cb_detector.py
-@@ -39,7 +39,7 @@ NAME = 'image_cb_detector_node'
- import roslib; roslib.load_manifest(PKG)
- 
- import rospy
--import cv
-+import cv2 as cv
- import math
- 
- from sensor_msgs.msg import Image
-@@ -130,7 +130,7 @@ class ImageCbDetectorNode:
-     #we need to convert the ros image to an opencv image
-     try:
-       image = self.bridge.imgmsg_to_cv(ros_image, "mono8")
--    except CvBridgeError, e:
-+    except CvBridgeError as e:
-       rospy.logerror("Error importing image %s" % e)
-       return
- 
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild
deleted file mode 100644
index 85dedfce544b..000000000000
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Extracts checkerboard corners from ROS images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	media-libs/opencv:=
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
deleted file mode 100644
index 85dedfce544b..000000000000
--- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Extracts checkerboard corners from ROS images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	media-libs/opencv:=
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/image_cb_detector/metadata.xml b/dev-ros/image_cb_detector/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/image_cb_detector/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest
deleted file mode 100644
index 6efdea3e541f..000000000000
--- a/dev-ros/image_geometry/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX ocv_leak.patch 493 BLAKE2B 1a71b4529c6d1bce8d08137cce851edce5905076f042a1d27476be156be8104cb861bb64ecd0269cbd067c4801e5b69f7c84bc2ffbe0ddd87831eb54572f1b7a SHA512 a20172e15b9b273be57830f9181075218bd5f97abfcc84d3d23ed83872c2f89e5d06da670dfd1071cae4b20d79d9670602b1746e544462c46e3dfe7c3cffddf4
-DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
-DIST vision_opencv-1.16.0.tar.gz 85452 BLAKE2B 5f167898cef4bbc753e32af87174b7f668b3eff00357a22e8c454d181116a925059d4837210086d445ceaf74819fdb9a527eb5667321df8a7c1fe84549dbe5b6 SHA512 affd61f0d933cc57d5d23e840f0708e8ffdc0033eee22a21fe5c0099a2ab75d4c3fdcc41705167ab3615f5388ce47641faf5b21e6c6365a4e540abe69dfad3fe
-DIST vision_opencv-1.16.2.tar.gz 86615 BLAKE2B e3078be4a865aed4317db7dc422a71661a52e8b42c52aaab92c524cdb14ad08ab85ac523d55b76b5ebc6201400a832d0ea9c3203ed5ff2af342a58be5ab0ef49 SHA512 c1fd4b402cc970797c0b01573d111cec041ea59598897256ed26ad01624e15300cc2147deaf701af1d12bc921ac9892917d927d17325d4086c0724633d96b3c5
-EBUILD image_geometry-1.15.0-r1.ebuild 679 BLAKE2B 760548b02316276a250ad07957bca99c7e90bea8024bc7afda6ac55dd5512989fa479919dfdee4024ee38a98b9845a9e8386b6874ed493fb9c605fadbf7f1566 SHA512 ef5b3e61274120abff3c67adbd947fbe91af19b47aac372e803994ebf2c745dd948ec90b6a5725dda69c86685a786d298ea7fffcd071368e7aed4ee604ec8a50
-EBUILD image_geometry-1.16.0.ebuild 679 BLAKE2B 42ba94c872993d79f5d05b4638c9ce5a5866be2d9ed039995ccf79c40d26e82e50d5e1c4603cf14e506374fefcaf9b8a7a7b0eca3d58e9e44d1fd83cbdcf9839 SHA512 108d12eef2a89a2d0493830e7cfed40132eb5c8b0023cb850cc8647880db13492c0d25f2f3165e7229c2a4b4c085b8e761cc382777e7fd6d3e478af6ae842ea3
-EBUILD image_geometry-1.16.2.ebuild 679 BLAKE2B 42ba94c872993d79f5d05b4638c9ce5a5866be2d9ed039995ccf79c40d26e82e50d5e1c4603cf14e506374fefcaf9b8a7a7b0eca3d58e9e44d1fd83cbdcf9839 SHA512 108d12eef2a89a2d0493830e7cfed40132eb5c8b0023cb850cc8647880db13492c0d25f2f3165e7229c2a4b4c085b8e761cc382777e7fd6d3e478af6ae842ea3
-EBUILD image_geometry-9999.ebuild 679 BLAKE2B 760548b02316276a250ad07957bca99c7e90bea8024bc7afda6ac55dd5512989fa479919dfdee4024ee38a98b9845a9e8386b6874ed493fb9c605fadbf7f1566 SHA512 ef5b3e61274120abff3c67adbd947fbe91af19b47aac372e803994ebf2c745dd948ec90b6a5725dda69c86685a786d298ea7fffcd071368e7aed4ee604ec8a50
-MISC metadata.xml 343 BLAKE2B 4c8ada208d6cb4fb1e99ee7839cc4c20275e86a8b351169790c54c8df90a8cb381d9d71b2ebfdf2306aa7f2d66581144d61dff8adb5aa0e7ddc13696d8f17aa5 SHA512 932ed7ee027c275e3be014ee0a048c16dbec1b7108777fb2150cab84678cc31d560f1b88d6ac3fd890357512239c85951c48819a31f2e0174dac68beef44d1b2
diff --git a/dev-ros/image_geometry/files/ocv_leak.patch b/dev-ros/image_geometry/files/ocv_leak.patch
deleted file mode 100644
index cbc0f5a50669..000000000000
--- a/dev-ros/image_geometry/files/ocv_leak.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: image_geometry/CMakeLists.txt
-===================================================================
---- image_geometry.orig/CMakeLists.txt
-+++ image_geometry/CMakeLists.txt
-@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.2)
- project(image_geometry)
- 
- find_package(catkin REQUIRED sensor_msgs)
--find_package(OpenCV REQUIRED)
-+find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_calib3d)
- 
- catkin_package(CATKIN_DEPENDS sensor_msgs
-                DEPENDS OpenCV
diff --git a/dev-ros/image_geometry/image_geometry-1.15.0-r1.ebuild b/dev-ros/image_geometry/image_geometry-1.15.0-r1.ebuild
deleted file mode 100644
index 851354d4b1be..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-cpp/gtest
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_geometry/image_geometry-1.16.0.ebuild b/dev-ros/image_geometry/image_geometry-1.16.0.ebuild
deleted file mode 100644
index ea1bbfe903b4..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.16.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-cpp/gtest
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_geometry/image_geometry-1.16.2.ebuild b/dev-ros/image_geometry/image_geometry-1.16.2.ebuild
deleted file mode 100644
index ea1bbfe903b4..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.16.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-cpp/gtest
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_geometry/image_geometry-9999.ebuild b/dev-ros/image_geometry/image_geometry-9999.ebuild
deleted file mode 100644
index 851354d4b1be..000000000000
--- a/dev-ros/image_geometry/image_geometry-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-cpp/gtest
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_geometry/metadata.xml b/dev-ros/image_geometry/metadata.xml
deleted file mode 100644
index 6fad310c965b..000000000000
--- a/dev-ros/image_geometry/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/vision_opencv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/image_proc/Manifest b/dev-ros/image_proc/Manifest
deleted file mode 100644
index 4863d8fadb3a..000000000000
--- a/dev-ros/image_proc/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX ocv_leak.patch 587 BLAKE2B 1233e318496eab850c8da43383a4dabf9997db88bf103c4652efb7a1b481d22832b90cae48294c2f0b52ba082b63ca4369445f1c4ff2092847fad0c6e14ab98b SHA512 37e1f7af29f73f972991a5e204e9d69169a4131ccdd7b19f7fa34232d0706c88303bf5f7bd476be0a21654dfb558a5e6af86d27aca8da35122b46c4846d6dee0
-DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
-DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
-DIST image_pipeline-1.17.0.tar.gz 154211 BLAKE2B 221c549d6794f3567706e724a48d52fa4d7f395b30f477a12750f4707d70782496a0110df9f89e83aa11ea95dbd65acab18eff13a8beb026091abd209370cbd4 SHA512 c5bc227f13415f6fe31eb2cee015f8671433b427044b8f8842d0e5d1ef19aff21f66e40945bb09227442ab5c4c49aae3217b56dac03b358804567cff4189efeb
-EBUILD image_proc-1.15.2-r2.ebuild 790 BLAKE2B a60d4e8a227353c4e09f5e2de57a65ff457dcc4fd2142f54bd9dfc5590e1fdfeb3f133a105150dedbe23b0e5df78309d4c0d26a7180518de9dc6b9eb03ad2b52 SHA512 6b9cb03f362ebf8dbb9520eb98bd54864d9e94b3d80d91ff7b15be4048e4c55c996547164cd2107c69c58b529cec7d61d446f55e53499cfdc882817a411aa1c7
-EBUILD image_proc-1.15.3-r1.ebuild 790 BLAKE2B a60d4e8a227353c4e09f5e2de57a65ff457dcc4fd2142f54bd9dfc5590e1fdfeb3f133a105150dedbe23b0e5df78309d4c0d26a7180518de9dc6b9eb03ad2b52 SHA512 6b9cb03f362ebf8dbb9520eb98bd54864d9e94b3d80d91ff7b15be4048e4c55c996547164cd2107c69c58b529cec7d61d446f55e53499cfdc882817a411aa1c7
-EBUILD image_proc-1.16.0.ebuild 790 BLAKE2B a60d4e8a227353c4e09f5e2de57a65ff457dcc4fd2142f54bd9dfc5590e1fdfeb3f133a105150dedbe23b0e5df78309d4c0d26a7180518de9dc6b9eb03ad2b52 SHA512 6b9cb03f362ebf8dbb9520eb98bd54864d9e94b3d80d91ff7b15be4048e4c55c996547164cd2107c69c58b529cec7d61d446f55e53499cfdc882817a411aa1c7
-EBUILD image_proc-1.17.0.ebuild 790 BLAKE2B a60d4e8a227353c4e09f5e2de57a65ff457dcc4fd2142f54bd9dfc5590e1fdfeb3f133a105150dedbe23b0e5df78309d4c0d26a7180518de9dc6b9eb03ad2b52 SHA512 6b9cb03f362ebf8dbb9520eb98bd54864d9e94b3d80d91ff7b15be4048e4c55c996547164cd2107c69c58b529cec7d61d446f55e53499cfdc882817a411aa1c7
-EBUILD image_proc-9999.ebuild 790 BLAKE2B a60d4e8a227353c4e09f5e2de57a65ff457dcc4fd2142f54bd9dfc5590e1fdfeb3f133a105150dedbe23b0e5df78309d4c0d26a7180518de9dc6b9eb03ad2b52 SHA512 6b9cb03f362ebf8dbb9520eb98bd54864d9e94b3d80d91ff7b15be4048e4c55c996547164cd2107c69c58b529cec7d61d446f55e53499cfdc882817a411aa1c7
-MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/image_proc/files/ocv_leak.patch b/dev-ros/image_proc/files/ocv_leak.patch
deleted file mode 100644
index 79722625d327..000000000000
--- a/dev-ros/image_proc/files/ocv_leak.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: image_proc/CMakeLists.txt
-===================================================================
---- image_proc.orig/CMakeLists.txt
-+++ image_proc/CMakeLists.txt
-@@ -4,7 +4,7 @@ project(image_proc)
- find_package(catkin REQUIRED)
- 
- find_package(catkin REQUIRED cv_bridge dynamic_reconfigure image_geometry image_transport nodelet nodelet_topic_tools roscpp sensor_msgs)
--find_package(OpenCV REQUIRED)
-+find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_highgui)
- find_package(Boost REQUIRED COMPONENTS thread)
- 
- if(cv_bridge_VERSION VERSION_GREATER "1.12.0")
diff --git a/dev-ros/image_proc/image_proc-1.15.2-r2.ebuild b/dev-ros/image_proc/image_proc-1.15.2-r2.ebuild
deleted file mode 100644
index 92a72ce17285..000000000000
--- a/dev-ros/image_proc/image_proc-1.15.2-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/roscpp
-	dev-libs/console_bridge:=
-	media-libs/opencv:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-		dev-ros/camera_calibration_parsers
-	)
-"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/image_proc-1.15.3-r1.ebuild b/dev-ros/image_proc/image_proc-1.15.3-r1.ebuild
deleted file mode 100644
index 92a72ce17285..000000000000
--- a/dev-ros/image_proc/image_proc-1.15.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/roscpp
-	dev-libs/console_bridge:=
-	media-libs/opencv:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-		dev-ros/camera_calibration_parsers
-	)
-"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/image_proc-1.16.0.ebuild b/dev-ros/image_proc/image_proc-1.16.0.ebuild
deleted file mode 100644
index 92a72ce17285..000000000000
--- a/dev-ros/image_proc/image_proc-1.16.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/roscpp
-	dev-libs/console_bridge:=
-	media-libs/opencv:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-		dev-ros/camera_calibration_parsers
-	)
-"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/image_proc-1.17.0.ebuild b/dev-ros/image_proc/image_proc-1.17.0.ebuild
deleted file mode 100644
index 92a72ce17285..000000000000
--- a/dev-ros/image_proc/image_proc-1.17.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/roscpp
-	dev-libs/console_bridge:=
-	media-libs/opencv:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-		dev-ros/camera_calibration_parsers
-	)
-"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/image_proc-9999.ebuild b/dev-ros/image_proc/image_proc-9999.ebuild
deleted file mode 100644
index 92a72ce17285..000000000000
--- a/dev-ros/image_proc/image_proc-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/roscpp
-	dev-libs/console_bridge:=
-	media-libs/opencv:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-		dev-ros/camera_calibration_parsers
-	)
-"
-PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/metadata.xml b/dev-ros/image_proc/metadata.xml
deleted file mode 100644
index a96f24591a70..000000000000
--- a/dev-ros/image_proc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/image_publisher/Manifest b/dev-ros/image_publisher/Manifest
deleted file mode 100644
index 25b63c10d54c..000000000000
--- a/dev-ros/image_publisher/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
-DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
-DIST image_pipeline-1.17.0.tar.gz 154211 BLAKE2B 221c549d6794f3567706e724a48d52fa4d7f395b30f477a12750f4707d70782496a0110df9f89e83aa11ea95dbd65acab18eff13a8beb026091abd209370cbd4 SHA512 c5bc227f13415f6fe31eb2cee015f8671433b427044b8f8842d0e5d1ef19aff21f66e40945bb09227442ab5c4c49aae3217b56dac03b358804567cff4189efeb
-EBUILD image_publisher-1.15.2.ebuild 628 BLAKE2B c7625a1bc3578250b68d5bc48bda5c1f753cacd538c421e038d22110f7eb5feaf554c1f35bee533452b3b88565cc8ef64a1bef87497b56bcf2f01348591756cb SHA512 c78bf36968d4261b61a726461d5ec09b898cf70d61ba302d155c100037618f11dd2a4ff285b01d61e786c55513e5320a685235956e6c9895852a742ac431323e
-EBUILD image_publisher-1.15.3.ebuild 628 BLAKE2B c7625a1bc3578250b68d5bc48bda5c1f753cacd538c421e038d22110f7eb5feaf554c1f35bee533452b3b88565cc8ef64a1bef87497b56bcf2f01348591756cb SHA512 c78bf36968d4261b61a726461d5ec09b898cf70d61ba302d155c100037618f11dd2a4ff285b01d61e786c55513e5320a685235956e6c9895852a742ac431323e
-EBUILD image_publisher-1.16.0.ebuild 628 BLAKE2B 6a2847b0aee30649ea734ba440095225011fcb81f546d40c9a9c76eb1c6cc6878bff4aaa499e1127c04cfc5e2bd918ceceec4d17aa3e6e91f1d13d8049940fca SHA512 e42fbe4b4b8051219082d47cef5eb3d292ebcec4520efdf6b3aad122f0633a2a0ce35dafa7f9d9deeb5a6dd4bac2807c86a469bb404a9bd74347b15cb1fca589
-EBUILD image_publisher-1.17.0.ebuild 628 BLAKE2B 6a2847b0aee30649ea734ba440095225011fcb81f546d40c9a9c76eb1c6cc6878bff4aaa499e1127c04cfc5e2bd918ceceec4d17aa3e6e91f1d13d8049940fca SHA512 e42fbe4b4b8051219082d47cef5eb3d292ebcec4520efdf6b3aad122f0633a2a0ce35dafa7f9d9deeb5a6dd4bac2807c86a469bb404a9bd74347b15cb1fca589
-EBUILD image_publisher-9999.ebuild 628 BLAKE2B c7625a1bc3578250b68d5bc48bda5c1f753cacd538c421e038d22110f7eb5feaf554c1f35bee533452b3b88565cc8ef64a1bef87497b56bcf2f01348591756cb SHA512 c78bf36968d4261b61a726461d5ec09b898cf70d61ba302d155c100037618f11dd2a4ff285b01d61e786c55513e5320a685235956e6c9895852a742ac431323e
-MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/image_publisher/image_publisher-1.15.2.ebuild b/dev-ros/image_publisher/image_publisher-1.15.2.ebuild
deleted file mode 100644
index 74a38b323b43..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.15.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/image_publisher/image_publisher-1.15.3.ebuild b/dev-ros/image_publisher/image_publisher-1.15.3.ebuild
deleted file mode 100644
index 74a38b323b43..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.15.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/image_publisher/image_publisher-1.16.0.ebuild b/dev-ros/image_publisher/image_publisher-1.16.0.ebuild
deleted file mode 100644
index b34fb3ec1130..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/image_publisher/image_publisher-1.17.0.ebuild b/dev-ros/image_publisher/image_publisher-1.17.0.ebuild
deleted file mode 100644
index b34fb3ec1130..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.17.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/image_publisher/image_publisher-9999.ebuild b/dev-ros/image_publisher/image_publisher-9999.ebuild
deleted file mode 100644
index 74a38b323b43..000000000000
--- a/dev-ros/image_publisher/image_publisher-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/image_publisher/metadata.xml b/dev-ros/image_publisher/metadata.xml
deleted file mode 100644
index a96f24591a70..000000000000
--- a/dev-ros/image_publisher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/image_rotate/Manifest b/dev-ros/image_rotate/Manifest
deleted file mode 100644
index 309946a3f15a..000000000000
--- a/dev-ros/image_rotate/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
-DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
-DIST image_pipeline-1.17.0.tar.gz 154211 BLAKE2B 221c549d6794f3567706e724a48d52fa4d7f395b30f477a12750f4707d70782496a0110df9f89e83aa11ea95dbd65acab18eff13a8beb026091abd209370cbd4 SHA512 c5bc227f13415f6fe31eb2cee015f8671433b427044b8f8842d0e5d1ef19aff21f66e40945bb09227442ab5c4c49aae3217b56dac03b358804567cff4189efeb
-EBUILD image_rotate-1.15.2.ebuild 630 BLAKE2B 18376c9b73e3fb2b5b7e178dad1369c4e82f8aa644c4fb562d8baf454213f4c05699a432b5972eddd9d486219697c3d4b23a3fcffc0fde791e1ded0c64ddc8f2 SHA512 c7580420cf209e54a04ed643266e532761ce84016d030490df785502ff063d8de70786f2ab2dff808cfbb1c086d8147533eedaeb5cad65858211aff1a540beb8
-EBUILD image_rotate-1.15.3.ebuild 630 BLAKE2B d2e6bc2d754f16372f10400174b560ccf66eee2511308cf030661ffb4a9b301863f0bf591168c9fa645a2eaefebddcf72c4b61222dc057595fd3671b1f0c4f83 SHA512 84d850e648653ca749c4dea0db4d494e10c6045ea82ebd8a0199744ba6f1c9c5c17ba686419d9ce34eca00739b47717fe6ec3d4d4a0482c0f9b2dedbad799a3d
-EBUILD image_rotate-1.16.0.ebuild 630 BLAKE2B bcc90d6ae3ff1a7e67bf17f7a541cdde694db809d2b64cf980ad3d69744bf55f919311cc5f6c63387ea5eb017759cedb32e4e19bf55e321f3f534d6c24476ff1 SHA512 95eb989e350ff6228c77c87c4def7c326457987ce481d7a89f8e1c7030256d390f0d14bd1cfb1359937b7ec1332dce03630dc924ed58d9d61d8c29043bb7f6e8
-EBUILD image_rotate-1.17.0.ebuild 630 BLAKE2B bcc90d6ae3ff1a7e67bf17f7a541cdde694db809d2b64cf980ad3d69744bf55f919311cc5f6c63387ea5eb017759cedb32e4e19bf55e321f3f534d6c24476ff1 SHA512 95eb989e350ff6228c77c87c4def7c326457987ce481d7a89f8e1c7030256d390f0d14bd1cfb1359937b7ec1332dce03630dc924ed58d9d61d8c29043bb7f6e8
-EBUILD image_rotate-9999.ebuild 630 BLAKE2B 18376c9b73e3fb2b5b7e178dad1369c4e82f8aa644c4fb562d8baf454213f4c05699a432b5972eddd9d486219697c3d4b23a3fcffc0fde791e1ded0c64ddc8f2 SHA512 c7580420cf209e54a04ed643266e532761ce84016d030490df785502ff063d8de70786f2ab2dff808cfbb1c086d8147533eedaeb5cad65858211aff1a540beb8
-MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/image_rotate/image_rotate-1.15.2.ebuild b/dev-ros/image_rotate/image_rotate-1.15.2.ebuild
deleted file mode 100644
index 37756f13089c..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.15.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/eigen_conversions
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.15.3.ebuild b/dev-ros/image_rotate/image_rotate-1.15.3.ebuild
deleted file mode 100644
index abc574b122b4..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.15.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/eigen_conversions
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.16.0.ebuild b/dev-ros/image_rotate/image_rotate-1.16.0.ebuild
deleted file mode 100644
index 46bd231c5933..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/eigen_conversions
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.17.0.ebuild b/dev-ros/image_rotate/image_rotate-1.17.0.ebuild
deleted file mode 100644
index 46bd231c5933..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.17.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/eigen_conversions
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-9999.ebuild b/dev-ros/image_rotate/image_rotate-9999.ebuild
deleted file mode 100644
index 37756f13089c..000000000000
--- a/dev-ros/image_rotate/image_rotate-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/eigen_conversions
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/metadata.xml b/dev-ros/image_rotate/metadata.xml
deleted file mode 100644
index a96f24591a70..000000000000
--- a/dev-ros/image_rotate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/image_transport/Manifest b/dev-ros/image_transport/Manifest
deleted file mode 100644
index 1b52665255d3..000000000000
--- a/dev-ros/image_transport/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
-EBUILD image_transport-1.12.0.ebuild 633 BLAKE2B 6e92221fd8af62c31dc495531439c3c3250d07399ee57b0795af1ff31fc10bc988c2ec8c9b530e7a7c7bd95c02cbfc2fe161d2bb39adbdc601a834fb47cbce68 SHA512 d1468b18424da63d7c2581d6371e95e38b40debaafd28fb7ff3fbf06afec5ccdbb13631087509fa6b61f73121f2e4b41609c02e591447be2871cdf90bb55105c
-EBUILD image_transport-9999.ebuild 633 BLAKE2B 6e92221fd8af62c31dc495531439c3c3250d07399ee57b0795af1ff31fc10bc988c2ec8c9b530e7a7c7bd95c02cbfc2fe161d2bb39adbdc601a834fb47cbce68 SHA512 d1468b18424da63d7c2581d6371e95e38b40debaafd28fb7ff3fbf06afec5ccdbb13631087509fa6b61f73121f2e4b41609c02e591447be2871cdf90bb55105c
-MISC metadata.xml 342 BLAKE2B 27accf100ff3b311ee478a43cb1b34f6a0f2116d780d4e4be9799dc68fda47d82bbd535766174d30097486e526c1275a3f55d41e477fe7f1058c10df85e132ca SHA512 da80f03ec79feaf642b2a1e32386b2b38c0b2942985214171bbb12fb1bf730eb934f1575f49d0d8d85b35ad226556ad1b426dfebfeb9ab5cd61fbc8cd96547e2
diff --git a/dev-ros/image_transport/image_transport-1.12.0.ebuild b/dev-ros/image_transport/image_transport-1.12.0.ebuild
deleted file mode 100644
index 4f3b8e6e7e86..000000000000
--- a/dev-ros/image_transport/image_transport-1.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transparent support for transporting images in low-bandwidth compressed formats"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/class_loader:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/image_transport/image_transport-9999.ebuild b/dev-ros/image_transport/image_transport-9999.ebuild
deleted file mode 100644
index 4f3b8e6e7e86..000000000000
--- a/dev-ros/image_transport/image_transport-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transparent support for transporting images in low-bandwidth compressed formats"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/class_loader:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/image_transport/metadata.xml b/dev-ros/image_transport/metadata.xml
deleted file mode 100644
index 80ca28d8d9f4..000000000000
--- a/dev-ros/image_transport/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
deleted file mode 100644
index 8d005ee90786..000000000000
--- a/dev-ros/image_view/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
-DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
-DIST image_pipeline-1.17.0.tar.gz 154211 BLAKE2B 221c549d6794f3567706e724a48d52fa4d7f395b30f477a12750f4707d70782496a0110df9f89e83aa11ea95dbd65acab18eff13a8beb026091abd209370cbd4 SHA512 c5bc227f13415f6fe31eb2cee015f8671433b427044b8f8842d0e5d1ef19aff21f66e40945bb09227442ab5c4c49aae3217b56dac03b358804567cff4189efeb
-EBUILD image_view-1.15.2-r2.ebuild 864 BLAKE2B 67768435f07c5348abff3aa61dbc32500aaa561d9724b370cce3a7d8ed69417ed4844e7fbd332002ea0ab0ddf6a0c8693a78ed783ae7d3d7510cd6d8d446476c SHA512 2643853827c09cb598b3521629d61d696683e4c3645d564b32d6e4746a2de93230274350c74e8e9367e93d9d4b4f328178c00721104a6e5fd2f7f0da2c8cf262
-EBUILD image_view-1.15.3-r1.ebuild 864 BLAKE2B 67768435f07c5348abff3aa61dbc32500aaa561d9724b370cce3a7d8ed69417ed4844e7fbd332002ea0ab0ddf6a0c8693a78ed783ae7d3d7510cd6d8d446476c SHA512 2643853827c09cb598b3521629d61d696683e4c3645d564b32d6e4746a2de93230274350c74e8e9367e93d9d4b4f328178c00721104a6e5fd2f7f0da2c8cf262
-EBUILD image_view-1.16.0.ebuild 864 BLAKE2B 67768435f07c5348abff3aa61dbc32500aaa561d9724b370cce3a7d8ed69417ed4844e7fbd332002ea0ab0ddf6a0c8693a78ed783ae7d3d7510cd6d8d446476c SHA512 2643853827c09cb598b3521629d61d696683e4c3645d564b32d6e4746a2de93230274350c74e8e9367e93d9d4b4f328178c00721104a6e5fd2f7f0da2c8cf262
-EBUILD image_view-1.17.0.ebuild 864 BLAKE2B 67768435f07c5348abff3aa61dbc32500aaa561d9724b370cce3a7d8ed69417ed4844e7fbd332002ea0ab0ddf6a0c8693a78ed783ae7d3d7510cd6d8d446476c SHA512 2643853827c09cb598b3521629d61d696683e4c3645d564b32d6e4746a2de93230274350c74e8e9367e93d9d4b4f328178c00721104a6e5fd2f7f0da2c8cf262
-EBUILD image_view-9999.ebuild 864 BLAKE2B 67768435f07c5348abff3aa61dbc32500aaa561d9724b370cce3a7d8ed69417ed4844e7fbd332002ea0ab0ddf6a0c8693a78ed783ae7d3d7510cd6d8d446476c SHA512 2643853827c09cb598b3521629d61d696683e4c3645d564b32d6e4746a2de93230274350c74e8e9367e93d9d4b4f328178c00721104a6e5fd2f7f0da2c8cf262
-MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/image_view/image_view-1.15.2-r2.ebuild b/dev-ros/image_view/image_view-1.15.2-r2.ebuild
deleted file mode 100644
index d7374f823e50..000000000000
--- a/dev-ros/image_view/image_view-1.15.2-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-
-	dev-libs/boost:=
-	media-libs/opencv:=
-	x11-libs/gtk+:3
-	media-libs/harfbuzz:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/image_view/image_view-1.15.3-r1.ebuild b/dev-ros/image_view/image_view-1.15.3-r1.ebuild
deleted file mode 100644
index d7374f823e50..000000000000
--- a/dev-ros/image_view/image_view-1.15.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-
-	dev-libs/boost:=
-	media-libs/opencv:=
-	x11-libs/gtk+:3
-	media-libs/harfbuzz:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/image_view/image_view-1.16.0.ebuild b/dev-ros/image_view/image_view-1.16.0.ebuild
deleted file mode 100644
index d7374f823e50..000000000000
--- a/dev-ros/image_view/image_view-1.16.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-
-	dev-libs/boost:=
-	media-libs/opencv:=
-	x11-libs/gtk+:3
-	media-libs/harfbuzz:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/image_view/image_view-1.17.0.ebuild b/dev-ros/image_view/image_view-1.17.0.ebuild
deleted file mode 100644
index d7374f823e50..000000000000
--- a/dev-ros/image_view/image_view-1.17.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-
-	dev-libs/boost:=
-	media-libs/opencv:=
-	x11-libs/gtk+:3
-	media-libs/harfbuzz:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild
deleted file mode 100644
index d7374f823e50..000000000000
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-
-	dev-libs/boost:=
-	media-libs/opencv:=
-	x11-libs/gtk+:3
-	media-libs/harfbuzz:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/image_view/metadata.xml b/dev-ros/image_view/metadata.xml
deleted file mode 100644
index a96f24591a70..000000000000
--- a/dev-ros/image_view/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/imu_complementary_filter/Manifest b/dev-ros/imu_complementary_filter/Manifest
deleted file mode 100644
index d844baeac826..000000000000
--- a/dev-ros/imu_complementary_filter/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
-DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
-EBUILD imu_complementary_filter-1.2.2.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
-EBUILD imu_complementary_filter-1.2.3.ebuild 587 BLAKE2B d0a18dee8ebd6a76e2402ec699ca2c57664720a0302dd3adb26d511075970046779908bac84a166f1cc444605c7d4e2e864101fc3d30b7d366a90c3bc8bbc422 SHA512 05fda7f83baeca40d3f21f7d0c8f9203782605ac0bac202e26323bf1b02f26aaec41fc3a1390e12718d89b24d0e6131b54567d1907c5dc8dd42e813b5761b1ce
-EBUILD imu_complementary_filter-9999.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
-MISC metadata.xml 337 BLAKE2B 0abae17ee07ca90a37714a843e0d3b46df6597fe58a0c3969d159e68d5461c84c17db4d6e97e224cd3fe199b5133999737059a255bea804f62f9e2058bad7e77 SHA512 72ffa991c3259c010e5ebb87fc756d91190cb767d4534735dd5e3a9271c78d1b3a36852ceff70d24e77ecec59967e916c6f2625a6b20de6b3a9642af8906408d
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild
deleted file mode 100644
index 6c1525c19499..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.ebuild
deleted file mode 100644
index 6d1597fea89e..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
deleted file mode 100644
index 6c1525c19499..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/imu_complementary_filter/metadata.xml b/dev-ros/imu_complementary_filter/metadata.xml
deleted file mode 100644
index 4ea7057e97a6..000000000000
--- a/dev-ros/imu_complementary_filter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ccny-ros-pkg/imu_tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
deleted file mode 100644
index 89f406a57f2d..000000000000
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
-DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
-EBUILD imu_filter_madgwick-1.2.2-r2.ebuild 767 BLAKE2B 6dceb2acb93dda766b0587bbce551998441dce1c5f8e46693017968d49f2036634bfd66c5019d6ef1927a91ce1ad2d0076ce8ec55ce08a0c6cac3a4a7dd32300 SHA512 bb7dd91f2c8e0d354e22529e6fb4e6f50a428c989b342beefa9638dbd0bc59dae58efca31ac5693c7d39e398ef89d1b68951936e3037a625b3da0a9bf8ec1631
-EBUILD imu_filter_madgwick-1.2.3.ebuild 767 BLAKE2B 6dceb2acb93dda766b0587bbce551998441dce1c5f8e46693017968d49f2036634bfd66c5019d6ef1927a91ce1ad2d0076ce8ec55ce08a0c6cac3a4a7dd32300 SHA512 bb7dd91f2c8e0d354e22529e6fb4e6f50a428c989b342beefa9638dbd0bc59dae58efca31ac5693c7d39e398ef89d1b68951936e3037a625b3da0a9bf8ec1631
-EBUILD imu_filter_madgwick-9999.ebuild 767 BLAKE2B 6dceb2acb93dda766b0587bbce551998441dce1c5f8e46693017968d49f2036634bfd66c5019d6ef1927a91ce1ad2d0076ce8ec55ce08a0c6cac3a4a7dd32300 SHA512 bb7dd91f2c8e0d354e22529e6fb4e6f50a428c989b342beefa9638dbd0bc59dae58efca31ac5693c7d39e398ef89d1b68951936e3037a625b3da0a9bf8ec1631
-MISC metadata.xml 337 BLAKE2B 0abae17ee07ca90a37714a843e0d3b46df6597fe58a0c3969d159e68d5461c84c17db4d6e97e224cd3fe199b5133999737059a255bea804f62f9e2058bad7e77 SHA512 72ffa991c3259c010e5ebb87fc756d91190cb767d4534735dd5e3a9271c78d1b3a36852ceff70d24e77ecec59967e916c6f2625a6b20de6b3a9642af8906408d
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r2.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r2.ebuild
deleted file mode 100644
index 88596ba7f3f8..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/message_filters
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rosunit
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.ebuild
deleted file mode 100644
index 88596ba7f3f8..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/message_filters
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rosunit
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
deleted file mode 100644
index 88596ba7f3f8..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/message_filters
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rosunit
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/imu_filter_madgwick/metadata.xml b/dev-ros/imu_filter_madgwick/metadata.xml
deleted file mode 100644
index 4ea7057e97a6..000000000000
--- a/dev-ros/imu_filter_madgwick/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ccny-ros-pkg/imu_tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/imu_processors/Manifest b/dev-ros/imu_processors/Manifest
deleted file mode 100644
index ec3af4570cb7..000000000000
--- a/dev-ros/imu_processors/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST imu_pipeline-0.3.0.tar.gz 8162 BLAKE2B 09bfcb10bc49691418e23fbde26203769857b9c6b0631beaa51c09b5abc599c7988a0c582908a392b12cffaf3a488c0863450922aea18c68906fc0c3da46119c SHA512 b6b18c559fa859b5c1534bef96d1d4cd15c34c9866045dc2e32f82981189515c003ac90e197a1ba85c785870e34865318481bb7941a82f643a08266213026b4b
-EBUILD imu_processors-0.3.0.ebuild 534 BLAKE2B 7e053ed7dc5e0fa3e68512bee5e0e96fe271aceedaab636b0f974000edda20789b6c1ef199b65eaa121d85fa68aeb50671e6c54d223e82d0d88851cb2f06dc60 SHA512 7af763fe68eaf4626501e9a80d9994aa20e619124e39822be234a28f0a830bd66e8af24909c317420abbca81786a13e8bf59213af2e82a8763204a9f6c619d41
-EBUILD imu_processors-9999.ebuild 534 BLAKE2B 7e053ed7dc5e0fa3e68512bee5e0e96fe271aceedaab636b0f974000edda20789b6c1ef199b65eaa121d85fa68aeb50671e6c54d223e82d0d88851cb2f06dc60 SHA512 7af763fe68eaf4626501e9a80d9994aa20e619124e39822be234a28f0a830bd66e8af24909c317420abbca81786a13e8bf59213af2e82a8763204a9f6c619d41
-MISC metadata.xml 342 BLAKE2B fffb9396b69668e02b5dc17a40b732d7a1ea1872918453b108c403ba6de210e769a1315467c5a19c16cc22dd4e7051f92a07feaa2175876825758fd22af76046 SHA512 bb67e1750f694f24b3872ab2ab12745ab504380fa51dd0663ea41f2c5343b4635035ba83de0ade38f94a265661a8cfbbdeea00721c5e1269baa334c13d5d2bef
diff --git a/dev-ros/imu_processors/imu_processors-0.3.0.ebuild b/dev-ros/imu_processors/imu_processors-0.3.0.ebuild
deleted file mode 100644
index d6a179c9745f..000000000000
--- a/dev-ros/imu_processors/imu_processors-0.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Processors for sensor_msgs::Imu data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/imu_processors/imu_processors-9999.ebuild b/dev-ros/imu_processors/imu_processors-9999.ebuild
deleted file mode 100644
index d6a179c9745f..000000000000
--- a/dev-ros/imu_processors/imu_processors-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Processors for sensor_msgs::Imu data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/imu_processors/metadata.xml b/dev-ros/imu_processors/metadata.xml
deleted file mode 100644
index c4428fdeabe6..000000000000
--- a/dev-ros/imu_processors/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/imu_transformer/Manifest b/dev-ros/imu_transformer/Manifest
deleted file mode 100644
index 28e5b0221da9..000000000000
--- a/dev-ros/imu_transformer/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST imu_pipeline-0.3.0.tar.gz 8162 BLAKE2B 09bfcb10bc49691418e23fbde26203769857b9c6b0631beaa51c09b5abc599c7988a0c582908a392b12cffaf3a488c0863450922aea18c68906fc0c3da46119c SHA512 b6b18c559fa859b5c1534bef96d1d4cd15c34c9866045dc2e32f82981189515c003ac90e197a1ba85c785870e34865318481bb7941a82f643a08266213026b4b
-EBUILD imu_transformer-0.3.0.ebuild 782 BLAKE2B a90142636e8804e57c5ded5e904089d6301bf73b8a209642425fb7a21214590eaca0d7be86dc2ead3eaa6d170f837866b421490921b84fe912e9724d875c70d1 SHA512 f0986421a96f0e938eef6005fbcf705490856e2aa172f4e990e965ed62548d808c32cb303bed6fb5c07fde56a74aa119515030672d89d99bdcb27beb70db3001
-EBUILD imu_transformer-9999.ebuild 782 BLAKE2B a90142636e8804e57c5ded5e904089d6301bf73b8a209642425fb7a21214590eaca0d7be86dc2ead3eaa6d170f837866b421490921b84fe912e9724d875c70d1 SHA512 f0986421a96f0e938eef6005fbcf705490856e2aa172f4e990e965ed62548d808c32cb303bed6fb5c07fde56a74aa119515030672d89d99bdcb27beb70db3001
-MISC metadata.xml 342 BLAKE2B fffb9396b69668e02b5dc17a40b732d7a1ea1872918453b108c403ba6de210e769a1315467c5a19c16cc22dd4e7051f92a07feaa2175876825758fd22af76046 SHA512 bb67e1750f694f24b3872ab2ab12745ab504380fa51dd0663ea41f2c5343b4635035ba83de0ade38f94a265661a8cfbbdeea00721c5e1269baa334c13d5d2bef
diff --git a/dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild b/dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild
deleted file mode 100644
index bd9fa0e9bf63..000000000000
--- a/dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transforms sensor_msgs::Imu data from one frame into another"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslaunch
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/topic_tools
-	dev-ros/tf2_sensor_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/imu_transformer/imu_transformer-9999.ebuild b/dev-ros/imu_transformer/imu_transformer-9999.ebuild
deleted file mode 100644
index bd9fa0e9bf63..000000000000
--- a/dev-ros/imu_transformer/imu_transformer-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transforms sensor_msgs::Imu data from one frame into another"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslaunch
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/topic_tools
-	dev-ros/tf2_sensor_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/imu_transformer/metadata.xml b/dev-ros/imu_transformer/metadata.xml
deleted file mode 100644
index c4428fdeabe6..000000000000
--- a/dev-ros/imu_transformer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/interactive_marker_tutorials/Manifest b/dev-ros/interactive_marker_tutorials/Manifest
deleted file mode 100644
index ec688d63fd11..000000000000
--- a/dev-ros/interactive_marker_tutorials/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD interactive_marker_tutorials-0.11.0.ebuild 654 BLAKE2B 1f0a863b104db3d928f13c8e57e37b5b7b7ccf031bca5d1e11943f7663606b8a5d4a11794f34ff9fa03f64e60f5e3a5cb5a06432d42ebbe24072612f77b96565 SHA512 ce403467063c0bc78aa37d2b8b50de51cbe2eff2e81c19322918105cc49fb01ac54f46f0a04cd01dc2550b8bb3b6d84dcbae66aad0ef6a89292b7be043cc92da
-EBUILD interactive_marker_tutorials-9999.ebuild 654 BLAKE2B 1f0a863b104db3d928f13c8e57e37b5b7b7ccf031bca5d1e11943f7663606b8a5d4a11794f34ff9fa03f64e60f5e3a5cb5a06432d42ebbe24072612f77b96565 SHA512 ce403467063c0bc78aa37d2b8b50de51cbe2eff2e81c19322918105cc49fb01ac54f46f0a04cd01dc2550b8bb3b6d84dcbae66aad0ef6a89292b7be043cc92da
-MISC metadata.xml 356 BLAKE2B 0e15a7c0c742df1f97b9674aaf9d0eb7c67544d269b644e0b19163a9a9bcaf8b0451f24ba2c2344acbbcd4856cf79f916e5d974bf5afde6f3c389b7ad7b8c45e SHA512 8e6b4b0942d77ede0e3e96b2f45a1dbddb293fe6235fb1a9e642dff5f483e5a272d18da8ad0d80e6bfa487eacff11d5a53089371a06c7d9c5fba56b3f3c147bb
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.11.0.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.11.0.ebuild
deleted file mode 100644
index a4442a8e777d..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.11.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interactive marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
deleted file mode 100644
index a4442a8e777d..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interactive marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/interactive_marker_tutorials/metadata.xml b/dev-ros/interactive_marker_tutorials/metadata.xml
deleted file mode 100644
index ade798056081..000000000000
--- a/dev-ros/interactive_marker_tutorials/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/interactive_markers/Manifest b/dev-ros/interactive_markers/Manifest
deleted file mode 100644
index 0b4beb4df415..000000000000
--- a/dev-ros/interactive_markers/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST interactive_markers-1.12.0.tar.gz 31698 BLAKE2B f71c9452688ae302f8053f7a75b471c833698bfd9eb99e95de2c42af4af3de7ea9d4f2327129e63f2b9327b92d560a9a8379c43ca02a3a3077eee8cda542f54b SHA512 9af0d27fa25ad9f56135948bc3aef523a5d2ac1018831268f224f3809646c770b19114904ba79dfdcefff96c7455f927cba692fd010c12d7cab6bf760820659b
-EBUILD interactive_markers-1.12.0-r1.ebuild 832 BLAKE2B ee820984c6412285b41ca1c746b18f735b9d7989d08064ee84ed9d6471e7efef86f360272ed86eb05b012f42decaf2a158e180def1fc748c9590075e65f68cc7 SHA512 962ca52f9e8f828f686cee33040033e9cdb37fbd72df9690dac9ac95185dfc6aed796535a1817eb070add55377c89c057a4d02eb887611c8d68d8e032c0650cd
-EBUILD interactive_markers-9999.ebuild 832 BLAKE2B ee820984c6412285b41ca1c746b18f735b9d7989d08064ee84ed9d6471e7efef86f360272ed86eb05b012f42decaf2a158e180def1fc748c9590075e65f68cc7 SHA512 962ca52f9e8f828f686cee33040033e9cdb37fbd72df9690dac9ac95185dfc6aed796535a1817eb070add55377c89c057a4d02eb887611c8d68d8e032c0650cd
-MISC metadata.xml 352 BLAKE2B 5a937e07cd028ede09ffc9310483a2c73a58fd504405a68e584abda83889f5e8bb3961cd5f21d098982ba8ed72bc1ca4d2365c0d97c0a096d722d5328155da3b SHA512 0cc1854e5b12bc183a58edf9df9fae36118742b5c8107f28060c64aca2612f043fbe75b18caf0c10628eca5854f2172f6307fcbb4e411a3d93ef611aa821ae39
diff --git a/dev-ros/interactive_markers/interactive_markers-1.12.0-r1.ebuild b/dev-ros/interactive_markers/interactive_markers-1.12.0-r1.ebuild
deleted file mode 100644
index 213935ea9d54..000000000000
--- a/dev-ros/interactive_markers/interactive_markers-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interactive_markers/interactive_markers-9999.ebuild b/dev-ros/interactive_markers/interactive_markers-9999.ebuild
deleted file mode 100644
index 213935ea9d54..000000000000
--- a/dev-ros/interactive_markers/interactive_markers-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interactive_markers/metadata.xml b/dev-ros/interactive_markers/metadata.xml
deleted file mode 100644
index 1db66937c7bd..000000000000
--- a/dev-ros/interactive_markers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/interactive_markers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/interval_intersection/Manifest b/dev-ros/interval_intersection/Manifest
deleted file mode 100644
index e1836d10dcc9..000000000000
--- a/dev-ros/interval_intersection/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD interval_intersection-0.10.14-r1.ebuild 694 BLAKE2B 6bc75003d113c9244cfe7de94cdabd2d83277d4a9569cdf7bcc9e23ee9ddf288b29b5212b9d98a8a611d54aa4aa458fcc1ff2dbecd03d6106ded173351ee4179 SHA512 7447edd0b26a41f345a15051c66eede206983beb93c46413f85feab6efaad4914cc93ecff5208c1403ebef46e489b3cb13c625c33069113e1ec233f9e75febb9
-EBUILD interval_intersection-0.10.15.ebuild 694 BLAKE2B 6bc75003d113c9244cfe7de94cdabd2d83277d4a9569cdf7bcc9e23ee9ddf288b29b5212b9d98a8a611d54aa4aa458fcc1ff2dbecd03d6106ded173351ee4179 SHA512 7447edd0b26a41f345a15051c66eede206983beb93c46413f85feab6efaad4914cc93ecff5208c1403ebef46e489b3cb13c625c33069113e1ec233f9e75febb9
-EBUILD interval_intersection-9999.ebuild 694 BLAKE2B 6bc75003d113c9244cfe7de94cdabd2d83277d4a9569cdf7bcc9e23ee9ddf288b29b5212b9d98a8a611d54aa4aa458fcc1ff2dbecd03d6106ded173351ee4179 SHA512 7447edd0b26a41f345a15051c66eede206983beb93c46413f85feab6efaad4914cc93ecff5208c1403ebef46e489b3cb13c625c33069113e1ec233f9e75febb9
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.14-r1.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.14-r1.ebuild
deleted file mode 100644
index ed19fbff80e5..000000000000
--- a/dev-ros/interval_intersection/interval_intersection-0.10.14-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for calculating the intersection of interval messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/actionlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.15.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.15.ebuild
deleted file mode 100644
index ed19fbff80e5..000000000000
--- a/dev-ros/interval_intersection/interval_intersection-0.10.15.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for calculating the intersection of interval messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/actionlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interval_intersection/interval_intersection-9999.ebuild b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
deleted file mode 100644
index ed19fbff80e5..000000000000
--- a/dev-ros/interval_intersection/interval_intersection-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for calculating the intersection of interval messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/actionlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interval_intersection/metadata.xml b/dev-ros/interval_intersection/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/interval_intersection/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ivcon/Manifest b/dev-ros/ivcon/Manifest
deleted file mode 100644
index 20a2f8ecf2c7..000000000000
--- a/dev-ros/ivcon/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ivcon-0.1.7.tar.gz 139018 BLAKE2B 780a0438bf9d9c14714e91639e8c24624d4a3d7dfc0f4ea8ebfea0d42a4e75cce9559642afdc1cabc9b2fcddfac57fecdcbf350d1947d3ab9bbe93c19736d9d1 SHA512 d533c4ab3a708411283b7bd03e6aefb3337edbf50b15b6be56f1aa5df803a0406b52663eee154007eb8980dcff60794206865f62e1910e0239afbd0d328a7c18
-EBUILD ivcon-0.1.7.ebuild 298 BLAKE2B 4790c1d51cd58801e494d40bd049e823b3dfde3da4ef83f44256f6be2d20fb4d9e4b50083949ae078c8e6180464bec99f14853ddf3d3acec454a906ef86eb69a SHA512 da31039d263dc20efb02ee0a176bea3798b0992c61b6dbe0b95f6c623e2dfed71f3adc63dfec9e3b42b91640d1fd7189a4b8ce24a53691ac6333ae85ef903ce0
-EBUILD ivcon-9999.ebuild 298 BLAKE2B 4790c1d51cd58801e494d40bd049e823b3dfde3da4ef83f44256f6be2d20fb4d9e4b50083949ae078c8e6180464bec99f14853ddf3d3acec454a906ef86eb69a SHA512 da31039d263dc20efb02ee0a176bea3798b0992c61b6dbe0b95f6c623e2dfed71f3adc63dfec9e3b42b91640d1fd7189a4b8ce24a53691ac6333ae85ef903ce0
-MISC metadata.xml 324 BLAKE2B 126f1071c771324546934fc92ae9d096e0111fdf2bc85728cae4abbc64bd92fe9b2c5e5acba077c78bcc1e691ecaa27396dcf98052c7f327b0027a7d3dc31090 SHA512 5b559e7bad6efb4a3833cbc324d2935c6b1a62c2948a55bd4582e875c3cd9018ff033a945b564f6f51df30a6014c55a6aa7cf74245310690e95c5d1141be77c5
diff --git a/dev-ros/ivcon/ivcon-0.1.7.ebuild b/dev-ros/ivcon/ivcon-0.1.7.ebuild
deleted file mode 100644
index 3576890e1fa1..000000000000
--- a/dev-ros/ivcon/ivcon-0.1.7.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ivcon"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Mesh Conversion Utility"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/ivcon/ivcon-9999.ebuild b/dev-ros/ivcon/ivcon-9999.ebuild
deleted file mode 100644
index 3576890e1fa1..000000000000
--- a/dev-ros/ivcon/ivcon-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ivcon"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Mesh Conversion Utility"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/ivcon/metadata.xml b/dev-ros/ivcon/metadata.xml
deleted file mode 100644
index 28fccf6624d0..000000000000
--- a/dev-ros/ivcon/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ivcon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
deleted file mode 100644
index c58f466c8629..000000000000
--- a/dev-ros/joint_limits_interface/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD joint_limits_interface-0.19.1.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
-EBUILD joint_limits_interface-0.19.2.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
-EBUILD joint_limits_interface-0.19.3.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
-EBUILD joint_limits_interface-0.19.4.ebuild 548 BLAKE2B 590581b099ba0c3a93d8d2681a2bb63f0e1d1a648a4ae03eb34bb5ca3c167315e8b609a4d83cb7d2243715ea95fe7c53bdec11c65dd3fac70dd7512e8391569b SHA512 ea969f5ca1ce2a93b6961ea436318e3ef7af833ac7dafff4b6cdbc1d4d0227d386bfad5b11aa8ab1bbcc2ffc129a6f99a4e74b3bfb1eded44244e7e9edbc997f
-EBUILD joint_limits_interface-0.19.5.ebuild 548 BLAKE2B 590581b099ba0c3a93d8d2681a2bb63f0e1d1a648a4ae03eb34bb5ca3c167315e8b609a4d83cb7d2243715ea95fe7c53bdec11c65dd3fac70dd7512e8391569b SHA512 ea969f5ca1ce2a93b6961ea436318e3ef7af833ac7dafff4b6cdbc1d4d0227d386bfad5b11aa8ab1bbcc2ffc129a6f99a4e74b3bfb1eded44244e7e9edbc997f
-EBUILD joint_limits_interface-9999.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild
deleted file mode 100644
index 86815d181892..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-libs/urdfdom
-	dev-ros/urdf
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.2.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.2.ebuild
deleted file mode 100644
index 86815d181892..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-libs/urdfdom
-	dev-ros/urdf
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.3.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.3.ebuild
deleted file mode 100644
index 86815d181892..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-libs/urdfdom
-	dev-ros/urdf
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.4.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.4.ebuild
deleted file mode 100644
index 3d396fd3f3f1..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-libs/urdfdom
-	dev-ros/urdf
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.ebuild
deleted file mode 100644
index 3d396fd3f3f1..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-libs/urdfdom
-	dev-ros/urdf
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
deleted file mode 100644
index 86815d181892..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-libs/urdfdom
-	dev-ros/urdf
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/joint_limits_interface/metadata.xml b/dev-ros/joint_limits_interface/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/joint_limits_interface/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/joint_state_publisher/Manifest b/dev-ros/joint_state_publisher/Manifest
deleted file mode 100644
index ed749f62f5e0..000000000000
--- a/dev-ros/joint_state_publisher/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST joint_state_publisher-1.15.1.tar.gz 28821 BLAKE2B 2bc83fd5f9aead52be31d9bedf8d20debb9b6f65ecbf8fd1ab01b365f52ad8af172c7f3724c37a519d3cf08f6085a29431238f7ea6c08468b5f5f30cded08244 SHA512 625b07ed4bff30cd885f369f1a0d354e4dbe8d77eef60fc8ef6a0e85bb4905cf771c7e0de3b7e5faf1bf6ba00e352c029739edca5a82c65201055fd4fe80d8f8
-EBUILD joint_state_publisher-1.15.1.ebuild 633 BLAKE2B 7315fa5ed6f32da9ff1491db0e4e5b276580d188755b2f594fbe5fbf3f2fe8245a57c596d2153e5dd07f9e8e70841691377b4926789b315970aa99e64dd225e4 SHA512 f66662c3adc7998d0c09e61a35830ec9adc01a9e523b8792b59d399f41d5fbcf5803870a491fe5b021f0f2b3a0deb800493c2daeb1f9b63b5f1538e74b90453d
-EBUILD joint_state_publisher-9999.ebuild 633 BLAKE2B c918cfec7c165c216083b0b33a98845448a9fd62e03623bc93df7a2eb5576687b2a8aa953fec368312d7cc984bf90515bfe9a94f7cde3d7b01572f69d68ba91b SHA512 acb9cac232f6297d5bafe5a7ba27e65b62af9f54f4d3ff1f7dbec58cb0e6b70d0715107aa453fe81b2da9f4a8d82a7bc2b1392a9a0c6e298fa156a899c199412
-MISC metadata.xml 340 BLAKE2B 52c82a93a35dbb2af8d4018d820683036c0e5bc22cc859b0141c0bcda6c2723e86b7d8bae9d17eb54e715048770ed0884d9f1499867ecfb18888b0efc2cef795 SHA512 89e0c4464b59a23bbcf308b50a31b71569e7412c8726d3ff77db7c14e4a74172afc7fd644ccab95d0bb302d3b01130a39fb1afba95e02bea07fa70f52acb19a9
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.15.1.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.15.1.ebuild
deleted file mode 100644
index 578a75edc963..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.15.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${DEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
deleted file mode 100644
index 4124df047534..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${DEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/joint_state_publisher/metadata.xml b/dev-ros/joint_state_publisher/metadata.xml
deleted file mode 100644
index 301a6d1968e9..000000000000
--- a/dev-ros/joint_state_publisher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/joint_state_publisher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/joint_state_publisher_gui/Manifest b/dev-ros/joint_state_publisher_gui/Manifest
deleted file mode 100644
index 6d5f3c16e098..000000000000
--- a/dev-ros/joint_state_publisher_gui/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST joint_state_publisher-1.15.1.tar.gz 28821 BLAKE2B 2bc83fd5f9aead52be31d9bedf8d20debb9b6f65ecbf8fd1ab01b365f52ad8af172c7f3724c37a519d3cf08f6085a29431238f7ea6c08468b5f5f30cded08244 SHA512 625b07ed4bff30cd885f369f1a0d354e4dbe8d77eef60fc8ef6a0e85bb4905cf771c7e0de3b7e5faf1bf6ba00e352c029739edca5a82c65201055fd4fe80d8f8
-EBUILD joint_state_publisher_gui-1.15.1.ebuild 597 BLAKE2B 14e6b6ac509957ef71c8841c721012b744103d1951011cacaab165f7dbaaebfe5badd066c6fb19c3ff6992f90986c6a9751aa3de0fa67a627f26da0686ffe8ae SHA512 d5c799195fe55a1a8ce2b9764e8b6e6968248b07bb51b45a53bc9efb111825225737aa017de58c1e305efcd201fe828c5d7f1792d0167b2da525dec78bdb4bcb
-EBUILD joint_state_publisher_gui-9999.ebuild 597 BLAKE2B f70d3a73e74ce21a96fc8919d0e87054be04f6d540cf11b43f096619fa833377679780f5af916279a35c37fd80494d9061a30d884470a7db01cc5bbcd922a181 SHA512 77fb12dc9f70ecd8a1dfdff9caf75e762e2ec80e1732784315d0bf83f01083ea2a8be82ee167d6b6a25e0b7a023f4767fb2f76fccb05e48d9c246ed2755d621d
-MISC metadata.xml 340 BLAKE2B 52c82a93a35dbb2af8d4018d820683036c0e5bc22cc859b0141c0bcda6c2723e86b7d8bae9d17eb54e715048770ed0884d9f1499867ecfb18888b0efc2cef795 SHA512 89e0c4464b59a23bbcf308b50a31b71569e7412c8726d3ff77db7c14e4a74172afc7fd644ccab95d0bb302d3b01130a39fb1afba95e02bea07fa70f52acb19a9
diff --git a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.1.ebuild b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.1.ebuild
deleted file mode 100644
index 00da14aeea40..000000000000
--- a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/joint_state_publisher[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${DEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild
deleted file mode 100644
index 4a20aa38a90b..000000000000
--- a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/joint_state_publisher[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${DEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher_gui/metadata.xml b/dev-ros/joint_state_publisher_gui/metadata.xml
deleted file mode 100644
index 301a6d1968e9..000000000000
--- a/dev-ros/joint_state_publisher_gui/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/joint_state_publisher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/joint_states_settler/Manifest b/dev-ros/joint_states_settler/Manifest
deleted file mode 100644
index 1fc018ab800d..000000000000
--- a/dev-ros/joint_states_settler/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gcc6.patch 459 BLAKE2B eadc7eb78eb79bff30535776516bed691354706192fe196107efd319b357f8b0c361bbd70492f37525137c78399954681e4ab8eaf48cfe71903785b5f889765a SHA512 dca02dec9e53395941bcb263d88b3a96ef1437315431d242ffcfa7768a2b0c4d5ec394db5c7e7d2dbe46750264adce5e7032caa207e912ec7dedbcad9c345519
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD joint_states_settler-0.10.14-r1.ebuild 678 BLAKE2B a68385f305ae0d5cbec7b748f1a767b9b3862760131b889ca3de1ca66c57bd7e38d25c76245fd37762e859914cb4ec9ce84bc00a1999551bd2628c23964f71ae SHA512 e4068cbf6a47ac2c01bec3dea2df82521c552813eec6099b1583a252683e41b6e4babbefaddafb1e91e8329640faa013ab00af41388438d8b8967f951b5d6329
-EBUILD joint_states_settler-0.10.15.ebuild 678 BLAKE2B a68385f305ae0d5cbec7b748f1a767b9b3862760131b889ca3de1ca66c57bd7e38d25c76245fd37762e859914cb4ec9ce84bc00a1999551bd2628c23964f71ae SHA512 e4068cbf6a47ac2c01bec3dea2df82521c552813eec6099b1583a252683e41b6e4babbefaddafb1e91e8329640faa013ab00af41388438d8b8967f951b5d6329
-EBUILD joint_states_settler-9999.ebuild 678 BLAKE2B a68385f305ae0d5cbec7b748f1a767b9b3862760131b889ca3de1ca66c57bd7e38d25c76245fd37762e859914cb4ec9ce84bc00a1999551bd2628c23964f71ae SHA512 e4068cbf6a47ac2c01bec3dea2df82521c552813eec6099b1583a252683e41b6e4babbefaddafb1e91e8329640faa013ab00af41388438d8b8967f951b5d6329
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/joint_states_settler/files/gcc6.patch b/dev-ros/joint_states_settler/files/gcc6.patch
deleted file mode 100644
index 80414e1a9521..000000000000
--- a/dev-ros/joint_states_settler/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: joint_states_settler/CMakeLists.txt
-===================================================================
---- joint_states_settler.orig/CMakeLists.txt
-+++ joint_states_settler/CMakeLists.txt
-@@ -15,7 +15,7 @@ catkin_package(DEPENDS actionlib actionl
- )
- 
- # create the library
--include_directories(SYSTEM ${Boost_INCLUDE_DIRS}
-+include_directories(${Boost_INCLUDE_DIRS}
-                            ${catkin_INCLUDE_DIRS}
- )
- include_directories(include)
diff --git a/dev-ros/joint_states_settler/joint_states_settler-0.10.14-r1.ebuild b/dev-ros/joint_states_settler/joint_states_settler-0.10.14-r1.ebuild
deleted file mode 100644
index ee91e1aa94c1..000000000000
--- a/dev-ros/joint_states_settler/joint_states_settler-0.10.14-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Reports how long a subset of joints has been settled"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/actionlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/settlerlib
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/joint_states_settler/joint_states_settler-0.10.15.ebuild b/dev-ros/joint_states_settler/joint_states_settler-0.10.15.ebuild
deleted file mode 100644
index ee91e1aa94c1..000000000000
--- a/dev-ros/joint_states_settler/joint_states_settler-0.10.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Reports how long a subset of joints has been settled"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/actionlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/settlerlib
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild b/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
deleted file mode 100644
index ee91e1aa94c1..000000000000
--- a/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Reports how long a subset of joints has been settled"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/actionlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/settlerlib
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/joint_states_settler/metadata.xml b/dev-ros/joint_states_settler/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/joint_states_settler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/kdl_conversions/Manifest b/dev-ros/kdl_conversions/Manifest
deleted file mode 100644
index 2003bcf57e4b..000000000000
--- a/dev-ros/kdl_conversions/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
-EBUILD kdl_conversions-1.13.2.ebuild 457 BLAKE2B 3e37a3425bc20769848aeefda3d4aa9968f5589e336307a29eb475da87346ac20165043ad82c8a47e2e6b39d3e933d40d256e78907b2ff485769138159b9b2a4 SHA512 24448d5e96234ec5788877288f9f18f7fdae6f79a50a55843b7669eed23c05b25c0f224825f96005bc3d67423eb953d720cdca16520ecf54d9c63185e5dcbded
-EBUILD kdl_conversions-9999.ebuild 457 BLAKE2B 3e37a3425bc20769848aeefda3d4aa9968f5589e336307a29eb475da87346ac20165043ad82c8a47e2e6b39d3e933d40d256e78907b2ff485769138159b9b2a4 SHA512 24448d5e96234ec5788877288f9f18f7fdae6f79a50a55843b7669eed23c05b25c0f224825f96005bc3d67423eb953d720cdca16520ecf54d9c63185e5dcbded
-MISC metadata.xml 327 BLAKE2B 566ab6c75daafd1554630fd8762bebc05fa3a002b3f785b59a69d77653167d6d2c0cce2e20067ead12cd5075da7c7d6e40f70e21b4628e419c43252c6d878500 SHA512 fd1f0d017b6a422df2fcdd7797ec631ac8b2afaa706338848b941c39e4d3d82549969f0018162da22cb9499a114a4a4a58a945b284585b30c7eff589ecf975d5
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild
deleted file mode 100644
index 3c146229a0cd..000000000000
--- a/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between KDL and geometry_msgs types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/orocos_kdl:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild b/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
deleted file mode 100644
index 3c146229a0cd..000000000000
--- a/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between KDL and geometry_msgs types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/orocos_kdl:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/kdl_conversions/metadata.xml b/dev-ros/kdl_conversions/metadata.xml
deleted file mode 100644
index 0717de2e0623..000000000000
--- a/dev-ros/kdl_conversions/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/kdl_parser/Manifest b/dev-ros/kdl_parser/Manifest
deleted file mode 100644
index a50d3480cd9b..000000000000
--- a/dev-ros/kdl_parser/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST kdl_parser-1.14.2.tar.gz 31995 BLAKE2B 8ddb34cd8af8445721aa93e57ffdf5faac19eea44c89a9887f1da26c09f03ead0aeb68662ef4132eccfd514e6e87476d01e97cf7d862487301dad38478395336 SHA512 e565edcec45206ce41a0f0f774bfe564025c2ec27a7063cedc4147f721ea905621c5250c9bef98a1bda91a88b0f92afcc9d2aaf18a53946e28a6f37a9be75ac6
-EBUILD kdl_parser-1.14.2.ebuild 670 BLAKE2B 462315409a647689baff15e358afde4a9bea448115e06f1dcaef3cf4587a17b31dedabb7272695162c34d08861f8cddb0b08b42c98efe150eadee789167801f0 SHA512 58996c7b8496bc892663fc3fc3d0abafd90af6201806d70a05f32fe5c5f166c5ca1af6c9c79f3575f336731fe94a45b5230797015ae233382361914c05ac14c9
-EBUILD kdl_parser-9999.ebuild 670 BLAKE2B ffad840daf6431928709eb8773d40b423818cb0264eab9770e843659fb5a787d548384482a830a94c4771b6e6e5dd072ad8c6c63e2bc369c43fc91af3a7ff638 SHA512 96c350a835e0fcd93001f8c4ea2c622024e5ccb37f97e59410962d1275f459cfa6e0f05ad58713834e5e3ceb5a1d2b6d5eaa689b5ff5e22eea35ae60d49bd192
-MISC metadata.xml 329 BLAKE2B 3d24dab40aa80e491861ca075876e5c5562c5952e233c07a874ece4dfe1e221260628672c8626ecd0e8ba5f8dbd9a0cfebadc22229baf0d34b52304cea3e8944 SHA512 f6e2e849630402780b2157646a87911813ff698b37f9e2cdd46c2f64ee4aa52b3cf426ef690eb9e1b85929d5e14105f6263eb9f83d196900b67062fd45c5eaaa
diff --git a/dev-ros/kdl_parser/kdl_parser-1.14.2.ebuild b/dev-ros/kdl_parser/kdl_parser-1.14.2.ebuild
deleted file mode 100644
index ca382bec8662..000000000000
--- a/dev-ros/kdl_parser/kdl_parser-1.14.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/rosconsole
-		dev-libs/console_bridge:=
-	>=dev-ros/urdf-1.13
-	sci-libs/orocos_kdl:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/kdl_parser/kdl_parser-9999.ebuild b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
deleted file mode 100644
index fa520608c0bb..000000000000
--- a/dev-ros/kdl_parser/kdl_parser-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/rosconsole
-		dev-libs/console_bridge:=
-	>=dev-ros/urdf-1.13
-	sci-libs/orocos_kdl:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/kdl_parser/metadata.xml b/dev-ros/kdl_parser/metadata.xml
deleted file mode 100644
index 78adedad5571..000000000000
--- a/dev-ros/kdl_parser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/kdl_parser</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/kdl_parser_py/Manifest b/dev-ros/kdl_parser_py/Manifest
deleted file mode 100644
index bb857de0cb11..000000000000
--- a/dev-ros/kdl_parser_py/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST kdl_parser-1.14.2.tar.gz 31995 BLAKE2B 8ddb34cd8af8445721aa93e57ffdf5faac19eea44c89a9887f1da26c09f03ead0aeb68662ef4132eccfd514e6e87476d01e97cf7d862487301dad38478395336 SHA512 e565edcec45206ce41a0f0f774bfe564025c2ec27a7063cedc4147f721ea905621c5250c9bef98a1bda91a88b0f92afcc9d2aaf18a53946e28a6f37a9be75ac6
-EBUILD kdl_parser_py-1.14.2.ebuild 714 BLAKE2B 9987730ef2bc8ca9d894e2e9322c46fe9a32ac3e22b93ef4c7f81d4196435380262f6dac24e32cbea896f4c92c21fb879a88b5b5267f01aca4ebe8aa5e26fc30 SHA512 ed08f20c2e8d2d143e2b9916906be4afc4778a4c5ead88e0d41ce92dbb12744fe696d213111f5f9996710ea588f23fbf7fdf1cc1fd8f20d1e1c269aaa7d3a192
-EBUILD kdl_parser_py-9999.ebuild 714 BLAKE2B 7e089e1d4205fe9c74cc22918d1ff208005882506bcc810199dfbf9ee42a19ea8236dd0ffaf9012f0b576f341b700fe643b93784f5575c81401eedea0c2493cf SHA512 edda2be2b580e2f15f454b574a499e4df6990a5e179881bb5f85ed6b22563db677ae5f245fb74e9677525ea1b9f6933956bba90eadbb435309f2a0e6c8ceeb83
-MISC metadata.xml 329 BLAKE2B 3d24dab40aa80e491861ca075876e5c5562c5952e233c07a874ece4dfe1e221260628672c8626ecd0e8ba5f8dbd9a0cfebadc22229baf0d34b52304cea3e8944 SHA512 f6e2e849630402780b2157646a87911813ff698b37f9e2cdd46c2f64ee4aa52b3cf426ef690eb9e1b85929d5e14105f6263eb9f83d196900b67062fd45c5eaaa
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.14.2.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.2.ebuild
deleted file mode 100644
index f64375d0da9d..000000000000
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.14.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python tools to construct a KDL tree from an XML robot representation in URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/urdf-1.13[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
deleted file mode 100644
index b100de35512c..000000000000
--- a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python tools to construct a KDL tree from an XML robot representation in URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/urdf-1.13[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/kdl_parser_py/metadata.xml b/dev-ros/kdl_parser_py/metadata.xml
deleted file mode 100644
index 78adedad5571..000000000000
--- a/dev-ros/kdl_parser_py/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/kdl_parser</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/laser_assembler/Manifest b/dev-ros/laser_assembler/Manifest
deleted file mode 100644
index f657d98c3fcf..000000000000
--- a/dev-ros/laser_assembler/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX eigen.patch 710 BLAKE2B 8738ab211cd7bb105174fc4eccff6f9a4146addb0b3b814368b15fa81a13d1015889630ff6040e4376ea1440e61570c7a17cf1d65c7ad98076a10691ce6ca5f8 SHA512 8e5c7360ba01aa751b108fe0536d780cfe10ff7a4417b2aab8840dac445e227cf00b2a59e336e4f0a473a12150df719b94c12128ed47870fb5b9ab55aff40a65
-DIST laser_assembler-1.7.8.tar.gz 22255 BLAKE2B dd01153a6fecf649793f180f651f84c790218a34755e367c51994699e928e6ce39486ea6a93ae47136dcd0c66499946570064af8062bef0345f66c7659b4a0ef SHA512 bd13512bc7cacef7e7bb2107390e57538cb701c9593f5cdb3501729b7c38b922470038e6e85c44803051deb04b74e9f677b5707b0441ab21824485fcf1e60942
-EBUILD laser_assembler-1.7.8.ebuild 821 BLAKE2B 85678f81a16e2f034b4897c82f909c1955638550339f0be3f87437dbba2477120447ebb9a7b5ca8fb1dc93c3235419f7aeb3be4f63c07ef6312cfb04cf01e04c SHA512 702bb89f147512dc9487e7646a1af1db6bb24c698316f5adf9a77ffc949083909f0b48d880306285d3eca35791e81e8d495e19cc8f702c024812337770f9878e
-EBUILD laser_assembler-9999.ebuild 821 BLAKE2B 85678f81a16e2f034b4897c82f909c1955638550339f0be3f87437dbba2477120447ebb9a7b5ca8fb1dc93c3235419f7aeb3be4f63c07ef6312cfb04cf01e04c SHA512 702bb89f147512dc9487e7646a1af1db6bb24c698316f5adf9a77ffc949083909f0b48d880306285d3eca35791e81e8d495e19cc8f702c024812337770f9878e
-MISC metadata.xml 345 BLAKE2B 7116e04dd748c54f3f166e20e7f02f363c87056553449f4f8f8e43b3a7601c43a40c6bd3c482ae76987eea1707633baa88fc553521a28269436c036aca89a63d SHA512 c3c03bfcd19235dd470ff1a2dd7f669357b3cbc79489eb4d73efb43075e855bbff75ba6d9217739f2ebcbcc9a876e5a8e16ca0d441010ea29e1f61bcf2d00534
diff --git a/dev-ros/laser_assembler/files/eigen.patch b/dev-ros/laser_assembler/files/eigen.patch
deleted file mode 100644
index 95c8c58bcdb3..000000000000
--- a/dev-ros/laser_assembler/files/eigen.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: laser_assembler-1.7.8/CMakeLists.txt
-===================================================================
---- laser_assembler-1.7.8.orig/CMakeLists.txt
-+++ laser_assembler-1.7.8/CMakeLists.txt
-@@ -12,7 +12,9 @@ find_package(catkin REQUIRED COMPONENTS
-   ${THIS_PACKAGE_ROS_DEPS}
-   message_generation)
- find_package(Boost REQUIRED COMPONENTS system)
--include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-+find_package(Eigen3 REQUIRED)
-+add_definitions(${EIGEN3_DEFINITIONS})
-+include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR})
- 
- ##############################################################################
- # Build service definitions
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
deleted file mode 100644
index 799f5939b8ef..000000000000
--- a/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/tf
-	dev-ros/laser_geometry[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/pluginlib
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/filters
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] dev-cpp/gtest )
-"
-PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_assembler/laser_assembler-9999.ebuild b/dev-ros/laser_assembler/laser_assembler-9999.ebuild
deleted file mode 100644
index 799f5939b8ef..000000000000
--- a/dev-ros/laser_assembler/laser_assembler-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/tf
-	dev-ros/laser_geometry[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/pluginlib
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/filters
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] dev-cpp/gtest )
-"
-PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_assembler/metadata.xml b/dev-ros/laser_assembler/metadata.xml
deleted file mode 100644
index 0c8633fd6695..000000000000
--- a/dev-ros/laser_assembler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/laser_assembler</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
deleted file mode 100644
index 183b3ff69782..000000000000
--- a/dev-ros/laser_cb_detector/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD laser_cb_detector-0.10.15.ebuild 816 BLAKE2B b5284d7cbf73a871659997e8ff28765da00d94a5469446272243a5e80229e9ba28a2434d85f92678e7cd232756030e4720690e9b72ac263636b175c18b09c826 SHA512 dcbbe9c0dd05056c802f0d374cb8cffdd6e67a69f445c40250aff57f1ed6976f8d5cf0e022d2ec4a3b6451e935c92881e803016ab5c7eeba94a1e3f65dee33b6
-EBUILD laser_cb_detector-9999.ebuild 816 BLAKE2B b5284d7cbf73a871659997e8ff28765da00d94a5469446272243a5e80229e9ba28a2434d85f92678e7cd232756030e4720690e9b72ac263636b175c18b09c826 SHA512 dcbbe9c0dd05056c802f0d374cb8cffdd6e67a69f445c40250aff57f1ed6976f8d5cf0e022d2ec4a3b6451e935c92881e803016ab5c7eeba94a1e3f65dee33b6
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild
deleted file mode 100644
index 80222bf21b13..000000000000
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Extracts checkerboard corners from a dense laser snapshot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/image_cb_detector
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/settlerlib
-"
-DEPEND="${RDEPEND}
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		media-libs/opencv[png]
-	)
-"
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
deleted file mode 100644
index 80222bf21b13..000000000000
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Extracts checkerboard corners from a dense laser snapshot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/image_cb_detector
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/settlerlib
-"
-DEPEND="${RDEPEND}
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		media-libs/opencv[png]
-	)
-"
diff --git a/dev-ros/laser_cb_detector/metadata.xml b/dev-ros/laser_cb_detector/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/laser_cb_detector/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
deleted file mode 100644
index dbfd2e2dff8a..000000000000
--- a/dev-ros/laser_filters/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX eigen.patch 715 BLAKE2B dc12bfbb1eeba06624b70d0cab04a723288fd6740b66e8cba9d2e1108b050ab66efa361bc8a9f0455a338a228389d1b346401b77c94eec8b56dcfd51eabec2cc SHA512 f3cf4f9b2ddb8a6baff879e1eae5520c8db4da0b78b2d5af49b84cdde6b9a502cacb6eabfefb8ac36971ec1e86e673d8d0f7fca4e1c32d46001d2c693595dade
-DIST laser_filters-1.8.11.tar.gz 42303 BLAKE2B e5344b273ebe3f9ad75c32f15f15c69a241273def5b3a4b90e39b5a329f3d3a682f67e687c48da3d41c93db0fc94a39f31153ad23cbe1e4997139f57a4c34f75 SHA512 06833adfa96248e360f4bf1b267ddec6c9263296afe64eac3716014f53071ec8cedd8b73f93438d9072e3785843e2ba345f007036d680ba7f4fbd3b720f40b2e
-EBUILD laser_filters-1.8.11-r1.ebuild 792 BLAKE2B 08f1dbcbba0b36574d53aa23760e4fcbf72b5051ffdd97808d53c6b0a7b0718595be2df2d80e617c9c744bbec02fed9cc76eb91c5b932b7586858a26ee5c668d SHA512 460ba5e9aeed70fe54092eda1504e01422ff4c3c86b8e71fba89c787efdadda7af8d3a3fbcf1de4b0dcaa133ea32884e044ff23b13aaac5dfe4d7f7e93c91d9e
-EBUILD laser_filters-9999.ebuild 792 BLAKE2B 08f1dbcbba0b36574d53aa23760e4fcbf72b5051ffdd97808d53c6b0a7b0718595be2df2d80e617c9c744bbec02fed9cc76eb91c5b932b7586858a26ee5c668d SHA512 460ba5e9aeed70fe54092eda1504e01422ff4c3c86b8e71fba89c787efdadda7af8d3a3fbcf1de4b0dcaa133ea32884e044ff23b13aaac5dfe4d7f7e93c91d9e
-MISC metadata.xml 343 BLAKE2B 65f618b43d8aa49617ba8f5e196e3124ad8ec4a98c4ce105bd98442f1c3ae9fd49a46734609d1815f0c298f6fd9d5468405566b63afd243dc221866896e9b4b4 SHA512 07d111fad41b06941e9ff3b041d5327f6123ee41da7e6fd8aa3c93fd1a62abc3e497a2eecac5de8fa810284d58a994c03f28e71cb593c7f3a33f9b4104699e58
diff --git a/dev-ros/laser_filters/files/eigen.patch b/dev-ros/laser_filters/files/eigen.patch
deleted file mode 100644
index 1ad02504218b..000000000000
--- a/dev-ros/laser_filters/files/eigen.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: laser_filters-1.8.11/CMakeLists.txt
-===================================================================
---- laser_filters-1.8.11.orig/CMakeLists.txt
-+++ laser_filters-1.8.11/CMakeLists.txt
-@@ -12,7 +12,9 @@ set(THIS_PACKAGE_ROS_DEPS sensor_msgs ro
- 
- find_package(catkin REQUIRED COMPONENTS ${THIS_PACKAGE_ROS_DEPS})
- find_package(Boost REQUIRED COMPONENTS system)
--include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-+find_package(Eigen3 REQUIRED)
-+add_definitions(${EIGEN3_DEFINITIONS})
-+include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR})
- 
- ##############################################################################
- # Define package
diff --git a/dev-ros/laser_filters/laser_filters-1.8.11-r1.ebuild b/dev-ros/laser_filters/laser_filters-1.8.11-r1.ebuild
deleted file mode 100644
index f9351a8d5d33..000000000000
--- a/dev-ros/laser_filters/laser_filters-1.8.11-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-perception/laser_filters"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/filters
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/pluginlib
-	dev-ros/angles:0
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_filters/laser_filters-9999.ebuild b/dev-ros/laser_filters/laser_filters-9999.ebuild
deleted file mode 100644
index f9351a8d5d33..000000000000
--- a/dev-ros/laser_filters/laser_filters-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-perception/laser_filters"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/filters
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/pluginlib
-	dev-ros/angles:0
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_filters/metadata.xml b/dev-ros/laser_filters/metadata.xml
deleted file mode 100644
index 29c29f27b53a..000000000000
--- a/dev-ros/laser_filters/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/laser_filters</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/laser_geometry/Manifest b/dev-ros/laser_geometry/Manifest
deleted file mode 100644
index 8ef334820afe..000000000000
--- a/dev-ros/laser_geometry/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST laser_geometry-1.6.7.tar.gz 19095 BLAKE2B 9ac9b1d24f26386e1e23e3ab75e1af18ae306670b5a86af2f547918327cd3fc9ec9140a3479c600ea799158617a9e4ce350f45f71db688aa2446edfaf04a5912 SHA512 7f6f887c3f8c4212adef90812fa877904e1e3fcf679df15cadca34a4ad451135be5086506eafee16682441c70df0d1c89fa90d2b365f5eed4f349ed741974c01
-EBUILD laser_geometry-1.6.7-r1.ebuild 907 BLAKE2B 9e039c23ee523c09339d5f7ddd7c03a4c19071c5b72b25f3d7c58fdee437172fd767638cdf0e24aa28e6ff95b6766460683a05bf1fac294baae70eeb1fb3a39e SHA512 8252560290406ed8c2a22d4de21e9f7209ad43c076dbbf7002ec713d7ef07f3ab60e37598f791c62128afd6baf3fa3ec61856adafdfb2bbe8ec5ecd03a1ff529
-EBUILD laser_geometry-9999.ebuild 907 BLAKE2B 9e039c23ee523c09339d5f7ddd7c03a4c19071c5b72b25f3d7c58fdee437172fd767638cdf0e24aa28e6ff95b6766460683a05bf1fac294baae70eeb1fb3a39e SHA512 8252560290406ed8c2a22d4de21e9f7209ad43c076dbbf7002ec713d7ef07f3ab60e37598f791c62128afd6baf3fa3ec61856adafdfb2bbe8ec5ecd03a1ff529
-MISC metadata.xml 344 BLAKE2B 3fc0b20615b5f064fcdbd7a4c249e1faa118866665a37ca2d80d0391e0a5f2bf714138e705ba931aaf17ac1d5b0bb69220b7fb1a1c50637592e9055a8dbf9bae SHA512 c1f5353ab14c0925bf3cee4609ad8e156a3c32a74ea3f3e246ddc34ce17fc8c247408be7224e896721483815327ca0a26997b2e5762cf8f7da4266f7d94c387a
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.7-r1.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.7-r1.ebuild
deleted file mode 100644
index 762e264d8657..000000000000
--- a/dev-ros/laser_geometry/laser_geometry-1.6.7-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/laser_geometry"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Class for converting from a 2D laser scan into a point cloud"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/laser_geometry/laser_geometry-9999.ebuild b/dev-ros/laser_geometry/laser_geometry-9999.ebuild
deleted file mode 100644
index 762e264d8657..000000000000
--- a/dev-ros/laser_geometry/laser_geometry-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/laser_geometry"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Class for converting from a 2D laser scan into a point cloud"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-BDEPEND="
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/laser_geometry/metadata.xml b/dev-ros/laser_geometry/metadata.xml
deleted file mode 100644
index 53c51b3d46ed..000000000000
--- a/dev-ros/laser_geometry/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/laser_geometry</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/laser_proc/Manifest b/dev-ros/laser_proc/Manifest
deleted file mode 100644
index f176496c0464..000000000000
--- a/dev-ros/laser_proc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST laser_proc-0.1.6.tar.gz 6945 BLAKE2B c19774c599e7d2da288e5daeada58b04c393801edc34d40cf173ca7d252a17e89b37facf58d4e22d4f9be372b9a0cf8ffb15d2f32c51125842b4efefb08d857b SHA512 a7bcb7ecff9bb884fa875ff59b1e728f408268dac90a13909e653367a2722e59eb435c3e0feba4fefe0e306a52adac69c98b66974ed610628a690d4e094a85f2
-EBUILD laser_proc-0.1.6.ebuild 525 BLAKE2B 8688db8dbe6c9c555d1f1c5849fdb167e5be54cb858e1cdf593abea0fa56b7311618a91f06ac44e900d2584e9fb85e312c3bf06d0db8e8655911624dbdc71e2a SHA512 30538127c35db69bb9ac2401c4cefc831cc39d8dd559d4fae30d1a43b2d21cb65d1eefd578ec21d58089f1934e33b5286eac60501c31fef0392451cc2a728ce8
-EBUILD laser_proc-9999.ebuild 525 BLAKE2B 8688db8dbe6c9c555d1f1c5849fdb167e5be54cb858e1cdf593abea0fa56b7311618a91f06ac44e900d2584e9fb85e312c3bf06d0db8e8655911624dbdc71e2a SHA512 30538127c35db69bb9ac2401c4cefc831cc39d8dd559d4fae30d1a43b2d21cb65d1eefd578ec21d58089f1934e33b5286eac60501c31fef0392451cc2a728ce8
-MISC metadata.xml 340 BLAKE2B 8502322d52755b89eb2a8e0428cf06b92fe24a00a69f5a845a2ebd998783551071308804f4673d1b4b261e2f4fda78a45c2bff308eb4304547d5c48a2e91f73a SHA512 360ffb313f2b7be8b78d04729301169368dd05de46a6cccda4fc6b03dbf19f8e1ef4d6e8a1086476b40d0696f0076d4d0f4c5795fb13ad409f806206c778dec2
diff --git a/dev-ros/laser_proc/laser_proc-0.1.6.ebuild b/dev-ros/laser_proc/laser_proc-0.1.6.ebuild
deleted file mode 100644
index 2609d02c2feb..000000000000
--- a/dev-ros/laser_proc/laser_proc-0.1.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/laser_proc"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Converts representations of LaserScan and MultiEchoLaserScan"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/nodelet
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/laser_proc/laser_proc-9999.ebuild b/dev-ros/laser_proc/laser_proc-9999.ebuild
deleted file mode 100644
index 2609d02c2feb..000000000000
--- a/dev-ros/laser_proc/laser_proc-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/laser_proc"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Converts representations of LaserScan and MultiEchoLaserScan"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/nodelet
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/laser_proc/metadata.xml b/dev-ros/laser_proc/metadata.xml
deleted file mode 100644
index 1b7e3309f768..000000000000
--- a/dev-ros/laser_proc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/laser_proc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
deleted file mode 100644
index 47651068f868..000000000000
--- a/dev-ros/libmavconn/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
-DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
-DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
-DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
-EBUILD libmavconn-1.2.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
-EBUILD libmavconn-1.4.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
-EBUILD libmavconn-1.5.2.ebuild 454 BLAKE2B 271cc373da00c3224c4fe2cc1404ac7726ecbd24650dfea7535180ee38b76652bf85a23a23ac982a4b7ec5829a576e0476654b505f1ea2fc6c2762918fafc2f1 SHA512 f253d391930adf479b0bee734b185ef285dcf760e9c0f602779ff74b6f1a8f42e0800b2be634ed532d055b0eec402e64ead5f499a0341fe44b198ecd3c7aa1fb
-EBUILD libmavconn-1.8.0.ebuild 454 BLAKE2B 271cc373da00c3224c4fe2cc1404ac7726ecbd24650dfea7535180ee38b76652bf85a23a23ac982a4b7ec5829a576e0476654b505f1ea2fc6c2762918fafc2f1 SHA512 f253d391930adf479b0bee734b185ef285dcf760e9c0f602779ff74b6f1a8f42e0800b2be634ed532d055b0eec402e64ead5f499a0341fe44b198ecd3c7aa1fb
-EBUILD libmavconn-9999.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
-MISC metadata.xml 329 BLAKE2B 012ad802feb99a35403af2fc0309d1967e259cf23d62998f696eafe1d0f5c0a7db5e1b425a64238d7efbd33f87630a0e0ea069313c671ec9d0eecc9efe75ec10 SHA512 3e659b36544ebc741833cbcf82f7bbdd3129bc6a38e518d864e99e12dd24ca857aef5c57525aaeb58bb30ee1ddd2fb6f9e2fec59b895d255b7174e352d818de7
diff --git a/dev-ros/libmavconn/libmavconn-1.2.0.ebuild b/dev-ros/libmavconn/libmavconn-1.2.0.ebuild
deleted file mode 100644
index 9a943481d549..000000000000
--- a/dev-ros/libmavconn/libmavconn-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink communication library"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/mavlink-gbp-release-2016.7.7
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/libmavconn/libmavconn-1.4.0.ebuild b/dev-ros/libmavconn/libmavconn-1.4.0.ebuild
deleted file mode 100644
index 9a943481d549..000000000000
--- a/dev-ros/libmavconn/libmavconn-1.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink communication library"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/mavlink-gbp-release-2016.7.7
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/libmavconn/libmavconn-1.5.2.ebuild b/dev-ros/libmavconn/libmavconn-1.5.2.ebuild
deleted file mode 100644
index 8f7b83354449..000000000000
--- a/dev-ros/libmavconn/libmavconn-1.5.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink communication library"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/mavlink-gbp-release-2016.7.7
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/libmavconn/libmavconn-1.8.0.ebuild b/dev-ros/libmavconn/libmavconn-1.8.0.ebuild
deleted file mode 100644
index 8f7b83354449..000000000000
--- a/dev-ros/libmavconn/libmavconn-1.8.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink communication library"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/mavlink-gbp-release-2016.7.7
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/libmavconn/libmavconn-9999.ebuild b/dev-ros/libmavconn/libmavconn-9999.ebuild
deleted file mode 100644
index 9a943481d549..000000000000
--- a/dev-ros/libmavconn/libmavconn-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink communication library"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/mavlink-gbp-release-2016.7.7
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/libmavconn/metadata.xml b/dev-ros/libmavconn/metadata.xml
deleted file mode 100644
index 3f4ec4d0aeca..000000000000
--- a/dev-ros/libmavconn/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mavlink/mavros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/librviz_tutorial/Manifest b/dev-ros/librviz_tutorial/Manifest
deleted file mode 100644
index a2e53875df55..000000000000
--- a/dev-ros/librviz_tutorial/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD librviz_tutorial-0.11.0.ebuild 446 BLAKE2B 2f7ef79f088ba7d0c4ae24cc8d749304e4cb9ef5941aa593933f2ad91876a283534eebc1acd65162c2720ca15d958c6db1196cc66c95eaed3417064028e8c569 SHA512 4a2ec58abe7fda27121906e6a55ba919f6c209871939ff9a0e96a38db2069faf88d014339275fb9b30f912204827a4e443dea16117defa220dbc0a4118b3cbd6
-EBUILD librviz_tutorial-9999.ebuild 446 BLAKE2B 2f7ef79f088ba7d0c4ae24cc8d749304e4cb9ef5941aa593933f2ad91876a283534eebc1acd65162c2720ca15d958c6db1196cc66c95eaed3417064028e8c569 SHA512 4a2ec58abe7fda27121906e6a55ba919f6c209871939ff9a0e96a38db2069faf88d014339275fb9b30f912204827a4e443dea16117defa220dbc0a4118b3cbd6
-MISC metadata.xml 356 BLAKE2B 0e15a7c0c742df1f97b9674aaf9d0eb7c67544d269b644e0b19163a9a9bcaf8b0451f24ba2c2344acbbcd4856cf79f916e5d974bf5afde6f3c389b7ad7b8c45e SHA512 8e6b4b0942d77ede0e3e96b2f45a1dbddb293fe6235fb1a9e642dff5f483e5a272d18da8ad0d80e6bfa487eacff11d5a53089371a06c7d9c5fba56b3f3c147bb
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
deleted file mode 100644
index fa17abc3aed7..000000000000
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorial showing how to build a C++ program with RViz displays and features"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rviz
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
deleted file mode 100644
index fa17abc3aed7..000000000000
--- a/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorial showing how to build a C++ program with RViz displays and features"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rviz
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/librviz_tutorial/metadata.xml b/dev-ros/librviz_tutorial/metadata.xml
deleted file mode 100644
index ade798056081..000000000000
--- a/dev-ros/librviz_tutorial/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/map_msgs/Manifest b/dev-ros/map_msgs/Manifest
deleted file mode 100644
index e91d36c8774c..000000000000
--- a/dev-ros/map_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST navigation_msgs-1.14.1.tar.gz 2631 BLAKE2B 3d965cd2fa73da3f427a856374bfae641ffdabaa149cd2d452cdb3c0bbc528332d8a436d74f62691a87cd6c8c428e62c2c4cd48f0737a9f558e3ee9dc17a2fe6 SHA512 1574037199ede3d93c6672fffd4bbe9c8c6f8704ef773d6fee12faf9d627d686fa637f0ee710ee9f28a5abe806e993936170a4c437a568c6e10089a3e4df5f44
-EBUILD map_msgs-1.14.1.ebuild 468 BLAKE2B 402b967a925cc34ec57c70ce908b539023d624bc11a2953bfe250c49b5772bbb89862395d7945e9b3fbb878f6b0dc54e3fd4185b6eb96c3e6a16d0623850675e SHA512 040f813a902b5f01feb14a5f6001d1fc621d89be1dabe962e5b9259380e9cc343dd0480a93f06b55e2b4a61573d02077b8c1219e3ff602f9308c7108896d7d78
-EBUILD map_msgs-9999.ebuild 468 BLAKE2B 5850756a4875bb5f53df0dd6b8f173a49e638e857414d1bcd7454ac7d614a4f575a7c6c6bd37777ebc7cb598a189ebb6dd6b0db7ff9df6411329814c08baf573 SHA512 2df227ee9518bfbe271a84767bf7aabf959e5216d2344a36f2e2876feb60bd93e36984d9ba3d4f0a18023d991da49bdfe035adcdc13054feb7e39df57812fb4c
-MISC metadata.xml 343 BLAKE2B 30f1e5113b836b8950bf5ca347921fdb5c342ec594eba48381220a97e92f73cd264f80484f7c4ad098f48d301821b5141df9ed7f63a4bacdb16acb97c6563033 SHA512 1dd6ce4b2fdad521284c0870f16e16279ea09b18058a7cba777c06fc5408e8116cbba52e085a55799a6a288f1e7fa89a632379d050a287e66083eac580a37448
diff --git a/dev-ros/map_msgs/map_msgs-1.14.1.ebuild b/dev-ros/map_msgs/map_msgs-1.14.1.ebuild
deleted file mode 100644
index 6e62f720f9fc..000000000000
--- a/dev-ros/map_msgs/map_msgs-1.14.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-planning/navigation_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs dev-ros/nav_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages commonly used in mapping packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/map_msgs/map_msgs-9999.ebuild b/dev-ros/map_msgs/map_msgs-9999.ebuild
deleted file mode 100644
index b8edba6c29a9..000000000000
--- a/dev-ros/map_msgs/map_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs dev-ros/nav_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages commonly used in mapping packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/map_msgs/metadata.xml b/dev-ros/map_msgs/metadata.xml
deleted file mode 100644
index 57108def8229..000000000000
--- a/dev-ros/map_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
deleted file mode 100644
index 42badb95023b..000000000000
--- a/dev-ros/map_server/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD map_server-1.17.0.ebuild 714 BLAKE2B ea65db38fc750fd7d5a431f386d82c052e12307b266a7969f18f8e5c56aefa28055197b3a99f49c7c6c1200d9aebe356111590e116941b924194148cc6ffe49f SHA512 c86a6ad4e1be82c74af966c81d8164b60cdd3b6f68de7c2970c824b857c060e37f6cf74ad2d0377f96193f0901982ede8fa5b296d14b070486db6c87f2e00dd1
-EBUILD map_server-1.17.1.ebuild 714 BLAKE2B ea65db38fc750fd7d5a431f386d82c052e12307b266a7969f18f8e5c56aefa28055197b3a99f49c7c6c1200d9aebe356111590e116941b924194148cc6ffe49f SHA512 c86a6ad4e1be82c74af966c81d8164b60cdd3b6f68de7c2970c824b857c060e37f6cf74ad2d0377f96193f0901982ede8fa5b296d14b070486db6c87f2e00dd1
-EBUILD map_server-9999.ebuild 714 BLAKE2B ea65db38fc750fd7d5a431f386d82c052e12307b266a7969f18f8e5c56aefa28055197b3a99f49c7c6c1200d9aebe356111590e116941b924194148cc6ffe49f SHA512 c86a6ad4e1be82c74af966c81d8164b60cdd3b6f68de7c2970c824b857c060e37f6cf74ad2d0377f96193f0901982ede8fa5b296d14b070486db6c87f2e00dd1
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/map_server/map_server-1.17.0.ebuild b/dev-ros/map_server/map_server-1.17.0.ebuild
deleted file mode 100644
index 01d98e8306e2..000000000000
--- a/dev-ros/map_server/map_server-1.17.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-physics/bullet:=
-	dev-ros/roscpp
-	media-libs/sdl-image[png]
-	dev-ros/tf2
-	>=dev-cpp/yaml-cpp-0.5:=
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest
-		dev-ros/rospy
-		dev-ros/rosunit
-		dev-cpp/gtest
-	)
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/map_server/map_server-1.17.1.ebuild b/dev-ros/map_server/map_server-1.17.1.ebuild
deleted file mode 100644
index 01d98e8306e2..000000000000
--- a/dev-ros/map_server/map_server-1.17.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-physics/bullet:=
-	dev-ros/roscpp
-	media-libs/sdl-image[png]
-	dev-ros/tf2
-	>=dev-cpp/yaml-cpp-0.5:=
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest
-		dev-ros/rospy
-		dev-ros/rosunit
-		dev-cpp/gtest
-	)
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/map_server/map_server-9999.ebuild b/dev-ros/map_server/map_server-9999.ebuild
deleted file mode 100644
index 01d98e8306e2..000000000000
--- a/dev-ros/map_server/map_server-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-physics/bullet:=
-	dev-ros/roscpp
-	media-libs/sdl-image[png]
-	dev-ros/tf2
-	>=dev-cpp/yaml-cpp-0.5:=
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest
-		dev-ros/rospy
-		dev-ros/rosunit
-		dev-cpp/gtest
-	)
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/map_server/metadata.xml b/dev-ros/map_server/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/map_server/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
deleted file mode 100644
index 79c30bf8a26c..000000000000
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gentoo.patch 708 BLAKE2B ad41a87474f0c542dcab2189e08f744c37ebc0a5993c9ca46633d3f02b3c13b002cd1b1644123694bd0bea756168d29d121eca9cd8071a548ae592f6e81431f1 SHA512 2ab7861c421e630a87924ae4b5f282493be043d1d0a53188ed6ec2938250ac4fb1e402072d4f10afc747271c94cad424bd84ca15d49d38e871b245b5068de698
-DIST mavlink-gbp-release-2021.7.7.tar.gz 4280663 BLAKE2B 36fe1f224178ec954866b07c470cebf50fb779eb004911092b24fc380492c6b89b5509fc3b823ab5b355a0957ab113ea4915c94d499667b1e27ee964867e1063 SHA512 b3e7b196ff0e58c3cccfd2ea21f8804732ffbf62bf0288f2c8e0f518e387629fb0260ce9c7cffd94d83b21e8203f2077176d568aa9de4818f2bd6badae9f6a0c
-EBUILD mavlink-gbp-release-2021.7.7.ebuild 563 BLAKE2B 56d0e10b830789364f5e12ba17baca70f520ec2b0e6cb753a53b081e40e2e726d74b7a62055416c69ba7f18cfe16dcbc6d8a104f82b96501467006754f757043 SHA512 aede556ebe20848f1c246acf61f7fcde3f58ee809b26c9304c9082142b7434962c3ab615bd1acacf1d2a315c491751b04c9f8a90e04dd1e99ea75f600ab267e8
-MISC metadata.xml 342 BLAKE2B 191ba7ce66c741044d1f1ce9f1f747e391d11f1f9501872b639bf30bd85e524314cc54498a2b92b80555e355df187cb7f2543359dc5033dd8169a3e3ce66e802 SHA512 adc5ca0981ce69e6eab94160ae0e94b2bbdeff4cc14f3d9b3f101a7247fc57463b4529e8c865931ec1334d686d894e90e669d385b5566d73a258b78b135b4d15
diff --git a/dev-ros/mavlink-gbp-release/files/gentoo.patch b/dev-ros/mavlink-gbp-release/files/gentoo.patch
deleted file mode 100644
index 92f16757158e..000000000000
--- a/dev-ros/mavlink-gbp-release/files/gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mavlink-gbp-release-release-kinetic-mavlink/CMakeLists.txt
-===================================================================
---- mavlink-gbp-release-release-kinetic-mavlink.orig/CMakeLists.txt
-+++ mavlink-gbp-release-release-kinetic-mavlink/CMakeLists.txt
-@@ -172,6 +172,8 @@ install(FILES ${PROJECT_BINARY_DIR}/COPY
-     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/ COMPONENT license)
- 
- install(FILES ${CMAKE_SOURCE_DIR}/package.xml
-+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ros_packages/${PROJECT_NAME}/ COMPONENT catkin)
-+install(FILES ${CMAKE_SOURCE_DIR}/package.xml
-     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/ COMPONENT catkin)
- 
- # vim:sw=4:ts=4:expandtab
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild
deleted file mode 100644
index 2b6b1f3ec934..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-EGIT_BRANCH="release/noetic/mavlink"
-VER_PREFIX="${EGIT_BRANCH}/"
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/future[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/metadata.xml b/dev-ros/mavlink-gbp-release/metadata.xml
deleted file mode 100644
index bbb0a7b985c3..000000000000
--- a/dev-ros/mavlink-gbp-release/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mavlink/mavlink-gbp-release</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
deleted file mode 100644
index 53639629f1ba..000000000000
--- a/dev-ros/mavros/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
-EBUILD mavros-1.8.0-r1.ebuild 1138 BLAKE2B 09db13045911280dbf041b3ab6741397c3a04b7954e66b6eee48ab30f27bcb2c578737c505cff2ae0f810055a1f3d322b89fce6de9329872333aa53b11809802 SHA512 a36cbdae272ca68c7c1555a35355e2dd37413ad8948251fb83ebeaad2df7e8d7666716bc72f2a6e9f39770ca58df9eb5b84cb946caca83f33d2e6a4bcb657062
-EBUILD mavros-9999.ebuild 1138 BLAKE2B 09db13045911280dbf041b3ab6741397c3a04b7954e66b6eee48ab30f27bcb2c578737c505cff2ae0f810055a1f3d322b89fce6de9329872333aa53b11809802 SHA512 a36cbdae272ca68c7c1555a35355e2dd37413ad8948251fb83ebeaad2df7e8d7666716bc72f2a6e9f39770ca58df9eb5b84cb946caca83f33d2e6a4bcb657062
-MISC metadata.xml 329 BLAKE2B 012ad802feb99a35403af2fc0309d1967e259cf23d62998f696eafe1d0f5c0a7db5e1b425a64238d7efbd33f87630a0e0ea069313c671ec9d0eecc9efe75ec10 SHA512 3e659b36544ebc741833cbcf82f7bbdd3129bc6a38e518d864e99e12dd24ca857aef5c57525aaeb58bb30ee1ddd2fb6f9e2fec59b895d255b7174e352d818de7
diff --git a/dev-ros/mavros/mavros-1.8.0-r1.ebuild b/dev-ros/mavros/mavros-1.8.0-r1.ebuild
deleted file mode 100644
index bf93840a0e01..000000000000
--- a/dev-ros/mavros/mavros-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles:0
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/eigen_conversions
-	sci-geosciences/GeographicLib
-	>=dev-ros/mavlink-gbp-release-2020.9.10
-	dev-libs/console_bridge:=
-	dev-ros/tf2_eigen
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
deleted file mode 100644
index bf93840a0e01..000000000000
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles:0
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/eigen_conversions
-	sci-geosciences/GeographicLib
-	>=dev-ros/mavlink-gbp-release-2020.9.10
-	dev-libs/console_bridge:=
-	dev-ros/tf2_eigen
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/mavros/metadata.xml b/dev-ros/mavros/metadata.xml
deleted file mode 100644
index 3f4ec4d0aeca..000000000000
--- a/dev-ros/mavros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mavlink/mavros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
deleted file mode 100644
index 5360a007b7b0..000000000000
--- a/dev-ros/mavros_extras/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
-DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
-DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
-DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
-EBUILD mavros_extras-1.2.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
-EBUILD mavros_extras-1.4.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
-EBUILD mavros_extras-1.5.2.ebuild 937 BLAKE2B 93a0e54096dd1473d688e8804e404012644826c24189740799bab7821942fe8db50773789572c19c6e054b8dec4c41f8309dd2bf17e13236d52f7ef42b8fd7d3 SHA512 21d079dbf7abf1cf9114b2acf839cfb599a25738ceb4f4611fa55c6edcb56f3ad17d462d2115f9911d90885995d1286f263555c7e1e035b28a054904dc716ba8
-EBUILD mavros_extras-1.8.0.ebuild 937 BLAKE2B 93a0e54096dd1473d688e8804e404012644826c24189740799bab7821942fe8db50773789572c19c6e054b8dec4c41f8309dd2bf17e13236d52f7ef42b8fd7d3 SHA512 21d079dbf7abf1cf9114b2acf839cfb599a25738ceb4f4611fa55c6edcb56f3ad17d462d2115f9911d90885995d1286f263555c7e1e035b28a054904dc716ba8
-EBUILD mavros_extras-9999.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
-MISC metadata.xml 329 BLAKE2B 012ad802feb99a35403af2fc0309d1967e259cf23d62998f696eafe1d0f5c0a7db5e1b425a64238d7efbd33f87630a0e0ea069313c671ec9d0eecc9efe75ec10 SHA512 3e659b36544ebc741833cbcf82f7bbdd3129bc6a38e518d864e99e12dd24ca857aef5c57525aaeb58bb30ee1ddd2fb6f9e2fec59b895d255b7174e352d818de7
diff --git a/dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
deleted file mode 100644
index e7290bdf87be..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild
deleted file mode 100644
index e7290bdf87be..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/mavros_extras/mavros_extras-1.5.2.ebuild b/dev-ros/mavros_extras/mavros_extras-1.5.2.ebuild
deleted file mode 100644
index 4a27f7707f48..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-1.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild
deleted file mode 100644
index 4a27f7707f48..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/mavros_extras/mavros_extras-9999.ebuild b/dev-ros/mavros_extras/mavros_extras-9999.ebuild
deleted file mode 100644
index e7290bdf87be..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/mavros_extras/metadata.xml b/dev-ros/mavros_extras/metadata.xml
deleted file mode 100644
index 3f4ec4d0aeca..000000000000
--- a/dev-ros/mavros_extras/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mavlink/mavros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
deleted file mode 100644
index f8d654f20c24..000000000000
--- a/dev-ros/mavros_msgs/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
-DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
-DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
-DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
-EBUILD mavros_msgs-1.2.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
-EBUILD mavros_msgs-1.4.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
-EBUILD mavros_msgs-1.5.2.ebuild 460 BLAKE2B e65c5f3a1c33f1808bec285c49a4e972cce02d468960449013b9d9778b8e03af75051f1683a61da1704e969e7d14830cfcd953f925cfcb815b1c462cf37d051c SHA512 318126d816e129f964dc2cded761f9d3527782149a451e3d936af8b3441e0112dbf5d50e6461106af8b0e3cb84cdbd8b69cd7992f3421497dd6aceca595226fd
-EBUILD mavros_msgs-1.8.0.ebuild 460 BLAKE2B e65c5f3a1c33f1808bec285c49a4e972cce02d468960449013b9d9778b8e03af75051f1683a61da1704e969e7d14830cfcd953f925cfcb815b1c462cf37d051c SHA512 318126d816e129f964dc2cded761f9d3527782149a451e3d936af8b3441e0112dbf5d50e6461106af8b0e3cb84cdbd8b69cd7992f3421497dd6aceca595226fd
-EBUILD mavros_msgs-9999.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
-MISC metadata.xml 329 BLAKE2B 012ad802feb99a35403af2fc0309d1967e259cf23d62998f696eafe1d0f5c0a7db5e1b425a64238d7efbd33f87630a0e0ea069313c671ec9d0eecc9efe75ec10 SHA512 3e659b36544ebc741833cbcf82f7bbdd3129bc6a38e518d864e99e12dd24ca857aef5c57525aaeb58bb30ee1ddd2fb6f9e2fec59b895d255b7174e352d818de7
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
deleted file mode 100644
index 04710e1afb12..000000000000
--- a/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for MAVROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild
deleted file mode 100644
index 04710e1afb12..000000000000
--- a/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for MAVROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.5.2.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.5.2.ebuild
deleted file mode 100644
index 11b0de2bd004..000000000000
--- a/dev-ros/mavros_msgs/mavros_msgs-1.5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for MAVROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild
deleted file mode 100644
index 11b0de2bd004..000000000000
--- a/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for MAVROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
deleted file mode 100644
index 04710e1afb12..000000000000
--- a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for MAVROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/metadata.xml b/dev-ros/mavros_msgs/metadata.xml
deleted file mode 100644
index 3f4ec4d0aeca..000000000000
--- a/dev-ros/mavros_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mavlink/mavros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/media_export/Manifest b/dev-ros/media_export/Manifest
deleted file mode 100644
index 796ccfb870b9..000000000000
--- a/dev-ros/media_export/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST media_export-0.3.0.tar.gz 1435 BLAKE2B 7f907ad84539f9bd54963d3b3e79a0402229c70f65a152da9f9db0d88db790705a7aaf73a0ba42a0a5d7355fb4e4afeab6e857af452b1de49151f32e910c489f SHA512 eabeb2224c47a6fc835a1fbea06302ba183954903a1a9dc3496201e63eb8e4752ef4b4456b91a63820fd230d20d0b446a79d856de1c69986fddc80085f1cf27e
-EBUILD media_export-0.3.0.ebuild 325 BLAKE2B fb98a51d7c08f22bcc060a94b8f5884f0308e51b3f60ddff2112502ec3b1cb392aa0c045e909543cdd7f05d1b028e84f947b2073247c251f46372c3986d6574e SHA512 c5ca5af5630ac5dcd3e5fc8071bebee1780c4889155bf6f6500c694f2d6c479de9528c8b69e2ed065161b515e173585818b4229bcc78736d7941f0f098f158e2
-EBUILD media_export-9999.ebuild 325 BLAKE2B fb98a51d7c08f22bcc060a94b8f5884f0308e51b3f60ddff2112502ec3b1cb392aa0c045e909543cdd7f05d1b028e84f947b2073247c251f46372c3986d6574e SHA512 c5ca5af5630ac5dcd3e5fc8071bebee1780c4889155bf6f6500c694f2d6c479de9528c8b69e2ed065161b515e173585818b4229bcc78736d7941f0f098f158e2
-MISC metadata.xml 331 BLAKE2B 7e949fbc1db58f80ebb511b2059a130d6da66adc30b1a874a69769c8310f3c72a8f275bd8f30f96c41c289f39f3a49236b6e9469e3ce4cfbaf7470b9a44c7484 SHA512 0bc1a5af654d990d1a5862ccef5e52709e99f1b16075c55f5bb7b339cb3aaad23cd0f4341e5d6fd8b9e5383629d8cb2d4199ac7d7d1895a2121920497bae091b
diff --git a/dev-ros/media_export/media_export-0.3.0.ebuild b/dev-ros/media_export/media_export-0.3.0.ebuild
deleted file mode 100644
index 6d904cb88330..000000000000
--- a/dev-ros/media_export/media_export-0.3.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/media_export"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Allow ROS packages to export media paths to each other"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
diff --git a/dev-ros/media_export/media_export-9999.ebuild b/dev-ros/media_export/media_export-9999.ebuild
deleted file mode 100644
index 6d904cb88330..000000000000
--- a/dev-ros/media_export/media_export-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/media_export"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Allow ROS packages to export media paths to each other"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
diff --git a/dev-ros/media_export/metadata.xml b/dev-ros/media_export/metadata.xml
deleted file mode 100644
index b24bc33e1e31..000000000000
--- a/dev-ros/media_export/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/media_export</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
deleted file mode 100644
index 52fcd8e7625b..000000000000
--- a/dev-ros/message_filters/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD message_filters-1.15.10-r1.ebuild 890 BLAKE2B 87fd395ec63a71573a1383d7f4a815b6a40199004f1337d4c425d708da0914ab8fa31242c3643c9bb114bfcc5bf412874268448d303efcdd8981332ae1a7aebf SHA512 482264b826e509ab989f511bef42ae06c46a65dc81d77a7a6d8367234f364cbf6e09f9c8c8d3ae81a234685f18d56367ec642e988736e72736fb7c55cf056881
-EBUILD message_filters-1.15.11.ebuild 890 BLAKE2B 87fd395ec63a71573a1383d7f4a815b6a40199004f1337d4c425d708da0914ab8fa31242c3643c9bb114bfcc5bf412874268448d303efcdd8981332ae1a7aebf SHA512 482264b826e509ab989f511bef42ae06c46a65dc81d77a7a6d8367234f364cbf6e09f9c8c8d3ae81a234685f18d56367ec642e988736e72736fb7c55cf056881
-EBUILD message_filters-1.15.13.ebuild 890 BLAKE2B 87fd395ec63a71573a1383d7f4a815b6a40199004f1337d4c425d708da0914ab8fa31242c3643c9bb114bfcc5bf412874268448d303efcdd8981332ae1a7aebf SHA512 482264b826e509ab989f511bef42ae06c46a65dc81d77a7a6d8367234f364cbf6e09f9c8c8d3ae81a234685f18d56367ec642e988736e72736fb7c55cf056881
-EBUILD message_filters-1.15.14.ebuild 890 BLAKE2B 87fd395ec63a71573a1383d7f4a815b6a40199004f1337d4c425d708da0914ab8fa31242c3643c9bb114bfcc5bf412874268448d303efcdd8981332ae1a7aebf SHA512 482264b826e509ab989f511bef42ae06c46a65dc81d77a7a6d8367234f364cbf6e09f9c8c8d3ae81a234685f18d56367ec642e988736e72736fb7c55cf056881
-EBUILD message_filters-1.15.8-r1.ebuild 890 BLAKE2B 87fd395ec63a71573a1383d7f4a815b6a40199004f1337d4c425d708da0914ab8fa31242c3643c9bb114bfcc5bf412874268448d303efcdd8981332ae1a7aebf SHA512 482264b826e509ab989f511bef42ae06c46a65dc81d77a7a6d8367234f364cbf6e09f9c8c8d3ae81a234685f18d56367ec642e988736e72736fb7c55cf056881
-EBUILD message_filters-1.15.9-r1.ebuild 890 BLAKE2B 87fd395ec63a71573a1383d7f4a815b6a40199004f1337d4c425d708da0914ab8fa31242c3643c9bb114bfcc5bf412874268448d303efcdd8981332ae1a7aebf SHA512 482264b826e509ab989f511bef42ae06c46a65dc81d77a7a6d8367234f364cbf6e09f9c8c8d3ae81a234685f18d56367ec642e988736e72736fb7c55cf056881
-EBUILD message_filters-9999.ebuild 890 BLAKE2B 87fd395ec63a71573a1383d7f4a815b6a40199004f1337d4c425d708da0914ab8fa31242c3643c9bb114bfcc5bf412874268448d303efcdd8981332ae1a7aebf SHA512 482264b826e509ab989f511bef42ae06c46a65dc81d77a7a6d8367234f364cbf6e09f9c8c8d3ae81a234685f18d56367ec642e988736e72736fb7c55cf056881
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/message_filters/files/tests.patch b/dev-ros/message_filters/files/tests.patch
deleted file mode 100644
index 2861213235e6..000000000000
--- a/dev-ros/message_filters/files/tests.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-Index: message_filters/test/test_approximate_time_policy.cpp
-===================================================================
---- message_filters.orig/test/test_approximate_time_policy.cpp
-+++ message_filters/test/test_approximate_time_policy.cpp
-@@ -106,8 +106,8 @@ public:
-   {
-     //printf("Call_back called\n");
-     //printf("Call back: <%f, %f>\n", p->header.stamp.toSec(), q->header.stamp.toSec());
--    ASSERT_TRUE(p);
--    ASSERT_TRUE(q);
-+    ASSERT_TRUE(p!=NULL);
-+    ASSERT_TRUE(q!=NULL);
-     ASSERT_LT(output_position_, output_.size());
-     EXPECT_EQ(output_[output_position_].first, p->header.stamp);
-     EXPECT_EQ(output_[output_position_].second, q->header.stamp);
-@@ -164,10 +164,10 @@ public:
-   {
-     //printf("Call_back called\n");
-     //printf("Call back: <%f, %f>\n", p->header.stamp.toSec(), q->header.stamp.toSec());
--    ASSERT_TRUE(p);
--    ASSERT_TRUE(q);
--    ASSERT_TRUE(r);
--    ASSERT_TRUE(s);
-+    ASSERT_TRUE(p!=NULL);
-+    ASSERT_TRUE(q!=NULL);
-+    ASSERT_TRUE(r!=NULL);
-+    ASSERT_TRUE(s!=NULL);
-     ASSERT_LT(output_position_, output_.size());
-     EXPECT_EQ(output_[output_position_].time[0], p->header.stamp);
-     EXPECT_EQ(output_[output_position_].time[1], q->header.stamp);
-Index: message_filters/test/test_chain.cpp
-===================================================================
---- message_filters.orig/test/test_chain.cpp
-+++ message_filters/test/test_chain.cpp
-@@ -148,8 +148,8 @@ TEST(Chain, retrieveFilter)
- 
-   c.addFilter(boost::make_shared<PassThrough<Msg> >());
- 
--  ASSERT_TRUE(c.getFilter<PassThrough<Msg> >(0));
--  ASSERT_FALSE(c.getFilter<PassThrough<Msg> >(1));
-+  ASSERT_TRUE(c.getFilter<PassThrough<Msg> >(0) != NULL);
-+  ASSERT_FALSE(c.getFilter<PassThrough<Msg> >(1) != NULL);
- }
- 
- TEST(Chain, retrieveFilterThroughBaseClass)
-@@ -161,8 +161,8 @@ TEST(Chain, retrieveFilterThroughBaseCla
- 
-   c.addFilter(boost::make_shared<PassThrough<Msg> >());
- 
--  ASSERT_TRUE(cb->getFilter<PassThrough<Msg> >(0));
--  ASSERT_FALSE(cb->getFilter<PassThrough<Msg> >(1));
-+  ASSERT_TRUE(cb->getFilter<PassThrough<Msg> >(0) != NULL);
-+  ASSERT_FALSE(cb->getFilter<PassThrough<Msg> >(1) != NULL);
- }
- 
- struct PTDerived : public PassThrough<Msg>
-@@ -174,8 +174,8 @@ TEST(Chain, retrieveBaseClass)
- {
-   Chain<Msg> c;
-   c.addFilter(boost::make_shared<PTDerived>());
--  ASSERT_TRUE(c.getFilter<PassThrough<Msg> >(0));
--  ASSERT_TRUE(c.getFilter<PTDerived>(0));
-+  ASSERT_TRUE(c.getFilter<PassThrough<Msg> >(0) != NULL);
-+  ASSERT_TRUE(c.getFilter<PTDerived>(0) != NULL);
- }
- 
- int main(int argc, char **argv){
-Index: message_filters/test/test_exact_time_policy.cpp
-===================================================================
---- message_filters.orig/test/test_exact_time_policy.cpp
-+++ message_filters/test/test_exact_time_policy.cpp
-@@ -187,8 +187,8 @@ TEST(ExactTime, eventInEventOut)
-   sync.add<0>(evt);
-   sync.add<1>(evt);
- 
--  ASSERT_TRUE(h.e1_.getMessage());
--  ASSERT_TRUE(h.e2_.getMessage());
-+  ASSERT_TRUE(h.e1_.getMessage()!=NULL);
-+  ASSERT_TRUE(h.e2_.getMessage()!=NULL);
-   ASSERT_EQ(h.e1_.getReceiptTime(), evt.getReceiptTime());
-   ASSERT_EQ(h.e2_.getReceiptTime(), evt.getReceiptTime());
- }
-Index: message_filters/test/test_subscriber.cpp
-===================================================================
---- message_filters.orig/test/test_subscriber.cpp
-+++ message_filters/test/test_subscriber.cpp
-@@ -152,7 +152,7 @@ TEST(Subscriber, singleNonConstCallback)
- 
-   ros::spinOnce();
- 
--  ASSERT_TRUE(h.msg_);
-+  ASSERT_TRUE(h.msg_!=NULL);
-   ASSERT_EQ(msg.get(), h.msg_.get());
- }
- 
-@@ -169,8 +169,8 @@ TEST(Subscriber, multipleNonConstCallbac
- 
-   ros::spinOnce();
- 
--  ASSERT_TRUE(h.msg_);
--  ASSERT_TRUE(h2.msg_);
-+  ASSERT_TRUE(h.msg_ !=NULL);
-+  ASSERT_TRUE(h2.msg_!=NULL);
-   EXPECT_NE(msg.get(), h.msg_.get());
-   EXPECT_NE(msg.get(), h2.msg_.get());
-   EXPECT_NE(h.msg_.get(), h2.msg_.get());
-@@ -189,8 +189,8 @@ TEST(Subscriber, multipleCallbacksSomeFi
- 
-   ros::spinOnce();
- 
--  ASSERT_TRUE(h.msg_);
--  ASSERT_TRUE(h2.msg_);
-+  ASSERT_TRUE(h.msg_ != NULL);
-+  ASSERT_TRUE(h2.msg_!= NULL);
-   EXPECT_NE(msg.get(), h.msg_.get());
-   EXPECT_NE(msg.get(), h2.msg_.get());
-   EXPECT_NE(h.msg_.get(), h2.msg_.get());
-Index: message_filters/test/time_synchronizer_unittest.cpp
-===================================================================
---- message_filters.orig/test/time_synchronizer_unittest.cpp
-+++ message_filters/test/time_synchronizer_unittest.cpp
-@@ -516,8 +516,8 @@ TEST(TimeSynchronizer, eventInEventOut)
-   sync.add<0>(evt);
-   sync.add<1>(evt);
- 
--  ASSERT_TRUE(h.e1_.getMessage());
--  ASSERT_TRUE(h.e2_.getMessage());
-+  ASSERT_TRUE(h.e1_.getMessage()!=NULL);
-+  ASSERT_TRUE(h.e2_.getMessage()!=NULL);
-   ASSERT_EQ(h.e1_.getReceiptTime(), evt.getReceiptTime());
-   ASSERT_EQ(h.e2_.getReceiptTime(), evt.getReceiptTime());
- }
diff --git a/dev-ros/message_filters/message_filters-1.15.10-r1.ebuild b/dev-ros/message_filters/message_filters-1.15.10-r1.ebuild
deleted file mode 100644
index 400839d2109e..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.10-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/message_filters/message_filters-1.15.11.ebuild b/dev-ros/message_filters/message_filters-1.15.11.ebuild
deleted file mode 100644
index 400839d2109e..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/message_filters/message_filters-1.15.13.ebuild b/dev-ros/message_filters/message_filters-1.15.13.ebuild
deleted file mode 100644
index 400839d2109e..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/message_filters/message_filters-1.15.14.ebuild b/dev-ros/message_filters/message_filters-1.15.14.ebuild
deleted file mode 100644
index 400839d2109e..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/message_filters/message_filters-1.15.8-r1.ebuild b/dev-ros/message_filters/message_filters-1.15.8-r1.ebuild
deleted file mode 100644
index 400839d2109e..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.8-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/message_filters/message_filters-1.15.9-r1.ebuild b/dev-ros/message_filters/message_filters-1.15.9-r1.ebuild
deleted file mode 100644
index 400839d2109e..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.9-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/message_filters/message_filters-9999.ebuild b/dev-ros/message_filters/message_filters-9999.ebuild
deleted file mode 100644
index 400839d2109e..000000000000
--- a/dev-ros/message_filters/message_filters-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/message_filters/metadata.xml b/dev-ros/message_filters/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/message_filters/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/message_generation/Manifest b/dev-ros/message_generation/Manifest
deleted file mode 100644
index 278d3b719ed3..000000000000
--- a/dev-ros/message_generation/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST message_generation-0.4.1.tar.gz 726 BLAKE2B bc9e1881b005d48fc9b9bc5f740e1b30537879f3019b4d879d3764a7e5733afc27ec7b4acc44c614c00b2dc6bb61b34221ba512caee55e55f33d1fbc55f748d1 SHA512 9a256dac2e4463917362e4f279c9dcd1945f8493890e423be4d2b4c6121677ffc859332fd48ef6a85977bef690e8843926269dda35e2c35d41a65eb714d6988a
-EBUILD message_generation-0.4.1.ebuild 460 BLAKE2B 08d7e85dc67eaa37ba06d2e72547cd9a026b2eba4609205593c53226eb3817be3fe6072213b6678535a9cab5930ff99a83d5e9562f82badf047589cc30c68200 SHA512 0a541548b586b50aaa77c3c554b126e864b09b378a102e2d56979e576c96a2610edafc246fae1b65ef8cac16bd866012955140c888ce217d6a2a42bf2bfa7dcb
-EBUILD message_generation-9999.ebuild 460 BLAKE2B 08d7e85dc67eaa37ba06d2e72547cd9a026b2eba4609205593c53226eb3817be3fe6072213b6678535a9cab5930ff99a83d5e9562f82badf047589cc30c68200 SHA512 0a541548b586b50aaa77c3c554b126e864b09b378a102e2d56979e576c96a2610edafc246fae1b65ef8cac16bd866012955140c888ce217d6a2a42bf2bfa7dcb
-MISC metadata.xml 337 BLAKE2B 3a59c5035dbb1c9edda4bd4fddb527c515deae9a7bbb930ab881d6c1b24cea8910187105c85deb7310a48877ab551fbb540a968291cb5975bb7d255e9cc84c3f SHA512 7cda69b1c7d48a22a3571faadbe21d1b5f8fae70c275177627e0218ddb1135842d174460bf12445bb06e606d129e1455719cdd3f19bf11ef0a6564306b20c761
diff --git a/dev-ros/message_generation/message_generation-0.4.1.ebuild b/dev-ros/message_generation/message_generation-0.4.1.ebuild
deleted file mode 100644
index 1ea158d9fce0..000000000000
--- a/dev-ros/message_generation/message_generation-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/message_generation"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Build-time dependencies for generating language bindings of messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg
-	dev-ros/genlisp
-	dev-ros/gencpp
-	dev-ros/genpy
-	dev-ros/geneus
-	dev-ros/gennodejs
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_generation/message_generation-9999.ebuild b/dev-ros/message_generation/message_generation-9999.ebuild
deleted file mode 100644
index 1ea158d9fce0..000000000000
--- a/dev-ros/message_generation/message_generation-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/message_generation"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Build-time dependencies for generating language bindings of messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg
-	dev-ros/genlisp
-	dev-ros/gencpp
-	dev-ros/genpy
-	dev-ros/geneus
-	dev-ros/gennodejs
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_generation/metadata.xml b/dev-ros/message_generation/metadata.xml
deleted file mode 100644
index e2562853025f..000000000000
--- a/dev-ros/message_generation/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/message_generation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/message_runtime/Manifest b/dev-ros/message_runtime/Manifest
deleted file mode 100644
index a11a880b381e..000000000000
--- a/dev-ros/message_runtime/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST message_runtime-0.4.13.tar.gz 776 BLAKE2B e5ac21f92e3c16d9220dbbc667c8f08a4eebfbacfd03a0a82dc1580898710d3b066629846fe50b7c550df27e1f41cc8f3403d96ac60efd4c7fb29de85dd41fb9 SHA512 0a5dfd5892929a5868133dd51ed33d67c8ec4fb509ed27f977b060531b5dfded977e3112dfeeb6df5bae5223fc8d7bcf00810a58d27e3adbef0bd53a06db6d80
-EBUILD message_runtime-0.4.13.ebuild 444 BLAKE2B 742824d58c39438a0b7bc2e778be8190d4c02717e22cdc5933c6bca4b4357c13e96e11f1d37da8cfb4bb394463742a04797e191b29e6e55de9cd8e7babc06961 SHA512 06494dccef5ad9ef1f4dcec4feeb18dc76ab6a33885b8af6144d6cf90aeef50b9c2a975a7a345cd6aedf59923d6db1dd70852fca11f092e6ff19c2a36e7fa397
-EBUILD message_runtime-9999.ebuild 444 BLAKE2B 742824d58c39438a0b7bc2e778be8190d4c02717e22cdc5933c6bca4b4357c13e96e11f1d37da8cfb4bb394463742a04797e191b29e6e55de9cd8e7babc06961 SHA512 06494dccef5ad9ef1f4dcec4feeb18dc76ab6a33885b8af6144d6cf90aeef50b9c2a975a7a345cd6aedf59923d6db1dd70852fca11f092e6ff19c2a36e7fa397
-MISC metadata.xml 334 BLAKE2B 4e0a866a15edd780560ce10d150e48448b592e51a4b80569e16d89a7d16ed6fd329decc9ea4a0f954eaadc1a762465e444f2838cb4599e6b2d286c706803141e SHA512 11782ee1d36a49f061ca4638a9b2809db806f0b02292e9bf2af75eb4ad447879a107786d31848f2a0e8af01a7c4f6bc1507e03f60224780397a85f236c52c5a9
diff --git a/dev-ros/message_runtime/message_runtime-0.4.13.ebuild b/dev-ros/message_runtime/message_runtime-0.4.13.ebuild
deleted file mode 100644
index 0168d5fac070..000000000000
--- a/dev-ros/message_runtime/message_runtime-0.4.13.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/message_runtime"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Package modeling the run-time dependencies for language bindings of messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/roscpp_traits
-	dev-ros/roscpp_serialization"
diff --git a/dev-ros/message_runtime/message_runtime-9999.ebuild b/dev-ros/message_runtime/message_runtime-9999.ebuild
deleted file mode 100644
index 0168d5fac070..000000000000
--- a/dev-ros/message_runtime/message_runtime-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/message_runtime"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Package modeling the run-time dependencies for language bindings of messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/roscpp_traits
-	dev-ros/roscpp_serialization"
diff --git a/dev-ros/message_runtime/metadata.xml b/dev-ros/message_runtime/metadata.xml
deleted file mode 100644
index 477db9c31b7b..000000000000
--- a/dev-ros/message_runtime/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/message_runtime</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/message_to_tf/Manifest b/dev-ros/message_to_tf/Manifest
deleted file mode 100644
index e7c4b1b7547e..000000000000
--- a/dev-ros/message_to_tf/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
-DIST hector_localization-0.4.0.tar.gz 75100 BLAKE2B afb6acb1444299c7ca47f25da7d7ad83a2363c98a6b1ed21756cdd5cf63e758b7e4e9d7ea806c7c748dc5e3606bafbe62df612a42597e86ec556696211dc8af9 SHA512 18fc8cb2f51ec978e309a627f12b896aff984fdbe2f2038c47369bd44479b3c739fad586b325c6962bb17c49e46eb7568f8af5af085fbc87749ddb2616ad34c3
-EBUILD message_to_tf-0.3.0.ebuild 611 BLAKE2B 5c7534594ca539dfc4722359537a546859e0815e4b460eadcead11cd1074654c7a4be9480074b70528a3f4cf429dda0d6c80bb34143ef17943ed18bbdb252060 SHA512 b20087191da892d03baad6aef63f653599c2c26e3475507888a1b2f44eeb36e76c920a77dd79b4a3060da6713aba157ff124510c1332b2645f84f7c1e5c9cdc6
-EBUILD message_to_tf-0.4.0.ebuild 611 BLAKE2B fbc2ee2e48999471f3206d891ae9130f9f0facb4cc84b76161303f087e69b2a41b64c02bfe8d230972a8326b255c58f72f793ecf7c307b05d86bdd36bbbe4a5e SHA512 5c3b8bc11eba91b432169615a6b7f8a8c39b81e618211aae20f0e2453a083a02e7f8fc259a13f096af237a86a69b6246630ef8253c82de51c9ba55ca8e9567fb
-EBUILD message_to_tf-9999.ebuild 611 BLAKE2B 5c7534594ca539dfc4722359537a546859e0815e4b460eadcead11cd1074654c7a4be9480074b70528a3f4cf429dda0d6c80bb34143ef17943ed18bbdb252060 SHA512 b20087191da892d03baad6aef63f653599c2c26e3475507888a1b2f44eeb36e76c920a77dd79b4a3060da6713aba157ff124510c1332b2645f84f7c1e5c9cdc6
-MISC metadata.xml 355 BLAKE2B f78c18ce1f7ee54b516270d7471e0df581a05048a420ce79b5cdd25b96d3e65059efc2d8fb9dc0597ad2a1ea4ef807297bda05a77ac7b825e46233ac38a15685 SHA512 263b343d6cc5bb7afba128f07c28549d60301e103563cdf839877ef98066d3f231f4688d83907f7777e5fbc8836760446f069846bd395cc5927b6e9ab91fd3a9
diff --git a/dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild b/dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild
deleted file mode 100644
index 1c31dc9a9a66..000000000000
--- a/dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Translates pose information from different kind of common message types to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf
-	dev-ros/topic_tools
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/message_to_tf/message_to_tf-0.4.0.ebuild b/dev-ros/message_to_tf/message_to_tf-0.4.0.ebuild
deleted file mode 100644
index 29d05af7cf53..000000000000
--- a/dev-ros/message_to_tf/message_to_tf-0.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Translates pose information from different kind of common message types to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf
-	dev-ros/topic_tools
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/message_to_tf/message_to_tf-9999.ebuild b/dev-ros/message_to_tf/message_to_tf-9999.ebuild
deleted file mode 100644
index 1c31dc9a9a66..000000000000
--- a/dev-ros/message_to_tf/message_to_tf-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Translates pose information from different kind of common message types to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf
-	dev-ros/topic_tools
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/message_to_tf/metadata.xml b/dev-ros/message_to_tf/metadata.xml
deleted file mode 100644
index b2ed6142a736..000000000000
--- a/dev-ros/message_to_tf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/metadata.xml b/dev-ros/metadata.xml
deleted file mode 100644
index efd90c113998..000000000000
--- a/dev-ros/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The dev-ros category contains ROS and ROS-related packages.
-	</longdescription>
-</catmetadata>
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
deleted file mode 100644
index 96120b5ac43c..000000000000
--- a/dev-ros/mk/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD mk-1.15.5.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
-EBUILD mk-1.15.6.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
-EBUILD mk-1.15.7.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
-EBUILD mk-1.15.8.ebuild 427 BLAKE2B 9fc29af0db3479c6cf61407838a0efb57f434979c14235dc83bf0f2d45bbcfe84c4d5289ef652720d75e5818d362c0d1c59efaecc4d3d72ff3b241b6428f48fc SHA512 4f5e49f2543bb6b0417653d0c04a22888741cd4b05b751114359a89e305a1c6d82dba9f0af7bc9f96a57fd26558324283033911205cec8bc541053e02f366cc9
-EBUILD mk-9999.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/mk/metadata.xml b/dev-ros/mk/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/mk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/mk/mk-1.15.5.ebuild b/dev-ros/mk/mk-1.15.5.ebuild
deleted file mode 100644
index 12bbf7f7952f..000000000000
--- a/dev-ros/mk/mk-1.15.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RDEPEND="${DEPEND}
-	dev-ros/rospack
-	dev-ros/rosbuild"
diff --git a/dev-ros/mk/mk-1.15.6.ebuild b/dev-ros/mk/mk-1.15.6.ebuild
deleted file mode 100644
index 12bbf7f7952f..000000000000
--- a/dev-ros/mk/mk-1.15.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RDEPEND="${DEPEND}
-	dev-ros/rospack
-	dev-ros/rosbuild"
diff --git a/dev-ros/mk/mk-1.15.7.ebuild b/dev-ros/mk/mk-1.15.7.ebuild
deleted file mode 100644
index 12bbf7f7952f..000000000000
--- a/dev-ros/mk/mk-1.15.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RDEPEND="${DEPEND}
-	dev-ros/rospack
-	dev-ros/rosbuild"
diff --git a/dev-ros/mk/mk-1.15.8.ebuild b/dev-ros/mk/mk-1.15.8.ebuild
deleted file mode 100644
index fbe42319472d..000000000000
--- a/dev-ros/mk/mk-1.15.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RDEPEND="${DEPEND}
-	dev-ros/rospack
-	dev-ros/rosbuild"
diff --git a/dev-ros/mk/mk-9999.ebuild b/dev-ros/mk/mk-9999.ebuild
deleted file mode 100644
index 12bbf7f7952f..000000000000
--- a/dev-ros/mk/mk-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-RDEPEND="${DEPEND}
-	dev-ros/rospack
-	dev-ros/rosbuild"
diff --git a/dev-ros/monocam_settler/Manifest b/dev-ros/monocam_settler/Manifest
deleted file mode 100644
index 9c610df57646..000000000000
--- a/dev-ros/monocam_settler/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD monocam_settler-0.10.14-r1.ebuild 634 BLAKE2B d10a52015b8c24cba979982d46375616b5fc730c2b1336d3233fd7288224e15e7aac56002db3b6e0a0eb3a6dc38e42bfadde87d376cce5ab0971cb8d6f29bfeb SHA512 17dbbbfc7633c70ab9b2a0a2b3c02c7c8f2ccef3d47aaa2cfc4f3ecdbe1cf14999011dede017755efc21a7e74ad867ec517def49a3a1061c8b232e5623085a20
-EBUILD monocam_settler-0.10.15.ebuild 634 BLAKE2B d10a52015b8c24cba979982d46375616b5fc730c2b1336d3233fd7288224e15e7aac56002db3b6e0a0eb3a6dc38e42bfadde87d376cce5ab0971cb8d6f29bfeb SHA512 17dbbbfc7633c70ab9b2a0a2b3c02c7c8f2ccef3d47aaa2cfc4f3ecdbe1cf14999011dede017755efc21a7e74ad867ec517def49a3a1061c8b232e5623085a20
-EBUILD monocam_settler-9999.ebuild 634 BLAKE2B d10a52015b8c24cba979982d46375616b5fc730c2b1336d3233fd7288224e15e7aac56002db3b6e0a0eb3a6dc38e42bfadde87d376cce5ab0971cb8d6f29bfeb SHA512 17dbbbfc7633c70ab9b2a0a2b3c02c7c8f2ccef3d47aaa2cfc4f3ecdbe1cf14999011dede017755efc21a7e74ad867ec517def49a3a1061c8b232e5623085a20
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/monocam_settler/metadata.xml b/dev-ros/monocam_settler/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/monocam_settler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.14-r1.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.14-r1.ebuild
deleted file mode 100644
index 07d68c2f8743..000000000000
--- a/dev-ros/monocam_settler/monocam_settler-0.10.14-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/settlerlib
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.15.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.15.ebuild
deleted file mode 100644
index 07d68c2f8743..000000000000
--- a/dev-ros/monocam_settler/monocam_settler-0.10.15.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/settlerlib
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/monocam_settler/monocam_settler-9999.ebuild b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
deleted file mode 100644
index 07d68c2f8743..000000000000
--- a/dev-ros/monocam_settler/monocam_settler-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/settlerlib
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
deleted file mode 100644
index abd469262ffe..000000000000
--- a/dev-ros/move_base/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD move_base-1.17.0.ebuild 1076 BLAKE2B 71de96487c5236d19e6178a91142a56336b56ef10be127c785fd5d6c92166e7cb311bbf678cae703921c7d8d272b5c1ee0645342a895556d7d2d38ffb194f959 SHA512 ca79a18498f16740a29d765b483639f0267945e0162c59c41a62079297ce6bcb0f73e9a0baf37a472c455e7ee8d617a3f1664df914a7ccb9ba9c14cd01b98a65
-EBUILD move_base-1.17.1.ebuild 1076 BLAKE2B 71de96487c5236d19e6178a91142a56336b56ef10be127c785fd5d6c92166e7cb311bbf678cae703921c7d8d272b5c1ee0645342a895556d7d2d38ffb194f959 SHA512 ca79a18498f16740a29d765b483639f0267945e0162c59c41a62079297ce6bcb0f73e9a0baf37a472c455e7ee8d617a3f1664df914a7ccb9ba9c14cd01b98a65
-EBUILD move_base-9999.ebuild 1076 BLAKE2B 71de96487c5236d19e6178a91142a56336b56ef10be127c785fd5d6c92166e7cb311bbf678cae703921c7d8d272b5c1ee0645342a895556d7d2d38ffb194f959 SHA512 ca79a18498f16740a29d765b483639f0267945e0162c59c41a62079297ce6bcb0f73e9a0baf37a472c455e7ee8d617a3f1664df914a7ccb9ba9c14cd01b98a65
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/move_base/metadata.xml b/dev-ros/move_base/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/move_base/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/move_base/move_base-1.17.0.ebuild b/dev-ros/move_base/move_base-1.17.0.ebuild
deleted file mode 100644
index eaf209fa0834..000000000000
--- a/dev-ros/move_base/move_base-1.17.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.17.1.ebuild b/dev-ros/move_base/move_base-1.17.1.ebuild
deleted file mode 100644
index eaf209fa0834..000000000000
--- a/dev-ros/move_base/move_base-1.17.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-9999.ebuild b/dev-ros/move_base/move_base-9999.ebuild
deleted file mode 100644
index eaf209fa0834..000000000000
--- a/dev-ros/move_base/move_base-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base_msgs/Manifest b/dev-ros/move_base_msgs/Manifest
deleted file mode 100644
index ceacdcb76ab3..000000000000
--- a/dev-ros/move_base_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST navigation_msgs-1.14.1.tar.gz 2631 BLAKE2B 3d965cd2fa73da3f427a856374bfae641ffdabaa149cd2d452cdb3c0bbc528332d8a436d74f62691a87cd6c8c428e62c2c4cd48f0737a9f558e3ee9dc17a2fe6 SHA512 1574037199ede3d93c6672fffd4bbe9c8c6f8704ef773d6fee12faf9d627d686fa637f0ee710ee9f28a5abe806e993936170a4c437a568c6e10089a3e4df5f44
-EBUILD move_base_msgs-1.14.1.ebuild 493 BLAKE2B 03c1dd87e1ae9282df2eff70b694e25f682818ca4497b46addd629c7b8df953b9ae6a2a2bfa794dcf5dad0ec1e0526f0348c0c757cb711ac7939d001b8e805e8 SHA512 472875d06b440bf5b0159eb9b677965e7566ce950cc62681d121e9a28b52d15e254b3d8efa45374f6370f49baae2ca8762c38fca2e795fa66ffd66b64aae48c3
-EBUILD move_base_msgs-9999.ebuild 493 BLAKE2B 52d5450b37242e3433f95ac5db7c51b33405428a807e0c964f5c43a75517ccf783096c23bacf023aeff348fb1303019bc890a4dfc96ad46c52877b6190651380 SHA512 69a1f51dd0802aa7c862304af5ed1adf80436d15e36021b6acbdcf8d4f306fb821c026a01b3c98c9a0d759c144fbaa4ee1f722d26c9bd3e9c45d0fb59063b773
-MISC metadata.xml 343 BLAKE2B 30f1e5113b836b8950bf5ca347921fdb5c342ec594eba48381220a97e92f73cd264f80484f7c4ad098f48d301821b5141df9ed7f63a4bacdb16acb97c6563033 SHA512 1dd6ce4b2fdad521284c0870f16e16279ea09b18058a7cba777c06fc5408e8116cbba52e085a55799a6a288f1e7fa89a632379d050a287e66083eac580a37448
diff --git a/dev-ros/move_base_msgs/metadata.xml b/dev-ros/move_base_msgs/metadata.xml
deleted file mode 100644
index 57108def8229..000000000000
--- a/dev-ros/move_base_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/move_base_msgs/move_base_msgs-1.14.1.ebuild b/dev-ros/move_base_msgs/move_base_msgs-1.14.1.ebuild
deleted file mode 100644
index 9462bb36177b..000000000000
--- a/dev-ros/move_base_msgs/move_base_msgs-1.14.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-planning/navigation_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Holds the action description and relevant messages for the move_base package"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild b/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
deleted file mode 100644
index 4ccf99a8e8da..000000000000
--- a/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Holds the action description and relevant messages for the move_base package"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/move_slow_and_clear/Manifest b/dev-ros/move_slow_and_clear/Manifest
deleted file mode 100644
index fe7ddecda259..000000000000
--- a/dev-ros/move_slow_and_clear/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD move_slow_and_clear-1.17.0-r1.ebuild 550 BLAKE2B bc25151ccd3c1dc6c4850e4168643b1535228aecef8caa981c37c376645ba91fee7b3d8b189e2b51daadafc6d79f0e8fb81cb2dae1a2cbaa5a38655006805ebc SHA512 fee4ad7f166d6d4b191fabbc98d4e2eefa4b4e62cd102245b96b107173d415348a77307105ce4d5460e823981f0306a36cc253538b879fda7af5bcb9a2b29c4a
-EBUILD move_slow_and_clear-1.17.1-r1.ebuild 550 BLAKE2B bc25151ccd3c1dc6c4850e4168643b1535228aecef8caa981c37c376645ba91fee7b3d8b189e2b51daadafc6d79f0e8fb81cb2dae1a2cbaa5a38655006805ebc SHA512 fee4ad7f166d6d4b191fabbc98d4e2eefa4b4e62cd102245b96b107173d415348a77307105ce4d5460e823981f0306a36cc253538b879fda7af5bcb9a2b29c4a
-EBUILD move_slow_and_clear-9999.ebuild 550 BLAKE2B bc25151ccd3c1dc6c4850e4168643b1535228aecef8caa981c37c376645ba91fee7b3d8b189e2b51daadafc6d79f0e8fb81cb2dae1a2cbaa5a38655006805ebc SHA512 fee4ad7f166d6d4b191fabbc98d4e2eefa4b4e62cd102245b96b107173d415348a77307105ce4d5460e823981f0306a36cc253538b879fda7af5bcb9a2b29c4a
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/move_slow_and_clear/metadata.xml b/dev-ros/move_slow_and_clear/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/move_slow_and_clear/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.0-r1.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.0-r1.ebuild
deleted file mode 100644
index 5657f3d2003c..000000000000
--- a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Move slow and clear"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-libs/boost:=
-	dev-cpp/eigen:3
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.1-r1.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.1-r1.ebuild
deleted file mode 100644
index 5657f3d2003c..000000000000
--- a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Move slow and clear"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-libs/boost:=
-	dev-cpp/eigen:3
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-9999.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-9999.ebuild
deleted file mode 100644
index 5657f3d2003c..000000000000
--- a/dev-ros/move_slow_and_clear/move_slow_and_clear-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Move slow and clear"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-libs/boost:=
-	dev-cpp/eigen:3
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
deleted file mode 100644
index 56be8de3b5b0..000000000000
--- a/dev-ros/moveit_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST moveit_msgs-0.11.2.tar.gz 21764 BLAKE2B 9994ae4468e6913a811103d7f107868eac60970016f2dacaf666fadc0c236db583001631a7378e18d97be9ddbe9823dae95ff984f91a3b28b1833412ef905326 SHA512 4b401c47b6d2a5c61c9e69807c4aec7f0aa20ff27de952ea91b2b8e339a5e5f18138f36b9e679601b7471aa0aa78d8d5763af12c44685a201bc4dbc67602857f
-EBUILD moveit_msgs-0.11.2.ebuild 585 BLAKE2B 35fa2b79ff082cc25f06ccf7e9f25e7b99277bc118c85741568e5da43a58b16d4b1565d442ee40aa228935a1151dd4c605dc1a9baad7ce54366190899b4505d5 SHA512 f78ac5466cfac89c96019064f192a9f435b69a92c0bd65e1bd60425b0c235925793428eed8467a71b9b9828589410382bee25daa1a204859badc558bd58674e5
-EBUILD moveit_msgs-9999.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
-MISC metadata.xml 339 BLAKE2B 3d3d16827c9b4d288a6894159c35acc46851c476242668e9fc639315e52f5b7b1179d50657214b0ea2a3444b212b33cd5661d016e53742e4a2e3e4a07f29422f SHA512 5fb8c74705fc09eeed50109559debf1418766aaa7cd0c1f4aed99c7e8ddb03cdcd7997504acaba7b3c9710ae9d00fd2efb09316e56d820cdb327714b16dff900
diff --git a/dev-ros/moveit_msgs/metadata.xml b/dev-ros/moveit_msgs/metadata.xml
deleted file mode 100644
index e2926dbce472..000000000000
--- a/dev-ros/moveit_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/moveit_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.11.2.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.11.2.ebuild
deleted file mode 100644
index 16c7d7fd966b..000000000000
--- a/dev-ros/moveit_msgs/moveit_msgs-0.11.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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-planning/moveit_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="
-	dev-ros/actionlib_msgs
-	dev-ros/sensor_msgs
-	dev-ros/geometry_msgs
-	dev-ros/trajectory_msgs
-	dev-ros/shape_msgs
-	dev-ros/std_msgs
-	dev-ros/octomap_msgs
-	dev-ros/object_recognition_msgs
-"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages, services and actions used by MoveIt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild b/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
deleted file mode 100644
index 6490a10393ef..000000000000
--- a/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="
-	dev-ros/actionlib_msgs
-	dev-ros/sensor_msgs
-	dev-ros/geometry_msgs
-	dev-ros/trajectory_msgs
-	dev-ros/shape_msgs
-	dev-ros/std_msgs
-	dev-ros/octomap_msgs
-	dev-ros/object_recognition_msgs
-"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages, services and actions used by MoveIt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_core/Manifest b/dev-ros/nav_core/Manifest
deleted file mode 100644
index 2745c1048a88..000000000000
--- a/dev-ros/nav_core/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD nav_core-1.17.0.ebuild 505 BLAKE2B 1bc51127b173b23f54ee7a8026190a2d3af1dd57aa945ab587a7ac81bef28ebcbe3d3b6aefe6d2fca92678b64a1a4cd5549ce3493a8547585e5306231668ca31 SHA512 0af0e2eda44cffd84865dc206bd835500c659672da22fa0f1329aed53df6939b55ec97f23fe6ebf3a7052f7b75c15c098c2fdb15dbded3c1aff4ab8d2d6676c6
-EBUILD nav_core-1.17.1.ebuild 505 BLAKE2B 1bc51127b173b23f54ee7a8026190a2d3af1dd57aa945ab587a7ac81bef28ebcbe3d3b6aefe6d2fca92678b64a1a4cd5549ce3493a8547585e5306231668ca31 SHA512 0af0e2eda44cffd84865dc206bd835500c659672da22fa0f1329aed53df6939b55ec97f23fe6ebf3a7052f7b75c15c098c2fdb15dbded3c1aff4ab8d2d6676c6
-EBUILD nav_core-9999.ebuild 505 BLAKE2B 1bc51127b173b23f54ee7a8026190a2d3af1dd57aa945ab587a7ac81bef28ebcbe3d3b6aefe6d2fca92678b64a1a4cd5549ce3493a8547585e5306231668ca31 SHA512 0af0e2eda44cffd84865dc206bd835500c659672da22fa0f1329aed53df6939b55ec97f23fe6ebf3a7052f7b75c15c098c2fdb15dbded3c1aff4ab8d2d6676c6
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/nav_core/metadata.xml b/dev-ros/nav_core/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/nav_core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/nav_core/nav_core-1.17.0.ebuild b/dev-ros/nav_core/nav_core-1.17.0.ebuild
deleted file mode 100644
index 389fbe3ca74a..000000000000
--- a/dev-ros/nav_core/nav_core-1.17.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Common interfaces for navigation specific robot actions"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_core/nav_core-1.17.1.ebuild b/dev-ros/nav_core/nav_core-1.17.1.ebuild
deleted file mode 100644
index 389fbe3ca74a..000000000000
--- a/dev-ros/nav_core/nav_core-1.17.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Common interfaces for navigation specific robot actions"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_core/nav_core-9999.ebuild b/dev-ros/nav_core/nav_core-9999.ebuild
deleted file mode 100644
index 389fbe3ca74a..000000000000
--- a/dev-ros/nav_core/nav_core-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Common interfaces for navigation specific robot actions"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/Manifest b/dev-ros/nav_msgs/Manifest
deleted file mode 100644
index b99fb852c0e0..000000000000
--- a/dev-ros/nav_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD nav_msgs-1.13.0.ebuild 479 BLAKE2B bee4790d3894f25cf7b5e1026d95a31851766e57369239c43dc55cfd2d5009ce96bf77eafc213b9f8a914040283c495b8f658d94fdf7e10d36fd71a634eb0816 SHA512 392c9f97623ce089b99a16eb3c99e1fb9ac3911f67dcb2f7e8aaeddb515718dc9cf3381e2c8d8062efbfa3a537492a9fb82e384d443df61c849dcfcc440518bf
-EBUILD nav_msgs-1.13.1.ebuild 479 BLAKE2B 6b358de36d38acc67a5d54610f3d61a2738b9857e44e4c07f08d40e0bd4028a19d8186a813aade40b3aa48604dc88ba12bdf3ef7d7dcda5e1aaef2a74fff6863 SHA512 89764278506dbce8032078ef7f2a3dfec808f3dbeba447fe38e6a43bcee91461b4570b843644c5c31b64b94e7c38f469ba7ef577264748330809084881f0bad0
-EBUILD nav_msgs-9999.ebuild 479 BLAKE2B bee4790d3894f25cf7b5e1026d95a31851766e57369239c43dc55cfd2d5009ce96bf77eafc213b9f8a914040283c495b8f658d94fdf7e10d36fd71a634eb0816 SHA512 392c9f97623ce089b99a16eb3c99e1fb9ac3911f67dcb2f7e8aaeddb515718dc9cf3381e2c8d8062efbfa3a537492a9fb82e384d443df61c849dcfcc440518bf
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/nav_msgs/metadata.xml b/dev-ros/nav_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/nav_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild b/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
deleted file mode 100644
index 11457f2e0fb4..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages used to interact with the navigation stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/nav_msgs-1.13.1.ebuild b/dev-ros/nav_msgs/nav_msgs-1.13.1.ebuild
deleted file mode 100644
index 1a9730e58e4a..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages used to interact with the navigation stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/nav_msgs-9999.ebuild b/dev-ros/nav_msgs/nav_msgs-9999.ebuild
deleted file mode 100644
index 11457f2e0fb4..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Common messages used to interact with the navigation stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
deleted file mode 100644
index 62062c09e417..000000000000
--- a/dev-ros/navfn/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX pgm_h_location.patch 818 BLAKE2B 9e1c0e8210f492423d897f3952e7bdecef3c3db27258308402b1fc3c96938a4b186436e7541af7c8076811b053a37a46c9ca629411dbb3ec4588430c434fc5ae SHA512 a6a0a1474480914d20d6978c52b0a7abbca16b4885be0d8aecb9e47e4ee3900964dee37546f2460a50193daf04431fd1419711a8b2c958b63423d70407117688
-AUX tests.patch 460 BLAKE2B 06814e0e141d4b7b75ef36bcea6dff20aadc324c700e0aa219110efac9b27316829f7faa0b83a99795998428e825568325e87e6ca52fa3696772e6e95b655aa2 SHA512 c02fa62a1446b403a535d028a1b36c1deac8a4cf09f0596ada560e696288412566c5b8e2719fd368e098f9ccfe23dec02c9d6e066cb837ea2cdf5b15523c21a2
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD navfn-1.17.0-r1.ebuild 1079 BLAKE2B bf31a77bb4bb336f1f3b459613218f6d561f64f65f0f2d10e27b1d754d4abd9de80c2d950487054a41abf9b10081654fd28b8a5b0224c07f3d69638ba2533e96 SHA512 7b2441b8b46a48e30c34b2b3e2db2f9ed2b6c24143ab0f37da67bd7ef58744526dd1670990c6ecceb8fac588785181fb1ed902eae2294fe8264df11125a1aee4
-EBUILD navfn-1.17.1-r1.ebuild 1079 BLAKE2B bf31a77bb4bb336f1f3b459613218f6d561f64f65f0f2d10e27b1d754d4abd9de80c2d950487054a41abf9b10081654fd28b8a5b0224c07f3d69638ba2533e96 SHA512 7b2441b8b46a48e30c34b2b3e2db2f9ed2b6c24143ab0f37da67bd7ef58744526dd1670990c6ecceb8fac588785181fb1ed902eae2294fe8264df11125a1aee4
-EBUILD navfn-9999.ebuild 1079 BLAKE2B bf31a77bb4bb336f1f3b459613218f6d561f64f65f0f2d10e27b1d754d4abd9de80c2d950487054a41abf9b10081654fd28b8a5b0224c07f3d69638ba2533e96 SHA512 7b2441b8b46a48e30c34b2b3e2db2f9ed2b6c24143ab0f37da67bd7ef58744526dd1670990c6ecceb8fac588785181fb1ed902eae2294fe8264df11125a1aee4
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/navfn/files/pgm_h_location.patch b/dev-ros/navfn/files/pgm_h_location.patch
deleted file mode 100644
index 8df1a6f38656..000000000000
--- a/dev-ros/navfn/files/pgm_h_location.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: navigation-1.13.0/navfn/src/navtest.cpp
-===================================================================
---- navfn/src/navtest.cpp
-+++ navfn/src/navtest.cpp
-@@ -21,7 +21,7 @@ using namespace navfn;
- extern "C" {
- #include <stdio.h>
- // pgm.h is not very friendly with system headers... need to undef max() and min() afterwards
--#include <pgm.h>
-+#include <netpbm/pgm.h>
- #undef max
- #undef min
- }
-Index: navigation-1.13.0/navfn/src/read_pgm_costmap.cpp
-===================================================================
---- navfn/src/read_pgm_costmap.cpp
-+++ navfn/src/read_pgm_costmap.cpp
-@@ -37,7 +37,7 @@
- extern "C" {
- #include <stdio.h>
- // pgm.h is not very friendly with system headers... need to undef max() and min() afterwards
--#include <pgm.h>
-+#include <netpbm/pgm.h>
- #undef max
- #undef min
- }
diff --git a/dev-ros/navfn/files/tests.patch b/dev-ros/navfn/files/tests.patch
deleted file mode 100644
index 2dcd222f6082..000000000000
--- a/dev-ros/navfn/files/tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: navfn/test/path_calc_test.cpp
-===================================================================
---- navfn.orig/test/path_calc_test.cpp
-+++ navfn/test/path_calc_test.cpp
-@@ -38,7 +38,7 @@
- navfn::NavFn* make_willow_nav()
- {
-   int sx,sy;
--  std::string path = ros::package::getPath( ROS_PACKAGE_NAME ) + "/test/willow_costmap.pgm";
-+  std::string path = @PGM_PATH@ ;
- 
-   COSTTYPE *cmap = readPGM( path.c_str(), &sx, &sy, true );
-   if( cmap == NULL )
diff --git a/dev-ros/navfn/metadata.xml b/dev-ros/navfn/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/navfn/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/navfn/navfn-1.17.0-r1.ebuild b/dev-ros/navfn/navfn-1.17.0-r1.ebuild
deleted file mode 100644
index 17e0e686be45..000000000000
--- a/dev-ros/navfn/navfn-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function for creating plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-cpp/eigen:3
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${FILESDIR}/tests.patch" )
-
-src_prepare() {
-	ros-catkin_src_prepare
-	sed -e "s#@PGM_PATH@#\"${S}/test/willow_costmap.pgm\"#" -i test/path_calc_test.cpp || die
-}
diff --git a/dev-ros/navfn/navfn-1.17.1-r1.ebuild b/dev-ros/navfn/navfn-1.17.1-r1.ebuild
deleted file mode 100644
index 17e0e686be45..000000000000
--- a/dev-ros/navfn/navfn-1.17.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function for creating plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-cpp/eigen:3
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${FILESDIR}/tests.patch" )
-
-src_prepare() {
-	ros-catkin_src_prepare
-	sed -e "s#@PGM_PATH@#\"${S}/test/willow_costmap.pgm\"#" -i test/path_calc_test.cpp || die
-}
diff --git a/dev-ros/navfn/navfn-9999.ebuild b/dev-ros/navfn/navfn-9999.ebuild
deleted file mode 100644
index 17e0e686be45..000000000000
--- a/dev-ros/navfn/navfn-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function for creating plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-cpp/eigen:3
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${FILESDIR}/tests.patch" )
-
-src_prepare() {
-	ros-catkin_src_prepare
-	sed -e "s#@PGM_PATH@#\"${S}/test/willow_costmap.pgm\"#" -i test/path_calc_test.cpp || die
-}
diff --git a/dev-ros/nmea_msgs/Manifest b/dev-ros/nmea_msgs/Manifest
deleted file mode 100644
index 70ca4fe7b06d..000000000000
--- a/dev-ros/nmea_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST nmea_msgs-1.1.0.tar.gz 2289 BLAKE2B 0e3b7819f4104e04f9a54a5355245097cfc8e86cb3289bf92d246529bb5b7ac5a7488535ddc4622ed2aecf6c1d923e4d765735b95b90800e4090e48bc5482f2e SHA512 7bf66adf6913bd56be12d180a435f02f71ae7739e9b76967b7fde0a61478272a523e7aef436223a659ffffd0abb0ec3bc6d79d2214b587c2aba13e6199a6d293
-EBUILD nmea_msgs-1.1.0.ebuild 404 BLAKE2B 02e425e40c05342ef90ac821f8d9ae69df86db0aee9ab59e3e449544ad075995bf37f8ff74d774f4e5df72456b7e11dd90b55a1385e610ec9a5bbd4cbcbf3fdc SHA512 e1607ca9e1dd3596c1fce06a10259c2533e802fca5cbaf8979bff7b6045bbc7f4e0b29b863101cb38e8ce2523af7518eb1e1707fad720b545e6635c05314a7e5
-EBUILD nmea_msgs-9999.ebuild 404 BLAKE2B 02e425e40c05342ef90ac821f8d9ae69df86db0aee9ab59e3e449544ad075995bf37f8ff74d774f4e5df72456b7e11dd90b55a1385e610ec9a5bbd4cbcbf3fdc SHA512 e1607ca9e1dd3596c1fce06a10259c2533e802fca5cbaf8979bff7b6045bbc7f4e0b29b863101cb38e8ce2523af7518eb1e1707fad720b545e6635c05314a7e5
-MISC metadata.xml 336 BLAKE2B 71a11a6cf4f7e0a8c9caa40dfbde08005b2b0c98067d14d8e116059596a18a834cd48162af8bcff11ebf59988df91f631bd78b48cdc44db9631bbbfebab62ebc SHA512 75b9a58eb491958470e946a840ce62fc0f61fb78f4392529c1159f52b980c8f0eb9ba767102482fff90367f361fe721a06fb5091bc80869d0108fd1dd1119572
diff --git a/dev-ros/nmea_msgs/metadata.xml b/dev-ros/nmea_msgs/metadata.xml
deleted file mode 100644
index 62919d63d3e8..000000000000
--- a/dev-ros/nmea_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/nmea_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild b/dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild
deleted file mode 100644
index 685e1a5323d0..000000000000
--- a/dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-drivers/nmea_msgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages related to data in the NMEA format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild b/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
deleted file mode 100644
index 685e1a5323d0..000000000000
--- a/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-drivers/nmea_msgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages related to data in the NMEA format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet/Manifest b/dev-ros/nodelet/Manifest
deleted file mode 100644
index 78e067876d6b..000000000000
--- a/dev-ros/nodelet/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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
-DIST nodelet_core-1.10.2.tar.gz 46049 BLAKE2B 19da87672c965fa84e6b8ae48eb3d40514dad79611a27c5d632c2300e2cb7b269abb1b3862390795b55e3bec3a48c686f5af19c4aa627faf975dcaa7e2b32c19 SHA512 5f9827a8b5e491640c57bfb242ffc266291825dbc6ba452ad5be6d7bd2168872205378cc1eac398afff1a8fb0ce3763ce36a1eff627644037f799b87ee86fc99
-EBUILD nodelet-1.10.0-r1.ebuild 761 BLAKE2B 8b1355c7f26e48fb093fd2b7309e0a947fbc697f819e3ce77628590d52c4198c37c8aab73c7c4e67d5230e90e8f81cc5d16f02fb4abeb8edb83d66b7b88f29f9 SHA512 b3d54bc11a4e8527fdb8cc4ef02a1efa7a98e6c13d0e6cd4c9e9ec0b090a9fb4ef16cc8809b6fa0d95f5f284634152a212888764e016ae0240018eaf73282236
-EBUILD nodelet-1.10.1.ebuild 761 BLAKE2B c7559ed5eeb5acf28647151d44473c850898b8ee57f43fc3b1fe29ec672cd9073f1949c5ae01d12ea33a8979ff805060653806f94f1b2c80535cc2ffaf975ecd SHA512 e3f05c997153483961a5b48ff51dcbc7a0e9a851f432479c7daace1564ccc60ee1dd866efeff7d60a661684d14b5b60a532e1af205a20a7b8531a839ac85bb96
-EBUILD nodelet-1.10.2.ebuild 761 BLAKE2B 5a803315f7e79d30d6c01aef1ce807ee51163410651e64905110f9c8c85c402c45cbf4f667bf2c10db239ce024e03cabb80586befb7fb8821569a37f0f3ad16c SHA512 10a46115a2c767b864f5ec2d73b2fbd14b04c6d9a483732ebc65df5dbb3c88b35dec9d578f62938cba60adb511a90777149651827212fb5f3d67d87e8083fc40
-EBUILD nodelet-9999.ebuild 761 BLAKE2B 8b1355c7f26e48fb093fd2b7309e0a947fbc697f819e3ce77628590d52c4198c37c8aab73c7c4e67d5230e90e8f81cc5d16f02fb4abeb8edb83d66b7b88f29f9 SHA512 b3d54bc11a4e8527fdb8cc4ef02a1efa7a98e6c13d0e6cd4c9e9ec0b090a9fb4ef16cc8809b6fa0d95f5f284634152a212888764e016ae0240018eaf73282236
-MISC metadata.xml 331 BLAKE2B 9cdba9b3243ff84970d32b4e3eefc05cb7623a2ca0182a8a2ce02c30e31ebfbbd256e7e8067e69f2276675067a8d1b6330ea421f4b112e9b487047f12ce13553 SHA512 7c8b10d8f28ca71b613b548d444c4c0f20cc50800976f9f4f5af5514f9cc1a3d2250678d5bedb8df52aa21e619069898caef2bdc51530bf1bcdacfa69fbe922b
diff --git a/dev-ros/nodelet/metadata.xml b/dev-ros/nodelet/metadata.xml
deleted file mode 100644
index 5265d8ee1ea1..000000000000
--- a/dev-ros/nodelet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/nodelet_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/nodelet/nodelet-1.10.0-r1.ebuild b/dev-ros/nodelet/nodelet-1.10.0-r1.ebuild
deleted file mode 100644
index 23f7d1d005e9..000000000000
--- a/dev-ros/nodelet/nodelet-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Runs multiple algorithms in the same process with zero copy transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/cmake_modules
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/rosconsole
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	sys-apps/util-linux
-	dev-ros/class_loader:=
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet/nodelet-1.10.1.ebuild b/dev-ros/nodelet/nodelet-1.10.1.ebuild
deleted file mode 100644
index e0adae91458b..000000000000
--- a/dev-ros/nodelet/nodelet-1.10.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Runs multiple algorithms in the same process with zero copy transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/cmake_modules
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/rosconsole
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	sys-apps/util-linux
-	dev-ros/class_loader:=
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet/nodelet-1.10.2.ebuild b/dev-ros/nodelet/nodelet-1.10.2.ebuild
deleted file mode 100644
index a47941a68cad..000000000000
--- a/dev-ros/nodelet/nodelet-1.10.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Runs multiple algorithms in the same process with zero copy transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/cmake_modules
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/rosconsole
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	sys-apps/util-linux
-	dev-ros/class_loader:=
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet/nodelet-9999.ebuild b/dev-ros/nodelet/nodelet-9999.ebuild
deleted file mode 100644
index 23f7d1d005e9..000000000000
--- a/dev-ros/nodelet/nodelet-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Runs multiple algorithms in the same process with zero copy transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/cmake_modules
-	dev-ros/pluginlib:=
-		dev-libs/tinyxml2:=
-	dev-ros/rosconsole
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-	sys-apps/util-linux
-	dev-ros/class_loader:=
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_topic_tools/Manifest b/dev-ros/nodelet_topic_tools/Manifest
deleted file mode 100644
index 4ac3d1edd100..000000000000
--- a/dev-ros/nodelet_topic_tools/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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
-DIST nodelet_core-1.10.2.tar.gz 46049 BLAKE2B 19da87672c965fa84e6b8ae48eb3d40514dad79611a27c5d632c2300e2cb7b269abb1b3862390795b55e3bec3a48c686f5af19c4aa627faf975dcaa7e2b32c19 SHA512 5f9827a8b5e491640c57bfb242ffc266291825dbc6ba452ad5be6d7bd2168872205378cc1eac398afff1a8fb0ce3763ce36a1eff627644037f799b87ee86fc99
-EBUILD nodelet_topic_tools-1.10.0-r1.ebuild 506 BLAKE2B e457ea1b9eaca78830ca6caef4652cc232b323cbf50b39407522617d998a9b2547bc5489bc4187b0f245251ced2f04959e844ba451da5f14e3d412f477355a2c SHA512 d94d681b64ab0c60d08699e511c2fdfa3224f94d363585d1ebf780cb19af6ef5eaf7ca2da6d26d541943fdafa58c1f0446092873e84e2caaa8de07db5c608ef3
-EBUILD nodelet_topic_tools-1.10.1-r1.ebuild 506 BLAKE2B e457ea1b9eaca78830ca6caef4652cc232b323cbf50b39407522617d998a9b2547bc5489bc4187b0f245251ced2f04959e844ba451da5f14e3d412f477355a2c SHA512 d94d681b64ab0c60d08699e511c2fdfa3224f94d363585d1ebf780cb19af6ef5eaf7ca2da6d26d541943fdafa58c1f0446092873e84e2caaa8de07db5c608ef3
-EBUILD nodelet_topic_tools-1.10.2.ebuild 506 BLAKE2B e457ea1b9eaca78830ca6caef4652cc232b323cbf50b39407522617d998a9b2547bc5489bc4187b0f245251ced2f04959e844ba451da5f14e3d412f477355a2c SHA512 d94d681b64ab0c60d08699e511c2fdfa3224f94d363585d1ebf780cb19af6ef5eaf7ca2da6d26d541943fdafa58c1f0446092873e84e2caaa8de07db5c608ef3
-EBUILD nodelet_topic_tools-9999.ebuild 506 BLAKE2B e457ea1b9eaca78830ca6caef4652cc232b323cbf50b39407522617d998a9b2547bc5489bc4187b0f245251ced2f04959e844ba451da5f14e3d412f477355a2c SHA512 d94d681b64ab0c60d08699e511c2fdfa3224f94d363585d1ebf780cb19af6ef5eaf7ca2da6d26d541943fdafa58c1f0446092873e84e2caaa8de07db5c608ef3
-MISC metadata.xml 331 BLAKE2B 9cdba9b3243ff84970d32b4e3eefc05cb7623a2ca0182a8a2ce02c30e31ebfbbd256e7e8067e69f2276675067a8d1b6330ea421f4b112e9b487047f12ce13553 SHA512 7c8b10d8f28ca71b613b548d444c4c0f20cc50800976f9f4f5af5514f9cc1a3d2250678d5bedb8df52aa21e619069898caef2bdc51530bf1bcdacfa69fbe922b
diff --git a/dev-ros/nodelet_topic_tools/metadata.xml b/dev-ros/nodelet_topic_tools/metadata.xml
deleted file mode 100644
index 5265d8ee1ea1..000000000000
--- a/dev-ros/nodelet_topic_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/nodelet_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0-r1.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0-r1.ebuild
deleted file mode 100644
index b403fc2d79ad..000000000000
--- a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="Common nodelet tools such as a mux, demux and throttle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/pluginlib
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.1-r1.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.1-r1.ebuild
deleted file mode 100644
index b403fc2d79ad..000000000000
--- a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="Common nodelet tools such as a mux, demux and throttle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/pluginlib
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.2.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.2.ebuild
deleted file mode 100644
index b403fc2d79ad..000000000000
--- a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="Common nodelet tools such as a mux, demux and throttle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/pluginlib
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild
deleted file mode 100644
index b403fc2d79ad..000000000000
--- a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="Common nodelet tools such as a mux, demux and throttle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/pluginlib
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_tutorial_math/Manifest b/dev-ros/nodelet_tutorial_math/Manifest
deleted file mode 100644
index ff0c9738d4c3..000000000000
--- a/dev-ros/nodelet_tutorial_math/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_tutorials-0.1.12.tar.gz 12609 BLAKE2B c570236517420685a4733d84694a03486798038f4b7a0e721179d602a6870b51afb558dedd64ed2ccf518bb0e37cccefcae701053eb4c5fe32ef3e2d5dc5d69b SHA512 37244290b0c84aff47172484e2f3c1eecfe3482856030a08e55f2d1b0cad903262be453e81780f58e250c4e1f24c06f6256da5ff1342617d7d5f501f38fc7527
-DIST common_tutorials-0.2.0.tar.gz 12624 BLAKE2B 051e8e980e23dc2ecac2bfb534a8d820b2d2ee3d84b7e42e7ebc538e82560a7ea7e84972a6d6ab5f0c441eba7cf8c7aa2b3b5aced00f73ffc0f0537a3df0c547 SHA512 a3f537199c3ed143ef6c44edaf3fe427374027ed33478f9d440adc62697ace7e69c09cc5b5cacc76d2062eabc32138cbb08314dfd3d4af6f45f0147cb39bf2d9
-EBUILD nodelet_tutorial_math-0.1.12.ebuild 445 BLAKE2B b8f1ba53801eb6a4a17acdfe54ca9fd6f6e3af45e7e4be163a920fa57a1e922229cb34da5a368661c2ebaf9408b851f33cf81b062957775964aa53f481ff59d5 SHA512 df66b37489bf9a322c2b1f2d3b5518c1d70b882d637af13a1d24b211fa31aafbe596087e66611d2ce868f7d8a121523df5797c9f8adcbeaaf63ec89754313f42
-EBUILD nodelet_tutorial_math-0.2.0.ebuild 445 BLAKE2B b8f1ba53801eb6a4a17acdfe54ca9fd6f6e3af45e7e4be163a920fa57a1e922229cb34da5a368661c2ebaf9408b851f33cf81b062957775964aa53f481ff59d5 SHA512 df66b37489bf9a322c2b1f2d3b5518c1d70b882d637af13a1d24b211fa31aafbe596087e66611d2ce868f7d8a121523df5797c9f8adcbeaaf63ec89754313f42
-EBUILD nodelet_tutorial_math-9999.ebuild 445 BLAKE2B b8f1ba53801eb6a4a17acdfe54ca9fd6f6e3af45e7e4be163a920fa57a1e922229cb34da5a368661c2ebaf9408b851f33cf81b062957775964aa53f481ff59d5 SHA512 df66b37489bf9a322c2b1f2d3b5518c1d70b882d637af13a1d24b211fa31aafbe596087e66611d2ce868f7d8a121523df5797c9f8adcbeaaf63ec89754313f42
-MISC metadata.xml 335 BLAKE2B a0188a143e0644b95b351037361ac43ba5392f4b919132542a72b35240697f665230056bdbcbb7ac72aaa83ad927d7dc6a476102a07ad0ccb321ba4f757b712c SHA512 e6e7a5d1e1ca928bcd3e14aa935369bd95f3d54811bde7df12e5878cd489a9d12b0f36c6294768e62286fdefd65109f100a46b7f10a4cc1cc2515b95733af841
diff --git a/dev-ros/nodelet_tutorial_math/metadata.xml b/dev-ros/nodelet_tutorial_math/metadata.xml
deleted file mode 100644
index 18730473acf0..000000000000
--- a/dev-ros/nodelet_tutorial_math/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild
deleted file mode 100644
index b0642c31d40f..000000000000
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet tutorial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.2.0.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.2.0.ebuild
deleted file mode 100644
index b0642c31d40f..000000000000
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet tutorial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild
deleted file mode 100644
index b0642c31d40f..000000000000
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet tutorial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/object_recognition_msgs/Manifest b/dev-ros/object_recognition_msgs/Manifest
deleted file mode 100644
index d76b94c1e02d..000000000000
--- a/dev-ros/object_recognition_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST object_recognition_msgs-0.4.2.tar.gz 4810 BLAKE2B 004087f2f7982b2cffca52023061a5f05830fb2e10e4d62683ca171f3c36926c912d9c6e07ab5ae2a694a07fe2a3d8dac040d8f0c3abb9640e8c07462084c416 SHA512 20a2e1d05f5610c0102340a6f6fe725d47134bf6a69e018a607dde68a2d980455fc0b7d848202259801cfd7d9671a80a3f4f1bd3f571df73240e4885f5eb9d34
-EBUILD object_recognition_msgs-0.4.2.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
-EBUILD object_recognition_msgs-9999.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
-MISC metadata.xml 352 BLAKE2B a88f85a80c55dbb3ca6844b4ab9ca15f9e5c32bd59b661bbf88605f90abc0c31e31b9e919d9d5955f93e79a2d4a665269329d363464f4c45cdecba2c06025e3b SHA512 e4c73b93baf148efa98d36d97519f5e05c198282422c929ae18c75b43bff52fd2d536b748119574f221ee13b0aecbed7f3aa51c42cf9a26deb472115d1d7d4d3
diff --git a/dev-ros/object_recognition_msgs/metadata.xml b/dev-ros/object_recognition_msgs/metadata.xml
deleted file mode 100644
index 4f47784b1a18..000000000000
--- a/dev-ros/object_recognition_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">wg-perception/object_recognition_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild
deleted file mode 100644
index 9af6f1bdaa76..000000000000
--- a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/wg-perception/object_recognition_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="
-	dev-ros/actionlib_msgs
-	dev-ros/geometry_msgs
-	dev-ros/sensor_msgs
-	dev-ros/shape_msgs
-	dev-ros/std_msgs
-"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS message and the actionlib definition used in object_recognition_core"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
deleted file mode 100644
index 9af6f1bdaa76..000000000000
--- a/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/wg-perception/object_recognition_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="
-	dev-ros/actionlib_msgs
-	dev-ros/geometry_msgs
-	dev-ros/sensor_msgs
-	dev-ros/shape_msgs
-	dev-ros/std_msgs
-"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS message and the actionlib definition used in object_recognition_core"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_msgs/Manifest b/dev-ros/octomap_msgs/Manifest
deleted file mode 100644
index 80f5fae42b7e..000000000000
--- a/dev-ros/octomap_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST octomap_msgs-0.3.5.tar.gz 4676 BLAKE2B 495172a8e2d01d1e21ef09f936eae4133fdb7ac7de089df13672ec01f833b413350484081c786a54a0a037af7de04ba65ac8d751c3ee0c60098c982befe452a0 SHA512 b828b8839d2e19f3df58041bb55034b086dbec057e91476ebfd00f637bdc7c6e02bedbafaa6aa96c5399d06af7bb513f6e4088ab8499842e6c537d22325dcde7
-EBUILD octomap_msgs-0.3.5.ebuild 450 BLAKE2B cacecf1df0c4d36d4796dff5cc60be3c89ef292c320c576d0d39f122b4fee72b15407ac522c81014c125c715a3105a5e2dfafd3d4bde2b06d03b580a266052c5 SHA512 f2bc70985ef975401583e90e1c56a614a1f24c5400a5b28dc91c946fc50c72f17a21817c07a454a11ff2f2c4dc0896381f56f42413e81cb45a547cb4531b97cd
-EBUILD octomap_msgs-9999.ebuild 450 BLAKE2B cacecf1df0c4d36d4796dff5cc60be3c89ef292c320c576d0d39f122b4fee72b15407ac522c81014c125c715a3105a5e2dfafd3d4bde2b06d03b580a266052c5 SHA512 f2bc70985ef975401583e90e1c56a614a1f24c5400a5b28dc91c946fc50c72f17a21817c07a454a11ff2f2c4dc0896381f56f42413e81cb45a547cb4531b97cd
-MISC metadata.xml 335 BLAKE2B 99131a8c2ce918add4e28a61790fc7d876e97ca551e5b3d3734eb326c8bb3aaa1f04c1e9753e9f4abb4b35a2df18a20d26676398af36818b5043a01c7088eda7 SHA512 e33b7f476ea77745e4f903de45c7ba4435ddcae14af07d0b5a764a2f205d349fd201def8762ee4f118259f94cb432942de018779dc285e06fe812931a7fa2e26
diff --git a/dev-ros/octomap_msgs/metadata.xml b/dev-ros/octomap_msgs/metadata.xml
deleted file mode 100644
index ecacdada5205..000000000000
--- a/dev-ros/octomap_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">OctoMap/octomap_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild b/dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild
deleted file mode 100644
index fb5758dfad35..000000000000
--- a/dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/OctoMap/octomap_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages and serializations / conversion for the OctoMap library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild b/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
deleted file mode 100644
index fb5758dfad35..000000000000
--- a/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/OctoMap/octomap_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages and serializations / conversion for the OctoMap library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_ros/Manifest b/dev-ros/octomap_ros/Manifest
deleted file mode 100644
index 188dc66c35f5..000000000000
--- a/dev-ros/octomap_ros/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST octomap_ros-0.4.1.tar.gz 5879 BLAKE2B a41d8d6688bfc2a182fce6c7b2e032c3cbc7b467c6c8b806adc4e93f371fb49a1aa5d9001b17407d8db33facc3edf868020816a06ff051d5190b9ca5463d6b12 SHA512 692a9f16589b24521440f81f4a55ddaca1778a5bc3c05e30313847300b4012af3a2d2db3786fec7e4a6b7af197c37dc447fded81ab343fcccfa2a4c8810883ab
-EBUILD octomap_ros-0.4.1.ebuild 507 BLAKE2B 37859dcb3020e93096235e3b3876eda22fc23ba77261074d4b5fa6e7216641a4b7a1ed921dbd8d3d4823da1fc2b88b3de32d95d284c60b1b803c3ff365274021 SHA512 82c9aa27831c864486c55381d764c10a8b2f526ec9e64e4543216ddc238fcf67bffd9773ac174155dca645f2ce84bcd9c7d2e8211272140154903c2cc581f75d
-EBUILD octomap_ros-9999.ebuild 507 BLAKE2B 37859dcb3020e93096235e3b3876eda22fc23ba77261074d4b5fa6e7216641a4b7a1ed921dbd8d3d4823da1fc2b88b3de32d95d284c60b1b803c3ff365274021 SHA512 82c9aa27831c864486c55381d764c10a8b2f526ec9e64e4543216ddc238fcf67bffd9773ac174155dca645f2ce84bcd9c7d2e8211272140154903c2cc581f75d
-MISC metadata.xml 334 BLAKE2B f07ca1ea0be706a47eb09caeac5645d22c9e91e6fbf5f6b6f44458e7024f5596ae3007e2a696a8e045241cfe7374f29fd08c2e2b43f54fc0a088d62cb42ab199 SHA512 920243ffe544f91714311a65a897b920488f01390a67367caa1c710d041da65016c7d3fcdf8a006ce3ea3e9c06138c29af501a9afb06fa696c7b752bc3c91db8
diff --git a/dev-ros/octomap_ros/metadata.xml b/dev-ros/octomap_ros/metadata.xml
deleted file mode 100644
index 668cdef483a7..000000000000
--- a/dev-ros/octomap_ros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">OctoMap/octomap_ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild b/dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
deleted file mode 100644
index a45d9828a875..000000000000
--- a/dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between ROS / PCL and OctoMap's native types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf
-	dev-ros/pcl_ros
-	sci-libs/octomap
-"
-DEPEND="${RDEPEND}
-	dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/octomap_ros/octomap_ros-9999.ebuild b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
deleted file mode 100644
index a45d9828a875..000000000000
--- a/dev-ros/octomap_ros/octomap_ros-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions between ROS / PCL and OctoMap's native types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf
-	dev-ros/pcl_ros
-	sci-libs/octomap
-"
-DEPEND="${RDEPEND}
-	dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
deleted file mode 100644
index 6dde20592452..000000000000
--- a/dev-ros/opencv_apps/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST opencv_apps-2.0.2-face_detector_withface_test_diamondback.bag 124489590 BLAKE2B a115cc48739ce6b422ea83bb763e3371b40b67febbfb650ffd114caf0cbc5d91d9e83cbdcc7330e9eed2735224ca5ee081cba4480607bdb0c5036e6704641c84 SHA512 944ba8649612283444c1bc191c0f2d502c52aa12d6edaf4615360e17c4c1cdc014e92dd0fe997718c6bd3a7b64e668fa117b0680449c169c99c5e516383d8597
-DIST opencv_apps-2.0.2-vslam_tutorial.bag 467607323 BLAKE2B 11d386de93fea9703f4ab5a807f47082da2f139102aa44ec6cb00f0785b2f129e98eb682ebd8e5c3a51b6919f17fe43d5e9c7ad7ef2d1d8dd328193849d4379b SHA512 82db8d7073d47e870604d21035fd5061a484ecf69c3d0f1d747938f435788b51fc8370e54ad5a0efa14ec28b529b52393514e3a753463fbc4824b0b51c285f25
-DIST opencv_apps-2.0.2.tar.gz 84924 BLAKE2B 1c305bf4f6f64f1f92675264b80c167f4ca0a751ef1901c7112171a82b139a836c7be6afa3f0f493d60d295261c3877c129bb00d69b9542d28e16cd91b6772c3 SHA512 86b5ca3be54b839fc4aa0c786d5a181b85c2c2585c1bed2c2acc273ad66464c1d58fda96f63d4cb474d21d7b203f9c725110d2702c218a28361fdfc6c857fd88
-DIST opencv_apps-9999-face_detector_withface_test_diamondback.bag 124489590 BLAKE2B a115cc48739ce6b422ea83bb763e3371b40b67febbfb650ffd114caf0cbc5d91d9e83cbdcc7330e9eed2735224ca5ee081cba4480607bdb0c5036e6704641c84 SHA512 944ba8649612283444c1bc191c0f2d502c52aa12d6edaf4615360e17c4c1cdc014e92dd0fe997718c6bd3a7b64e668fa117b0680449c169c99c5e516383d8597
-DIST opencv_apps-9999-vslam_tutorial.bag 467607323 BLAKE2B 11d386de93fea9703f4ab5a807f47082da2f139102aa44ec6cb00f0785b2f129e98eb682ebd8e5c3a51b6919f17fe43d5e9c7ad7ef2d1d8dd328193849d4379b SHA512 82db8d7073d47e870604d21035fd5061a484ecf69c3d0f1d747938f435788b51fc8370e54ad5a0efa14ec28b529b52393514e3a753463fbc4824b0b51c285f25
-EBUILD opencv_apps-2.0.2.ebuild 1555 BLAKE2B 279f7278c6cf143d57f822f811f2ef34ceda9038dcc3dd6c268a88d2fc24cbe5866965fbb01b3c857ac1cf80d56d32210b709f9d93979acb10b4f79da1153490 SHA512 4970cde869e036d7a74cd5f045b4132f402901a72d7da5c91f7c030f70970491743cea3be1d6e382ac8d3f7ba63dc9a2ff9db33f647f23c1094d2a928c8ec4ec
-EBUILD opencv_apps-9999.ebuild 1555 BLAKE2B 279f7278c6cf143d57f822f811f2ef34ceda9038dcc3dd6c268a88d2fc24cbe5866965fbb01b3c857ac1cf80d56d32210b709f9d93979acb10b4f79da1153490 SHA512 4970cde869e036d7a74cd5f045b4132f402901a72d7da5c91f7c030f70970491743cea3be1d6e382ac8d3f7ba63dc9a2ff9db33f647f23c1094d2a928c8ec4ec
-MISC metadata.xml 343 BLAKE2B 4c8ada208d6cb4fb1e99ee7839cc4c20275e86a8b351169790c54c8df90a8cb381d9d71b2ebfdf2306aa7f2d66581144d61dff8adb5aa0e7ddc13696d8f17aa5 SHA512 932ed7ee027c275e3be014ee0a048c16dbec1b7108777fb2150cab84678cc31d560f1b88d6ac3fd890357512239c85951c48819a31f2e0174dac68beef44d1b2
diff --git a/dev-ros/opencv_apps/metadata.xml b/dev-ros/opencv_apps/metadata.xml
deleted file mode 100644
index 6fad310c965b..000000000000
--- a/dev-ros/opencv_apps/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/vision_opencv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/opencv_apps/opencv_apps-2.0.2.ebuild b/dev-ros/opencv_apps/opencv_apps-2.0.2.ebuild
deleted file mode 100644
index d53270120b50..000000000000
--- a/dev-ros/opencv_apps/opencv_apps-2.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/opencv_apps"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="OpenCV applications for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-SRC_URI="${SRC_URI}
-	http://download.ros.org/data/face_detector/face_detector_withface_test_diamondback.bag -> ${P}-face_detector_withface_test_diamondback.bag
-	http://download.ros.org/data/vslam_system/vslam_tutorial.bag -> ${P}-vslam_tutorial.bag
-"
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	>=media-libs/opencv-3.3:0=[contrib]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/roslaunch
-		dev-ros/rostest
-		dev-ros/rosbag
-		dev-ros/rosservice
-		dev-ros/rostopic
-		dev-ros/image_proc
-		dev-ros/topic_tools
-		dev-ros/compressed_image_transport
-		dev-ros/image_view
-	)
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in face_detector_withface_test_diamondback.bag vslam_tutorial.bag ; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed \
-		-e "s#http://download.ros.org/data/face_detector#file://${S}#" \
-		-e "s#http://download.ros.org/data/vslam_system#file://${S}#" \
-		-i test/CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
deleted file mode 100644
index d53270120b50..000000000000
--- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/opencv_apps"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="OpenCV applications for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-SRC_URI="${SRC_URI}
-	http://download.ros.org/data/face_detector/face_detector_withface_test_diamondback.bag -> ${P}-face_detector_withface_test_diamondback.bag
-	http://download.ros.org/data/vslam_system/vslam_tutorial.bag -> ${P}-vslam_tutorial.bag
-"
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	>=media-libs/opencv-3.3:0=[contrib]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/roslaunch
-		dev-ros/rostest
-		dev-ros/rosbag
-		dev-ros/rosservice
-		dev-ros/rostopic
-		dev-ros/image_proc
-		dev-ros/topic_tools
-		dev-ros/compressed_image_transport
-		dev-ros/image_view
-	)
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in face_detector_withface_test_diamondback.bag vslam_tutorial.bag ; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed \
-		-e "s#http://download.ros.org/data/face_detector#file://${S}#" \
-		-e "s#http://download.ros.org/data/vslam_system#file://${S}#" \
-		-i test/CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/opencv_tests/Manifest b/dev-ros/opencv_tests/Manifest
deleted file mode 100644
index 43719051d0a2..000000000000
--- a/dev-ros/opencv_tests/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
-DIST vision_opencv-1.16.0.tar.gz 85452 BLAKE2B 5f167898cef4bbc753e32af87174b7f668b3eff00357a22e8c454d181116a925059d4837210086d445ceaf74819fdb9a527eb5667321df8a7c1fe84549dbe5b6 SHA512 affd61f0d933cc57d5d23e840f0708e8ffdc0033eee22a21fe5c0099a2ab75d4c3fdcc41705167ab3615f5388ce47641faf5b21e6c6365a4e540abe69dfad3fe
-DIST vision_opencv-1.16.2.tar.gz 86615 BLAKE2B e3078be4a865aed4317db7dc422a71661a52e8b42c52aaab92c524cdb14ad08ab85ac523d55b76b5ebc6201400a832d0ea9c3203ed5ff2af342a58be5ab0ef49 SHA512 c1fd4b402cc970797c0b01573d111cec041ea59598897256ed26ad01624e15300cc2147deaf701af1d12bc921ac9892917d927d17325d4086c0724633d96b3c5
-EBUILD opencv_tests-1.15.0.ebuild 705 BLAKE2B 02c1f88b34b75de6d24cc2b6a1b0ab7b271c6485fb4288ca4df27f0d7cf34acaa7e01c6565fa8592d995b797131f75635fed360c9c627fa1600ddedc7397e4cf SHA512 fdeb7b53f1884286480b2f5898c3bbba5deba6d9867f0f14b0db5f01368cc841b0982fc69222ffe6f36f5d6d0f7ee9c425c318a0064100d8a846b524a11ee048
-EBUILD opencv_tests-1.16.0.ebuild 705 BLAKE2B a611d93c82f59ba78916c5eeb10bdec1bb412d872a3f4292c81229d535ca6aabdbc95b9c42eba9db3c7f80e4e19a674ea3b1ec7fa209882f0a89446b0dc07eaf SHA512 fdb2c72c47d19d0885d6f0b62abb1d3f7fc5d62cd5e9d3d797c49ccefad1d80d7e8494a3f6da29dbce889ee8ecef67094cd0099e8146116e63542512da7840a4
-EBUILD opencv_tests-1.16.2.ebuild 705 BLAKE2B a611d93c82f59ba78916c5eeb10bdec1bb412d872a3f4292c81229d535ca6aabdbc95b9c42eba9db3c7f80e4e19a674ea3b1ec7fa209882f0a89446b0dc07eaf SHA512 fdb2c72c47d19d0885d6f0b62abb1d3f7fc5d62cd5e9d3d797c49ccefad1d80d7e8494a3f6da29dbce889ee8ecef67094cd0099e8146116e63542512da7840a4
-EBUILD opencv_tests-9999.ebuild 705 BLAKE2B 02c1f88b34b75de6d24cc2b6a1b0ab7b271c6485fb4288ca4df27f0d7cf34acaa7e01c6565fa8592d995b797131f75635fed360c9c627fa1600ddedc7397e4cf SHA512 fdeb7b53f1884286480b2f5898c3bbba5deba6d9867f0f14b0db5f01368cc841b0982fc69222ffe6f36f5d6d0f7ee9c425c318a0064100d8a846b524a11ee048
-MISC metadata.xml 343 BLAKE2B 4c8ada208d6cb4fb1e99ee7839cc4c20275e86a8b351169790c54c8df90a8cb381d9d71b2ebfdf2306aa7f2d66581144d61dff8adb5aa0e7ddc13696d8f17aa5 SHA512 932ed7ee027c275e3be014ee0a048c16dbec1b7108777fb2150cab84678cc31d560f1b88d6ac3fd890357512239c85951c48819a31f2e0174dac68beef44d1b2
diff --git a/dev-ros/opencv_tests/metadata.xml b/dev-ros/opencv_tests/metadata.xml
deleted file mode 100644
index 6fad310c965b..000000000000
--- a/dev-ros/opencv_tests/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/vision_opencv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild b/dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
deleted file mode 100644
index 7047774c56b1..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.16.0.ebuild b/dev-ros/opencv_tests/opencv_tests-1.16.0.ebuild
deleted file mode 100644
index c1cfbbde482c..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.16.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.16.2.ebuild b/dev-ros/opencv_tests/opencv_tests-1.16.2.ebuild
deleted file mode 100644
index c1cfbbde482c..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.16.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-9999.ebuild b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
deleted file mode 100644
index 7047774c56b1..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest
deleted file mode 100644
index 4d019186f9a6..000000000000
--- a/dev-ros/openni2_camera/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST openni2_camera-1.5.1.tar.gz 40518 BLAKE2B 10cee624b9eda0a3d8f45df1fa6ba720a6e1c7f1a36dd0f0b933266854904f3a16f2292a5a51ed5f7e3d6f4ba5b9aaaf5260d7d2f6f012dbba060b5f3e3445f6 SHA512 59ab19bf60f6bd4196374138b68e64dc8aa44a8c451c3e7d5893f1501e83ab1c9034ddea2cbc1eedf12b2b2a13a9ecc4bbf2b87a71ab7fa38cde4c0d6ccc04cc
-EBUILD openni2_camera-1.5.1.ebuild 647 BLAKE2B 76ea37672a393f19e8a09529282ee88dfa06cc6bd0d2804a0f4d4fa098c22ebcf532e43e819ac5cf9eea3da9f4bd2d396715a73d096f5a2231c3a88a555dc924 SHA512 631bbce494875501d40fead492a37b3697b03e20fb486c17286ac3865d4691bda6815631f6cfb82cfcefbd4fdf7b82dfbada477217cc7245f9224b5b11ddfa57
-EBUILD openni2_camera-9999.ebuild 647 BLAKE2B 76ea37672a393f19e8a09529282ee88dfa06cc6bd0d2804a0f4d4fa098c22ebcf532e43e819ac5cf9eea3da9f4bd2d396715a73d096f5a2231c3a88a555dc924 SHA512 631bbce494875501d40fead492a37b3697b03e20fb486c17286ac3865d4691bda6815631f6cfb82cfcefbd4fdf7b82dfbada477217cc7245f9224b5b11ddfa57
-MISC metadata.xml 341 BLAKE2B 226e9f63746f2ece1d225cea58bd2f8693790c7a0c0e3be136ea804561483c689d837170bdb7205e6e2614f4b7afca8749ac164525be141b50647e9bc18a9704 SHA512 e22d5f878937370540cdbf18f415f0f9ad8a526a9e84eb68ef9ad861559c06f509c879e4db17ac34fd395924d7cafbf666e6db2030cd2885adcac769ae5e70a3
diff --git a/dev-ros/openni2_camera/metadata.xml b/dev-ros/openni2_camera/metadata.xml
deleted file mode 100644
index 39c915499d34..000000000000
--- a/dev-ros/openni2_camera/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/openni2_camera</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild b/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild
deleted file mode 100644
index fdc7e0aa846e..000000000000
--- a/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/camera_info_manager
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/OpenNI2
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/openni2_camera/openni2_camera-9999.ebuild b/dev-ros/openni2_camera/openni2_camera-9999.ebuild
deleted file mode 100644
index fdc7e0aa846e..000000000000
--- a/dev-ros/openni2_camera/openni2_camera-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/camera_info_manager
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/OpenNI2
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
deleted file mode 100644
index 8293c5d8ff45..000000000000
--- a/dev-ros/openni2_launch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST openni2_camera-1.5.1.tar.gz 40518 BLAKE2B 10cee624b9eda0a3d8f45df1fa6ba720a6e1c7f1a36dd0f0b933266854904f3a16f2292a5a51ed5f7e3d6f4ba5b9aaaf5260d7d2f6f012dbba060b5f3e3445f6 SHA512 59ab19bf60f6bd4196374138b68e64dc8aa44a8c451c3e7d5893f1501e83ab1c9034ddea2cbc1eedf12b2b2a13a9ecc4bbf2b87a71ab7fa38cde4c0d6ccc04cc
-EBUILD openni2_launch-1.5.1.ebuild 558 BLAKE2B 24b984bc6ca8234b4b10cf216e64c31c76496ae5117559b8e576ffd9f9deb7372440402f7e40d695a8218dc7eb409fa901058458d532e095913ec7be5402ee22 SHA512 11705ad41bbf7163c27d0b772030f3c8bb847f7e2825b0669e4f174f746deb33b7e09bca034e8f3b789242ce11cbc74d61642416f92b46a5b907d7abc576e786
-EBUILD openni2_launch-9999.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
-MISC metadata.xml 341 BLAKE2B 8cba0e2b835f8e77b03078f2c50f44376adc34e70816bd918a1e91f6a3e9d49a3a94be4fba00cdeaf57244224a0d2ce2de1717ad65a4467f28de45ab7041da2c SHA512 3fcc22884be97171bad82393050fd2d9e325dfb05a16d0689a086a746bf2eecc782a4cff7c0bb39569e1fabadff26868440c2a51aeb517306b41e753621522b8
diff --git a/dev-ros/openni2_launch/metadata.xml b/dev-ros/openni2_launch/metadata.xml
deleted file mode 100644
index 26de3a1011c3..000000000000
--- a/dev-ros/openni2_launch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/openni2_launch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/openni2_launch/openni2_launch-1.5.1.ebuild b/dev-ros/openni2_launch/openni2_launch-1.5.1.ebuild
deleted file mode 100644
index 230a0150b089..000000000000
--- a/dev-ros/openni2_launch/openni2_launch-1.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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-drivers/openni2_camera"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rgbd_launch
-	dev-ros/depth_image_proc
-	dev-ros/image_proc
-	dev-ros/nodelet
-	dev-ros/openni2_camera
-	dev-ros/tf
-	dev-ros/roslaunch
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	sys-apps/usbutils"
diff --git a/dev-ros/openni2_launch/openni2_launch-9999.ebuild b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
deleted file mode 100644
index 227a922039f1..000000000000
--- a/dev-ros/openni2_launch/openni2_launch-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rgbd_launch
-	dev-ros/depth_image_proc
-	dev-ros/image_proc
-	dev-ros/nodelet
-	dev-ros/openni2_camera
-	dev-ros/tf
-	dev-ros/roslaunch
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	sys-apps/usbutils"
diff --git a/dev-ros/openslam_gmapping/Manifest b/dev-ros/openslam_gmapping/Manifest
deleted file mode 100644
index 13d9fdb5b66f..000000000000
--- a/dev-ros/openslam_gmapping/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST openslam_gmapping-0.2.1.tar.gz 104933 BLAKE2B fbd31e66849ee28b63ac24ec059ebca368f31c8796b229f59fda56af7aceec12d45673651ad05c690da268e8a0fc7ae581b7911ea6e773af833c6374fb83843e SHA512 bb3b1a634ded258f526dd65b1b70c7a0f284810eedb5cfafbc2012a4997793c1e7aeacdca2afeea4ddec13cadb445b994cac07cb0763117c5fa478b3def1cbe6
-EBUILD openslam_gmapping-0.2.1.ebuild 335 BLAKE2B 1d3bb5e4b713377b23de7ea94e6de22fa813c2f905c5dd5e7db985682561f4ddceebe3cfb891333ee2de2d792de03cc0d305cd484086ee9131988fb13e4de55d SHA512 760139c73e71b38e10f4c8e0065c6e77facfcb617f91a590539b513df000f93765cd9da81ea35696375badb7a6852cc2bd6a548a01177d03f3b4546ace84f851
-EBUILD openslam_gmapping-9999.ebuild 335 BLAKE2B 1d3bb5e4b713377b23de7ea94e6de22fa813c2f905c5dd5e7db985682561f4ddceebe3cfb891333ee2de2d792de03cc0d305cd484086ee9131988fb13e4de55d SHA512 760139c73e71b38e10f4c8e0065c6e77facfcb617f91a590539b513df000f93765cd9da81ea35696375badb7a6852cc2bd6a548a01177d03f3b4546ace84f851
-MISC metadata.xml 347 BLAKE2B e0b2a57ebf358f05297c6ee484a1b393ab3aa9601abc1b798367d0fbfcdfad8ae4b7c350e090e492145184433d0b109928f95738bdca17d39d1b2a7f13954219 SHA512 24507e042a7932ba2a1847cd2b5c9f10aa6154d8e5edbd7b084b07c231d24f1e6b457710d385436f4f52fdb1835c5d9af35a0711e28c7bcce024a8289f07dbc4
diff --git a/dev-ros/openslam_gmapping/metadata.xml b/dev-ros/openslam_gmapping/metadata.xml
deleted file mode 100644
index 94bef80627d0..000000000000
--- a/dev-ros/openslam_gmapping/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/openslam_gmapping</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
deleted file mode 100644
index cb126bd33da3..000000000000
--- a/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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-perception/openslam_gmapping"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-ified version of gmapping SLAM"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
deleted file mode 100644
index cb126bd33da3..000000000000
--- a/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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-perception/openslam_gmapping"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-ified version of gmapping SLAM"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
deleted file mode 100644
index e549157b7890..000000000000
--- a/dev-ros/pcl_conversions/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX pcl.patch 2427 BLAKE2B ec9099ea6b6c39054df19aba957c6503db864190b4704445440b5e0cc93065b269d070d21b3cdd18a392dbd4acc2380b924efae34f4e3d70f96da7733ef80979 SHA512 33fdf3284c4c34fe0e7f4f36e2c6328eba471b2f2d7a30bf9bf44c82b81ff4c68a522404eafea81546d7be0d07988fa6b94e2e6d5ec96278bb11ae68177bb741
-DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
-DIST perception_pcl-1.7.4.tar.gz 82160 BLAKE2B 11f4936da3d2fc86eafcc1219e4bd4acf0defece3f2dfcefea54ad3e239fc3a87c3a581291f5cd3adae74c0b6093213cff50ee1cfc7b87b1006299457773d2a8 SHA512 ee5b03dd348de2c589ec01bcab165959dc1e177abd3a2beca62bf701854231296a18052142273c6b4965101fe1b72ee685884049b45d93aa452397bb2df640f4
-EBUILD pcl_conversions-1.7.2-r1.ebuild 636 BLAKE2B 41739024596fccb8ea978f74c4f7b57552766f23c05a556e6726b3aa78fc26d9dae54f7d469dc6ceb664325fd3f30a0f5b23910478847d8b80dd15de3ded8030 SHA512 b558b33311491e1fcc409c39c37640bae397de978a333654817a0ac6255a2a6d0545193cb908e3414b5681ccd5d93e62630eaf031d9fd30c2ca38a8581bb21ac
-EBUILD pcl_conversions-1.7.4.ebuild 602 BLAKE2B df380e4fb501d46a5fe51c7a4833bac5b22199a09572ffe3ab0d4c8a4d2b6ef6371d9544cf40adf688770812fd2a48cbc0e6c7568e2157c160b510d33866bd54 SHA512 9623ef35d5b5f6cf8ca6cf96b6a9db9777878609a450ab8600b13a062ccc24b1de4a491148c5bc171081bb5dbe54310cfff059714cac4a859b8f573cc14fde45
-EBUILD pcl_conversions-9999.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
-MISC metadata.xml 344 BLAKE2B d9539150674440607eb7fd36b90cf5843da6a17a9f3e1e82632553e8cdedddc7ae3973ce9278234b9daefeef7784274edbe49d7d017c4040f69f668a38a18f3f SHA512 40ca3538a08b2b1c63be52c15c2a41bf13bd0a59af38fb9105ebeea977c43563f1ec51a1a569bd5f925b8ec9917e3014a01b28bd02dee6352cf55a84aa72efbb
diff --git a/dev-ros/pcl_conversions/files/pcl.patch b/dev-ros/pcl_conversions/files/pcl.patch
deleted file mode 100644
index fc0ef8866863..000000000000
--- a/dev-ros/pcl_conversions/files/pcl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 6900f7cf650e6c0df2aef45e0011833905b0ba9e Mon Sep 17 00:00:00 2001
-From: Markus Vieth <39675748+mvieth@users.noreply.github.com>
-Date: Fri, 6 Nov 2020 19:13:16 +0100
-Subject: [PATCH] Change conversions of Vertices for new PCL versions (#313)
-
-In https://github.com/PointCloudLibrary/pcl/commit/ad00c7bee2fad0391649479d90eee4461a2e74e7, the vertices field of pcl::Vertices changed from std::vector<std::uint32_t> to std::vector<pcl::index_t>, where index_t is an index type with configurable size (currently by default int). This commit makes conversions from and to pcl_msgs::Vertices possible again, moving the vector contents if possible.
----
- .../include/pcl_conversions/pcl_conversions.h | 23 +++++++++++++++----
- 1 file changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/pcl_conversions/include/pcl_conversions/pcl_conversions.h b/pcl_conversions/include/pcl_conversions/pcl_conversions.h
-index a5671c25..5ac0a41a 100644
---- a/include/pcl_conversions/pcl_conversions.h
-+++ b/include/pcl_conversions/pcl_conversions.h
-@@ -350,10 +350,25 @@ namespace pcl_conversions {
- 
-   /** pcl::Vertices <=> pcl_msgs::Vertices **/
- 
-+  namespace internal
-+  {
-+    template <class T>
-+    inline void move(std::vector<T> &a, std::vector<T> &b)
-+    {
-+      b.swap(a);
-+    }
-+
-+    template <class T1, class T2>
-+    inline void move(std::vector<T1> &a, std::vector<T2> &b)
-+    {
-+      b.assign(a.cbegin(), a.cend());
-+    }
-+  }
-+
-   inline
-   void fromPCL(const pcl::Vertices &pcl_vert, pcl_msgs::Vertices &vert)
-   {
--    vert.vertices = pcl_vert.vertices;
-+    vert.vertices.assign(pcl_vert.vertices.cbegin(), pcl_vert.vertices.cend());
-   }
- 
-   inline
-@@ -370,7 +385,7 @@ namespace pcl_conversions {
-   inline
-   void moveFromPCL(pcl::Vertices &pcl_vert, pcl_msgs::Vertices &vert)
-   {
--    vert.vertices.swap(pcl_vert.vertices);
-+    internal::move(pcl_vert.vertices, vert.vertices);
-   }
- 
-   inline
-@@ -387,7 +402,7 @@ namespace pcl_conversions {
-   inline
-   void toPCL(const pcl_msgs::Vertices &vert, pcl::Vertices &pcl_vert)
-   {
--    pcl_vert.vertices = vert.vertices;
-+    pcl_vert.vertices.assign(vert.vertices.cbegin(), vert.vertices.cend());
-   }
- 
-   inline
-@@ -404,7 +419,7 @@ namespace pcl_conversions {
-   inline
-   void moveToPCL(pcl_msgs::Vertices &vert, pcl::Vertices &pcl_vert)
-   {
--    pcl_vert.vertices.swap(vert.vertices);
-+    internal::move(vert.vertices, pcl_vert.vertices);
-   }
- 
-   inline
diff --git a/dev-ros/pcl_conversions/metadata.xml b/dev-ros/pcl_conversions/metadata.xml
deleted file mode 100644
index 57f3ccdd6493..000000000000
--- a/dev-ros/pcl_conversions/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/perception_pcl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild
deleted file mode 100644
index ec80ff5fa28b..000000000000
--- a/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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-perception/perception_pcl"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides conversions from PCL data types and ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	sci-libs/pcl:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )"
-PATCHES=("${FILESDIR}/pcl.patch")
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.4.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.4.ebuild
deleted file mode 100644
index 0cf5c845fbc9..000000000000
--- a/dev-ros/pcl_conversions/pcl_conversions-1.7.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides conversions from PCL data types and ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	sci-libs/pcl:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild b/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
deleted file mode 100644
index 2aa2de1919aa..000000000000
--- a/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides conversions from PCL data types and ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	sci-libs/pcl:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_msgs/Manifest b/dev-ros/pcl_msgs/Manifest
deleted file mode 100644
index 807ffbd837a3..000000000000
--- a/dev-ros/pcl_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pcl_msgs-0.3.0.tar.gz 1674 BLAKE2B 4700014325557987dd2ac18ce24f5b17e92861dc0030ef65d2511609d90d1b3ad6f7dab56d173fb95b3a713ecca7e8d45a5e5882b0c606ece6988a0a4b61e7b5 SHA512 30a0af7e5447e29754168b6d9358bd8ba30ee35e156d5b112c5562c98e30915f5965d4791831334b57222864b5d3de6d77d67108222f87279a76666dd96caedb
-EBUILD pcl_msgs-0.3.0.ebuild 433 BLAKE2B b5d453cb821bf605416d0daa76e7cad99525e069629b535f73196f3d6a4e24eda28c9ab7cbf55498d01e32d1a43e4a575c29175b0a194053c1da777b167e8fc1 SHA512 f7f213d0a7fcf7683e222edf1e949e76646a52bffa3745e2da051685d66b222007372717f9182d7b240386c0bb8fe6729ade94b7bbc6ecffb36d3edd117bfc04
-EBUILD pcl_msgs-9999.ebuild 433 BLAKE2B b5d453cb821bf605416d0daa76e7cad99525e069629b535f73196f3d6a4e24eda28c9ab7cbf55498d01e32d1a43e4a575c29175b0a194053c1da777b167e8fc1 SHA512 f7f213d0a7fcf7683e222edf1e949e76646a52bffa3745e2da051685d66b222007372717f9182d7b240386c0bb8fe6729ade94b7bbc6ecffb36d3edd117bfc04
-MISC metadata.xml 338 BLAKE2B bd9385e59818ca1387395a5e4a5387e43f85178e6d09ff4ce7ac7ee9af9e52790f17bb85ebacd808768ae291c979b9839cadd58f1553f07f87afa820b639f52b SHA512 3498a93aed8566ebf77688514da744e7f2ac50b0dbd2e716a45b5f84a46859d846412c3805a93d9238e66f3f9ba1f99458ff77d24bf237ef73ccd5a6b94bb9b4
diff --git a/dev-ros/pcl_msgs/metadata.xml b/dev-ros/pcl_msgs/metadata.xml
deleted file mode 100644
index a3993cc22fff..000000000000
--- a/dev-ros/pcl_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/pcl_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild b/dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
deleted file mode 100644
index b19fe487df07..000000000000
--- a/dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-perception/pcl_msgs"
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library)-related ROS messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild b/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
deleted file mode 100644
index b19fe487df07..000000000000
--- a/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-perception/pcl_msgs"
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library)-related ROS messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
deleted file mode 100644
index 22498a592b84..000000000000
--- a/dev-ros/pcl_ros/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX pcl.patch 2215 BLAKE2B ff38d380d743c69de3c7377c52af5df23cb89ccb7011b12b34f921fa1a3bf10ec3ec72e8c8b7fe1ade282a8b926467895198db8c6545ba33b0434dbcdd533bba SHA512 82cc5101f2545262f966acfa238b2d630a31da621840beabb670ba3ab9a988a4a29d80c81739fff259d98004579e3fe1f0a3221fd6253f7cfed94bf0024e395b
-AUX tests.patch 526 BLAKE2B 6a4c015707096bea03a5921387286a70289e8933ff75300aee8f070fec7a2870932e35f5b4a4ddbe2131611716c2493b99ed63f93fa34880c36fd918a04eb158 SHA512 fdcba450c84e92aaa5f7263b02f118d4d3832725cd3aa30b218f3ff1af4439406ae930ccba8c601b757173572d99a26c12a670b33ad7600e71695a165461459d
-DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
-DIST perception_pcl-1.7.4.tar.gz 82160 BLAKE2B 11f4936da3d2fc86eafcc1219e4bd4acf0defece3f2dfcefea54ad3e239fc3a87c3a581291f5cd3adae74c0b6093213cff50ee1cfc7b87b1006299457773d2a8 SHA512 ee5b03dd348de2c589ec01bcab165959dc1e177abd3a2beca62bf701854231296a18052142273c6b4965101fe1b72ee685884049b45d93aa452397bb2df640f4
-EBUILD pcl_ros-1.7.2-r1.ebuild 1207 BLAKE2B 4235ded544b5311d60f1cb2119c1ba13f33b03e5381c27a6df1d96afb915b2b117e49c2953500cf6239713ae7ba4a55dae89a94eb491a5b804823ffe94564068 SHA512 57af72003f6f05427a66cf67d3922ed2030467f950ced861e2698429d95d31a514712f0971381cb40c2c1f8c5e58852816542ff84a1cc433fa5a49c38b2189bc
-EBUILD pcl_ros-1.7.4.ebuild 1183 BLAKE2B 6d18d246361311529b36356a42161208494c177a9fe7926207f6016cba318f557ef54d1587314f76e9a3d93ddbeedb908b5c37b11d6a13057b6f49ad7fbea9a5 SHA512 d384f763b8e2fc35eea906afde8a8c8329867627495778c724199d18609ce78e2fcc31f5505cf1793c02b9ad0eeef04be42eaedb07722c8924396becbb29106e
-EBUILD pcl_ros-9999.ebuild 1183 BLAKE2B 6d18d246361311529b36356a42161208494c177a9fe7926207f6016cba318f557ef54d1587314f76e9a3d93ddbeedb908b5c37b11d6a13057b6f49ad7fbea9a5 SHA512 d384f763b8e2fc35eea906afde8a8c8329867627495778c724199d18609ce78e2fcc31f5505cf1793c02b9ad0eeef04be42eaedb07722c8924396becbb29106e
-MISC metadata.xml 344 BLAKE2B d9539150674440607eb7fd36b90cf5843da6a17a9f3e1e82632553e8cdedddc7ae3973ce9278234b9daefeef7784274edbe49d7d017c4040f69f668a38a18f3f SHA512 40ca3538a08b2b1c63be52c15c2a41bf13bd0a59af38fb9105ebeea977c43563f1ec51a1a569bd5f925b8ec9917e3014a01b28bd02dee6352cf55a84aa72efbb
diff --git a/dev-ros/pcl_ros/files/pcl.patch b/dev-ros/pcl_ros/files/pcl.patch
deleted file mode 100644
index 6847fff9c4ce..000000000000
--- a/dev-ros/pcl_ros/files/pcl.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bd21be2cb8ec6ad70a282c61b14aa9dd43edf9ff Mon Sep 17 00:00:00 2001
-From: Markus Vieth <39675748+mvieth@users.noreply.github.com>
-Date: Mon, 21 Jun 2021 19:42:58 +0200
-Subject: [PATCH] Use complete namespace for traits members (#330)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This prevents errors like this: error: ‘name’ is not a member of ‘pcl::detail::traits’; did you mean ‘pcl::traits::name’?
-The error appears for newer PCL versions (everything after commit https://github.com/PointCloudLibrary/pcl/commit/d39d3d3300746b952997e5bd2742dac7482aa5ab), but this change should also be fully compatible with older PCL versions.
----
- pcl_ros/include/pcl_ros/point_cloud.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.h
-index 93df7365..3c57f298 100644
---- a/include/pcl_ros/point_cloud.h
-+++ b/include/pcl_ros/point_cloud.h
-@@ -23,19 +23,19 @@ namespace pcl
- 
-       template<typename U> void operator() ()
-       {
--        const char* name = traits::name<PointT, U>::value;
-+        const char* name = pcl::traits::name<PointT, U>::value;
-         std::uint32_t name_length = strlen(name);
-         stream_.next(name_length);
-         if (name_length > 0)
-           memcpy(stream_.advance(name_length), name, name_length);
- 
--        std::uint32_t offset = traits::offset<PointT, U>::value;
-+        std::uint32_t offset = pcl::traits::offset<PointT, U>::value;
-         stream_.next(offset);
- 
--        std::uint8_t datatype = traits::datatype<PointT, U>::value;
-+        std::uint8_t datatype = pcl::traits::datatype<PointT, U>::value;
-         stream_.next(datatype);
- 
--        std::uint32_t count = traits::datatype<PointT, U>::size;
-+        std::uint32_t count = pcl::traits::datatype<PointT, U>::size;
-         stream_.next(count);
-       }
- 
-@@ -49,7 +49,7 @@ namespace pcl
- 
-       template<typename U> void operator() ()
-       {
--        std::uint32_t name_length = strlen(traits::name<PointT, U>::value);
-+        std::uint32_t name_length = strlen(pcl::traits::name<PointT, U>::value);
-         length += name_length + 13;
-       }
- 
diff --git a/dev-ros/pcl_ros/files/tests.patch b/dev-ros/pcl_ros/files/tests.patch
deleted file mode 100644
index dbb2f3030186..000000000000
--- a/dev-ros/pcl_ros/files/tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Increase tolerance, this fails under high loads
-
-Index: pcl_ros/samples/pcl_ros/segmentation/sample_extract_clusters.launch
-===================================================================
---- pcl_ros.orig/samples/pcl_ros/segmentation/sample_extract_clusters.launch
-+++ pcl_ros/samples/pcl_ros/segmentation/sample_extract_clusters.launch
-@@ -25,7 +25,7 @@
-     <rosparam>
-       topic: /extract_clusters/output
-       hz: 3000
--      hzerror: 2400
-+      hzerror: 2900
-       test_duration: 5.0
-     </rosparam>
-   </test>
diff --git a/dev-ros/pcl_ros/metadata.xml b/dev-ros/pcl_ros/metadata.xml
deleted file mode 100644
index 57f3ccdd6493..000000000000
--- a/dev-ros/pcl_ros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/perception_pcl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
deleted file mode 100644
index 89ff275c11b8..000000000000
--- a/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosbag
-	dev-ros/rosconsole
-	dev-ros/roslib
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	>=dev-cpp/eigen-3.2.5:3
-	dev-ros/pluginlib
-	dev-libs/console_bridge:=
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/tf2_eigen
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	sci-libs/pcl:=[qhull]
-	>=dev-ros/pcl_conversions-0.2.1-r1
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
-PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/pcl.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.4.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.4.ebuild
deleted file mode 100644
index e19b87c85bd4..000000000000
--- a/dev-ros/pcl_ros/pcl_ros-1.7.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosbag
-	dev-ros/rosconsole
-	dev-ros/roslib
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	>=dev-cpp/eigen-3.2.5:3
-	dev-ros/pluginlib
-	dev-libs/console_bridge:=
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/tf2_eigen
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	sci-libs/pcl:=[qhull]
-	>=dev-ros/pcl_conversions-0.2.1-r1
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
deleted file mode 100644
index e19b87c85bd4..000000000000
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosbag
-	dev-ros/rosconsole
-	dev-ros/roslib
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	>=dev-cpp/eigen-3.2.5:3
-	dev-ros/pluginlib
-	dev-libs/console_bridge:=
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/tf2_eigen
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	sci-libs/pcl:=[qhull]
-	>=dev-ros/pcl_conversions-0.2.1-r1
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
deleted file mode 100644
index 10533cae9d11..000000000000
--- a/dev-ros/pluginlib/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX catkin_prefix_path2.patch 678 BLAKE2B c494700f8d2cfce884b65ef87963cbf414dc4af1a9c9390978e7f458ad7f93b28c54bcd9831ff3edf4d6a421c4ec9ad1859bafff5f8ed209662ea1d14a70c299 SHA512 3b91fac26a2e48087fc70a773f5416e6cc3f7758adcddea6d50ba97a2d1ff8ae2f14fd5b74ba043a5546a8809def8b2154c70a97b10c451ba3773a82eda67100
-AUX libdir.patch 849 BLAKE2B 4ca2be8207311e6ac342637d07ba63cb135b4f8433b8cead15279f4b5150fd0388c65f34553842009bb26ec100b8ba220a3737a0923ace55e07ede4b580e7032 SHA512 71404dfc435630f899b9bdd2152363257c918f43c8d718450348308156d586fddf2e45a0715d7d439626bf5d67169fa7e6faff0de26647b7aa803dee6e37622c
-DIST pluginlib-1.13.0.tar.gz 20124 BLAKE2B d2c2c643345e3b76bc580e413538af3ddb49ffe00d9d14ee6ad4dfb3d930ca70bad12ef232c831474238050f4b934c0ca5accded800b8c719c006c01e3c7ac00 SHA512 69566fad8aad92cf1d481117e5beb46c6033538ea08db0487e10766c40e89510d6a58e817f52c0bdce2946813272f2f2e72145e949647e24465f1e13995cf85f
-EBUILD pluginlib-1.13.0-r2.ebuild 766 BLAKE2B f0237c2133425950d5460df7b3cbb1353218f7c83e8ed6e6cdd72a44e43f4b7dd73bc907f3483a396f59f51bf2c844556b9e1d731676bac11efc03637830aa8d SHA512 fc3b88bfee5d94baee611fc330811ab7b120eb4f48317dcdf3e71951978ae4dbc18c31c0aac6582a9c2966a683e23fc66f1862b013c79a1b25a6033bbf26202d
-EBUILD pluginlib-9999.ebuild 766 BLAKE2B f0237c2133425950d5460df7b3cbb1353218f7c83e8ed6e6cdd72a44e43f4b7dd73bc907f3483a396f59f51bf2c844556b9e1d731676bac11efc03637830aa8d SHA512 fc3b88bfee5d94baee611fc330811ab7b120eb4f48317dcdf3e71951978ae4dbc18c31c0aac6582a9c2966a683e23fc66f1862b013c79a1b25a6033bbf26202d
-MISC metadata.xml 328 BLAKE2B 0fa7923a2e7c6f5bb095ad58af424e97da4f0f648849851643d0859545d5b62f24ee8d2efe3a4877d1b9902998dd960a1f89ca9a87f753d24f15274cae135286 SHA512 8b3963576ec362c29c21981c8a431aba8721e41e03873604a273bb4257e3a255bd8b01fe5e064d8aa070a7671a1b8aff1dc22f1b238b839e7f0045d163e70e1c
diff --git a/dev-ros/pluginlib/files/catkin_prefix_path2.patch b/dev-ros/pluginlib/files/catkin_prefix_path2.patch
deleted file mode 100644
index 12e759c63216..000000000000
--- a/dev-ros/pluginlib/files/catkin_prefix_path2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use CMAKE_PREFIX_PATH.
-
-Index: pluginlib-1.11.2/include/pluginlib/class_loader_imp.hpp
-===================================================================
---- pluginlib-1.11.2.orig/include/pluginlib/class_loader_imp.hpp
-+++ pluginlib-1.11.2/include/pluginlib/class_loader_imp.hpp
-@@ -68,7 +68,7 @@ namespace
- std::vector<std::string> catkinFindLib()
- {
-   std::vector<std::string> lib_paths;
--  const char * env = std::getenv("CMAKE_PREFIX_PATH");
-+  const char * env = std::getenv("CATKIN_PREFIX_PATH");
-   if (env) {
-     std::string env_catkin_prefix_paths(env);
-     std::vector<std::string> catkin_prefix_paths;
diff --git a/dev-ros/pluginlib/files/libdir.patch b/dev-ros/pluginlib/files/libdir.patch
deleted file mode 100644
index 5152705f0196..000000000000
--- a/dev-ros/pluginlib/files/libdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Add more search pathes for potential libdirs
-
-Index: pluginlib/include/pluginlib/class_loader_imp.hpp
-===================================================================
---- pluginlib.orig/include/pluginlib/class_loader_imp.hpp
-+++ pluginlib/include/pluginlib/class_loader_imp.hpp
-@@ -323,6 +323,12 @@ std::vector<std::string> ClassLoader<T>:
-       boost::filesystem::path bin("bin");
-       lib_paths.push_back((path / bin).string());
- #endif
-+      boost::filesystem::path lib64("lib64");
-+      lib_paths.push_back((path / lib64).string());
-+      boost::filesystem::path lib32("lib32");
-+      lib_paths.push_back((path / lib32).string());
-+      boost::filesystem::path libx32("libx32");
-+      lib_paths.push_back((path / libx32).string());
-       boost::filesystem::path lib("lib");
-       lib_paths.push_back((path / lib).string());
-     }
diff --git a/dev-ros/pluginlib/metadata.xml b/dev-ros/pluginlib/metadata.xml
deleted file mode 100644
index b72351cb8201..000000000000
--- a/dev-ros/pluginlib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/pluginlib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild b/dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild
deleted file mode 100644
index 7dc414eb606d..000000000000
--- a/dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/pluginlib"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR="${PN}"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for writing and dynamically loading plugins using the ROS infrastructure"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5:=
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" )
-
-src_test() {
-	cmake_build tests
-
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH=devel/
-	ros-catkin_src_test
-}
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
deleted file mode 100644
index 7dc414eb606d..000000000000
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/pluginlib"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR="${PN}"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for writing and dynamically loading plugins using the ROS infrastructure"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5:=
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" )
-
-src_test() {
-	cmake_build tests
-
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH=devel/
-	ros-catkin_src_test
-}
diff --git a/dev-ros/pluginlib_tutorials/Manifest b/dev-ros/pluginlib_tutorials/Manifest
deleted file mode 100644
index 829bcb4bb15f..000000000000
--- a/dev-ros/pluginlib_tutorials/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_tutorials-0.1.12.tar.gz 12609 BLAKE2B c570236517420685a4733d84694a03486798038f4b7a0e721179d602a6870b51afb558dedd64ed2ccf518bb0e37cccefcae701053eb4c5fe32ef3e2d5dc5d69b SHA512 37244290b0c84aff47172484e2f3c1eecfe3482856030a08e55f2d1b0cad903262be453e81780f58e250c4e1f24c06f6256da5ff1342617d7d5f501f38fc7527
-DIST common_tutorials-0.2.0.tar.gz 12624 BLAKE2B 051e8e980e23dc2ecac2bfb534a8d820b2d2ee3d84b7e42e7ebc538e82560a7ea7e84972a6d6ab5f0c441eba7cf8c7aa2b3b5aced00f73ffc0f0537a3df0c547 SHA512 a3f537199c3ed143ef6c44edaf3fe427374027ed33478f9d440adc62697ace7e69c09cc5b5cacc76d2062eabc32138cbb08314dfd3d4af6f45f0147cb39bf2d9
-EBUILD pluginlib_tutorials-0.1.12.ebuild 424 BLAKE2B 1346a531b6feeddd413fc55cdc2e1c9a3798e3d345e868af81f3f61a08b0e3d9a36603cb0fe17d974c9ae601cfddbe7ebe55963cbfd739dc3e205b89cec239d9 SHA512 41570e6500d74d78c4a0e45becf992627932d9a27ea13aeb326329992e401dbe246366c2f1473394c0b7de192850617c73d2dc1d3f8c989849efbf6238dc9c3a
-EBUILD pluginlib_tutorials-0.2.0.ebuild 424 BLAKE2B 1346a531b6feeddd413fc55cdc2e1c9a3798e3d345e868af81f3f61a08b0e3d9a36603cb0fe17d974c9ae601cfddbe7ebe55963cbfd739dc3e205b89cec239d9 SHA512 41570e6500d74d78c4a0e45becf992627932d9a27ea13aeb326329992e401dbe246366c2f1473394c0b7de192850617c73d2dc1d3f8c989849efbf6238dc9c3a
-EBUILD pluginlib_tutorials-9999.ebuild 424 BLAKE2B 1346a531b6feeddd413fc55cdc2e1c9a3798e3d345e868af81f3f61a08b0e3d9a36603cb0fe17d974c9ae601cfddbe7ebe55963cbfd739dc3e205b89cec239d9 SHA512 41570e6500d74d78c4a0e45becf992627932d9a27ea13aeb326329992e401dbe246366c2f1473394c0b7de192850617c73d2dc1d3f8c989849efbf6238dc9c3a
-MISC metadata.xml 335 BLAKE2B a0188a143e0644b95b351037361ac43ba5392f4b919132542a72b35240697f665230056bdbcbb7ac72aaa83ad927d7dc6a476102a07ad0ccb321ba4f757b712c SHA512 e6e7a5d1e1ca928bcd3e14aa935369bd95f3d54811bde7df12e5878cd489a9d12b0f36c6294768e62286fdefd65109f100a46b7f10a4cc1cc2515b95733af841
diff --git a/dev-ros/pluginlib_tutorials/metadata.xml b/dev-ros/pluginlib_tutorials/metadata.xml
deleted file mode 100644
index 18730473acf0..000000000000
--- a/dev-ros/pluginlib_tutorials/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild
deleted file mode 100644
index 1bb6261afa2a..000000000000
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Pluginlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.2.0.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.2.0.ebuild
deleted file mode 100644
index 1bb6261afa2a..000000000000
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Pluginlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild
deleted file mode 100644
index 1bb6261afa2a..000000000000
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Pluginlib tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/poco_vendor/Manifest b/dev-ros/poco_vendor/Manifest
deleted file mode 100644
index 5d46219e00ea..000000000000
--- a/dev-ros/poco_vendor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST poco_vendor-1.2.1.tar.gz 3156 BLAKE2B 3f9714c81046892463d043642eee5295a6d6436730a22f7b2e114e4d9163d11e50afab895b32b31b1985373d51ea10290b5b22176643890b2f9a2f82ac9ed4f3 SHA512 21dfa72bb413e710f1ac51bbeca18b6ae111078ca06d3aba456628071f6763a386794334d0565b5111e907bb9012dbb124b73fc141002cd77717931009fa1161
-EBUILD poco_vendor-1.2.1.ebuild 796 BLAKE2B a326d416dfb29e5a978d9505a3c347b06cff4bc1742dc0365e5413c2a2067ce801168bd466d99e777f512809e7635f0fad69cf761f8bddd3b93c7bc7f7b8398e SHA512 632eaa5c1d5dd087bf0e270f3315c1303761a1b2cb3560b445c80878580e9be24f0124afc4fbe04bdb69f2647d13311cc9c5a1a55ea08e4c6f36c496e6f89cd4
-EBUILD poco_vendor-9999.ebuild 1073 BLAKE2B a741772266590dcc80e3024e7370b6af25f09aecbb251d1ed0f0021d645d61cb471242630ee5bee4163ad021d01b00c023958161867e031c37ed41ba7385166f SHA512 43bf1444d86969820d379e8350c136925e00f6c1f995108d3d2d860eef1a9e0e74cdcdc0039141696bd211154e4dfe299eca756faa09314d2652adcad99c33f3
-MISC metadata.xml 331 BLAKE2B bb0bfaa70ddf2d70283fa683421b1641b3439ed560f135cc5ec1b4b238fbecc31268a66dc338b60cc1cc8183bf12e4fcb5406ccc42b8bcd98e3f433008edf00e SHA512 f615d33808e4b759c621f93494d007fbc438a81c754e96f60badcb7796f5ba0d570be8d925f40a1d5da625b7a33eb148ab3233a16403681bed562aeb5c4e9445
diff --git a/dev-ros/poco_vendor/metadata.xml b/dev-ros/poco_vendor/metadata.xml
deleted file mode 100644
index 474bc2fd19e1..000000000000
--- a/dev-ros/poco_vendor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros2/poco_vendor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
deleted file mode 100644
index 3f7e3e953f63..000000000000
--- a/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/poco_vendor"
-else
-	SRC_URI="https://github.com/ros2/poco_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake shim over the poco library"
-HOMEPAGE="https://github.com/ros2/poco_vendor"
-
-LICENSE="Apache-2.0 Boost-1.0"
-SLOT="0"
-
-DEPEND="
-	>=dev-libs/poco-1.6.1
-	dev-libs/libpcre
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/poco_vendor/poco_vendor-9999.ebuild b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
deleted file mode 100644
index 6338331766f1..000000000000
--- a/dev-ros/poco_vendor/poco_vendor-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/poco_vendor"
-else
-	SRC_URI="https://github.com/ros2/poco_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake shim over the poco library"
-HOMEPAGE="https://github.com/ros2/poco_vendor"
-
-LICENSE="Apache-2.0 Boost-1.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/poco-1.6.1
-	dev-libs/libpcre
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	test? (
-		dev-ros/ament_cmake_copyright
-		dev-ros/ament_cmake_lint_cmake
-		dev-ros/ament_cmake_xmllint
-		dev-ros/ament_cmake_test
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/pointcloud_to_laserscan/Manifest b/dev-ros/pointcloud_to_laserscan/Manifest
deleted file mode 100644
index 01373988a964..000000000000
--- a/dev-ros/pointcloud_to_laserscan/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pointcloud_to_laserscan-1.4.1.tar.gz 7645 BLAKE2B b3b32213920679e3b0f76d1401658b5dce5057f9556f442e96e79719f083910454aa42e85869628c6713f0dfb858e10e16fc089a92c0e2233b810b9b698334a5 SHA512 c81fdb38affe6cf7da76db9de2b1c17f60a0c464fbd25278d013a601e8474a528a72ec981c3e2e8d257239c398f266960f9adc41e46e5d09bae81d9da8c05c84
-EBUILD pointcloud_to_laserscan-1.4.1.ebuild 619 BLAKE2B 6900108b3b2d8eed415c7b31fc54e0dd765b2f4ec55dcf524610f1cc9488ddf5863935d8a87df13e7ea6288e78521c553fcc6c0e63fe3efc49e6098c941b8d90 SHA512 5938861c3c5fe4136536ebcd06f490f1e271bd1091bd1ddabb710424f92c84e5aefff4a3b193ff2e5b618f5fed9265cee0c281be87e6c87b56b195bbde5921af
-EBUILD pointcloud_to_laserscan-9999.ebuild 619 BLAKE2B 6900108b3b2d8eed415c7b31fc54e0dd765b2f4ec55dcf524610f1cc9488ddf5863935d8a87df13e7ea6288e78521c553fcc6c0e63fe3efc49e6098c941b8d90 SHA512 5938861c3c5fe4136536ebcd06f490f1e271bd1091bd1ddabb710424f92c84e5aefff4a3b193ff2e5b618f5fed9265cee0c281be87e6c87b56b195bbde5921af
-MISC metadata.xml 353 BLAKE2B 36ddceee58c7332496a04eed5db39ecf45bd7558f86b6fadf35f64e1a4fd134d7a901cd6e2bc3698f88070966abd499a47156fca5430c3719786306f6243f500 SHA512 40d45718a41bba47a8bd4b66b33bb1b8f8cc722da23d87eeed90bf84815e769abe6b5a2f59234024aa8ab12f896ceeceeab6efb62e3c17fbc703c5e1f8c96081
diff --git a/dev-ros/pointcloud_to_laserscan/metadata.xml b/dev-ros/pointcloud_to_laserscan/metadata.xml
deleted file mode 100644
index 9cfd0a7882de..000000000000
--- a/dev-ros/pointcloud_to_laserscan/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/pointcloud_to_laserscan</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.1.ebuild b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.1.ebuild
deleted file mode 100644
index 43c2f87630ec..000000000000
--- a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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-perception/pointcloud_to_laserscan"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Converts a 3D Point Cloud into a 2D laser scan"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/tf2_sensor_msgs
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/laser_geometry
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/roslint
-	)
-"
diff --git a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
deleted file mode 100644
index 43c2f87630ec..000000000000
--- a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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-perception/pointcloud_to_laserscan"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Converts a 3D Point Cloud into a 2D laser scan"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/tf2_sensor_msgs
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/laser_geometry
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/roslint
-	)
-"
diff --git a/dev-ros/polled_camera/Manifest b/dev-ros/polled_camera/Manifest
deleted file mode 100644
index f038016cbd07..000000000000
--- a/dev-ros/polled_camera/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
-EBUILD polled_camera-1.12.0.ebuild 526 BLAKE2B b691a89ad6cac4b547d5fdf36b09b95a547ac7f29024c3a55952393b3e88f3d43f8fe3d6ef58e3ee374db358064c1064255e3d34bc46406c569ec028c9e571ed SHA512 013f3bc89ec672758b8bd5f423a4299d7307ca9166daf165f691a3990f44416d7e65286a445040ebd746b1354272c47a9440fdba994e3893a0f0d4c3b552d1d2
-EBUILD polled_camera-9999.ebuild 526 BLAKE2B b691a89ad6cac4b547d5fdf36b09b95a547ac7f29024c3a55952393b3e88f3d43f8fe3d6ef58e3ee374db358064c1064255e3d34bc46406c569ec028c9e571ed SHA512 013f3bc89ec672758b8bd5f423a4299d7307ca9166daf165f691a3990f44416d7e65286a445040ebd746b1354272c47a9440fdba994e3893a0f0d4c3b552d1d2
-MISC metadata.xml 342 BLAKE2B 27accf100ff3b311ee478a43cb1b34f6a0f2116d780d4e4be9799dc68fda47d82bbd535766174d30097486e526c1275a3f55d41e477fe7f1058c10df85e132ca SHA512 da80f03ec79feaf642b2a1e32386b2b38c0b2942985214171bbb12fb1bf730eb934f1575f49d0d8d85b35ad226556ad1b426dfebfeb9ab5cd61fbc8cd96547e2
diff --git a/dev-ros/polled_camera/metadata.xml b/dev-ros/polled_camera/metadata.xml
deleted file mode 100644
index 80ca28d8d9f4..000000000000
--- a/dev-ros/polled_camera/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/polled_camera/polled_camera-1.12.0.ebuild b/dev-ros/polled_camera/polled_camera-1.12.0.ebuild
deleted file mode 100644
index b2ad5f93c137..000000000000
--- a/dev-ros/polled_camera/polled_camera-1.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="C++ classes for implementing a polled camera driver node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/image_transport
-	dev-ros/rosconsole
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/polled_camera/polled_camera-9999.ebuild b/dev-ros/polled_camera/polled_camera-9999.ebuild
deleted file mode 100644
index b2ad5f93c137..000000000000
--- a/dev-ros/polled_camera/polled_camera-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="C++ classes for implementing a polled camera driver node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/image_transport
-	dev-ros/rosconsole
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
deleted file mode 100644
index 346cf7e06cdf..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-DIST pr2_common-1.13.0.tar.gz 21741522 BLAKE2B a8488526aa8f059a5f3aa9e43cb30600c610a2a63d6689a32e14c39e6077c6ce2411f29ff273d00864970491cf7fab76fd94de3dc5b94bc1a12199c11aa8fe44 SHA512 c62f5c9de1d7bfaa138510633ae16a6255fadd90ae019fab203eedeb1914858287c91d0ffde287ef4df4f7245c6548ccad400ffcc94b342a1f22aec014035bc5
-EBUILD pr2_dashboard_aggregator-1.12.4.ebuild 518 BLAKE2B 391535aefd882495e7b0cae7e8c1ee74b8abfafedbeff96491fd343ef24cae9028d81e8974c2407b41405b2dad410a1098c341da0e678e21fe52335e3162112b SHA512 3c551b8194ce339137985b0bc32216a1ba31bb75924a436032a62fe9b4839515c3b434308f230cf8fb7cfdb75840326e046d10d447d16983b0686289f2ffdd70
-EBUILD pr2_dashboard_aggregator-1.13.0.ebuild 518 BLAKE2B 391535aefd882495e7b0cae7e8c1ee74b8abfafedbeff96491fd343ef24cae9028d81e8974c2407b41405b2dad410a1098c341da0e678e21fe52335e3162112b SHA512 3c551b8194ce339137985b0bc32216a1ba31bb75924a436032a62fe9b4839515c3b434308f230cf8fb7cfdb75840326e046d10d447d16983b0686289f2ffdd70
-EBUILD pr2_dashboard_aggregator-9999.ebuild 518 BLAKE2B 391535aefd882495e7b0cae7e8c1ee74b8abfafedbeff96491fd343ef24cae9028d81e8974c2407b41405b2dad410a1098c341da0e678e21fe52335e3162112b SHA512 3c551b8194ce339137985b0bc32216a1ba31bb75924a436032a62fe9b4839515c3b434308f230cf8fb7cfdb75840326e046d10d447d16983b0686289f2ffdd70
-MISC metadata.xml 329 BLAKE2B 7d5c8bb38fc6a9f4dab910219da13497aa91c58ae708587f847422f2292e062e94f581e18f3515e52ee8ab50a98685571c89d7a48b354dc810a54f4ea1f70856 SHA512 a9733d189f856b9143f9a83f007d752216482323fedafd9fe3ee14e381583639e8340c38a5f93cd6f035f1c7e0241f745dd1c41838f49818fb5773410150fb7f
diff --git a/dev-ros/pr2_dashboard_aggregator/metadata.xml b/dev-ros/pr2_dashboard_aggregator/metadata.xml
deleted file mode 100644
index 40e1cb66e7ce..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">pr2/pr2_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
deleted file mode 100644
index bc9b14b580de..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.13.0.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.13.0.ebuild
deleted file mode 100644
index bc9b14b580de..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.13.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
deleted file mode 100644
index bc9b14b580de..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
deleted file mode 100644
index 37bb61863ef3..000000000000
--- a/dev-ros/pr2_description/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-DIST pr2_common-1.13.0.tar.gz 21741522 BLAKE2B a8488526aa8f059a5f3aa9e43cb30600c610a2a63d6689a32e14c39e6077c6ce2411f29ff273d00864970491cf7fab76fd94de3dc5b94bc1a12199c11aa8fe44 SHA512 c62f5c9de1d7bfaa138510633ae16a6255fadd90ae019fab203eedeb1914858287c91d0ffde287ef4df4f7245c6548ccad400ffcc94b342a1f22aec014035bc5
-EBUILD pr2_description-1.12.4.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
-EBUILD pr2_description-1.13.0.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
-EBUILD pr2_description-9999.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
-MISC metadata.xml 329 BLAKE2B 7d5c8bb38fc6a9f4dab910219da13497aa91c58ae708587f847422f2292e062e94f581e18f3515e52ee8ab50a98685571c89d7a48b354dc810a54f4ea1f70856 SHA512 a9733d189f856b9143f9a83f007d752216482323fedafd9fe3ee14e381583639e8340c38a5f93cd6f035f1c7e0241f745dd1c41838f49818fb5773410150fb7f
diff --git a/dev-ros/pr2_description/metadata.xml b/dev-ros/pr2_description/metadata.xml
deleted file mode 100644
index 40e1cb66e7ce..000000000000
--- a/dev-ros/pr2_description/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">pr2/pr2_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
deleted file mode 100644
index 6b8e630a5696..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/urdfdom
-		dev-cpp/gtest
-		dev-ros/rosbash
-	)"
-BDEPEND="
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/pr2_description/pr2_description-1.13.0.ebuild b/dev-ros/pr2_description/pr2_description-1.13.0.ebuild
deleted file mode 100644
index 6b8e630a5696..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.13.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/urdfdom
-		dev-cpp/gtest
-		dev-ros/rosbash
-	)"
-BDEPEND="
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild b/dev-ros/pr2_description/pr2_description-9999.ebuild
deleted file mode 100644
index 6b8e630a5696..000000000000
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/urdfdom
-		dev-cpp/gtest
-		dev-ros/rosbash
-	)"
-BDEPEND="
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
deleted file mode 100644
index 8b2d1fdb4ee5..000000000000
--- a/dev-ros/pr2_machine/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-DIST pr2_common-1.13.0.tar.gz 21741522 BLAKE2B a8488526aa8f059a5f3aa9e43cb30600c610a2a63d6689a32e14c39e6077c6ce2411f29ff273d00864970491cf7fab76fd94de3dc5b94bc1a12199c11aa8fe44 SHA512 c62f5c9de1d7bfaa138510633ae16a6255fadd90ae019fab203eedeb1914858287c91d0ffde287ef4df4f7245c6548ccad400ffcc94b342a1f22aec014035bc5
-EBUILD pr2_machine-1.12.4.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
-EBUILD pr2_machine-1.13.0.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
-EBUILD pr2_machine-9999.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
-MISC metadata.xml 329 BLAKE2B 7d5c8bb38fc6a9f4dab910219da13497aa91c58ae708587f847422f2292e062e94f581e18f3515e52ee8ab50a98685571c89d7a48b354dc810a54f4ea1f70856 SHA512 a9733d189f856b9143f9a83f007d752216482323fedafd9fe3ee14e381583639e8340c38a5f93cd6f035f1c7e0241f745dd1c41838f49818fb5773410150fb7f
diff --git a/dev-ros/pr2_machine/metadata.xml b/dev-ros/pr2_machine/metadata.xml
deleted file mode 100644
index 40e1cb66e7ce..000000000000
--- a/dev-ros/pr2_machine/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">pr2/pr2_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
deleted file mode 100644
index 258bc46816a7..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.13.0.ebuild b/dev-ros/pr2_machine/pr2_machine-1.13.0.ebuild
deleted file mode 100644
index 258bc46816a7..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.13.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-9999.ebuild b/dev-ros/pr2_machine/pr2_machine-9999.ebuild
deleted file mode 100644
index 258bc46816a7..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
deleted file mode 100644
index c57b02cf150f..000000000000
--- a/dev-ros/pr2_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-DIST pr2_common-1.13.0.tar.gz 21741522 BLAKE2B a8488526aa8f059a5f3aa9e43cb30600c610a2a63d6689a32e14c39e6077c6ce2411f29ff273d00864970491cf7fab76fd94de3dc5b94bc1a12199c11aa8fe44 SHA512 c62f5c9de1d7bfaa138510633ae16a6255fadd90ae019fab203eedeb1914858287c91d0ffde287ef4df4f7245c6548ccad400ffcc94b342a1f22aec014035bc5
-EBUILD pr2_msgs-1.12.4.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
-EBUILD pr2_msgs-1.13.0.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
-EBUILD pr2_msgs-9999.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
-MISC metadata.xml 329 BLAKE2B 7d5c8bb38fc6a9f4dab910219da13497aa91c58ae708587f847422f2292e062e94f581e18f3515e52ee8ab50a98685571c89d7a48b354dc810a54f4ea1f70856 SHA512 a9733d189f856b9143f9a83f007d752216482323fedafd9fe3ee14e381583639e8340c38a5f93cd6f035f1c7e0241f745dd1c41838f49818fb5773410150fb7f
diff --git a/dev-ros/pr2_msgs/metadata.xml b/dev-ros/pr2_msgs/metadata.xml
deleted file mode 100644
index 40e1cb66e7ce..000000000000
--- a/dev-ros/pr2_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">pr2/pr2_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
deleted file mode 100644
index cbbb022aa76a..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.13.0.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.13.0.ebuild
deleted file mode 100644
index cbbb022aa76a..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild b/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
deleted file mode 100644
index cbbb022aa76a..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/python_cmake_module/Manifest b/dev-ros/python_cmake_module/Manifest
deleted file mode 100644
index 7df7e2956786..000000000000
--- a/dev-ros/python_cmake_module/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST python_cmake_module-0.8.1.tar.gz 7047 BLAKE2B 79f6259913d42381443f3d93d48f67fb325abf423baf054465d83f641ca40f5bfad0acab0f19560968a280eaacecf56df253c90688d75144e25e27e28f3646b0 SHA512 f513031c9d0bbd5d05a1711074287a5ffd0c30be79d2f4849599ff539584f950c2e7c2322763358c8a1ac266da325f40fe9cd4d3a127cd6a9e4dfd83a3e4149c
-EBUILD python_cmake_module-0.8.1.ebuild 992 BLAKE2B 9928df6fe89a0cc3947f3bf37be0ae4e9fc7b4694536884eb5ede9a47e2fe541cddf0b1522ed4b0af1284b40f6ec6b9ca20db4a81266b1e19e97bd32cd6bc688 SHA512 afe9f1b15eba80eeba4f934fe0bba387b15bc32a55b4ebbe5ba997fcf026dfca8e41e584c62e49a83fcd821d5ddab19ac6a2aba74210e69b43e50efe762dfef2
-EBUILD python_cmake_module-9999.ebuild 992 BLAKE2B 9928df6fe89a0cc3947f3bf37be0ae4e9fc7b4694536884eb5ede9a47e2fe541cddf0b1522ed4b0af1284b40f6ec6b9ca20db4a81266b1e19e97bd32cd6bc688 SHA512 afe9f1b15eba80eeba4f934fe0bba387b15bc32a55b4ebbe5ba997fcf026dfca8e41e584c62e49a83fcd821d5ddab19ac6a2aba74210e69b43e50efe762dfef2
-MISC metadata.xml 339 BLAKE2B 377b2b39e6e34169034061e193a85f733223ab4016b86ebe047622d579eb7981ea80f50e1210a048c53df099f1d529312287c69eeedd0726d0f88ad217f1208a SHA512 be0c139a5d989a28bba3fe868d5c5700abcc802e1d976d732eb90479393937b09f6cdce8d542bdb587d1699a2e55b741ccef508087c1c9476f66d1ca6a83f54b
diff --git a/dev-ros/python_cmake_module/metadata.xml b/dev-ros/python_cmake_module/metadata.xml
deleted file mode 100644
index ffa35e41f52d..000000000000
--- a/dev-ros/python_cmake_module/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros2/python_cmake_module</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild b/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
deleted file mode 100644
index 21139c207c70..000000000000
--- a/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="python_cmake_module"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/python_cmake_module"
-else
-	SRC_URI="https://github.com/ros2/python_cmake_module/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake module with extra functionality for Python"
-HOMEPAGE="https://github.com/ros2/python_cmake_module"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	test? (
-		dev-ros/ament_lint_auto
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild b/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild
deleted file mode 100644
index 21139c207c70..000000000000
--- a/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-any-r1
-
-ROS_PN="python_cmake_module"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/python_cmake_module"
-else
-	SRC_URI="https://github.com/ros2/python_cmake_module/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CMake module with extra functionality for Python"
-HOMEPAGE="https://github.com/ros2/python_cmake_module"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	test? (
-		dev-ros/ament_lint_auto
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
deleted file mode 100644
index 8361a12f91a0..000000000000
--- a/dev-ros/python_qt_binding/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST python_qt_binding-0.4.4.tar.gz 12776 BLAKE2B 519b10d2995fa508c1a2013740c82fe834f069b944c02b78168a51b8a87a86952189ea92bf214b13becd81454ba2120a644adf08527cf76db51bd9e459d24884 SHA512 db3f60c72bbce012b598ede1ad2e8beafb495dbd4ef2be15a6e75daec0ae97a618061849995cfac2b71af14d6e858febbf6b3b07e9acfeca3630af15cd24c1dc
-EBUILD python_qt_binding-0.4.4.ebuild 462 BLAKE2B 212a2f8978ed89e6c9ca7dcff9f7d71f64f0cc7734aa1d2c9698d7600a8dfd47f5384c8d7cde39a571c428352573657394611e84f4f82ef3718175594674de34 SHA512 a22195eacc02d1bb9b5edf36d10e21728e813f0fa10ad4e84d834f4ac0d1e670d5f6d80bb3d848d36b41bb2f2690774f238cecbc8fb0e136fe5c0aa0c7a7dbd7
-EBUILD python_qt_binding-9999.ebuild 462 BLAKE2B 11287745485473ecee2f88bf531b9193e90c0136cea9312364b3f12cdeaaa32314864a838371ec5d3b786dc121af8b9eaed62c14a54d6a4100ea7d74f8355a2c SHA512 66d6ec04d1f79dc79b1dc4097a0169ea1ece1e5cc0949f4a4db685eaf0731d0f7eb34e22448f3a5e3f1c8a1a8a0bfd085b3929a5686064d575bc0d3b23fec3a5
-MISC metadata.xml 350 BLAKE2B 131d8dadc60a7e4fb3dee70a6cd77a9d5f8d73d8c6cf4218aeec1b611f6fc07033ba20cc33e4d635acaed451e848a4483a314928d9c897809e07f70e657e9860 SHA512 2791e93d7cf4a16fe04796e690c2f7a9e4e9b506bb69a5a64ae5f68f057d3b9818c6515f44f1f1b278edfe43b726c87e1fd33eaf17271aae078e045c4e08df31
diff --git a/dev-ros/python_qt_binding/metadata.xml b/dev-ros/python_qt_binding/metadata.xml
deleted file mode 100644
index 2670853750da..000000000000
--- a/dev-ros/python_qt_binding/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/python_qt_binding</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.4.4.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.4.4.ebuild
deleted file mode 100644
index a5642194ace7..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.4.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/PyQt5[gui,widgets,printsupport,\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild b/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
deleted file mode 100644
index 09f3528474a0..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/PyQt5[gui,widgets,printsupport,\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_dotgraph/Manifest b/dev-ros/qt_dotgraph/Manifest
deleted file mode 100644
index 8009519cf492..000000000000
--- a/dev-ros/qt_dotgraph/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST qt_gui_core-0.4.1.tar.gz 96850 BLAKE2B a8a4325d5462a0788a69661adb20b3bf1bc9e391344ced31468bf9ddbe7114a13a2ecd3dda580986bd0af98c837641bda3e3d6cd3c5d9fa3352c37817ace2ed4 SHA512 0c46f86f88a818107049d08db6682a320f47b1b4983c586e4c944a387c070c7e017fca2f4be9d251f8a907f15be439998b2d559bea51ffc724fa4afc5e75f67c
-DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
-EBUILD qt_dotgraph-0.4.1.ebuild 607 BLAKE2B e4cd2d63c3a94df8c8a0da5ce8a35e586485ad8784f77691d31c25370d457491ce18b3092f10415d114da3cd0dbe5ae9188ec3e508d8ed4898c64480d18e0692 SHA512 97adc64a5ca5f2bfbe1b029fb84674e6e10214a7e8501f7e4bf13a64907fe1ecacca7501e36984be04a8b7347034b3837e63a147506490366e22432732b9e6f9
-EBUILD qt_dotgraph-0.4.2.ebuild 607 BLAKE2B e4cd2d63c3a94df8c8a0da5ce8a35e586485ad8784f77691d31c25370d457491ce18b3092f10415d114da3cd0dbe5ae9188ec3e508d8ed4898c64480d18e0692 SHA512 97adc64a5ca5f2bfbe1b029fb84674e6e10214a7e8501f7e4bf13a64907fe1ecacca7501e36984be04a8b7347034b3837e63a147506490366e22432732b9e6f9
-EBUILD qt_dotgraph-9999.ebuild 607 BLAKE2B e4cd2d63c3a94df8c8a0da5ce8a35e586485ad8784f77691d31c25370d457491ce18b3092f10415d114da3cd0dbe5ae9188ec3e508d8ed4898c64480d18e0692 SHA512 97adc64a5ca5f2bfbe1b029fb84674e6e10214a7e8501f7e4bf13a64907fe1ecacca7501e36984be04a8b7347034b3837e63a147506490366e22432732b9e6f9
-MISC metadata.xml 344 BLAKE2B 7a6d5c571d914341b5b944b2fc392b456a5e4a062f450626f1cf152aa8e41af55d91ea6be53a63d852f43e07ebf00e29400f213e170f64d5dd94696efbc5e008 SHA512 08fd1461236cf357ac987ef434c64a2e229e8b9176f2027addaf88cd3cb25403392c87aece0f7bc361ade70fc41f21b290ebdf30e437e41c5a0335dbbe863786
diff --git a/dev-ros/qt_dotgraph/metadata.xml b/dev-ros/qt_dotgraph/metadata.xml
deleted file mode 100644
index 23af26039247..000000000000
--- a/dev-ros/qt_dotgraph/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.4.1.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.4.1.ebuild
deleted file mode 100644
index 5dd8cebe50df..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/pydot[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/pygraphviz[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.4.2.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.4.2.ebuild
deleted file mode 100644
index 5dd8cebe50df..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/pydot[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/pygraphviz[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-9999.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-9999.ebuild
deleted file mode 100644
index 5dd8cebe50df..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/pydot[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/pygraphviz[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/qt_gui/Manifest b/dev-ros/qt_gui/Manifest
deleted file mode 100644
index 77112b54a54c..000000000000
--- a/dev-ros/qt_gui/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST qt_gui_core-0.4.1.tar.gz 96850 BLAKE2B a8a4325d5462a0788a69661adb20b3bf1bc9e391344ced31468bf9ddbe7114a13a2ecd3dda580986bd0af98c837641bda3e3d6cd3c5d9fa3352c37817ace2ed4 SHA512 0c46f86f88a818107049d08db6682a320f47b1b4983c586e4c944a387c070c7e017fca2f4be9d251f8a907f15be439998b2d559bea51ffc724fa4afc5e75f67c
-DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
-EBUILD qt_gui-0.4.1.ebuild 525 BLAKE2B 8effb9999dab419e9b5de3eba324dd6205cfd18954931cd01a61247263b8a2cfee3807f7417d765f2c8db2a2cc14d1b24d78438ac8b089398b60545062bb3310 SHA512 58c8cce20c88193284a02798d8e1b06d8499f652e2771af1fc55092d7c41d083b18b25c621bbf895e8e0d16a6c476eac9ac48bbe802f5ab5c0e584a0a6b8cf43
-EBUILD qt_gui-0.4.2.ebuild 525 BLAKE2B 8effb9999dab419e9b5de3eba324dd6205cfd18954931cd01a61247263b8a2cfee3807f7417d765f2c8db2a2cc14d1b24d78438ac8b089398b60545062bb3310 SHA512 58c8cce20c88193284a02798d8e1b06d8499f652e2771af1fc55092d7c41d083b18b25c621bbf895e8e0d16a6c476eac9ac48bbe802f5ab5c0e584a0a6b8cf43
-EBUILD qt_gui-9999.ebuild 525 BLAKE2B 8effb9999dab419e9b5de3eba324dd6205cfd18954931cd01a61247263b8a2cfee3807f7417d765f2c8db2a2cc14d1b24d78438ac8b089398b60545062bb3310 SHA512 58c8cce20c88193284a02798d8e1b06d8499f652e2771af1fc55092d7c41d083b18b25c621bbf895e8e0d16a6c476eac9ac48bbe802f5ab5c0e584a0a6b8cf43
-MISC metadata.xml 344 BLAKE2B 7a6d5c571d914341b5b944b2fc392b456a5e4a062f450626f1cf152aa8e41af55d91ea6be53a63d852f43e07ebf00e29400f213e170f64d5dd94696efbc5e008 SHA512 08fd1461236cf357ac987ef434c64a2e229e8b9176f2027addaf88cd3cb25403392c87aece0f7bc361ade70fc41f21b290ebdf30e437e41c5a0335dbbe863786
diff --git a/dev-ros/qt_gui/metadata.xml b/dev-ros/qt_gui/metadata.xml
deleted file mode 100644
index 23af26039247..000000000000
--- a/dev-ros/qt_gui/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/qt_gui/qt_gui-0.4.1.ebuild b/dev-ros/qt_gui/qt_gui-0.4.1.ebuild
deleted file mode 100644
index 13d36a028a20..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.4.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.4.2.ebuild b/dev-ros/qt_gui/qt_gui-0.4.2.ebuild
deleted file mode 100644
index 13d36a028a20..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-9999.ebuild b/dev-ros/qt_gui/qt_gui-9999.ebuild
deleted file mode 100644
index 13d36a028a20..000000000000
--- a/dev-ros/qt_gui/qt_gui-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/Manifest b/dev-ros/qt_gui_app/Manifest
deleted file mode 100644
index 28e5978176a9..000000000000
--- a/dev-ros/qt_gui_app/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST qt_gui_core-0.4.1.tar.gz 96850 BLAKE2B a8a4325d5462a0788a69661adb20b3bf1bc9e391344ced31468bf9ddbe7114a13a2ecd3dda580986bd0af98c837641bda3e3d6cd3c5d9fa3352c37817ace2ed4 SHA512 0c46f86f88a818107049d08db6682a320f47b1b4983c586e4c944a387c070c7e017fca2f4be9d251f8a907f15be439998b2d559bea51ffc724fa4afc5e75f67c
-DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
-EBUILD qt_gui_app-0.4.1.ebuild 431 BLAKE2B 4376eceba3e6b15f410fba6653b90a792430453555d928b88e5968679362b670fef65866d7ddb07e71a3bb367bca71025ad616d5f7b91dc3b0f59d71153adb38 SHA512 955791de4fd3c422b9b0809954f6913e18975c6f73e87b75c0a3f44a08981de3a7ff49c2ce792194cabd5a7d9f5816d10cf8dfe353c599788bf40d8b3a5b38b8
-EBUILD qt_gui_app-0.4.2.ebuild 431 BLAKE2B 4376eceba3e6b15f410fba6653b90a792430453555d928b88e5968679362b670fef65866d7ddb07e71a3bb367bca71025ad616d5f7b91dc3b0f59d71153adb38 SHA512 955791de4fd3c422b9b0809954f6913e18975c6f73e87b75c0a3f44a08981de3a7ff49c2ce792194cabd5a7d9f5816d10cf8dfe353c599788bf40d8b3a5b38b8
-EBUILD qt_gui_app-9999.ebuild 431 BLAKE2B 4376eceba3e6b15f410fba6653b90a792430453555d928b88e5968679362b670fef65866d7ddb07e71a3bb367bca71025ad616d5f7b91dc3b0f59d71153adb38 SHA512 955791de4fd3c422b9b0809954f6913e18975c6f73e87b75c0a3f44a08981de3a7ff49c2ce792194cabd5a7d9f5816d10cf8dfe353c599788bf40d8b3a5b38b8
-MISC metadata.xml 344 BLAKE2B 7a6d5c571d914341b5b944b2fc392b456a5e4a062f450626f1cf152aa8e41af55d91ea6be53a63d852f43e07ebf00e29400f213e170f64d5dd94696efbc5e008 SHA512 08fd1461236cf357ac987ef434c64a2e229e8b9176f2027addaf88cd3cb25403392c87aece0f7bc361ade70fc41f21b290ebdf30e437e41c5a0335dbbe863786
diff --git a/dev-ros/qt_gui_app/metadata.xml b/dev-ros/qt_gui_app/metadata.xml
deleted file mode 100644
index 23af26039247..000000000000
--- a/dev-ros/qt_gui_app/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.4.1.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.4.1.ebuild
deleted file mode 100644
index da15e6be0295..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.4.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.4.2.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.4.2.ebuild
deleted file mode 100644
index da15e6be0295..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-9999.ebuild b/dev-ros/qt_gui_app/qt_gui_app-9999.ebuild
deleted file mode 100644
index da15e6be0295..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
deleted file mode 100644
index 0235f3b9b49b..000000000000
--- a/dev-ros/qt_gui_cpp/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libdir.patch 864 BLAKE2B c104517d108824d13455565cecbeac0886c60cc042bcab4ffd9961be7096117342157a0da0bb4912e18179bca5c40d8391be8d162ac9f07a7b4a5c8a3d65f4c5 SHA512 16960a3224f982cf3b55904d5c5370a715aed2a7dfd6f98ecc21af1f70fd527e84b1ee10f127e45251a149abb165aed06e595c73f7deda88f84548fb4c7cb717
-AUX rpaths.patch 1008 BLAKE2B 98d940001ca220ecb4078188c6c461e47038ce9bc3b486ee1ccf5dbd13a6d2cd632cdbc684bbce48485da52c04ef460bfd7a069f393cf8879afcd56fe3796c69 SHA512 a3bba92a6309859097be3c0ef8381dc327c43a90645c4c6d22ebf351b8d4cf98df90a6fb91d48a1d12cdaa901a6da5fc273098950d0f80f10b3366305142ec9b
-DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
-EBUILD qt_gui_cpp-0.4.2-r1.ebuild 799 BLAKE2B 41074e1276cdeaa6f1262cb5f00c6235a662aed9af6eb81a4cd49c683ad44be561aaf9ba46fd87fddb9611a02f98ec739abd9ff4e74bf2cebe6875847a79e0b0 SHA512 4b9fc5e74caa6a98ab9a962c5dc95044daf95fc6fb1e8aa91b6b0ffec3259d13397801629157c2cdea6a87bb36ace3f2f1842846c01fbef48d19f141967a523d
-EBUILD qt_gui_cpp-9999.ebuild 799 BLAKE2B 41074e1276cdeaa6f1262cb5f00c6235a662aed9af6eb81a4cd49c683ad44be561aaf9ba46fd87fddb9611a02f98ec739abd9ff4e74bf2cebe6875847a79e0b0 SHA512 4b9fc5e74caa6a98ab9a962c5dc95044daf95fc6fb1e8aa91b6b0ffec3259d13397801629157c2cdea6a87bb36ace3f2f1842846c01fbef48d19f141967a523d
-MISC metadata.xml 344 BLAKE2B 7a6d5c571d914341b5b944b2fc392b456a5e4a062f450626f1cf152aa8e41af55d91ea6be53a63d852f43e07ebf00e29400f213e170f64d5dd94696efbc5e008 SHA512 08fd1461236cf357ac987ef434c64a2e229e8b9176f2027addaf88cd3cb25403392c87aece0f7bc361ade70fc41f21b290ebdf30e437e41c5a0335dbbe863786
diff --git a/dev-ros/qt_gui_cpp/files/libdir.patch b/dev-ros/qt_gui_cpp/files/libdir.patch
deleted file mode 100644
index b2656183de95..000000000000
--- a/dev-ros/qt_gui_cpp/files/libdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-===================================================================
---- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt
-+++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-@@ -29,7 +29,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
- # maintain context for different named target
- set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS})
- set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
--set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/lib)
-+set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
- set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
- 
- find_package(python_qt_binding REQUIRED)
diff --git a/dev-ros/qt_gui_cpp/files/rpaths.patch b/dev-ros/qt_gui_cpp/files/rpaths.patch
deleted file mode 100644
index 313e3edcb72a..000000000000
--- a/dev-ros/qt_gui_cpp/files/rpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-===================================================================
---- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt
-+++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-@@ -29,8 +29,8 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
- # maintain context for different named target
- set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS})
- set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
--set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
--set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
-+set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS})
-+set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -L${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
- 
- find_package(python_qt_binding REQUIRED)
- include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)
diff --git a/dev-ros/qt_gui_cpp/metadata.xml b/dev-ros/qt_gui_cpp/metadata.xml
deleted file mode 100644
index 23af26039247..000000000000
--- a/dev-ros/qt_gui_cpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
deleted file mode 100644
index 84d56a89ba1f..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-# FIXME: fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit ros-catkin
-
-DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-	"${FILESDIR}/rpaths.patch"
-)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
deleted file mode 100644
index 84d56a89ba1f..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-# FIXME: fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit ros-catkin
-
-DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-	"${FILESDIR}/rpaths.patch"
-)
diff --git a/dev-ros/qt_gui_py_common/Manifest b/dev-ros/qt_gui_py_common/Manifest
deleted file mode 100644
index 80fc2a71fec4..000000000000
--- a/dev-ros/qt_gui_py_common/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST qt_gui_core-0.4.1.tar.gz 96850 BLAKE2B a8a4325d5462a0788a69661adb20b3bf1bc9e391344ced31468bf9ddbe7114a13a2ecd3dda580986bd0af98c837641bda3e3d6cd3c5d9fa3352c37817ace2ed4 SHA512 0c46f86f88a818107049d08db6682a320f47b1b4983c586e4c944a387c070c7e017fca2f4be9d251f8a907f15be439998b2d559bea51ffc724fa4afc5e75f67c
-DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
-EBUILD qt_gui_py_common-0.4.1.ebuild 497 BLAKE2B 621f198cac706bfd019e38cb6a7117c53fd90f29c348ac0fcea5bf3a647fa0ea7689dc69f9bcc2fdfe14af8eabfc819e0f64a51be7d35927a2e9fc23e4c46048 SHA512 69c6555f302c7deb3deefc67bbeb1dae71a0dc1e9c3ae504db74cf3c52f7c3677966a068b2e38109a9281ec124e7e02f677bcfbaa72b533fd8ed2e62ba48ed86
-EBUILD qt_gui_py_common-0.4.2.ebuild 497 BLAKE2B 621f198cac706bfd019e38cb6a7117c53fd90f29c348ac0fcea5bf3a647fa0ea7689dc69f9bcc2fdfe14af8eabfc819e0f64a51be7d35927a2e9fc23e4c46048 SHA512 69c6555f302c7deb3deefc67bbeb1dae71a0dc1e9c3ae504db74cf3c52f7c3677966a068b2e38109a9281ec124e7e02f677bcfbaa72b533fd8ed2e62ba48ed86
-EBUILD qt_gui_py_common-9999.ebuild 497 BLAKE2B 621f198cac706bfd019e38cb6a7117c53fd90f29c348ac0fcea5bf3a647fa0ea7689dc69f9bcc2fdfe14af8eabfc819e0f64a51be7d35927a2e9fc23e4c46048 SHA512 69c6555f302c7deb3deefc67bbeb1dae71a0dc1e9c3ae504db74cf3c52f7c3677966a068b2e38109a9281ec124e7e02f677bcfbaa72b533fd8ed2e62ba48ed86
-MISC metadata.xml 344 BLAKE2B 7a6d5c571d914341b5b944b2fc392b456a5e4a062f450626f1cf152aa8e41af55d91ea6be53a63d852f43e07ebf00e29400f213e170f64d5dd94696efbc5e008 SHA512 08fd1461236cf357ac987ef434c64a2e229e8b9176f2027addaf88cd3cb25403392c87aece0f7bc361ade70fc41f21b290ebdf30e437e41c5a0335dbbe863786
diff --git a/dev-ros/qt_gui_py_common/metadata.xml b/dev-ros/qt_gui_py_common/metadata.xml
deleted file mode 100644
index 23af26039247..000000000000
--- a/dev-ros/qt_gui_py_common/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.1.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.1.ebuild
deleted file mode 100644
index a642b1ac2af7..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.2.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.2.ebuild
deleted file mode 100644
index a642b1ac2af7..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-9999.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-9999.ebuild
deleted file mode 100644
index a642b1ac2af7..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/random_numbers/Manifest b/dev-ros/random_numbers/Manifest
deleted file mode 100644
index da5fee3b180a..000000000000
--- a/dev-ros/random_numbers/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST random_numbers-0.3.2.tar.gz 6952 BLAKE2B ed2be18d8e6cc036689d413335030fe501aeecdb95ac5c12d5ebaf21759d8fd45af6d7c34cb6ae903e2002cf791ab823f8f65552fd8a58eeb5838829ffe6060f SHA512 13145f91b846c97f3dc0d9dc290e237060968251a78f1648acb5aefcdea0569586daa3531f2840829ac8261ca046e20e03c39ded6dcd060cf4917375ac6bd918
-EBUILD random_numbers-0.3.2-r1.ebuild 384 BLAKE2B 6ee67f3212c67865d813cbb5add35c4337222961cc25e1a35ed5b0be5ac063e1e9c8ee5b124c38444108585909a0a3103535c5e0751022144083ee5f138fa762 SHA512 4de5e19beb788a108c5aa348a7291ede12c597feddf05c53e31e0deb7d4bc15e7403718787cde0900bbb108abeda22c1d61b57bee608c5192c1a9a8a4901bd13
-EBUILD random_numbers-9999.ebuild 384 BLAKE2B 6ee67f3212c67865d813cbb5add35c4337222961cc25e1a35ed5b0be5ac063e1e9c8ee5b124c38444108585909a0a3103535c5e0751022144083ee5f138fa762 SHA512 4de5e19beb788a108c5aa348a7291ede12c597feddf05c53e31e0deb7d4bc15e7403718787cde0900bbb108abeda22c1d61b57bee608c5192c1a9a8a4901bd13
-MISC metadata.xml 342 BLAKE2B d9364b0dc218c3426c749a52a39cfd69965609af6a0ff8492b9f00f64484ab3494eb0522d4ae760b8bd3be999fd133ef5e1087e2752b7ff1f024286394450c55 SHA512 cbcde351b97b6080254f1d996fae25c7b8c7c3c88701c2b828a93569d9a91d0d22da781a0bb2a28712ecce366ede8a593a46726d316af816e27012054d0cdf0c
diff --git a/dev-ros/random_numbers/metadata.xml b/dev-ros/random_numbers/metadata.xml
deleted file mode 100644
index 415eb7486a7a..000000000000
--- a/dev-ros/random_numbers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/random_numbers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/random_numbers/random_numbers-0.3.2-r1.ebuild b/dev-ros/random_numbers/random_numbers-0.3.2-r1.ebuild
deleted file mode 100644
index 842d0a9f2537..000000000000
--- a/dev-ros/random_numbers/random_numbers-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-planning/random_numbers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Wrappers for generating floating point values, integers and quaternions"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/random_numbers/random_numbers-9999.ebuild b/dev-ros/random_numbers/random_numbers-9999.ebuild
deleted file mode 100644
index 842d0a9f2537..000000000000
--- a/dev-ros/random_numbers/random_numbers-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-planning/random_numbers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Wrappers for generating floating point values, integers and quaternions"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/realtime_tools/Manifest b/dev-ros/realtime_tools/Manifest
deleted file mode 100644
index 3abed1b28054..000000000000
--- a/dev-ros/realtime_tools/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX atomic.patch 411 BLAKE2B 2af7ae6e0f7b91cbc80188ede62098bd700e556dad07c24d681c19d1b84efe3bfa9f06b3d1b0cd9f83437c160ccbf1494f684e76421a4d19a79defadc6d10832 SHA512 f58cb21ee24f7615c37cb5a4fb86547d0c1458f075d93039dab1ab3a5c35b90a5964587326b5331b331867eeaa13a218838941f100851b3605b2ac193d85870a
-DIST realtime_tools-1.16.1.tar.gz 12161 BLAKE2B 940e703ea5231976c8a963ae657647e66ce0c1e4f5544e930c5dae86db63b5699a2a1356066a89e6f4f7ad898590f2e4f9024da38b76f9b16e40c890cd7584d1 SHA512 14ae5e4b8d883ffccaef0abde7b86829fe528084302fb51c86c2115c837573be3be92190380b5bc13d35eddc4e15d7968f516d4b03d374636fa386dcb7c3a31c
-EBUILD realtime_tools-1.16.1.ebuild 604 BLAKE2B 5062f3c5237dfc58921439f20c54098640561bf2617524fd2834e37c3e97ef723b3907bc75c0c9aae6686908769c028b9b70551b203b11678a6db3953498eb77 SHA512 3b9d3dc8142be19e8935d53232d39ba167c09bc075e4d49a726de8b26b170f3be4486dc67a3e253c9a1d783817cfe8c189cc62709a309193fbe3553b210e7bbd
-EBUILD realtime_tools-9999.ebuild 604 BLAKE2B 3dcfe4ab7a5988cf7f0ffda2ac976e24ae7f51340b9cd8e7e136eb95c57daff6b70c598dbf3e5a19a64af9fbd07225c1b19d5af4bfc6b2905b06ea7dbd6dbd9b SHA512 f3b6eeba05b6f2b3b700419676c8be7af0685a86a127d098ac4eda5bc0d59c1aa5113b5c5fc2d9eea011b560d67d3e91ca61c8acf1cf95db97567c4090088adf
-MISC metadata.xml 342 BLAKE2B 8e93f495b1d419398c12427a0e97f058f575f1822165babbf6f2e05c4ab146bc72a9ef4a948717b5d516874b8c7fc8ac9e6064486cd30221211a50bea54f3497 SHA512 98bae484029e688be07196bdfdf09ad2b7e55b4bc0f3d2c87eb2fb43fc56a21fd79c7e00a250a779332910b50ae9e8bf67a95817acec5531e7f79c2937e56253
diff --git a/dev-ros/realtime_tools/files/atomic.patch b/dev-ros/realtime_tools/files/atomic.patch
deleted file mode 100644
index 0440900b9c32..000000000000
--- a/dev-ros/realtime_tools/files/atomic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: realtime_tools-1.16.0/include/realtime_tools/realtime_publisher.h
-===================================================================
---- realtime_tools-1.16.0.orig/include/realtime_tools/realtime_publisher.h
-+++ realtime_tools-1.16.0/include/realtime_tools/realtime_publisher.h
-@@ -45,6 +45,7 @@
- #include <memory>
- #include <mutex>
- #include <thread>
-+#include <atomic>
- 
- namespace realtime_tools {
- 
diff --git a/dev-ros/realtime_tools/metadata.xml b/dev-ros/realtime_tools/metadata.xml
deleted file mode 100644
index 65f40ec1b88d..000000000000
--- a/dev-ros/realtime_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/realtime_tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/realtime_tools/realtime_tools-1.16.1.ebuild b/dev-ros/realtime_tools/realtime_tools-1.16.1.ebuild
deleted file mode 100644
index 7461e643ffec..000000000000
--- a/dev-ros/realtime_tools/realtime_tools-1.16.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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-controls/realtime_tools"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools that can be used from a hard realtime thread"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-		dev-cpp/gtest
-		dev-ros/actionlib
-	)
-"
-PATCHES=( "${FILESDIR}/atomic.patch" )
diff --git a/dev-ros/realtime_tools/realtime_tools-9999.ebuild b/dev-ros/realtime_tools/realtime_tools-9999.ebuild
deleted file mode 100644
index c76733870b90..000000000000
--- a/dev-ros/realtime_tools/realtime_tools-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/realtime_tools"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools that can be used from a hard realtime thread"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-		dev-cpp/gtest
-		dev-ros/actionlib
-	)
-"
-PATCHES=( "${FILESDIR}/atomic.patch" )
diff --git a/dev-ros/resource_retriever/Manifest b/dev-ros/resource_retriever/Manifest
deleted file mode 100644
index 9c170e2a873a..000000000000
--- a/dev-ros/resource_retriever/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST resource_retriever-1.12.7.tar.gz 6982 BLAKE2B c58f41b55f1e47e6531787f05bc58d99c650905994d02e3a793acff1d0b568729cea835010e7c83c68669f5bff4835ec6a69212e05d9dd69e0f95b4790583466 SHA512 09f718d944b62bb19aa0ba29760d4acb3791b82bbd690809295315aa2fb61e862e975240b4eccc6d77fb7b741502cb9dc10be2266a6b54b93446396efad598ef
-EBUILD resource_retriever-1.12.7.ebuild 766 BLAKE2B de4a2eb01bb73040b9642920074542d7c3ef117637d226715ec228d39ee55ac62d0d05660118e5711855e83747f96ff91ec89d4f1495d5b3c6a704fd90b3757f SHA512 766ccc3c4d27bd914c0ba832b4a13dcc085d874f8a0e72fc8eb2c4dd77ed415c174e897669298ce03db429070dd2ed83db8ae6bfe09e923350f65d6a35fd61d8
-EBUILD resource_retriever-9999.ebuild 766 BLAKE2B b34eb0342e2a90551c81450443328c3b3701db92579ef9d9734773d105542b670f159ec33155299e1058c34eda9f86f7809eed39a7ddf7d22cdff642ce29cb5c SHA512 65c8702de80b1d9dbfaf6057cb213f61bfe2de4a48722be29e9b391f4155fb529ea47e48123cc5e9c6352144865957e27fb6fb2a0a1071107468881b90e97899
-MISC metadata.xml 337 BLAKE2B 289c87e2689131a4f413daf89ec22d38252d897e1bdc3a866284627fc99ef823d200bdc58fd3f4179db780119f56ecc7009f1263c2fd7a5efbc025c2f8815260 SHA512 cbb9c81598f3b7b98929c9e3d34a863c4b62c3cc41142ac9936c65907bdb4a98a3f7faa257f9a276d6da80d1609134eef75fb6c62c1d10beadd5181442ed04a8
diff --git a/dev-ros/resource_retriever/metadata.xml b/dev-ros/resource_retriever/metadata.xml
deleted file mode 100644
index 10b96b66dbc8..000000000000
--- a/dev-ros/resource_retriever/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/resource_retriever</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.7.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.7.ebuild
deleted file mode 100644
index 1ce7de9a14ac..000000000000
--- a/dev-ros/resource_retriever/resource_retriever-1.12.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/resource_retriever"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves data from url-format files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	if has network-sandbox ${FEATURES}; then
-		einfo "Skipping network tests due to network sandbox"
-		export GTEST_FILTER='-Retriever.http'
-		export NOSE_TESTMATCH='^(?!test_http).*'
-	fi
-	ros-catkin_src_test
-}
diff --git a/dev-ros/resource_retriever/resource_retriever-9999.ebuild b/dev-ros/resource_retriever/resource_retriever-9999.ebuild
deleted file mode 100644
index 4a7691efbe1e..000000000000
--- a/dev-ros/resource_retriever/resource_retriever-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/resource_retriever"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves data from url-format files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	if has network-sandbox ${FEATURES}; then
-		einfo "Skipping network tests due to network sandbox"
-		export GTEST_FILTER='-Retriever.http'
-		export NOSE_TESTMATCH='^(?!test_http).*'
-	fi
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rgbd_launch/Manifest b/dev-ros/rgbd_launch/Manifest
deleted file mode 100644
index e19e5e7a9fb6..000000000000
--- a/dev-ros/rgbd_launch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rgbd_launch-2.3.0.tar.gz 7246 BLAKE2B 2f5d7bceaba85d28e1a747d1d7a9c08faede7cdb7dc1270a61bf4038a24d7342e0e4a10c74a69c6eaa3f39ea4ed7dedb5e7a94178b3be1201c474d53a1a04639 SHA512 77767f4c6829c5d32d7e18baf2ab86189e758d681bad626826a378c8225551c3ec93d1f0f363b292b4e9aa04f2268a7567ac956145d8cb0b9556dca0bc88903e
-EBUILD rgbd_launch-2.3.0.ebuild 404 BLAKE2B b8471b5e2a6b9d7c31e4f091ad43d20c01b3e78e289a3e90c02ed589fb2c6dc95354b5f2df092eafed22645fa6d9e0ed4a307476022898c6252ffe7f07e265bc SHA512 c353813a826012a9722c63e850cc78da0c0dbeb64f9e6de7016be339ef578a58a1b75adc0d5830735d2d0a60255204cd7e2192d28c44be73b725677fbc5b7faa
-EBUILD rgbd_launch-9999.ebuild 404 BLAKE2B b8471b5e2a6b9d7c31e4f091ad43d20c01b3e78e289a3e90c02ed589fb2c6dc95354b5f2df092eafed22645fa6d9e0ed4a307476022898c6252ffe7f07e265bc SHA512 c353813a826012a9722c63e850cc78da0c0dbeb64f9e6de7016be339ef578a58a1b75adc0d5830735d2d0a60255204cd7e2192d28c44be73b725677fbc5b7faa
-MISC metadata.xml 338 BLAKE2B 6e2683047949d05327bbeb8c2d055fc9ccf1dc66172c411ae54c4560363741818ee8d2db19832532336054cac7ede44cd07325cd7a2a1a69c5629e2067137ef4 SHA512 eff81eb51f98380b56736adaebe5c0ef5bca2b20293080a12e9c78dc9a41d19f1c58e751b63f87aa8edc3a0d86e161750afb189b9c43d0d0106166e061b231e3
diff --git a/dev-ros/rgbd_launch/metadata.xml b/dev-ros/rgbd_launch/metadata.xml
deleted file mode 100644
index e2554d09f238..000000000000
--- a/dev-ros/rgbd_launch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rgbd_launch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rgbd_launch/rgbd_launch-2.3.0.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.3.0.ebuild
deleted file mode 100644
index d7ddf76635c1..000000000000
--- a/dev-ros/rgbd_launch/rgbd_launch-2.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files to open an RGBD device"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/depth_image_proc
-	dev-ros/image_proc
-	dev-ros/nodelet
-	dev-ros/tf
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild b/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild
deleted file mode 100644
index d7ddf76635c1..000000000000
--- a/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files to open an RGBD device"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/depth_image_proc
-	dev-ros/image_proc
-	dev-ros/nodelet
-	dev-ros/tf
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_localization/Manifest b/dev-ros/robot_localization/Manifest
deleted file mode 100644
index 7648caa474ae..000000000000
--- a/dev-ros/robot_localization/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nowerror.patch 478 BLAKE2B 9e2d2079524b14db178bebce4dac0471dee662ffc208d97ba0e4a2327b38800d077dc751db28220079cc274b25738b853f0d0302442a72acf2879ceca3c7d05f SHA512 11543749935449cf98dd92724adedcc0396dddff00a01fed0bf8ea53d53f7e96a7b1824771761137b531cf39fed2aed34c44c4841f2b5f129d34dddbea73ef05
-DIST robot_localization-2.7.3.tar.gz 6525696 BLAKE2B 74003020bb9e4ba84664ac60f5ba5122e77c55581b6e8f395bae92ef50b74cc0c6339d97c97e80a503a737d092454dace14707e73531a755b151e2c3c058b356 SHA512 2d0d7d029e01424eb35126bbe98b23b687f34331d177e4f7f5ee27a75382b72a27f1cdf90062b59ea4a471338cea57545c858479e04b0e1dd964cb04f4df7bfa
-EBUILD robot_localization-2.7.3.ebuild 1392 BLAKE2B 7d1948639ef236582dca668cba40b09c017691158e74ac253abad95165ecfb6e9eb6fb7910b27dbbc37fda6e40416c49033bfde6cd5da802e7b90d37dee3d819 SHA512 10f60a07af450854e5fff49b7ca668c82901859ff075c3559e58cbf1180633c42a41fff2e9cf1f072d4aef20c8f9fcd86954cb71f23b9b738f9ebaf88ba76f04
-EBUILD robot_localization-9999.ebuild 1392 BLAKE2B 7d1948639ef236582dca668cba40b09c017691158e74ac253abad95165ecfb6e9eb6fb7910b27dbbc37fda6e40416c49033bfde6cd5da802e7b90d37dee3d819 SHA512 10f60a07af450854e5fff49b7ca668c82901859ff075c3559e58cbf1180633c42a41fff2e9cf1f072d4aef20c8f9fcd86954cb71f23b9b738f9ebaf88ba76f04
-MISC metadata.xml 345 BLAKE2B 868dfce8e83341b89663fcc8d04b0405ecd717fef5bb0ed84182dc426c169ce1e039f4151ed3df470fa5cc087ab72d5338f23c08c90107d19955047dfd65b76b SHA512 668294f524a3eb070f2894629ecc338f3eb80d3f1348cba40112b676e20ada04198c33fb6253dd6fd9be1d090b7990e194ac9cb7e8b21016cb21d85590bd06bb
diff --git a/dev-ros/robot_localization/files/nowerror.patch b/dev-ros/robot_localization/files/nowerror.patch
deleted file mode 100644
index 31feb81abecd..000000000000
--- a/dev-ros/robot_localization/files/nowerror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: robot_localization-2.6.8/CMakeLists.txt
-===================================================================
---- robot_localization-2.6.8.orig/CMakeLists.txt
-+++ robot_localization-2.6.8/CMakeLists.txt
-@@ -44,7 +44,7 @@ endif()
- set(CMAKE_CXX_STANDARD 14)
- 
- if(NOT MSVC)
--  set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
-+  set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall")
- endif()
- add_definitions(-DEIGEN_NO_DEBUG -DEIGEN_MPL2_ONLY)
- 
diff --git a/dev-ros/robot_localization/metadata.xml b/dev-ros/robot_localization/metadata.xml
deleted file mode 100644
index 14eaf3a91f46..000000000000
--- a/dev-ros/robot_localization/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cra-ros-pkg/robot_localization</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/robot_localization/robot_localization-2.7.3.ebuild b/dev-ros/robot_localization/robot_localization-2.7.3.ebuild
deleted file mode 100644
index 043bb3e92385..000000000000
--- a/dev-ros/robot_localization/robot_localization-2.7.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geographic_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Package of nonlinear state estimation nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/eigen_conversions
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-cpp/yaml-cpp:=
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	sci-geosciences/GeographicLib:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit dev-cpp/gtest )
-"
-BDEPEND="dev-ros/roslint"
-
-PATCHES=( "${FILESDIR}/nowerror.patch" )
-
-src_configure() {
-	local mycatkincmakeargs=(
-		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/share/cmake/GeographicLib"
-	)
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/robot_localization/robot_localization-9999.ebuild b/dev-ros/robot_localization/robot_localization-9999.ebuild
deleted file mode 100644
index 043bb3e92385..000000000000
--- a/dev-ros/robot_localization/robot_localization-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geographic_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Package of nonlinear state estimation nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/eigen_conversions
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-cpp/yaml-cpp:=
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	sci-geosciences/GeographicLib:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit dev-cpp/gtest )
-"
-BDEPEND="dev-ros/roslint"
-
-PATCHES=( "${FILESDIR}/nowerror.patch" )
-
-src_configure() {
-	local mycatkincmakeargs=(
-		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/share/cmake/GeographicLib"
-	)
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/robot_pose_ekf/Manifest b/dev-ros/robot_pose_ekf/Manifest
deleted file mode 100644
index 1ccb3655b1a0..000000000000
--- a/dev-ros/robot_pose_ekf/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST robot_pose_ekf-1.15.0-ekf_test2_indexed.bag 3693526 BLAKE2B 44dd3664a74233a75811d9979ce94bbf5a2b25544b9ffef7e1033fd68f3f119775db9bdec8d41ca85d409b9bf7784c1d8362f521159819ff9800d2206c01f172 SHA512 fb98e063e61b6424463e39d0e1bc7541632adce0533180a64801107927cc51c63d9e969c37d013df9230148db8687c810c0938389ca49712b5fbd48ee0063e0c
-DIST robot_pose_ekf-1.15.0-zero_covariance_indexed.bag 71021 BLAKE2B 6cf243bb4b230488990c866a8b4d9166664aee8b236ea2b0fc4a0e6139e781ada2378d7605022fd30a16e17604619d9b121273ede0b7b2a059852d378454d931 SHA512 0772c6481e227dbeb8e09a2e344708570696037f8f79e90d00bb9f2ed8881410b56cfbfbccd20cfb06b3a5298afbf831515f897a97f3e97caa7e87ebdfe47abd
-DIST robot_pose_ekf-1.15.0.tar.gz 18789 BLAKE2B a2110275633291926d73e5a5d352b135836a12645078251967f1bdfeda2e1e266204dcb0d9c240362b9c63b82170f91a92ed8cb372d2b1b99faf3c5459bbd5fc SHA512 a17373488e229ecb3d9c00a44b1f4e9c458f392460d0828c5cc36df91b2a70efaf345aaa3ad2d7b031a442c2e2cac81b7d3a4dd59a280b14a67b9c6c1bb7e41c
-DIST robot_pose_ekf-9999-ekf_test2_indexed.bag 3693526 BLAKE2B 44dd3664a74233a75811d9979ce94bbf5a2b25544b9ffef7e1033fd68f3f119775db9bdec8d41ca85d409b9bf7784c1d8362f521159819ff9800d2206c01f172 SHA512 fb98e063e61b6424463e39d0e1bc7541632adce0533180a64801107927cc51c63d9e969c37d013df9230148db8687c810c0938389ca49712b5fbd48ee0063e0c
-DIST robot_pose_ekf-9999-zero_covariance_indexed.bag 71021 BLAKE2B 6cf243bb4b230488990c866a8b4d9166664aee8b236ea2b0fc4a0e6139e781ada2378d7605022fd30a16e17604619d9b121273ede0b7b2a059852d378454d931 SHA512 0772c6481e227dbeb8e09a2e344708570696037f8f79e90d00bb9f2ed8881410b56cfbfbccd20cfb06b3a5298afbf831515f897a97f3e97caa7e87ebdfe47abd
-EBUILD robot_pose_ekf-1.15.0.ebuild 1335 BLAKE2B 5522f1b732d0c6435fd887712dfe9bd4007bd87eab893c114c2782ca7c3e7cfc84c3cbd4b625f36b26002019de103503fe9e89b2c95786d271d48dfb785eaa0b SHA512 38d47278e8282a64e8d9aabe22fc743d5a1a8f5cd1a68076dd6d8bde314eda015b37cfc1ec2b9b5e5eabfe1c84121c5de597668e8cea8dee32473297ea8fc00d
-EBUILD robot_pose_ekf-9999.ebuild 1335 BLAKE2B 5522f1b732d0c6435fd887712dfe9bd4007bd87eab893c114c2782ca7c3e7cfc84c3cbd4b625f36b26002019de103503fe9e89b2c95786d271d48dfb785eaa0b SHA512 38d47278e8282a64e8d9aabe22fc743d5a1a8f5cd1a68076dd6d8bde314eda015b37cfc1ec2b9b5e5eabfe1c84121c5de597668e8cea8dee32473297ea8fc00d
-MISC metadata.xml 342 BLAKE2B 76714279d28d878cd29bea9802e9feb1c29228b7ed2c1521e8c784fa2677b841be74691fab6da4f54aa24a297e70d577bded3611462a1655e5b0bd0ad0bb87c4 SHA512 6a9c1717d574a12c6b63676bfdb1666227ce8db59b1b49a3d5124fea801e158f6d5164c6501990a716203920459189d836b5bdbe73f796490065d31374abb0da
diff --git a/dev-ros/robot_pose_ekf/metadata.xml b/dev-ros/robot_pose_ekf/metadata.xml
deleted file mode 100644
index 745f3cdac2c8..000000000000
--- a/dev-ros/robot_pose_ekf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/robot_pose_ekf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.0.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.0.ebuild
deleted file mode 100644
index af03ac6af239..000000000000
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/robot_pose_ekf"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimate the 3D pose of a robot from pose measurements from various sources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	sci-libs/orocos-bfl
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-	virtual/pkgconfig"
-
-TEST_DATA="ekf_test2_indexed.bag zero_covariance_indexed.bag"
-
-SRC_URI="${SRC_URI} test? ( "
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI} http://download.ros.org/data/robot_pose_ekf/${i} -> ${P}-${i}"
-done
-SRC_URI="${SRC_URI} )"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	if use test; then
-		for i in ${TEST_DATA} ; do
-			cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-		done
-		sed \
-			-e "s#http://download.ros.org/data/robot_pose_ekf#file://${S}#" \
-			-i CMakeLists.txt || die
-	fi
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
deleted file mode 100644
index af03ac6af239..000000000000
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/robot_pose_ekf"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimate the 3D pose of a robot from pose measurements from various sources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	sci-libs/orocos-bfl
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-	virtual/pkgconfig"
-
-TEST_DATA="ekf_test2_indexed.bag zero_covariance_indexed.bag"
-
-SRC_URI="${SRC_URI} test? ( "
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI} http://download.ros.org/data/robot_pose_ekf/${i} -> ${P}-${i}"
-done
-SRC_URI="${SRC_URI} )"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	if use test; then
-		for i in ${TEST_DATA} ; do
-			cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-		done
-		sed \
-			-e "s#http://download.ros.org/data/robot_pose_ekf#file://${S}#" \
-			-i CMakeLists.txt || die
-	fi
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/robot_pose_publisher/Manifest b/dev-ros/robot_pose_publisher/Manifest
deleted file mode 100644
index 4160495ce7f1..000000000000
--- a/dev-ros/robot_pose_publisher/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST robot_pose_publisher-0.2.4.tar.gz 4269 BLAKE2B ba91c13f8502d38bbcaccc0adec6ab6b94cb2ee5fda5a05a4f3a9fa3e44e2995ededf58f842889b29fd16d6c1ab5197fe216c93b50ebca87827960c4e8199a27 SHA512 1309c0335dc0375802c3a4c7186d6248dca1307319d4ece6b390643d94bd2887cf5b016669d1b44025f04bd509424b7bee0d029c10f992a1207e2090366ae150
-EBUILD robot_pose_publisher-0.2.4.ebuild 456 BLAKE2B e6680ef0d3a400ed1e666bb944ef18a378ba1480033f9fe968262f34745d5d18fa9a860e8e167c48b008efdb3303ca2c7ff654def268091ff37620109f916f00 SHA512 0fcb1c415415a9464bd995c7604cb8a42af1a30b35223899744f754535b529e6994cd7984d880fddd766bd30cb39aae66c7f337663449cdca186eb80de9e79b6
-EBUILD robot_pose_publisher-9999.ebuild 456 BLAKE2B e6680ef0d3a400ed1e666bb944ef18a378ba1480033f9fe968262f34745d5d18fa9a860e8e167c48b008efdb3303ca2c7ff654def268091ff37620109f916f00 SHA512 0fcb1c415415a9464bd995c7604cb8a42af1a30b35223899744f754535b529e6994cd7984d880fddd766bd30cb39aae66c7f337663449cdca186eb80de9e79b6
-MISC metadata.xml 344 BLAKE2B 39556b97e030f90dc4b214bbb0bc4e51497cf2dd8cbaaa59cedb868a39970cfc7952bb266dbe3e01ee5536c9bce570fe951d32ea692560981bb35a9802326116 SHA512 00d97bfd11d6f175abe160b11d14d55cc4e1b0cdb9b318d390a6dea2a594a918a3a39dd07ae413669e454f32299aecc1e0043e5c12335de99ff9fdf3dee07833
diff --git a/dev-ros/robot_pose_publisher/metadata.xml b/dev-ros/robot_pose_publisher/metadata.xml
deleted file mode 100644
index 39c98625f7ca..000000000000
--- a/dev-ros/robot_pose_publisher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">WPI-RAIL/robot_pose_publisher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild
deleted file mode 100644
index ea56dc707dea..000000000000
--- a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/GT-RAIL/robot_pose_publisher"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
deleted file mode 100644
index ea56dc707dea..000000000000
--- a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/GT-RAIL/robot_pose_publisher"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/robot_state_publisher/Manifest b/dev-ros/robot_state_publisher/Manifest
deleted file mode 100644
index 5673675d8f9d..000000000000
--- a/dev-ros/robot_state_publisher/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST robot_state_publisher-1.15.2-joint_states_indexed.bag 778888 BLAKE2B 3d117e06712ed20f838be247057645799a8b8501ddc3582a0037d34a2da40b8390367de88bd278f05632f150e88139b34325be3d5a1ce44f7ad3ebfaffd5e0ac SHA512 171e4eb810e12da4af5f9ce4f91bb6967e3895dfa284aa542010b7a7691571051e237ab96b055105f559e8d242099eb41f1429c5afcba13361ee58bdd565a689
-DIST robot_state_publisher-1.15.2.tar.gz 792878 BLAKE2B b68d7985545cece374ebe454345be7f66bd5b66d763d224932708187fbcdf11964b2c88db95048f6e114a78c727203790b19e30724bd00aae5cb234d5cd0936b SHA512 715c578992ecdd979226e1a5b30823c7e97399e53252884d974c149727e5b1467acdf79d3870a240b0619686921f809e1037945d1b6e7863b22ce111aacfee84
-DIST robot_state_publisher-9999-joint_states_indexed.bag 778888 BLAKE2B 3d117e06712ed20f838be247057645799a8b8501ddc3582a0037d34a2da40b8390367de88bd278f05632f150e88139b34325be3d5a1ce44f7ad3ebfaffd5e0ac SHA512 171e4eb810e12da4af5f9ce4f91bb6967e3895dfa284aa542010b7a7691571051e237ab96b055105f559e8d242099eb41f1429c5afcba13361ee58bdd565a689
-EBUILD robot_state_publisher-1.15.2.ebuild 1211 BLAKE2B 113e46b3d033b8b7fe5135d4ea1dc6fa4910d828064f3fa90ad22fd9fb2ac5f7c13d1b652909fc58dfe5ca83b62b22048c1e473e80fe77ff05143cde52bc4744 SHA512 24e1352de69312fa4d16f316ac78193b411ec97d83c4465208353d43d40c7a71c1c62820014720247021c517fb7572616b57908342fde80aab64cd50ae799035
-EBUILD robot_state_publisher-9999.ebuild 1211 BLAKE2B 3df70e764d45800e04e9d63eacbeffb2cb8b5356f93cc508e43f25b6a9d0d0e59fd7923321b4ad2e3e837d9608fcaf76d3d1da5d2c5dfcb76d65b7218c60d541 SHA512 e8d8ddcc9e033729f78dfbccde1080a9deb2bb2ab579aa7d2764b4ccf038275aab9016201e821babcd2a600fe583016e7b90438e2fd4efa9adbdb7562dbab5d5
-MISC metadata.xml 340 BLAKE2B dbf525f2d6e9ef39165e4e5fe00f3855793612c594bb3abce6f1d0e99212b40bda4ba409d83b66cb32cd41c066ecac03c772f4b579df78eb0daf9c2a2a454d6f SHA512 04656e683460e3e6cac76fa1e742e5fe02e951166dd69e5004745f4eb1b2e85f4cf7508777ec558cd52b12354f6c125e95c8656415e92e9ec8326ed9f27f95f9
diff --git a/dev-ros/robot_state_publisher/metadata.xml b/dev-ros/robot_state_publisher/metadata.xml
deleted file mode 100644
index 6408d8568670..000000000000
--- a/dev-ros/robot_state_publisher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/robot_state_publisher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.15.2.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.15.2.ebuild
deleted file mode 100644
index f77574829462..000000000000
--- a/dev-ros/robot_state_publisher/robot_state_publisher-1.15.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Package for publishing the state of a robot to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DATA="joint_states_indexed.bag"
-for i in ${DATA}; do
-	SRC_URI="${SRC_URI}
-		http://wiki.ros.org/robot_state_publisher/data?action=AttachFile&do=get&target=${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/kdl_parser
-	dev-cpp/eigen:3
-	sci-libs/orocos_kdl:=
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/tf2_ros
-	dev-ros/tf2_kdl
-	dev-ros/kdl_conversions
-	dev-ros/sensor_msgs
-	dev-ros/tf
-	dev-ros/urdf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://wiki.ros.org/robot_state_publisher/data?action=AttachFile&do=get&target=#file://${S}#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
deleted file mode 100644
index 8849ecad4f2e..000000000000
--- a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Package for publishing the state of a robot to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DATA="joint_states_indexed.bag"
-for i in ${DATA}; do
-	SRC_URI="${SRC_URI}
-		http://wiki.ros.org/robot_state_publisher/data?action=AttachFile&do=get&target=${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/kdl_parser
-	dev-cpp/eigen:3
-	sci-libs/orocos_kdl:=
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/tf2_ros
-	dev-ros/tf2_kdl
-	dev-ros/kdl_conversions
-	dev-ros/sensor_msgs
-	dev-ros/tf
-	dev-ros/urdf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://wiki.ros.org/robot_state_publisher/data?action=AttachFile&do=get&target=#file://${S}#" -i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/ros_environment/Manifest b/dev-ros/ros_environment/Manifest
deleted file mode 100644
index e9dd6bb6f575..000000000000
--- a/dev-ros/ros_environment/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX catkinprefixpath.patch 1035 BLAKE2B 8054e8f2ae8a7f0060d44558fe32bdf607b81054249a2f7255878801e8abc2fdaa695609fc056b5a4cfc1fdbf7eae9adbd5057bd8f0831820bbb564b4778c8f2 SHA512 ce669139250c78e521e82ea23ca288c0b12cf7da17bbf06cf4cb3c425b3bc61ad182a475af3923fdbdf7c07f574077e2ad935d6c0c133d408ffc0f0d3f2d02ae
-DIST ros_environment-1.3.2.tar.gz 6418 BLAKE2B d08308c966e95e2bf9a043d52b4f3c787c89b39ce30b038daae7907aa9493ab0478c898da84673099485f08c5b5d811dfc84af3bb714766fb5ff4ab95a17b1ed SHA512 4fff1bfba0af47aaf0fa2e571f61e559952432da77b5c453153b357e22fc9148d72bad4772bf3def0f754e86794c0246662c384ec75b7d89b6ebac4ad8baf808
-EBUILD ros_environment-1.3.2.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
-EBUILD ros_environment-9999.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
-MISC metadata.xml 334 BLAKE2B 1cae9e711e7783e5f0e56057537b1467dd051ff1c4e89e96d78f204fc88fe5433a3a25b3f5371c29ee558438872136b6abca39d6353fa5be5db886e10da5ce5b SHA512 3c27fca00f04f1a68bbce364cd540b839ad475bbad77f9b6209bd47ca579490fd6db129a4d415f8c49c3e438b6482c2a839ff53e609209dbe005afa9d1e3ae48
diff --git a/dev-ros/ros_environment/files/catkinprefixpath.patch b/dev-ros/ros_environment/files/catkinprefixpath.patch
deleted file mode 100644
index 67f16ec9348a..000000000000
--- a/dev-ros/ros_environment/files/catkinprefixpath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Support CATKIN_PREFIX_PATH; let CMAKE_PREFIX_PATH come first, so that standard ROS methods still work even if we do not
-use them.
-
-Index: ros_environment-1.2.0/env-hooks/1.ros_package_path.sh.em
-===================================================================
---- ros_environment-1.2.0.orig/env-hooks/1.ros_package_path.sh.em
-+++ ros_environment-1.2.0/env-hooks/1.ros_package_path.sh.em
-@@ -4,8 +4,10 @@
- PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF
- from __future__ import print_function
- import os
--env_name = 'CMAKE_PREFIX_PATH'
--paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
-+env_names = [ 'CMAKE_PREFIX_PATH', 'CATKIN_PREFIX_PATH' ]
-+paths = []
-+for env_name in env_names:
-+    paths += [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
- workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.catkin'))]
- paths = []
- for workspace in workspaces:
diff --git a/dev-ros/ros_environment/metadata.xml b/dev-ros/ros_environment/metadata.xml
deleted file mode 100644
index d2d29b151755..000000000000
--- a/dev-ros/ros_environment/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_environment</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/ros_environment/ros_environment-1.3.2.ebuild b/dev-ros/ros_environment/ros_environment-1.3.2.ebuild
deleted file mode 100644
index 9b7f339511b4..000000000000
--- a/dev-ros/ros_environment/ros_environment-1.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_environment"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS environment variables"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!!<dev-ros/roslib-1.14.3"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkinprefixpath.patch" )
-
-src_configure() {
-	export ROS_DISTRO="Gentoo"
-	export ROS_DISTRO_OVERRIDE="Gentoo"
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/ros_environment/ros_environment-9999.ebuild b/dev-ros/ros_environment/ros_environment-9999.ebuild
deleted file mode 100644
index 9b7f339511b4..000000000000
--- a/dev-ros/ros_environment/ros_environment-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_environment"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS environment variables"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!!<dev-ros/roslib-1.14.3"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkinprefixpath.patch" )
-
-src_configure() {
-	export ROS_DISTRO="Gentoo"
-	export ROS_DISTRO_OVERRIDE="Gentoo"
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rosapi/Manifest b/dev-ros/rosapi/Manifest
deleted file mode 100644
index d8ec05d3f8a2..000000000000
--- a/dev-ros/rosapi/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosbridge_suite-0.11.10.tar.gz 112955 BLAKE2B 82d9ee61d57876795a14b425d5037ac811d8fa7eed46be4a792244582dc620107973ad5bb05f5131618b124e2624a4e54047f795771be0a79de28a8d003f0a6d SHA512 0bd038792c75e451e92a242724a104a0e2e16d807e300db88317a4093a783813c218ebd76793c77352ba3c8155451cd20cb7154cf957ef22e821f4e76d37e88d
-DIST rosbridge_suite-0.11.13.tar.gz 113727 BLAKE2B 3dace7515804be548c1bc2d85bf28a7821425f17913f74e7f97f305bdecc49c681aa351238d2187fb55430f249bb61a8ff5029a8657a22200a23f4be2f32cae5 SHA512 f22fccf944313dd5a7c99f3fc79585caeccc248826b6701f38cfa55f5cdf5753e16f458e7a0fe13212bd19ccb1ceda21cf2a0328e2607a952e1fbd7493e46e59
-DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
-EBUILD rosapi-0.11.10.ebuild 609 BLAKE2B 76f9c2f3857fbca1091ed148959b768ec2f83f6478687adcb5fa065f1653aeca8940707072d9e4fd8ffbe1ad78135ace9a905a939202c433eb3fc4057c8df972 SHA512 be4a9c00d4a8dd9b4725416596e06030c534c93aaa2b007d1a42389020d3cf2bbdb870f49251d971217b3406c0f4c859257680b59438988c9c1b4f44e5c3889f
-EBUILD rosapi-0.11.13.ebuild 609 BLAKE2B c6fc70e5911c6bd31dc907bd72c9fb93e1058ecf9ffb92fff41f638109e4ff7921eebb7515681978b871a492116c30cdab417410dbcfe6c13c6c4c350fc32afb SHA512 8a15e41fe4d5ebc0bb52695d125fb8cae443f46646d8f3765335290391b7cb7722f9deab88b4ae338e9a8aacdb8cfd2d65cbde3c87692196432fa7496fd05824
-EBUILD rosapi-0.11.9.ebuild 609 BLAKE2B 76f9c2f3857fbca1091ed148959b768ec2f83f6478687adcb5fa065f1653aeca8940707072d9e4fd8ffbe1ad78135ace9a905a939202c433eb3fc4057c8df972 SHA512 be4a9c00d4a8dd9b4725416596e06030c534c93aaa2b007d1a42389020d3cf2bbdb870f49251d971217b3406c0f4c859257680b59438988c9c1b4f44e5c3889f
-EBUILD rosapi-9999.ebuild 609 BLAKE2B 76f9c2f3857fbca1091ed148959b768ec2f83f6478687adcb5fa065f1653aeca8940707072d9e4fd8ffbe1ad78135ace9a905a939202c433eb3fc4057c8df972 SHA512 be4a9c00d4a8dd9b4725416596e06030c534c93aaa2b007d1a42389020d3cf2bbdb870f49251d971217b3406c0f4c859257680b59438988c9c1b4f44e5c3889f
-MISC metadata.xml 344 BLAKE2B af1c8aa9f048c14782d7752ccad08d6be969af6f06cc52c56cd45419abc7784f57e0ab57c07bf21791af380dec7b4efabe56e59e935ed1e220960b74a78f97dd SHA512 5c96aa12b512ef19768ba2231d529564d3717fc48453af47077a28c4757bb5a4892392fbbd098c04a90a5191bb33b1eb455be12a0daea349c66e135458d3c410
diff --git a/dev-ros/rosapi/metadata.xml b/dev-ros/rosapi/metadata.xml
deleted file mode 100644
index bfa58bd28c6b..000000000000
--- a/dev-ros/rosapi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosapi/rosapi-0.11.10.ebuild b/dev-ros/rosapi/rosapi-0.11.10.ebuild
deleted file mode 100644
index 1f0478a2bcae..000000000000
--- a/dev-ros/rosapi/rosapi-0.11.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Service calls for getting ros meta-information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.11.13.ebuild b/dev-ros/rosapi/rosapi-0.11.13.ebuild
deleted file mode 100644
index fea15e810ba5..000000000000
--- a/dev-ros/rosapi/rosapi-0.11.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Service calls for getting ros meta-information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.11.9.ebuild b/dev-ros/rosapi/rosapi-0.11.9.ebuild
deleted file mode 100644
index 1f0478a2bcae..000000000000
--- a/dev-ros/rosapi/rosapi-0.11.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Service calls for getting ros meta-information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-9999.ebuild b/dev-ros/rosapi/rosapi-9999.ebuild
deleted file mode 100644
index 1f0478a2bcae..000000000000
--- a/dev-ros/rosapi/rosapi-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Service calls for getting ros meta-information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosauth/Manifest b/dev-ros/rosauth/Manifest
deleted file mode 100644
index c2139557a48c..000000000000
--- a/dev-ros/rosauth/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rosauth-1.0.1.tar.gz 6209 BLAKE2B a87db7cd226919007c500465f84099500cdcdd32705603cbcd2b70bfa1d2ce0da4534b1cda1ae76f698cd2568fb6d4c4ec4dc836f43ecf67054ad2f8121daeba SHA512 5fb0b02bf6edc92c49a7572cb3ddd441094c0a6a9f1a69e7ab03097f859562426f39351da2d4e9e63de4a3558033d46a606f10117a63362b1e0a8e73cbbdda11
-EBUILD rosauth-1.0.1.ebuild 571 BLAKE2B 6bf7cc4f4b217c8835c8354c2c8f21fccf2f61e1c63f87c45cd05b28e4fc69435c64a4f8c44e7731fbb35db205a603983fbddbd92d84034d7d0e9f0258c63113 SHA512 f7736b54ea3015d4319477caba2285e705f08c8418156d3f475af5dfee4e5104ace8437d6c2e77d4c22f7793dee3b689e123338e0df3cac09155f4156f99917f
-EBUILD rosauth-9999.ebuild 571 BLAKE2B 6bf7cc4f4b217c8835c8354c2c8f21fccf2f61e1c63f87c45cd05b28e4fc69435c64a4f8c44e7731fbb35db205a603983fbddbd92d84034d7d0e9f0258c63113 SHA512 f7736b54ea3015d4319477caba2285e705f08c8418156d3f475af5dfee4e5104ace8437d6c2e77d4c22f7793dee3b689e123338e0df3cac09155f4156f99917f
-MISC metadata.xml 331 BLAKE2B a022d905979ee06c12396645ad1c35ea97844872ad66df08ec96d37c63e95e5f15db4450e15842854a5c1ffeca16e6129a1e545d60d149f1a9de860ec3941a8f SHA512 4673dce9b08ca1075e2a8fae3d49effb310267fde7f0869d514aef5518ac07aac1de545a604ce9390fff30372c96b00888385c29465524a7caf8176398188cd8
diff --git a/dev-ros/rosauth/metadata.xml b/dev-ros/rosauth/metadata.xml
deleted file mode 100644
index 8085c31e5029..000000000000
--- a/dev-ros/rosauth/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">WPI-RAIL/rosauth</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosauth/rosauth-1.0.1.ebuild b/dev-ros/rosauth/rosauth-1.0.1.ebuild
deleted file mode 100644
index 10f5ea08a15f..000000000000
--- a/dev-ros/rosauth/rosauth-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/WPI-RAIL/rosauth"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Server Side tools for Authorization and Authentication of ROS Clients"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosauth/rosauth-9999.ebuild b/dev-ros/rosauth/rosauth-9999.ebuild
deleted file mode 100644
index 10f5ea08a15f..000000000000
--- a/dev-ros/rosauth/rosauth-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/WPI-RAIL/rosauth"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Server Side tools for Authorization and Authentication of ROS Clients"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
deleted file mode 100644
index 9626800a983d..000000000000
--- a/dev-ros/rosbag/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc5865304d220df7e1e9bea3799743a1f7a2a274423ec3fa4e367773814bd5fbb5cb074acb7252845ba6e94 SHA512 2343aca88929010f76389f31187b913f92f8d510a18a0d81b20c2c9accc2da68d15fd959404f11d363bdbe98f644ff2e76a70fdca4a718b490fa7f812a1b417e
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosbag-1.15.10.ebuild 961 BLAKE2B 41c1b43271318a507cdd6153811ab76908819f0e75dc7c8dcfb1c7c4dcf6ed0e59b673647107caade89e21f6b6700b164053c4ce5b7de7db5fbef5ed8c8a473b SHA512 de5b04faed760e3ae5b12fbd58acdae9168de808f99e023b0f3564eca8dc1118ca30d09a14978c4fedae8c8e6e7a018b1ed0dd12b38df28002088ca8a43674cc
-EBUILD rosbag-1.15.11.ebuild 961 BLAKE2B 41c1b43271318a507cdd6153811ab76908819f0e75dc7c8dcfb1c7c4dcf6ed0e59b673647107caade89e21f6b6700b164053c4ce5b7de7db5fbef5ed8c8a473b SHA512 de5b04faed760e3ae5b12fbd58acdae9168de808f99e023b0f3564eca8dc1118ca30d09a14978c4fedae8c8e6e7a018b1ed0dd12b38df28002088ca8a43674cc
-EBUILD rosbag-1.15.13.ebuild 961 BLAKE2B 41c1b43271318a507cdd6153811ab76908819f0e75dc7c8dcfb1c7c4dcf6ed0e59b673647107caade89e21f6b6700b164053c4ce5b7de7db5fbef5ed8c8a473b SHA512 de5b04faed760e3ae5b12fbd58acdae9168de808f99e023b0f3564eca8dc1118ca30d09a14978c4fedae8c8e6e7a018b1ed0dd12b38df28002088ca8a43674cc
-EBUILD rosbag-1.15.14.ebuild 961 BLAKE2B f6c381b9ea86cb79f6b0112d51139040394018e4b93b97d284b5562e38bec70ac139ef008e7b77c3102b207db2e9117bca1720c2097723c41266a2dd875fd8e3 SHA512 c1cfc094521f4e3f7d7fd7857f69a67da2bce3635b2dd2b896fda69226fdc013f14c5a0fb0e6ba1534c7d5a60bf2fd609519d3b839ddde9f362d3cd0c4151fec
-EBUILD rosbag-1.15.7.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
-EBUILD rosbag-1.15.8.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
-EBUILD rosbag-1.15.9.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
-EBUILD rosbag-9999.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
-MISC metadata.xml 419 BLAKE2B a61c370625ea765a15c099adf469a8e6d6cb6b6e68f744383d7067820e7e178705d1c9fc1d0698931313ca3491b23aed400f99af1390138409c9f9d3ea2b5ee2 SHA512 b55b00e8a556ec6322dc45df8d73dbed6fc9a4d373904a0c249cc5d91882cce83e1dd048e20c94f4f7932d23ea42f0c050d1365c51c7a6e5d320dbe2cd9cd7fe
diff --git a/dev-ros/rosbag/files/pycrypto.patch b/dev-ros/rosbag/files/pycrypto.patch
deleted file mode 100644
index c221d1bc086b..000000000000
--- a/dev-ros/rosbag/files/pycrypto.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: rosbag/src/rosbag/bag.py
-===================================================================
---- rosbag.orig/src/rosbag/bag.py
-+++ rosbag/src/rosbag/bag.py
-@@ -50,8 +50,8 @@ import threading
- import time
- import yaml
- 
--from Cryptodome.Cipher import AES
--from Cryptodome.Random import get_random_bytes
-+from Crypto.Cipher import AES
-+from Crypto.Random import get_random_bytes
- 
- import gnupg
- 
diff --git a/dev-ros/rosbag/metadata.xml b/dev-ros/rosbag/metadata.xml
deleted file mode 100644
index 67a39625a5b9..000000000000
--- a/dev-ros/rosbag/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ros@gentoo.org</email>
-    <name>Gentoo ROS Project</name>
-  </maintainer>
-  <use>
-    <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/rosbag-1.15.10.ebuild b/dev-ros/rosbag/rosbag-1.15.10.ebuild
deleted file mode 100644
index d6ca262b4d4e..000000000000
--- a/dev-ros/rosbag/rosbag-1.15.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
-	>=dev-ros/rosbag_storage-1.14
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/console_bridge:=
-	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
-PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-1.15.11.ebuild b/dev-ros/rosbag/rosbag-1.15.11.ebuild
deleted file mode 100644
index d6ca262b4d4e..000000000000
--- a/dev-ros/rosbag/rosbag-1.15.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
-	>=dev-ros/rosbag_storage-1.14
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/console_bridge:=
-	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
-PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-1.15.13.ebuild b/dev-ros/rosbag/rosbag-1.15.13.ebuild
deleted file mode 100644
index d6ca262b4d4e..000000000000
--- a/dev-ros/rosbag/rosbag-1.15.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
-	>=dev-ros/rosbag_storage-1.14
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/console_bridge:=
-	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
-PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-1.15.14.ebuild b/dev-ros/rosbag/rosbag-1.15.14.ebuild
deleted file mode 100644
index 35de79fe3bdc..000000000000
--- a/dev-ros/rosbag/rosbag-1.15.14.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
-	>=dev-ros/rosbag_storage-1.14
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/console_bridge:=
-	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
-PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-1.15.7.ebuild b/dev-ros/rosbag/rosbag-1.15.7.ebuild
deleted file mode 100644
index 39331484104e..000000000000
--- a/dev-ros/rosbag/rosbag-1.15.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
-	>=dev-ros/rosbag_storage-1.14
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/console_bridge:=
-	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
-PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-1.15.8.ebuild b/dev-ros/rosbag/rosbag-1.15.8.ebuild
deleted file mode 100644
index 39331484104e..000000000000
--- a/dev-ros/rosbag/rosbag-1.15.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
-	>=dev-ros/rosbag_storage-1.14
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/console_bridge:=
-	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
-PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-1.15.9.ebuild b/dev-ros/rosbag/rosbag-1.15.9.ebuild
deleted file mode 100644
index 39331484104e..000000000000
--- a/dev-ros/rosbag/rosbag-1.15.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
-	>=dev-ros/rosbag_storage-1.14
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/console_bridge:=
-	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
-PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild
deleted file mode 100644
index 39331484104e..000000000000
--- a/dev-ros/rosbag/rosbag-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE="lz4"
-
-RDEPEND="
-	>=dev-ros/rosbag_storage-1.14
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/console_bridge:=
-	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
-PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag_migration_rule/Manifest b/dev-ros/rosbag_migration_rule/Manifest
deleted file mode 100644
index dd428371ebdf..000000000000
--- a/dev-ros/rosbag_migration_rule/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rosbag_migration_rule-1.0.1.tar.gz 581 BLAKE2B 6434feaa7a022dca38659a09ac47217f716edf77c09f863d972932cf134700d10434d81591627fff1fc8ed67fe92439ee6272b1d97897de0c5f2d1313da9e198 SHA512 ae5b471daa8603740272e8c819d1120adafba0ed69027e853292939041aab3f19d40ce5736c88d3c0bf6c7979dce1436573b0585fa6a126e606d7c82502462d4
-EBUILD rosbag_migration_rule-1.0.1.ebuild 367 BLAKE2B ef5453fc35c68a655fb4705a5ee69da724320d0583c404033a14175210f302fa9e5d84a537a2156fe8c50133cf25eb6cf4f5f89f72bb2004b59c8fe901ad7af1 SHA512 045cef0861eb6297edd9fc07eb0020747cd4ee97468d26d734f9c1eecb1ebcfdad50bb480f4fd7c78a3bd9851014a49a278cb389c9cd84f9c7aaab3879b12be2
-EBUILD rosbag_migration_rule-9999.ebuild 367 BLAKE2B ef5453fc35c68a655fb4705a5ee69da724320d0583c404033a14175210f302fa9e5d84a537a2156fe8c50133cf25eb6cf4f5f89f72bb2004b59c8fe901ad7af1 SHA512 045cef0861eb6297edd9fc07eb0020747cd4ee97468d26d734f9c1eecb1ebcfdad50bb480f4fd7c78a3bd9851014a49a278cb389c9cd84f9c7aaab3879b12be2
-MISC metadata.xml 348 BLAKE2B 1b739d9b76f09e961271e85a5fc4915ef3f35fa7fcbff0582de7ab03be3e6cce6ab44fb915ec4fcad03d7fe315ac5a0e084e884e7dd0514e542559f7121bb1c5 SHA512 03e353e4f569c73ed5bc6f3fcc2acd3cb7c9ede08e8f08f28fc5afe316ae2f90f99e48e6213294e6d71910ab7a984ad95f68c59c7533e441d39bc7e3ad58c216
diff --git a/dev-ros/rosbag_migration_rule/metadata.xml b/dev-ros/rosbag_migration_rule/metadata.xml
deleted file mode 100644
index 0fd375df01ea..000000000000
--- a/dev-ros/rosbag_migration_rule/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ros@gentoo.org</email>
-    <name>Gentoo ROS Project</name>
-  </maintainer>
-  <upstream>
-  <remote-id type="github">ros/rosbag_migration_rule</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.1.ebuild b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.1.ebuild
deleted file mode 100644
index c57c937cf578..000000000000
--- a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/rosbag_migration_rule"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Allows to export rosbag migration rule files without depending on rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild
deleted file mode 100644
index c57c937cf578..000000000000
--- a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/rosbag_migration_rule"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Allows to export rosbag migration rule files without depending on rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
deleted file mode 100644
index 7958232a4e41..000000000000
--- a/dev-ros/rosbag_storage/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosbag_storage-1.15.10-r1.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
-EBUILD rosbag_storage-1.15.11-r1.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
-EBUILD rosbag_storage-1.15.13-r1.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
-EBUILD rosbag_storage-1.15.14.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
-EBUILD rosbag_storage-1.15.8-r2.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
-EBUILD rosbag_storage-1.15.9-r1.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
-EBUILD rosbag_storage-9999.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosbag_storage/metadata.xml b/dev-ros/rosbag_storage/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rosbag_storage/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.10-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.10-r1.ebuild
deleted file mode 100644
index 183c62dbd6f3..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.10-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-
-	dev-ros/cpp_common
-	>=dev-ros/pluginlib-1.13.0-r2:=
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-
-	dev-libs/openssl:0=
-	app-crypt/gpgme:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.11-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.11-r1.ebuild
deleted file mode 100644
index 183c62dbd6f3..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.11-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-
-	dev-ros/cpp_common
-	>=dev-ros/pluginlib-1.13.0-r2:=
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-
-	dev-libs/openssl:0=
-	app-crypt/gpgme:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.13-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.13-r1.ebuild
deleted file mode 100644
index 183c62dbd6f3..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.13-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-
-	dev-ros/cpp_common
-	>=dev-ros/pluginlib-1.13.0-r2:=
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-
-	dev-libs/openssl:0=
-	app-crypt/gpgme:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.14.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.14.ebuild
deleted file mode 100644
index 183c62dbd6f3..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.14.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-
-	dev-ros/cpp_common
-	>=dev-ros/pluginlib-1.13.0-r2:=
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-
-	dev-libs/openssl:0=
-	app-crypt/gpgme:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r2.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r2.ebuild
deleted file mode 100644
index 183c62dbd6f3..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-
-	dev-ros/cpp_common
-	>=dev-ros/pluginlib-1.13.0-r2:=
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-
-	dev-libs/openssl:0=
-	app-crypt/gpgme:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.9-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.9-r1.ebuild
deleted file mode 100644
index 183c62dbd6f3..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.9-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-
-	dev-ros/cpp_common
-	>=dev-ros/pluginlib-1.13.0-r2:=
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-
-	dev-libs/openssl:0=
-	app-crypt/gpgme:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
deleted file mode 100644
index 183c62dbd6f3..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-
-	dev-ros/cpp_common
-	>=dev-ros/pluginlib-1.13.0-r2:=
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-
-	dev-libs/openssl:0=
-	app-crypt/gpgme:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
deleted file mode 100644
index 76ef2fa69803..000000000000
--- a/dev-ros/rosbash/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX catkin_prefix.patch 443 BLAKE2B 4b366a582a5ebda3cfd644fb0319cd6cd07e9e983db9ed6cdb850bc6ecd393172e7e8dc93c30100470ba8417991e0487a7f85be53556472aa37947bae48ff2b6 SHA512 8662743559045f129a1dd94c7b42491f025b9038dff960f5d5259775760c0d3a0ae7086a6faae8bc6f511e72a0c5552013c88c4a8333043a0af6291b894ec5c1
-DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD rosbash-1.15.5.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
-EBUILD rosbash-1.15.6.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
-EBUILD rosbash-1.15.7.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
-EBUILD rosbash-1.15.8.ebuild 408 BLAKE2B 128f53622cac97f22f89acc18820facfa2994ee5da8dc99edf722f0b08098ccb971541502925ec7d1dbea6beae97a7060644e64278127125a9b1fd05917db21a SHA512 7ef15abeea17af2acd308d2457841f53b38f0f693d4a9749ce97733f1be1c057d3639015254496b951025b09737678e8e442c56d54c20d0d260b237b5cc605cf
-EBUILD rosbash-9999.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/rosbash/files/catkin_prefix.patch b/dev-ros/rosbash/files/catkin_prefix.patch
deleted file mode 100644
index 89877b005f9d..000000000000
--- a/dev-ros/rosbash/files/catkin_prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rosbash/scripts/rosrun
-===================================================================
---- rosbash.orig/scripts/rosrun
-+++ rosbash/scripts/rosrun
-@@ -47,7 +47,7 @@ case $2 in
-     ;;
- esac
- 
--if [[ -n $CMAKE_PREFIX_PATH ]]; then
-+if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
-   _rosrun_IFS="$IFS"
-   IFS=$'\n'
-   catkin_package_libexec_dirs=($(catkin_find --without-underlays --libexec --share "$1" 2> /dev/null))
diff --git a/dev-ros/rosbash/metadata.xml b/dev-ros/rosbash/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/rosbash/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosbash/rosbash-1.15.5.ebuild b/dev-ros/rosbash/rosbash-1.15.5.ebuild
deleted file mode 100644
index 31312870be31..000000000000
--- a/dev-ros/rosbash/rosbash-1.15.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospack"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.15.6.ebuild b/dev-ros/rosbash/rosbash-1.15.6.ebuild
deleted file mode 100644
index 31312870be31..000000000000
--- a/dev-ros/rosbash/rosbash-1.15.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospack"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.15.7.ebuild b/dev-ros/rosbash/rosbash-1.15.7.ebuild
deleted file mode 100644
index 31312870be31..000000000000
--- a/dev-ros/rosbash/rosbash-1.15.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospack"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.15.8.ebuild b/dev-ros/rosbash/rosbash-1.15.8.ebuild
deleted file mode 100644
index 2177afe2fcf5..000000000000
--- a/dev-ros/rosbash/rosbash-1.15.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospack"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosbash/rosbash-9999.ebuild b/dev-ros/rosbash/rosbash-9999.ebuild
deleted file mode 100644
index 31312870be31..000000000000
--- a/dev-ros/rosbash/rosbash-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rospack"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
deleted file mode 100644
index 344873247e43..000000000000
--- a/dev-ros/rosboost_cfg/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD rosboost_cfg-1.15.5.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
-EBUILD rosboost_cfg-1.15.6.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
-EBUILD rosboost_cfg-1.15.7.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
-EBUILD rosboost_cfg-1.15.8.ebuild 363 BLAKE2B da3ac96f4bb836728226d82b7202f88ac210592d950a05f3980a97cc9b89a7cd42469a4e3a7068fa509994d7cd0b06f794073a72e95859cb380d4162ae64f91e SHA512 f7b7b23f0cb18d32cbd0af6e66a1a575398e1022af1de99408829676703d824d89e33cde8cd7ffcb8d6f27c118e7511c9f1350cc26ac103db90f07ba4b5b0a3d
-EBUILD rosboost_cfg-9999.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/rosboost_cfg/metadata.xml b/dev-ros/rosboost_cfg/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/rosboost_cfg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.5.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.5.ebuild
deleted file mode 100644
index efba0bfb28e5..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.6.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.6.ebuild
deleted file mode 100644
index efba0bfb28e5..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.7.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.7.ebuild
deleted file mode 100644
index efba0bfb28e5..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild
deleted file mode 100644
index 68c0316e8510..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild
deleted file mode 100644
index efba0bfb28e5..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_library/Manifest b/dev-ros/rosbridge_library/Manifest
deleted file mode 100644
index 7efa38006a90..000000000000
--- a/dev-ros/rosbridge_library/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosbridge_suite-0.11.10.tar.gz 112955 BLAKE2B 82d9ee61d57876795a14b425d5037ac811d8fa7eed46be4a792244582dc620107973ad5bb05f5131618b124e2624a4e54047f795771be0a79de28a8d003f0a6d SHA512 0bd038792c75e451e92a242724a104a0e2e16d807e300db88317a4093a783813c218ebd76793c77352ba3c8155451cd20cb7154cf957ef22e821f4e76d37e88d
-DIST rosbridge_suite-0.11.13.tar.gz 113727 BLAKE2B 3dace7515804be548c1bc2d85bf28a7821425f17913f74e7f97f305bdecc49c681aa351238d2187fb55430f249bb61a8ff5029a8657a22200a23f4be2f32cae5 SHA512 f22fccf944313dd5a7c99f3fc79585caeccc248826b6701f38cfa55f5cdf5753e16f458e7a0fe13212bd19ccb1ceda21cf2a0328e2607a952e1fbd7493e46e59
-DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
-EBUILD rosbridge_library-0.11.10.ebuild 1563 BLAKE2B cc1256cd90e170d3b9a1447898ca8722cd870c6a10ee51a6b6f48a4d66908aeba750c86150fb81cfd878f5dc7cde51145b48712d0c58c2575c850ecb98bb9d8b SHA512 3c2c50d00e7d7fafc5e4c842c8404c25f64a6efe95d0674b928db8724b95c195b80c8294406b898db9f3d2e7313ded3868046b8ef445771f6f00ce497c629071
-EBUILD rosbridge_library-0.11.13.ebuild 1563 BLAKE2B 7f5923bb84c76c4b166ccc9d21eeb506abb73ba8272c2f19ca5b3c165bf71416f4c84f33c1d0f831328d90bd8c576db3add49710568024c7ddf334d232dc22a2 SHA512 f0854a4788341be9ff7227ce39f95e294f449b1e3db14151d5029eda0a90c78d0ecee11dbf0c69010e482848c2930d85e91b57526fc9a7c81f7929e6287bfaad
-EBUILD rosbridge_library-0.11.9.ebuild 1563 BLAKE2B cc1256cd90e170d3b9a1447898ca8722cd870c6a10ee51a6b6f48a4d66908aeba750c86150fb81cfd878f5dc7cde51145b48712d0c58c2575c850ecb98bb9d8b SHA512 3c2c50d00e7d7fafc5e4c842c8404c25f64a6efe95d0674b928db8724b95c195b80c8294406b898db9f3d2e7313ded3868046b8ef445771f6f00ce497c629071
-EBUILD rosbridge_library-9999.ebuild 1563 BLAKE2B cc1256cd90e170d3b9a1447898ca8722cd870c6a10ee51a6b6f48a4d66908aeba750c86150fb81cfd878f5dc7cde51145b48712d0c58c2575c850ecb98bb9d8b SHA512 3c2c50d00e7d7fafc5e4c842c8404c25f64a6efe95d0674b928db8724b95c195b80c8294406b898db9f3d2e7313ded3868046b8ef445771f6f00ce497c629071
-MISC metadata.xml 344 BLAKE2B af1c8aa9f048c14782d7752ccad08d6be969af6f06cc52c56cd45419abc7784f57e0ab57c07bf21791af380dec7b4efabe56e59e935ed1e220960b74a78f97dd SHA512 5c96aa12b512ef19768ba2231d529564d3717fc48453af47077a28c4757bb5a4892392fbbd098c04a90a5191bb33b1eb455be12a0daea349c66e135458d3c410
diff --git a/dev-ros/rosbridge_library/metadata.xml b/dev-ros/rosbridge_library/metadata.xml
deleted file mode 100644
index bfa58bd28c6b..000000000000
--- a/dev-ros/rosbridge_library/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.11.10.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.11.10.ebuild
deleted file mode 100644
index 0e9d84e423a4..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.11.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package for parsing JSON and performing the appropriate action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pillow[\${PYTHON_USEDEP}]")
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pymongo[\${PYTHON_USEDEP}]")
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.11.13.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.11.13.ebuild
deleted file mode 100644
index faa742a45319..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.11.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package for parsing JSON and performing the appropriate action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pillow[\${PYTHON_USEDEP}]")
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pymongo[\${PYTHON_USEDEP}]")
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.11.9.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.11.9.ebuild
deleted file mode 100644
index 0e9d84e423a4..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.11.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package for parsing JSON and performing the appropriate action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pillow[\${PYTHON_USEDEP}]")
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pymongo[\${PYTHON_USEDEP}]")
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
deleted file mode 100644
index 0e9d84e423a4..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package for parsing JSON and performing the appropriate action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pillow[\${PYTHON_USEDEP}]")
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pymongo[\${PYTHON_USEDEP}]")
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_msgs/Manifest b/dev-ros/rosbridge_msgs/Manifest
deleted file mode 100644
index b271a40c3831..000000000000
--- a/dev-ros/rosbridge_msgs/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosbridge_suite-0.11.10.tar.gz 112955 BLAKE2B 82d9ee61d57876795a14b425d5037ac811d8fa7eed46be4a792244582dc620107973ad5bb05f5131618b124e2624a4e54047f795771be0a79de28a8d003f0a6d SHA512 0bd038792c75e451e92a242724a104a0e2e16d807e300db88317a4093a783813c218ebd76793c77352ba3c8155451cd20cb7154cf957ef22e821f4e76d37e88d
-DIST rosbridge_suite-0.11.13.tar.gz 113727 BLAKE2B 3dace7515804be548c1bc2d85bf28a7821425f17913f74e7f97f305bdecc49c681aa351238d2187fb55430f249bb61a8ff5029a8657a22200a23f4be2f32cae5 SHA512 f22fccf944313dd5a7c99f3fc79585caeccc248826b6701f38cfa55f5cdf5753e16f458e7a0fe13212bd19ccb1ceda21cf2a0328e2607a952e1fbd7493e46e59
-DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
-EBUILD rosbridge_msgs-0.11.10.ebuild 432 BLAKE2B ad129286cf96eb65669f58382ec644289ec1009fa74b0069237db573018317901bbaa8f82b064e9eef69f750c1f7aa05ac90748c1677a37017ac1add2895b872 SHA512 c881eb615821af812138f8032202ffbe95bb11ab411fade1ee71bced8f3059439a01020e50ebc648ea8ce58d6f784dbd912d9fb28b07df5cb4bac6713b0a2362
-EBUILD rosbridge_msgs-0.11.13.ebuild 432 BLAKE2B b9caf811c5f0f803327be9efe670b1016c5cce7a0c334349ab80628966b017d41305dfcb404c310ea38d4a17519d32777acbd6185a7bb16e57c7471919b1e97c SHA512 ad876ac8aff79c3ea33db19d4c793d41d9b0b62ab20ee396ba0e0e2bad8e87b3adbd92f0a4f878440bbda54d3a3ed748297e7ed094512ad5aa6d6e59cc70b7fd
-EBUILD rosbridge_msgs-0.11.9.ebuild 432 BLAKE2B ad129286cf96eb65669f58382ec644289ec1009fa74b0069237db573018317901bbaa8f82b064e9eef69f750c1f7aa05ac90748c1677a37017ac1add2895b872 SHA512 c881eb615821af812138f8032202ffbe95bb11ab411fade1ee71bced8f3059439a01020e50ebc648ea8ce58d6f784dbd912d9fb28b07df5cb4bac6713b0a2362
-EBUILD rosbridge_msgs-9999.ebuild 432 BLAKE2B ad129286cf96eb65669f58382ec644289ec1009fa74b0069237db573018317901bbaa8f82b064e9eef69f750c1f7aa05ac90748c1677a37017ac1add2895b872 SHA512 c881eb615821af812138f8032202ffbe95bb11ab411fade1ee71bced8f3059439a01020e50ebc648ea8ce58d6f784dbd912d9fb28b07df5cb4bac6713b0a2362
-MISC metadata.xml 344 BLAKE2B af1c8aa9f048c14782d7752ccad08d6be969af6f06cc52c56cd45419abc7784f57e0ab57c07bf21791af380dec7b4efabe56e59e935ed1e220960b74a78f97dd SHA512 5c96aa12b512ef19768ba2231d529564d3717fc48453af47077a28c4757bb5a4892392fbbd098c04a90a5191bb33b1eb455be12a0daea349c66e135458d3c410
diff --git a/dev-ros/rosbridge_msgs/metadata.xml b/dev-ros/rosbridge_msgs/metadata.xml
deleted file mode 100644
index bfa58bd28c6b..000000000000
--- a/dev-ros/rosbridge_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.10.ebuild b/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.10.ebuild
deleted file mode 100644
index 153a13a52cca..000000000000
--- a/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Package containing message files for rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.13.ebuild b/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.13.ebuild
deleted file mode 100644
index 8a47855257d8..000000000000
--- a/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.13.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Package containing message files for rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.9.ebuild b/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.9.ebuild
deleted file mode 100644
index 153a13a52cca..000000000000
--- a/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Package containing message files for rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_msgs/rosbridge_msgs-9999.ebuild b/dev-ros/rosbridge_msgs/rosbridge_msgs-9999.ebuild
deleted file mode 100644
index 153a13a52cca..000000000000
--- a/dev-ros/rosbridge_msgs/rosbridge_msgs-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Package containing message files for rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/Manifest b/dev-ros/rosbridge_server/Manifest
deleted file mode 100644
index 783a9aa7434b..000000000000
--- a/dev-ros/rosbridge_server/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosbridge_suite-0.11.10.tar.gz 112955 BLAKE2B 82d9ee61d57876795a14b425d5037ac811d8fa7eed46be4a792244582dc620107973ad5bb05f5131618b124e2624a4e54047f795771be0a79de28a8d003f0a6d SHA512 0bd038792c75e451e92a242724a104a0e2e16d807e300db88317a4093a783813c218ebd76793c77352ba3c8155451cd20cb7154cf957ef22e821f4e76d37e88d
-DIST rosbridge_suite-0.11.13.tar.gz 113727 BLAKE2B 3dace7515804be548c1bc2d85bf28a7821425f17913f74e7f97f305bdecc49c681aa351238d2187fb55430f249bb61a8ff5029a8657a22200a23f4be2f32cae5 SHA512 f22fccf944313dd5a7c99f3fc79585caeccc248826b6701f38cfa55f5cdf5753e16f458e7a0fe13212bd19ccb1ceda21cf2a0328e2607a952e1fbd7493e46e59
-DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
-EBUILD rosbridge_server-0.11.10.ebuild 838 BLAKE2B 0e7f0780767900b7a8888dac9faca0f6683da392f7f2ad98d2d832cdefa9f588ec90c39c4c57cc90f2ef7c107c47d2e77eb48d96c42e62bf3918ebef0d67dc14 SHA512 e2f59bbaf8bfc490f617e38a7c71c0aaf4fda36ae49a36159bd0743ff79556e9a957653ddf61c1b66aa7221b5148c38eae856a710557995e1dc7a5c7d08c00cb
-EBUILD rosbridge_server-0.11.13.ebuild 837 BLAKE2B 52f22c58d452bf73bb2ba9730bab1c56d03fb98e2197b52949dfe49479e2a003131ff8cf49536768a1778ba0c42777b1a735137b8c0ac901f522655e5c85c84c SHA512 439f12c7b0a671adf147b20fb6e043aab195d369f43278e25fc08ddd260ec3bc4103480e1712abb26c9283ebabb0f8458d0c666dfe421c391418fe12b6790f17
-EBUILD rosbridge_server-0.11.9.ebuild 838 BLAKE2B 0e7f0780767900b7a8888dac9faca0f6683da392f7f2ad98d2d832cdefa9f588ec90c39c4c57cc90f2ef7c107c47d2e77eb48d96c42e62bf3918ebef0d67dc14 SHA512 e2f59bbaf8bfc490f617e38a7c71c0aaf4fda36ae49a36159bd0743ff79556e9a957653ddf61c1b66aa7221b5148c38eae856a710557995e1dc7a5c7d08c00cb
-EBUILD rosbridge_server-9999.ebuild 837 BLAKE2B 4e8f6f2b9dbc2f99228843aa5bc7ad0cf9c2d1cb998874f03c404b89763a51bf9a133231ade3bc2e4f87b0579a41b2a30e5d76bc68f1c2b3aff15fa0bb22694e SHA512 98e0709485d2ea1cb0f691f9567c7b895c46cea3add4a969e37c1e356f5b07f7bbdeb9996a322953119b0ddae8ab5b00cff6e17fde3ab70490225a74d747ed9f
-MISC metadata.xml 344 BLAKE2B af1c8aa9f048c14782d7752ccad08d6be969af6f06cc52c56cd45419abc7784f57e0ab57c07bf21791af380dec7b4efabe56e59e935ed1e220960b74a78f97dd SHA512 5c96aa12b512ef19768ba2231d529564d3717fc48453af47077a28c4757bb5a4892392fbbd098c04a90a5191bb33b1eb455be12a0daea349c66e135458d3c410
diff --git a/dev-ros/rosbridge_server/metadata.xml b/dev-ros/rosbridge_server/metadata.xml
deleted file mode 100644
index bfa58bd28c6b..000000000000
--- a/dev-ros/rosbridge_server/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.10.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.10.ebuild
deleted file mode 100644
index 20b681b38250..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosbridge_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosapi[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
-
-	$(python_gen_cond_dep '
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/tornado[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-	')
-	"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
-"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.13.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.13.ebuild
deleted file mode 100644
index 90dab3669990..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosbridge_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosapi[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
-
-	$(python_gen_cond_dep '
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/tornado[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
-"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
deleted file mode 100644
index 20b681b38250..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosbridge_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosapi[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
-
-	$(python_gen_cond_dep '
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/tornado[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-	')
-	"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
-"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
deleted file mode 100644
index 93dafa4cbcb8..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	dev-ros/rosbridge_library[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosbridge_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosapi[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosauth[${PYTHON_SINGLE_USEDEP}]
-
-	$(python_gen_cond_dep '
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/tornado[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
-"
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
deleted file mode 100644
index 16d3d722eee7..000000000000
--- a/dev-ros/rosbuild/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD rosbuild-1.15.5.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
-EBUILD rosbuild-1.15.6.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
-EBUILD rosbuild-1.15.7.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
-EBUILD rosbuild-1.15.8.ebuild 356 BLAKE2B 2b5a012d6c007b90fb8154678e6a5db9153b043a9c4601b1bfce6caefb51a208865e70798b452e192be6b0fd942b62c43c8e41a81433f36a01bc115e5b8ba040 SHA512 6ec6204e743e60e3a2dc7db1c69402e833ea4e3e8604bcdd9d241a352732ac0a5b850be7c56793b00fd51679f2a01a900bfd57fdac9891dfb092d967dbdc415d
-EBUILD rosbuild-9999.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/rosbuild/metadata.xml b/dev-ros/rosbuild/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/rosbuild/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosbuild/rosbuild-1.15.5.ebuild b/dev-ros/rosbuild/rosbuild-1.15.5.ebuild
deleted file mode 100644
index ee01e05ff7a2..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.15.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/rosbuild-1.15.6.ebuild b/dev-ros/rosbuild/rosbuild-1.15.6.ebuild
deleted file mode 100644
index ee01e05ff7a2..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.15.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/rosbuild-1.15.7.ebuild b/dev-ros/rosbuild/rosbuild-1.15.7.ebuild
deleted file mode 100644
index ee01e05ff7a2..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.15.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/rosbuild-1.15.8.ebuild b/dev-ros/rosbuild/rosbuild-1.15.8.ebuild
deleted file mode 100644
index a66d7458c4dc..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.15.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/rosbuild-9999.ebuild b/dev-ros/rosbuild/rosbuild-9999.ebuild
deleted file mode 100644
index ee01e05ff7a2..000000000000
--- a/dev-ros/rosbuild/rosbuild-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
deleted file mode 100644
index 6bc19084a804..000000000000
--- a/dev-ros/rosclean/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD rosclean-1.15.5.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
-EBUILD rosclean-1.15.6.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
-EBUILD rosclean-1.15.7.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
-EBUILD rosclean-1.15.8.ebuild 478 BLAKE2B 5203b3ef3612407db9bf3d4e202569dabcbefab768a38c74b7b403a553d32e37c5a215f93382221f57f8113d730eb29ec4209726b9b6f21f0c9e5450f3eba280 SHA512 ba2ffb59731adbe0d7ac11b0af63bcdb12e3d6eacad46176a119d292807f404bc31ec6eeeaa1dfca1e2faf776603eec7ac79639e0d0521e2f0f73e1b980ecd3d
-EBUILD rosclean-9999.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/rosclean/metadata.xml b/dev-ros/rosclean/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/rosclean/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosclean/rosclean-1.15.5.ebuild b/dev-ros/rosclean/rosclean-1.15.5.ebuild
deleted file mode 100644
index 990890224df3..000000000000
--- a/dev-ros/rosclean/rosclean-1.15.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosclean/rosclean-1.15.6.ebuild b/dev-ros/rosclean/rosclean-1.15.6.ebuild
deleted file mode 100644
index 990890224df3..000000000000
--- a/dev-ros/rosclean/rosclean-1.15.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosclean/rosclean-1.15.7.ebuild b/dev-ros/rosclean/rosclean-1.15.7.ebuild
deleted file mode 100644
index 990890224df3..000000000000
--- a/dev-ros/rosclean/rosclean-1.15.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosclean/rosclean-1.15.8.ebuild b/dev-ros/rosclean/rosclean-1.15.8.ebuild
deleted file mode 100644
index ab620eea3d8f..000000000000
--- a/dev-ros/rosclean/rosclean-1.15.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosclean/rosclean-9999.ebuild b/dev-ros/rosclean/rosclean-9999.ebuild
deleted file mode 100644
index 990890224df3..000000000000
--- a/dev-ros/rosclean/rosclean-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosconsole/Manifest b/dev-ros/rosconsole/Manifest
deleted file mode 100644
index bb10dfe8d172..000000000000
--- a/dev-ros/rosconsole/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosconsole-1.14.0.tar.gz 26166 BLAKE2B 79d73e5918eb5f3837e57e4207b3b42cc3222a92e8357265132d2d0848f966fa1e1aed69f8809af30497ef6b1f52c0de0073c20bf6e309010a8d98e0f745fb9c SHA512 68a5d709294b162d5b424bdbcd70fb66a43ccd8512bc60f571fe24bb0150e52f93addc3f22777c2f5810e95492265be58d3cfc6563a4e66665b3261ef161d5cd
-DIST rosconsole-1.14.2.tar.gz 26212 BLAKE2B b43f07f920a526c740d1ee8c3f5d7f5724ed617adad409df84001571e0df30df65c200bfc50c4c6a97a24642b3ad61340706ed4b6d14822935256bfb305350a3 SHA512 f1af112ada723195acda17edb64f75969a0abea58504d14507470eb36b0649e028cd675a368e040ddc955216da304dd64416fda8de7bc29dcd73c56c8286f311
-DIST rosconsole-1.14.3.tar.gz 26274 BLAKE2B 77547855d29bd837144663cff15ef0d5711ffbabacad161de0903df7acdda45bf2461718ce78ee1c9706a455ff1398876ed2014382bc4f39f08174cffc6ebae9 SHA512 a134dea50a8fb5cef600eecdf2e7402d7c95da364081f9619ae4a75be8782b28acdd4535146da2493b2e533867e7d7968398e83ea6d5438c171168ffab30ea97
-EBUILD rosconsole-1.14.0-r1.ebuild 756 BLAKE2B 6622e8aaa277fb3de405c28309b9727434f1bc0454ca1a19b0e0d954233259108de752a65f4e9ad34e963a138c195f60e31584685bcebe4300e8d7894959e5dc SHA512 89ca8c2992f9aaf6dd32e0d2a95ddc8dc3d224779864a4589d4faf1fbb1112ce710cf73da8144f4b8afeb60388ed7f7a2dff0a622e4d82c54d43eab0b9de5fb1
-EBUILD rosconsole-1.14.2-r1.ebuild 756 BLAKE2B 6622e8aaa277fb3de405c28309b9727434f1bc0454ca1a19b0e0d954233259108de752a65f4e9ad34e963a138c195f60e31584685bcebe4300e8d7894959e5dc SHA512 89ca8c2992f9aaf6dd32e0d2a95ddc8dc3d224779864a4589d4faf1fbb1112ce710cf73da8144f4b8afeb60388ed7f7a2dff0a622e4d82c54d43eab0b9de5fb1
-EBUILD rosconsole-1.14.3-r1.ebuild 756 BLAKE2B 6622e8aaa277fb3de405c28309b9727434f1bc0454ca1a19b0e0d954233259108de752a65f4e9ad34e963a138c195f60e31584685bcebe4300e8d7894959e5dc SHA512 89ca8c2992f9aaf6dd32e0d2a95ddc8dc3d224779864a4589d4faf1fbb1112ce710cf73da8144f4b8afeb60388ed7f7a2dff0a622e4d82c54d43eab0b9de5fb1
-EBUILD rosconsole-9999.ebuild 756 BLAKE2B 6622e8aaa277fb3de405c28309b9727434f1bc0454ca1a19b0e0d954233259108de752a65f4e9ad34e963a138c195f60e31584685bcebe4300e8d7894959e5dc SHA512 89ca8c2992f9aaf6dd32e0d2a95ddc8dc3d224779864a4589d4faf1fbb1112ce710cf73da8144f4b8afeb60388ed7f7a2dff0a622e4d82c54d43eab0b9de5fb1
-MISC metadata.xml 509 BLAKE2B 4d4e8e28bf64fe6a322a5a7c3a90bf192f7fab8d8912a6febc0f95c9dd663f834ceb71ee131eac75afe34ed7a19bb5fdce79381ebb64c470cf5cc619b1ef3c56 SHA512 84c830b81be7b2f0bf7eee581e65ac2b99b2b9964e3b5f00c65a6b54c9a5aa2c2e7c7cb9962fe87d43b189ca5bbb69a25553717bc9c30971b6f311a2a59d6e02
diff --git a/dev-ros/rosconsole/metadata.xml b/dev-ros/rosconsole/metadata.xml
deleted file mode 100644
index ade910461704..000000000000
--- a/dev-ros/rosconsole/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ros@gentoo.org</email>
-    <name>Gentoo ROS Project</name>
-  </maintainer>
-  <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>
-  </use>
-  <upstream>
-    <remote-id type="github">ros/rosconsole</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosconsole/rosconsole-1.14.0-r1.ebuild b/dev-ros/rosconsole/rosconsole-1.14.0-r1.ebuild
deleted file mode 100644
index 5671abddd8d6..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/rosconsole"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/rosunit
-	dev-libs/boost:=
-	log4cxx? ( dev-libs/log4cxx )
-	!log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local ROSCONSOLE_BACKEND=""
-	if use log4cxx; then
-		ROSCONSOLE_BACKEND="log4cxx"
-	elif use glog; then
-		ROSCONSOLE_BACKEND="glog"
-	else
-		ROSCONSOLE_BACKEND="print"
-	fi
-	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.14.2-r1.ebuild b/dev-ros/rosconsole/rosconsole-1.14.2-r1.ebuild
deleted file mode 100644
index 5671abddd8d6..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/rosconsole"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/rosunit
-	dev-libs/boost:=
-	log4cxx? ( dev-libs/log4cxx )
-	!log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local ROSCONSOLE_BACKEND=""
-	if use log4cxx; then
-		ROSCONSOLE_BACKEND="log4cxx"
-	elif use glog; then
-		ROSCONSOLE_BACKEND="glog"
-	else
-		ROSCONSOLE_BACKEND="print"
-	fi
-	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.14.3-r1.ebuild b/dev-ros/rosconsole/rosconsole-1.14.3-r1.ebuild
deleted file mode 100644
index 5671abddd8d6..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/rosconsole"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/rosunit
-	dev-libs/boost:=
-	log4cxx? ( dev-libs/log4cxx )
-	!log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local ROSCONSOLE_BACKEND=""
-	if use log4cxx; then
-		ROSCONSOLE_BACKEND="log4cxx"
-	elif use glog; then
-		ROSCONSOLE_BACKEND="glog"
-	else
-		ROSCONSOLE_BACKEND="print"
-	fi
-	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-9999.ebuild b/dev-ros/rosconsole/rosconsole-9999.ebuild
deleted file mode 100644
index 5671abddd8d6..000000000000
--- a/dev-ros/rosconsole/rosconsole-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/rosconsole"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/rosunit
-	dev-libs/boost:=
-	log4cxx? ( dev-libs/log4cxx )
-	!log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local ROSCONSOLE_BACKEND=""
-	if use log4cxx; then
-		ROSCONSOLE_BACKEND="log4cxx"
-	elif use glog; then
-		ROSCONSOLE_BACKEND="glog"
-	else
-		ROSCONSOLE_BACKEND="print"
-	fi
-	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole_bridge/Manifest b/dev-ros/rosconsole_bridge/Manifest
deleted file mode 100644
index 8a30e001a050..000000000000
--- a/dev-ros/rosconsole_bridge/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rosconsole_bridge-0.5.4.tar.gz 4874 BLAKE2B 73a8a21918d062e0d362a884e0ceb98bb8c3187d0126c37db32c47bef61b01e0c8545ad99193f785ecb66fd29adcfd78b941f04278efdc4fd4618b0f91777bc0 SHA512 06f216033783a2f58041170ff9000443177d7de9d7e3c43096f8b11a1603339e75e780dfb32869023c5a1e6c890f24168cc1936ffaa797df263f5c35f59a7908
-EBUILD rosconsole_bridge-0.5.4.ebuild 400 BLAKE2B b45ea9f720d8ef9a9f5d6e7d1f7a1686215e411c89c7327054aa69db51b61f66bdddae1a0f086bdca6e9b65f2a0c251a16c7162e1943f66c84b0e222a829c202 SHA512 e28c153dc9db109f617f818fec68711a1cb5c38b2204f8a4d1a03aaa765d768804522c8a5fde64174c2c0f13525e2fab95c6d552bd09f364a367f71ef2a61dc9
-EBUILD rosconsole_bridge-9999.ebuild 400 BLAKE2B b45ea9f720d8ef9a9f5d6e7d1f7a1686215e411c89c7327054aa69db51b61f66bdddae1a0f086bdca6e9b65f2a0c251a16c7162e1943f66c84b0e222a829c202 SHA512 e28c153dc9db109f617f818fec68711a1cb5c38b2204f8a4d1a03aaa765d768804522c8a5fde64174c2c0f13525e2fab95c6d552bd09f364a367f71ef2a61dc9
-MISC metadata.xml 336 BLAKE2B 1426c63743617e11a507a9d17d7c444ace43b8e9fd5ed2719cf1e5cb054a34d96c913a29823d5d92f0785d05266c0193abfe42c58e86cc44825419fe91414701 SHA512 4b683aa121119f78a92fc7e723e6dc83fe36347ee48ad9b1580957c5a23527db0966b06d1f8e950739cfc55270e17a3e8fd7883c7fc4b9f23edf59a041902521
diff --git a/dev-ros/rosconsole_bridge/metadata.xml b/dev-ros/rosconsole_bridge/metadata.xml
deleted file mode 100644
index df211242f3a9..000000000000
--- a/dev-ros/rosconsole_bridge/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/rosconsole_bridge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.4.ebuild b/dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.4.ebuild
deleted file mode 100644
index 4b81c6cd3740..000000000000
--- a/dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/rosconsole_bridge"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Connects console_bridge-based logging to rosconsole-based logging"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/console_bridge:=
-	dev-ros/rosconsole"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild b/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild
deleted file mode 100644
index 4b81c6cd3740..000000000000
--- a/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/rosconsole_bridge"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Connects console_bridge-based logging to rosconsole-based logging"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/console_bridge:=
-	dev-ros/rosconsole"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
deleted file mode 100644
index b9e6f165c346..000000000000
--- a/dev-ros/roscpp/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD roscpp-1.15.10.ebuild 606 BLAKE2B b8e78e2ed68bd093f06a3649296603d192b8e2c2632d13146585e5ab506c197ff704a911bf915ee752e67f4dbe24cf5585158d00d06f7014652ab85237003576 SHA512 6066703301141ca2d920c33dcc76e59c8fd4bc8ee428de58490a56989bc91188ed5a52b3df441dca451283a95bdc0f0a9298d5d1ff74649ad753ff1f3964ec7b
-EBUILD roscpp-1.15.11.ebuild 606 BLAKE2B b8e78e2ed68bd093f06a3649296603d192b8e2c2632d13146585e5ab506c197ff704a911bf915ee752e67f4dbe24cf5585158d00d06f7014652ab85237003576 SHA512 6066703301141ca2d920c33dcc76e59c8fd4bc8ee428de58490a56989bc91188ed5a52b3df441dca451283a95bdc0f0a9298d5d1ff74649ad753ff1f3964ec7b
-EBUILD roscpp-1.15.13.ebuild 606 BLAKE2B b8e78e2ed68bd093f06a3649296603d192b8e2c2632d13146585e5ab506c197ff704a911bf915ee752e67f4dbe24cf5585158d00d06f7014652ab85237003576 SHA512 6066703301141ca2d920c33dcc76e59c8fd4bc8ee428de58490a56989bc91188ed5a52b3df441dca451283a95bdc0f0a9298d5d1ff74649ad753ff1f3964ec7b
-EBUILD roscpp-1.15.14.ebuild 606 BLAKE2B 14da7ff69ee4b1bbc29297eb5902fae269dd76d3d0ccfd525d18ebe0160cd5c96aa453ba43720de8eedf131ac17461cd3cfb3186125d3194986de5ac5c05af60 SHA512 43bc039c40ba035f8be199ef1967d2474b4430b306b9247a16f8ddcbf582f66076e10da6946d295c66d88927a05478d935243fe8c48cc6df7ca32b904dc90e47
-EBUILD roscpp-1.15.9.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
-EBUILD roscpp-9999.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/roscpp/metadata.xml b/dev-ros/roscpp/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/roscpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roscpp/roscpp-1.15.10.ebuild b/dev-ros/roscpp/roscpp-1.15.10.ebuild
deleted file mode 100644
index 7cee4461c7ca..000000000000
--- a/dev-ros/roscpp/roscpp-1.15.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.15.11.ebuild b/dev-ros/roscpp/roscpp-1.15.11.ebuild
deleted file mode 100644
index 7cee4461c7ca..000000000000
--- a/dev-ros/roscpp/roscpp-1.15.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.15.13.ebuild b/dev-ros/roscpp/roscpp-1.15.13.ebuild
deleted file mode 100644
index 7cee4461c7ca..000000000000
--- a/dev-ros/roscpp/roscpp-1.15.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.15.14.ebuild b/dev-ros/roscpp/roscpp-1.15.14.ebuild
deleted file mode 100644
index 59de1ac4d413..000000000000
--- a/dev-ros/roscpp/roscpp-1.15.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.15.9.ebuild b/dev-ros/roscpp/roscpp-1.15.9.ebuild
deleted file mode 100644
index 033a2eb87fd0..000000000000
--- a/dev-ros/roscpp/roscpp-1.15.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-9999.ebuild b/dev-ros/roscpp/roscpp-9999.ebuild
deleted file mode 100644
index 033a2eb87fd0..000000000000
--- a/dev-ros/roscpp/roscpp-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_serialization/Manifest b/dev-ros/roscpp_serialization/Manifest
deleted file mode 100644
index 93e8852bdb3d..000000000000
--- a/dev-ros/roscpp_serialization/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST roscpp_core-0.7.2.tar.gz 35095 BLAKE2B 065f81f514becd2ea1586735c759be79765eeee1c8a9606261ebd2086cf406c87276b143ace4ac43eeb7f8ee6dccc07812c614e6e185f2354d64b1dfe401b849 SHA512 fb04ee37db14d31b7c06ae3484f5aa414563e96a90b820b7d6e23e921bcd831a8bf1d66c723aef65a617b2da92456345cb796271409c8dc155ef1084926659ef
-EBUILD roscpp_serialization-0.7.2.ebuild 384 BLAKE2B 54154f8d77760639e91270b2e3cb939a2080cb86481df17d4325ac1a7a157227e636c1b3941d7902509f8f95978e788730fd634b604b72b55bf8c173b75f02b2 SHA512 dd1e7b0c404a9edb453e6725eb4fed7d5b084aca5587bbd49e603cf9deac4ade9df547acd6b7326559ae7458fda6d555bee1621899266001d1c34089dad1f269
-EBUILD roscpp_serialization-9999.ebuild 384 BLAKE2B 54154f8d77760639e91270b2e3cb939a2080cb86481df17d4325ac1a7a157227e636c1b3941d7902509f8f95978e788730fd634b604b72b55bf8c173b75f02b2 SHA512 dd1e7b0c404a9edb453e6725eb4fed7d5b084aca5587bbd49e603cf9deac4ade9df547acd6b7326559ae7458fda6d555bee1621899266001d1c34089dad1f269
-MISC metadata.xml 330 BLAKE2B 29b9adee2c65256491b9192e5d15f2398d839b011ab15a5383db9472455c8adcc3f4ead321f65943dd8fd6b010514b001248af026b1f5a708316e9ad4a699fb9 SHA512 cfdf921ea410ba8db72aa8bae017f699948dbc789c3068cec5798b5320c1e574bd3c854e05e04053fca24fb6bd6bbf6c847b742b8e636c3c1a4dc920a7262183
diff --git a/dev-ros/roscpp_serialization/metadata.xml b/dev-ros/roscpp_serialization/metadata.xml
deleted file mode 100644
index 4e0c376ad93e..000000000000
--- a/dev-ros/roscpp_serialization/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/roscpp_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roscpp_serialization/roscpp_serialization-0.7.2.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.7.2.ebuild
deleted file mode 100644
index 6aaa762b9466..000000000000
--- a/dev-ros/roscpp_serialization/roscpp_serialization-0.7.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Code for serialization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/roscpp_traits
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_serialization/roscpp_serialization-9999.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-9999.ebuild
deleted file mode 100644
index 6aaa762b9466..000000000000
--- a/dev-ros/roscpp_serialization/roscpp_serialization-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Code for serialization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/roscpp_traits
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/Manifest b/dev-ros/roscpp_traits/Manifest
deleted file mode 100644
index 9eaf35bed98f..000000000000
--- a/dev-ros/roscpp_traits/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST roscpp_core-0.7.2.tar.gz 35095 BLAKE2B 065f81f514becd2ea1586735c759be79765eeee1c8a9606261ebd2086cf406c87276b143ace4ac43eeb7f8ee6dccc07812c614e6e185f2354d64b1dfe401b849 SHA512 fb04ee37db14d31b7c06ae3484f5aa414563e96a90b820b7d6e23e921bcd831a8bf1d66c723aef65a617b2da92456345cb796271409c8dc155ef1084926659ef
-EBUILD roscpp_traits-0.7.2.ebuild 358 BLAKE2B 463624e635121f4225070b00461c0a700b1943d2b42cd48fe0364ea11c185b1a01e07340e304f22a9d2b1a28650502020b889fb5c33ef010ab297302b52802b3 SHA512 735b7ef25cfbc508841a88b1e83da703105c1457bc22219f9719195b78cd1affaf3c3c9989b3a3938d31c19eb7f479114de591e6ce94163148258acfbf101b67
-EBUILD roscpp_traits-9999.ebuild 358 BLAKE2B 463624e635121f4225070b00461c0a700b1943d2b42cd48fe0364ea11c185b1a01e07340e304f22a9d2b1a28650502020b889fb5c33ef010ab297302b52802b3 SHA512 735b7ef25cfbc508841a88b1e83da703105c1457bc22219f9719195b78cd1affaf3c3c9989b3a3938d31c19eb7f479114de591e6ce94163148258acfbf101b67
-MISC metadata.xml 330 BLAKE2B 29b9adee2c65256491b9192e5d15f2398d839b011ab15a5383db9472455c8adcc3f4ead321f65943dd8fd6b010514b001248af026b1f5a708316e9ad4a699fb9 SHA512 cfdf921ea410ba8db72aa8bae017f699948dbc789c3068cec5798b5320c1e574bd3c854e05e04053fca24fb6bd6bbf6c847b742b8e636c3c1a4dc920a7262183
diff --git a/dev-ros/roscpp_traits/metadata.xml b/dev-ros/roscpp_traits/metadata.xml
deleted file mode 100644
index 4e0c376ad93e..000000000000
--- a/dev-ros/roscpp_traits/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/roscpp_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.7.2.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.7.2.ebuild
deleted file mode 100644
index e3e556dff1e0..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.7.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Message traits code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/roscpp_traits-9999.ebuild b/dev-ros/roscpp_traits/roscpp_traits-9999.ebuild
deleted file mode 100644
index e3e556dff1e0..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Message traits code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_tutorials/Manifest b/dev-ros/roscpp_tutorials/Manifest
deleted file mode 100644
index 95811ba8a449..000000000000
--- a/dev-ros/roscpp_tutorials/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ros_tutorials-0.10.1.tar.gz 159522 BLAKE2B b0e045c6ee62cb68dfa977d17125af23d8ef80a619e822d245531a6cb3520a4d53120769e74ae2ba9af2813ce968e0c4fb22b7655eadd13b1a720705a9f75374 SHA512 592edb84f2e0ea80b2757ae890f495e8cb93d867b1bc6d64e6446f28fcffbd48c05703ac30ac29fd184a689f465728a5958d8c747587c756b53341c1d0740684
-DIST ros_tutorials-0.10.2.tar.gz 159630 BLAKE2B 6b7ea4c0aba110b746052a42150dd4e9faedbb1e4ab5a44bbef7c1079192238ac22bb18fc9968ea9e4450dde47bf1f5b7dabc0788aa8c232dfef3d1039a63f2e SHA512 73b420acf20a468f51db891fe0b0b33c3c838ea6fab4c03faab9a7abedc3ee68ec27ef0e70869143d0a22941eb77bac1fc80542cc0c14988ff75cb9685c174c5
-EBUILD roscpp_tutorials-0.10.1-r1.ebuild 529 BLAKE2B 3804b712f926a6459eb3c71b35fb3ee4131cbf16e7498060e06747efcda0b62edc28c65df6772337b84f4589dd6c2f0a292d8d8073294d0558b1d8d2385e47d2 SHA512 61cfde43094f8c70996662815c682274fdd11e79107bf970986d1f79bc941d45930fa3d576f2d83a3d810f8a4f4aa6cbe76360470855892f0337306960ebe5f4
-EBUILD roscpp_tutorials-0.10.2-r1.ebuild 529 BLAKE2B 3804b712f926a6459eb3c71b35fb3ee4131cbf16e7498060e06747efcda0b62edc28c65df6772337b84f4589dd6c2f0a292d8d8073294d0558b1d8d2385e47d2 SHA512 61cfde43094f8c70996662815c682274fdd11e79107bf970986d1f79bc941d45930fa3d576f2d83a3d810f8a4f4aa6cbe76360470855892f0337306960ebe5f4
-EBUILD roscpp_tutorials-9999.ebuild 529 BLAKE2B 3804b712f926a6459eb3c71b35fb3ee4131cbf16e7498060e06747efcda0b62edc28c65df6772337b84f4589dd6c2f0a292d8d8073294d0558b1d8d2385e47d2 SHA512 61cfde43094f8c70996662815c682274fdd11e79107bf970986d1f79bc941d45930fa3d576f2d83a3d810f8a4f4aa6cbe76360470855892f0337306960ebe5f4
-MISC metadata.xml 332 BLAKE2B 16b962550ae20fa64a58582eaf57a1abd6304a2708e2539dbc4b8b1f6ba0464b40141742e6768a87a2bf2929a2b84f6baec920e44fb33b04d7e1748acd70bfcc SHA512 44c4d51343043fcf48606163b7f3e5b84465df928b12df089015f638552a49223787ff906f5754347aadac6a802a3201e2a7e1af793b0b8d5ad0003c6f121882
diff --git a/dev-ros/roscpp_tutorials/metadata.xml b/dev-ros/roscpp_tutorials/metadata.xml
deleted file mode 100644
index 33597496d65f..000000000000
--- a/dev-ros/roscpp_tutorials/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.1-r1.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.1-r1.ebuild
deleted file mode 100644
index 050a9f8d56bd..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.2-r1.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.2-r1.ebuild
deleted file mode 100644
index 050a9f8d56bd..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_tutorials/roscpp_tutorials-9999.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-9999.ebuild
deleted file mode 100644
index 050a9f8d56bd..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
deleted file mode 100644
index e74b3c14d699..000000000000
--- a/dev-ros/roscreate/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD roscreate-1.15.6.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
-EBUILD roscreate-1.15.7.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
-EBUILD roscreate-1.15.8.ebuild 626 BLAKE2B c693496ae70386c6223d046e07448cfa8c6f1d50546f4c1a3f70a5821aae386f5c23b0a80b231855f5c2b226f4cb1f9733708e929dc19b3ff980620344ebbaf5 SHA512 787dd7bf22f32415830805254742c4bf7847544167aa71433233196a07225e4f25ed410a8bcddf05c9bd59ca0bed5354b2765d72456f434473c2ef0b362c188e
-EBUILD roscreate-9999.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/roscreate/metadata.xml b/dev-ros/roscreate/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/roscreate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roscreate/roscreate-1.15.6.ebuild b/dev-ros/roscreate/roscreate-1.15.6.ebuild
deleted file mode 100644
index 5a077c7eb99f..000000000000
--- a/dev-ros/roscreate/roscreate-1.15.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roscreate/roscreate-1.15.7.ebuild b/dev-ros/roscreate/roscreate-1.15.7.ebuild
deleted file mode 100644
index 5a077c7eb99f..000000000000
--- a/dev-ros/roscreate/roscreate-1.15.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roscreate/roscreate-1.15.8.ebuild b/dev-ros/roscreate/roscreate-1.15.8.ebuild
deleted file mode 100644
index fdca9421e8ab..000000000000
--- a/dev-ros/roscreate/roscreate-1.15.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roscreate/roscreate-9999.ebuild b/dev-ros/roscreate/roscreate-9999.ebuild
deleted file mode 100644
index 5a077c7eb99f..000000000000
--- a/dev-ros/roscreate/roscreate-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosdiagnostic/Manifest b/dev-ros/rosdiagnostic/Manifest
deleted file mode 100644
index b24838726462..000000000000
--- a/dev-ros/rosdiagnostic/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
-DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
-DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
-DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
-DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
-DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
-DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
-EBUILD rosdiagnostic-1.10.1.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
-EBUILD rosdiagnostic-1.10.2.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
-EBUILD rosdiagnostic-1.10.3.ebuild 467 BLAKE2B 74db2d4dbd883a3d15235d3e26f0bbb545d8cecdfc7a7a9c6f2fade5d1c1ea8db750855662d1d53d535750b408ffc2e492c27f69ca502d9cce359bcc29bed3f3 SHA512 e519a24e329c1676e6fcf97621ba58279017ff4a44294af21c4b97f9585417aca1dbcf87cce97b1cea510dc3aca1dc76e8f21ba57553ec0d0758bf4b23d76f1a
-EBUILD rosdiagnostic-1.10.4.ebuild 467 BLAKE2B 74db2d4dbd883a3d15235d3e26f0bbb545d8cecdfc7a7a9c6f2fade5d1c1ea8db750855662d1d53d535750b408ffc2e492c27f69ca502d9cce359bcc29bed3f3 SHA512 e519a24e329c1676e6fcf97621ba58279017ff4a44294af21c4b97f9585417aca1dbcf87cce97b1cea510dc3aca1dc76e8f21ba57553ec0d0758bf4b23d76f1a
-EBUILD rosdiagnostic-1.11.0.ebuild 467 BLAKE2B 8353792c03843b7047e1b4549776fde5be7724a9c7d043103831aeadba91d449ca8350dd4b2e5f346acaa744c944db48a0bfea7be77b72123837317614d22280 SHA512 2951a6552702317a7e576123a6848b98c259b31623d197cc7dca1b54b6c8f9aff24c0e1792d34b0c87697cc5561afd16bceffa39c4a635442e74bcb7bf783821
-EBUILD rosdiagnostic-1.9.4.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
-EBUILD rosdiagnostic-1.9.6.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
-EBUILD rosdiagnostic-9999.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
-MISC metadata.xml 330 BLAKE2B a856cefc508ebf638d764bbfad848bae8140bb8f4f8e0fcde5ade3d168cff85647d3f803f92fd05824d459cd1e723d86ff48b21c07211b27527d251bb7eb90fd SHA512 d6abd3b4af2ba8eb1de110f8b59296f327e83ced62d9618e1dd2be6d39e04e4bad27a32aa78f9e7358b2f22f872aa96bbdac1da860c6af37ebff054d6e5c7f67
diff --git a/dev-ros/rosdiagnostic/metadata.xml b/dev-ros/rosdiagnostic/metadata.xml
deleted file mode 100644
index dd82416e0b4a..000000000000
--- a/dev-ros/rosdiagnostic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/diagnostics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.1.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.1.ebuild
deleted file mode 100644
index 89a06deb6a4d..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.2.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.2.ebuild
deleted file mode 100644
index 89a06deb6a4d..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.3.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.3.ebuild
deleted file mode 100644
index e28046b6462d..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.4.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.4.ebuild
deleted file mode 100644
index e28046b6462d..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.11.0.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.11.0.ebuild
deleted file mode 100644
index 7797dd481b5e..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.11.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild
deleted file mode 100644
index 89a06deb6a4d..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.6.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.6.ebuild
deleted file mode 100644
index 89a06deb6a4d..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild
deleted file mode 100644
index 89a06deb6a4d..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
deleted file mode 100644
index 70d6e9265e13..000000000000
--- a/dev-ros/rosgraph/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosgraph-1.15.10.ebuild 710 BLAKE2B bc1be14a2d80c6acf980993059cb6ca0903dc884dddcfbced3d709057f827ba00f5743e99874ea5f0900c837b7f95c05d3ce89c99ce3cf502f226982d901a152 SHA512 3f1a196462ad7125e2384543384e0dfa7909bb974efdb311a9ab6584c8b31eb7fe16099594fb7fd5fa2c7c50e8c0746bf50b4ec3bdcd47f7e1960b203b3c8a9b
-EBUILD rosgraph-1.15.11.ebuild 710 BLAKE2B bc1be14a2d80c6acf980993059cb6ca0903dc884dddcfbced3d709057f827ba00f5743e99874ea5f0900c837b7f95c05d3ce89c99ce3cf502f226982d901a152 SHA512 3f1a196462ad7125e2384543384e0dfa7909bb974efdb311a9ab6584c8b31eb7fe16099594fb7fd5fa2c7c50e8c0746bf50b4ec3bdcd47f7e1960b203b3c8a9b
-EBUILD rosgraph-1.15.13.ebuild 710 BLAKE2B bc1be14a2d80c6acf980993059cb6ca0903dc884dddcfbced3d709057f827ba00f5743e99874ea5f0900c837b7f95c05d3ce89c99ce3cf502f226982d901a152 SHA512 3f1a196462ad7125e2384543384e0dfa7909bb974efdb311a9ab6584c8b31eb7fe16099594fb7fd5fa2c7c50e8c0746bf50b4ec3bdcd47f7e1960b203b3c8a9b
-EBUILD rosgraph-1.15.14.ebuild 710 BLAKE2B 19a788063e217e6d18f34bd41acc0b4bc8c1a33c8e0b0caef3939b2b01f415f3ebdee8c6aefd08536e3c3bc61b01a1b5e72d011f0b1c0e19a36a3f4a5bf0fc11 SHA512 e897aa8f9b2913f43bb51826ad8202d44bbdf6189605efde8b1dba5d95bc17f8de04d65a9143b5df4999109c734c6bf30c181785494ee443cdda33258ae4d1de
-EBUILD rosgraph-1.15.8.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
-EBUILD rosgraph-1.15.9.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
-EBUILD rosgraph-9999.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosgraph/metadata.xml b/dev-ros/rosgraph/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rosgraph/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosgraph/rosgraph-1.15.10.ebuild b/dev-ros/rosgraph/rosgraph-1.15.10.ebuild
deleted file mode 100644
index 79863bd48ac7..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosgraph/rosgraph-1.15.11.ebuild b/dev-ros/rosgraph/rosgraph-1.15.11.ebuild
deleted file mode 100644
index 79863bd48ac7..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosgraph/rosgraph-1.15.13.ebuild b/dev-ros/rosgraph/rosgraph-1.15.13.ebuild
deleted file mode 100644
index 79863bd48ac7..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosgraph/rosgraph-1.15.14.ebuild b/dev-ros/rosgraph/rosgraph-1.15.14.ebuild
deleted file mode 100644
index c62c038b5cfa..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosgraph/rosgraph-1.15.8.ebuild b/dev-ros/rosgraph/rosgraph-1.15.8.ebuild
deleted file mode 100644
index 171218629338..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosgraph/rosgraph-1.15.9.ebuild b/dev-ros/rosgraph/rosgraph-1.15.9.ebuild
deleted file mode 100644
index 171218629338..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosgraph/rosgraph-9999.ebuild b/dev-ros/rosgraph/rosgraph-9999.ebuild
deleted file mode 100644
index 171218629338..000000000000
--- a/dev-ros/rosgraph/rosgraph-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosgraph_msgs/Manifest b/dev-ros/rosgraph_msgs/Manifest
deleted file mode 100644
index e5a354f5e16b..000000000000
--- a/dev-ros/rosgraph_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ros_comm_msgs-1.11.3.tar.gz 2483 BLAKE2B dd6753d0cd5f285cce9343e29c3c593260708bcc7627850564fe6e3975511b55359ee790d6ddf6066e8433c2fa03bc576d9f7ec41ee0a5a362a9e42be2c87e65 SHA512 e7afef3326fbbfa9435ecaed9a553de74d694def975e5e2bdaff6cc671c8001cdef540defb90df936c0731bfa5d3d7d6e00300847271cd8d3c00ec59b24f1207
-EBUILD rosgraph_msgs-1.11.3.ebuild 408 BLAKE2B 55c40e3d4d0d67e6ed7b8e37af99f8c7e9f16286169908380e431b2787196531ca679c3338d77004e96cb56fe7ecb6978ad0a4554fd7148ae634f70d036e47ea SHA512 f92fd23faeb53072f195af3bb309a4439e6e978045467c1cbdca0c7ab8c04246ef38d58f3f1bf5be2ccee4fe9b1cfefe919869c84f648c30327c890b171b141c
-EBUILD rosgraph_msgs-9999.ebuild 408 BLAKE2B 55c40e3d4d0d67e6ed7b8e37af99f8c7e9f16286169908380e431b2787196531ca679c3338d77004e96cb56fe7ecb6978ad0a4554fd7148ae634f70d036e47ea SHA512 f92fd23faeb53072f195af3bb309a4439e6e978045467c1cbdca0c7ab8c04246ef38d58f3f1bf5be2ccee4fe9b1cfefe919869c84f648c30327c890b171b141c
-MISC metadata.xml 332 BLAKE2B 7942db85cc27688399e5521b48849909d06b367a934fe10a486c6c1dc8e894a5781202cefcce29492ce62eed72c288a2803ecccd24395eda93bfec2d7edd5b39 SHA512 4c6ee03f69eeaa12affbc06aa409e83c8e6955ff5fa10e18332c7e647bce3a6f40c43ff4fd08f20578b6651b34fd13fb02474f4c6a9659ffb3ce2341bc2381ce
diff --git a/dev-ros/rosgraph_msgs/metadata.xml b/dev-ros/rosgraph_msgs/metadata.xml
deleted file mode 100644
index 02fcd6b01352..000000000000
--- a/dev-ros/rosgraph_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.3.ebuild b/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.3.ebuild
deleted file mode 100644
index 9cc4b761683f..000000000000
--- a/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages relating to ROS comm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild b/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild
deleted file mode 100644
index 9cc4b761683f..000000000000
--- a/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages relating to ROS comm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
deleted file mode 100644
index baa944e71d74..000000000000
--- a/dev-ros/roslang/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD roslang-1.15.5.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
-EBUILD roslang-1.15.6.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
-EBUILD roslang-1.15.7.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
-EBUILD roslang-1.15.8.ebuild 342 BLAKE2B ed208da62480d0e5ae90fe19496d9c3ee27e97e38b27d0c3f6921893e27db1369b8d7cdaf3d9a9ca5b97c21d792b651a1e7b4b1b2e45cde54cca4ac7f34424bb SHA512 aecdf1dec4b31407eacbf8c5ce0db4b421fe884293a135499226d31651271f1c6b267e31583ee7d0370c1fd7f4be74823792dc8c9177570c5d7b0270554c141e
-EBUILD roslang-9999.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/roslang/metadata.xml b/dev-ros/roslang/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/roslang/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roslang/roslang-1.15.5.ebuild b/dev-ros/roslang/roslang-1.15.5.ebuild
deleted file mode 100644
index 5c52cec83fd8..000000000000
--- a/dev-ros/roslang/roslang-1.15.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common package for all ROS client libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslang/roslang-1.15.6.ebuild b/dev-ros/roslang/roslang-1.15.6.ebuild
deleted file mode 100644
index 5c52cec83fd8..000000000000
--- a/dev-ros/roslang/roslang-1.15.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common package for all ROS client libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslang/roslang-1.15.7.ebuild b/dev-ros/roslang/roslang-1.15.7.ebuild
deleted file mode 100644
index 5c52cec83fd8..000000000000
--- a/dev-ros/roslang/roslang-1.15.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common package for all ROS client libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslang/roslang-1.15.8.ebuild b/dev-ros/roslang/roslang-1.15.8.ebuild
deleted file mode 100644
index a2c65f71cd37..000000000000
--- a/dev-ros/roslang/roslang-1.15.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common package for all ROS client libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslang/roslang-9999.ebuild b/dev-ros/roslang/roslang-9999.ebuild
deleted file mode 100644
index 5c52cec83fd8..000000000000
--- a/dev-ros/roslang/roslang-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common package for all ROS client libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
deleted file mode 100644
index 4476c30a4cc7..000000000000
--- a/dev-ros/roslaunch/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX 40roslaunch 59 BLAKE2B 2dc6a88ae1902f2c42b026f8afbda9b1f5289eee8981969c0e86247e1cfae7bb45a8365b4edc43b8d1716ea3da34e7928cfbc7cf81232d3ce529ff9b8ccb32dd SHA512 baeb824bcaeb6023d2138335c002df67387b82e369d53be50f694a6122823dbd6bb114e1244721a623b3cd5ee87af696143345af000f73a256b1316d016d51b4
-AUX roscore.confd 9 BLAKE2B 89bba6f2d5d004cd5d0e3bb931d039e54e5389f21538c4210924c2e52d9287b2191e1ae5f94641658fb95fef10bf55e261e2d20e702974cc823988609e27781a SHA512 91af98d3c1f567572e0d995b68f268cefe8abaff46b58499fdd11845809947e858c8d133c6b4428115f0a62db6eb847495bf462619a7fa7c233bf3a97dc9f0bc
-AUX roscore.initd 533 BLAKE2B 2ff10e03a6b75128fd72a98022a040b93c32ddba6782912133e4164e50427a37f77c5911cd1a50082ba33f90cc7cc6983d2d4eff4ca1ef86c07d3e2ebabfbce6 SHA512 8a43dd2ec83c24db1c00f4e849fa3e6193d348c6c3e4cae0317717d1d08cd1da6cbc37dbfdd338b9d2d77d2bf852d93736214c7d3c31e6dba3b46627e3d0b410
-AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af930e3e01a32dc3228dfc60aeb4c1d6efe05f8245a948edd2314dcb550f9e80d1acd36461c347ce38 SHA512 fff18b8f4ffdf3f3e6cdc3b33cdb386dabaab769f3bac995cb3c29243c8380b13898cd5892026e9dee459f88f4f05886c052696b2f081fbbb393ade148fda0f6
-AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
-AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-EBUILD roslaunch-1.15.10-r1.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
-EBUILD roslaunch-1.15.11.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
-EBUILD roslaunch-1.15.13.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
-EBUILD roslaunch-1.15.14.ebuild 1615 BLAKE2B 619d759347f21db69c707028ecdb7b471adc68a5d07573e6f2a114943296dd93c0088d7fe83fdc13ab230c5e64252160a254f5ae90dfbdbfe98643add4d6d803 SHA512 53e5e06dee8a2a0d1823ca0c4c781d6578f53d48ca2adeab715e69c1661c43ebc885e4cb3678ea557d7eb4874d65a1f8ce3a5564045161f23012671db294cbb7
-EBUILD roslaunch-9999.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/roslaunch/files/40roslaunch b/dev-ros/roslaunch/files/40roslaunch
deleted file mode 100644
index e9dac18dd65f..000000000000
--- a/dev-ros/roslaunch/files/40roslaunch
+++ /dev/null
@@ -1,2 +0,0 @@
-ROS_MASTER_URI="http://localhost:11311/"
-ROS_DISTRO=Gentoo
diff --git a/dev-ros/roslaunch/files/roscore.confd b/dev-ros/roslaunch/files/roscore.confd
deleted file mode 100644
index 3c689cd9bd81..000000000000
--- a/dev-ros/roslaunch/files/roscore.confd
+++ /dev/null
@@ -1 +0,0 @@
-LC_ALL=C
diff --git a/dev-ros/roslaunch/files/roscore.initd b/dev-ros/roslaunch/files/roscore.initd
deleted file mode 100644
index d05c3fe98a76..000000000000
--- a/dev-ros/roslaunch/files/roscore.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after net
-}
-
-start() {
-	ebegin "Starting ROS server roscore"
-	start-stop-daemon --start \
-		--user ros --group ros \
-		-m --pidfile /var/run/roscore.pid \
-		--exec "/usr/bin/roscore" --background
-	eend $? "Failed to start roscore"
-}
-
-stop() {
-	ebegin "Stopping roscore"
-	start-stop-daemon --stop \
-		--pidfile /var/run/roscore.pid \
-		--exec "/usr/bin/roscore"
-	eend $? "Failed to stop roscore"
-}
diff --git a/dev-ros/roslaunch/files/roscore.xml.in b/dev-ros/roslaunch/files/roscore.xml.in
deleted file mode 100644
index 1730d4259781..000000000000
--- a/dev-ros/roslaunch/files/roscore.xml.in
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 
-  ROS Core Stack definition
-
-  Before making any modifications to this file, please read:
-  http://ros.org/wiki/roscore
-  -->
-<launch>
-  <group ns="/">
-    <param name="rosversion" value="@PKG_VERSION@" />
-    <param name="rosdistro" value="Gentoo" />
-    <node pkg="rosout" type="rosout" name="rosout" respawn="true"/>
-  </group>
-</launch>
diff --git a/dev-ros/roslaunch/files/roslaunch.confd b/dev-ros/roslaunch/files/roslaunch.confd
deleted file mode 100644
index 4d7bd633546b..000000000000
--- a/dev-ros/roslaunch/files/roslaunch.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-LC_ALL=C
-ROSLAUNCH_FILE="/etc/ros/ros.launch"
diff --git a/dev-ros/roslaunch/files/roslaunch.initd b/dev-ros/roslaunch/files/roslaunch.initd
deleted file mode 100644
index fa0c0ace1c55..000000000000
--- a/dev-ros/roslaunch/files/roslaunch.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need roscore
-}
-
-checkconfig() {
-	[ -f "${ROSLAUNCH_FILE}" ]
-	eend $? "You need to define ROSLAUNCH_FILE and point it to a correct location (${ROSLAUNCH_FILE} does not exist)"
-}
-
-start() {
-	checkconfig || exit 1
-	ebegin "Waiting for roscore"
-
-	val=${ROS_MASTER_URI#http://}
-	dest=$(echo ${val%/} | tr ':' ' ')
-	while ! echo exit | nc ${dest} &> /dev/null; do sleep 1; done
-
-	ebegin "Starting ROS via roslaunch"
-	start-stop-daemon --start \
-		--user ros --group ros \
-		-m --pidfile /var/run/roslaunch.pid \
-		--exec "/usr/bin/roslaunch" --background \
-		-- ${ROSLAUNCH_FILE}
-	eend $? "Failed to start ROS"
-}
-
-stop() {
-	ebegin "Stopping roslaunch"
-	start-stop-daemon --stop \
-		--pidfile /var/run/roslaunch.pid \
-		--exec "/usr/bin/roslaunch"
-	eend $? "Failed to stop roslaunch"
-}
diff --git a/dev-ros/roslaunch/metadata.xml b/dev-ros/roslaunch/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/roslaunch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild b/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild
deleted file mode 100644
index 2cc8912dd83a..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.10-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-
-CDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-
-RDEPEND="
-	${CDEPEND}
-	acct-group/ros
-	acct-user/ros
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.11.ebuild b/dev-ros/roslaunch/roslaunch-1.15.11.ebuild
deleted file mode 100644
index 2cc8912dd83a..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-
-CDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-
-RDEPEND="
-	${CDEPEND}
-	acct-group/ros
-	acct-user/ros
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.13.ebuild b/dev-ros/roslaunch/roslaunch-1.15.13.ebuild
deleted file mode 100644
index 2cc8912dd83a..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-
-CDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-
-RDEPEND="
-	${CDEPEND}
-	acct-group/ros
-	acct-user/ros
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.14.ebuild b/dev-ros/roslaunch/roslaunch-1.15.14.ebuild
deleted file mode 100644
index 9f0aa7c4ab8c..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.14.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-
-CDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-
-RDEPEND="
-	${CDEPEND}
-	acct-group/ros
-	acct-user/ros
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
deleted file mode 100644
index 2cc8912dd83a..000000000000
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-
-CDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-
-RDEPEND="
-	${CDEPEND}
-	acct-group/ros
-	acct-user/ros
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
deleted file mode 100644
index 2023ddf0f574..000000000000
--- a/dev-ros/roslib/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD roslib-1.15.6-r1.ebuild 645 BLAKE2B b0b77c3b539929471712948563c30ecc8680b58b160a4d3cd83e168087017b184c3389534edeaf453397bf98f5cb960704aba7970cef8c7c79e24979da178518 SHA512 74efe3024e5c02d23ad67d4248cf6175841a13b54627b1e5cfd223f485b1314b51bba07bc1913d291f6f413570892b01ecdcd2099c1fb853f1c59ea2d4912470
-EBUILD roslib-1.15.7-r1.ebuild 645 BLAKE2B b0b77c3b539929471712948563c30ecc8680b58b160a4d3cd83e168087017b184c3389534edeaf453397bf98f5cb960704aba7970cef8c7c79e24979da178518 SHA512 74efe3024e5c02d23ad67d4248cf6175841a13b54627b1e5cfd223f485b1314b51bba07bc1913d291f6f413570892b01ecdcd2099c1fb853f1c59ea2d4912470
-EBUILD roslib-1.15.8.ebuild 645 BLAKE2B b0b77c3b539929471712948563c30ecc8680b58b160a4d3cd83e168087017b184c3389534edeaf453397bf98f5cb960704aba7970cef8c7c79e24979da178518 SHA512 74efe3024e5c02d23ad67d4248cf6175841a13b54627b1e5cfd223f485b1314b51bba07bc1913d291f6f413570892b01ecdcd2099c1fb853f1c59ea2d4912470
-EBUILD roslib-9999.ebuild 645 BLAKE2B b0b77c3b539929471712948563c30ecc8680b58b160a4d3cd83e168087017b184c3389534edeaf453397bf98f5cb960704aba7970cef8c7c79e24979da178518 SHA512 74efe3024e5c02d23ad67d4248cf6175841a13b54627b1e5cfd223f485b1314b51bba07bc1913d291f6f413570892b01ecdcd2099c1fb853f1c59ea2d4912470
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/roslib/metadata.xml b/dev-ros/roslib/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/roslib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roslib/roslib-1.15.6-r1.ebuild b/dev-ros/roslib/roslib-1.15.6-r1.ebuild
deleted file mode 100644
index cba16db461e2..000000000000
--- a/dev-ros/roslib/roslib-1.15.6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../../"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roslib/roslib-1.15.7-r1.ebuild b/dev-ros/roslib/roslib-1.15.7-r1.ebuild
deleted file mode 100644
index cba16db461e2..000000000000
--- a/dev-ros/roslib/roslib-1.15.7-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../../"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roslib/roslib-1.15.8.ebuild b/dev-ros/roslib/roslib-1.15.8.ebuild
deleted file mode 100644
index cba16db461e2..000000000000
--- a/dev-ros/roslib/roslib-1.15.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../../"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roslib/roslib-9999.ebuild b/dev-ros/roslib/roslib-9999.ebuild
deleted file mode 100644
index cba16db461e2..000000000000
--- a/dev-ros/roslib/roslib-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../../"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roslint/Manifest b/dev-ros/roslint/Manifest
deleted file mode 100644
index 34adff80af45..000000000000
--- a/dev-ros/roslint/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST roslint-0.12.0.tar.gz 103218 BLAKE2B f4396457df4d575a5ffecb5d6aac299c7d614272e5189cd20fcaaf36bc3ac2bbf7aa47806a9b0f7de35d242f93747af5e420d1aea21f69eadc83150b6311aceb SHA512 f533852f193fe0c78940a42bcff0971c3ac71f550a83120414bfcb954ea6c919c50f843e08fb4e3b14f76647676c7adf0fd8bb9dd5f835b4477f3fa8b39f25d7
-EBUILD roslint-0.12.0.ebuild 426 BLAKE2B 571e121bf5cd7e77113ad44343c2624ea50bcdaf6d090e601dbb4de49281fef534ecfafdff8ab2c1d0078b8f8749accd2e901469e85b2fc234c20dda78179a2c SHA512 dff00bc170aa30dbbb481791aaa52cd3cabc164c428eea6660395714e1bcaea1b7099d8179e67b0b196f74930097ba21649856fdfb2a7f65ba127aef748d0838
-EBUILD roslint-9999.ebuild 426 BLAKE2B 571e121bf5cd7e77113ad44343c2624ea50bcdaf6d090e601dbb4de49281fef534ecfafdff8ab2c1d0078b8f8749accd2e901469e85b2fc234c20dda78179a2c SHA512 dff00bc170aa30dbbb481791aaa52cd3cabc164c428eea6660395714e1bcaea1b7099d8179e67b0b196f74930097ba21649856fdfb2a7f65ba127aef748d0838
-MISC metadata.xml 326 BLAKE2B 878aac383173fe2cb9a472ebbb2398f299998f6396873bf4de1170aa6e1380fd61e56736b39dd3da1bff5fb011cd7eb652eb6309e3b03d256d764d26a85a860e SHA512 3ede04118c8065b686d199cdd769929e14240191c5e80dc173e125ec3195b8218e407cc180e76ba4223183c8308691f12e2ed4a0489cd1acf94a087baf29c92c
diff --git a/dev-ros/roslint/metadata.xml b/dev-ros/roslint/metadata.xml
deleted file mode 100644
index 44594bf26090..000000000000
--- a/dev-ros/roslint/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/roslint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roslint/roslint-0.12.0.ebuild b/dev-ros/roslint/roslint-0.12.0.ebuild
deleted file mode 100644
index eff6b00931fb..000000000000
--- a/dev-ros/roslint/roslint-0.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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/roslint"
-KEYWORDS="~amd64 ~arm"
-
-CMAKE_MAKEFILE_GENERATOR="emake" # https://bugs.gentoo.org/738584
-inherit ros-catkin
-
-DESCRIPTION="Static checking of Python or C++ source code for errors and standards compliance"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslint/roslint-9999.ebuild b/dev-ros/roslint/roslint-9999.ebuild
deleted file mode 100644
index eff6b00931fb..000000000000
--- a/dev-ros/roslint/roslint-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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/roslint"
-KEYWORDS="~amd64 ~arm"
-
-CMAKE_MAKEFILE_GENERATOR="emake" # https://bugs.gentoo.org/738584
-inherit ros-catkin
-
-DESCRIPTION="Static checking of Python or C++ source code for errors and standards compliance"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslisp/Manifest b/dev-ros/roslisp/Manifest
deleted file mode 100644
index 47c291f1bc0d..000000000000
--- a/dev-ros/roslisp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST roslisp-1.9.24.tar.gz 116563 BLAKE2B ccc54d26929868d1274f8c16cd17f24dc66b2bd684cec156e4e8bc94ad551d480d54311568abb52bf7e2188042741793c5e40e399ab4e370070a65d4fc2371a4 SHA512 904f0a6d0bb30064b2b4de643d82ea1c8eb5f1f3755bf469eef1f7b3becde76e3c6f76b7bcc57f9eee971ee9875605b92c6a53b4e78594d77e68d2e6b0410a42
-EBUILD roslisp-1.9.24.ebuild 394 BLAKE2B b27cea1c478f56fc4d74835ba66f6d82f8cfc4c6692b0d03813b9493267dce84e368f0b03b9e3d53ea84ddd1a7d529fdc739b3e75a4b6817196a479ab68ebd77 SHA512 07d7f990ef623a5660dd71aa854611f9d2fe3b9035e4e636e4ac34d7bf5f2257ee6892704d260e21364dee5dbb4e9df1c9ce07c8bf5e8b0ff51ae272c7075838
-EBUILD roslisp-9999.ebuild 394 BLAKE2B b27cea1c478f56fc4d74835ba66f6d82f8cfc4c6692b0d03813b9493267dce84e368f0b03b9e3d53ea84ddd1a7d529fdc739b3e75a4b6817196a479ab68ebd77 SHA512 07d7f990ef623a5660dd71aa854611f9d2fe3b9035e4e636e4ac34d7bf5f2257ee6892704d260e21364dee5dbb4e9df1c9ce07c8bf5e8b0ff51ae272c7075838
-MISC metadata.xml 326 BLAKE2B 38d2ab0548cc0db52040ff55768012d67870c0380136420497984121421b061b5579ef235e07bde837b14492cb9a9e353149fadef7d4bd98ce1253051acae730 SHA512 c43fe3d3fac2a2348c2ee572d4a365a26625254e45d66833a97714a5aab2b98728947d73ef08460f04c868a3ed2db2f871d635b07197aa214cef770c35bb7d7e
diff --git a/dev-ros/roslisp/metadata.xml b/dev-ros/roslisp/metadata.xml
deleted file mode 100644
index 375c30002146..000000000000
--- a/dev-ros/roslisp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/roslisp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roslisp/roslisp-1.9.24.ebuild b/dev-ros/roslisp/roslisp-1.9.24.ebuild
deleted file mode 100644
index 661bfba7dea6..000000000000
--- a/dev-ros/roslisp/roslisp-1.9.24.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/roslisp"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Lisp client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslang
-	dev-lisp/sbcl
-	dev-ros/rospack
-	dev-ros/rosgraph_msgs
-	dev-ros/std_srvs
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslisp/roslisp-9999.ebuild b/dev-ros/roslisp/roslisp-9999.ebuild
deleted file mode 100644
index 661bfba7dea6..000000000000
--- a/dev-ros/roslisp/roslisp-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/roslisp"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Lisp client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslang
-	dev-lisp/sbcl
-	dev-ros/rospack
-	dev-ros/rosgraph_msgs
-	dev-ros/std_srvs
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
deleted file mode 100644
index bf4d3f705ad1..000000000000
--- a/dev-ros/roslz4/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD roslz4-1.15.10.ebuild 423 BLAKE2B ee04baf38a91a0d5a0cda63d01dd680343998aab1b0d97ad7f5858df17df4189f2565c1c592d2f1c00b317d38f3df4db221970b8ce52fb6ba4cfd58b42029a69 SHA512 5154747f57c5529cd781f3542abe7cbdc4c7a6b94ddfbb2c9521ad00d98ffeaa3ccd9546580e77a6e9aa34e6f3ec15479d0a6c9f23f3a9036a0c1996adff49e2
-EBUILD roslz4-1.15.11.ebuild 423 BLAKE2B ee04baf38a91a0d5a0cda63d01dd680343998aab1b0d97ad7f5858df17df4189f2565c1c592d2f1c00b317d38f3df4db221970b8ce52fb6ba4cfd58b42029a69 SHA512 5154747f57c5529cd781f3542abe7cbdc4c7a6b94ddfbb2c9521ad00d98ffeaa3ccd9546580e77a6e9aa34e6f3ec15479d0a6c9f23f3a9036a0c1996adff49e2
-EBUILD roslz4-1.15.13.ebuild 423 BLAKE2B ee04baf38a91a0d5a0cda63d01dd680343998aab1b0d97ad7f5858df17df4189f2565c1c592d2f1c00b317d38f3df4db221970b8ce52fb6ba4cfd58b42029a69 SHA512 5154747f57c5529cd781f3542abe7cbdc4c7a6b94ddfbb2c9521ad00d98ffeaa3ccd9546580e77a6e9aa34e6f3ec15479d0a6c9f23f3a9036a0c1996adff49e2
-EBUILD roslz4-1.15.14.ebuild 423 BLAKE2B 7dc710c1c0d4d125494d85b24f20b5ce6931fffe069e8359785cb33198a28fd9b0fbe61db5af9ea743675396f1ee6ecb739d74593711f15dd4a4120e973e2fe3 SHA512 ab769f27fc830563f178152b6d7ebe5f0d624a22c9e3ee9e64dcc3f10677fb96b5145f0d4b19a7a336ebaa4c55310444befd5ea3495f3d837fbf3bce04210383
-EBUILD roslz4-1.15.8.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
-EBUILD roslz4-1.15.9.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
-EBUILD roslz4-9999.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/roslz4/metadata.xml b/dev-ros/roslz4/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/roslz4/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roslz4/roslz4-1.15.10.ebuild b/dev-ros/roslz4/roslz4-1.15.10.ebuild
deleted file mode 100644
index bcbd9d65b47d..000000000000
--- a/dev-ros/roslz4/roslz4-1.15.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4
-	dev-ros/cpp_common"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.15.11.ebuild b/dev-ros/roslz4/roslz4-1.15.11.ebuild
deleted file mode 100644
index bcbd9d65b47d..000000000000
--- a/dev-ros/roslz4/roslz4-1.15.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4
-	dev-ros/cpp_common"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.15.13.ebuild b/dev-ros/roslz4/roslz4-1.15.13.ebuild
deleted file mode 100644
index bcbd9d65b47d..000000000000
--- a/dev-ros/roslz4/roslz4-1.15.13.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4
-	dev-ros/cpp_common"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.15.14.ebuild b/dev-ros/roslz4/roslz4-1.15.14.ebuild
deleted file mode 100644
index 38046fb7703f..000000000000
--- a/dev-ros/roslz4/roslz4-1.15.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4
-	dev-ros/cpp_common"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.15.8.ebuild b/dev-ros/roslz4/roslz4-1.15.8.ebuild
deleted file mode 100644
index 6f69f8c2dc65..000000000000
--- a/dev-ros/roslz4/roslz4-1.15.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4
-	dev-ros/cpp_common"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.15.9.ebuild b/dev-ros/roslz4/roslz4-1.15.9.ebuild
deleted file mode 100644
index 6f69f8c2dc65..000000000000
--- a/dev-ros/roslz4/roslz4-1.15.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4
-	dev-ros/cpp_common"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-9999.ebuild b/dev-ros/roslz4/roslz4-9999.ebuild
deleted file mode 100644
index 6f69f8c2dc65..000000000000
--- a/dev-ros/roslz4/roslz4-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/lz4
-	dev-ros/cpp_common"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmake/Manifest b/dev-ros/rosmake/Manifest
deleted file mode 100644
index 05a55a464995..000000000000
--- a/dev-ros/rosmake/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD rosmake-1.15.5.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
-EBUILD rosmake-1.15.6.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
-EBUILD rosmake-1.15.7.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
-EBUILD rosmake-1.15.8.ebuild 464 BLAKE2B f9144487971d8fa50862515420d0ce69dea3635744a73086d236baaa91dc5598fd78b1e14dd9b650f47386a083b6566e9d6182a1dce530e9fabf3c75c42741c9 SHA512 18a9a93645dec8fdebf0719cab37245395618c204878c333c01dc4f2233086c763ccc27bf8ff18b5db027a6cea19de31b6735f12efc72aa4863b6393555e7b91
-EBUILD rosmake-9999.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/rosmake/metadata.xml b/dev-ros/rosmake/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/rosmake/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosmake/rosmake-1.15.5.ebuild b/dev-ros/rosmake/rosmake-1.15.5.ebuild
deleted file mode 100644
index d848bd5393ac..000000000000
--- a/dev-ros/rosmake/rosmake-1.15.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosmake/rosmake-1.15.6.ebuild b/dev-ros/rosmake/rosmake-1.15.6.ebuild
deleted file mode 100644
index d848bd5393ac..000000000000
--- a/dev-ros/rosmake/rosmake-1.15.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosmake/rosmake-1.15.7.ebuild b/dev-ros/rosmake/rosmake-1.15.7.ebuild
deleted file mode 100644
index d848bd5393ac..000000000000
--- a/dev-ros/rosmake/rosmake-1.15.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosmake/rosmake-1.15.8.ebuild b/dev-ros/rosmake/rosmake-1.15.8.ebuild
deleted file mode 100644
index 8081da39d9a8..000000000000
--- a/dev-ros/rosmake/rosmake-1.15.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosmake/rosmake-9999.ebuild b/dev-ros/rosmake/rosmake-9999.ebuild
deleted file mode 100644
index d848bd5393ac..000000000000
--- a/dev-ros/rosmake/rosmake-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
deleted file mode 100644
index 66b9b252cb4c..000000000000
--- a/dev-ros/rosmaster/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosmaster-1.15.10.ebuild 512 BLAKE2B a25499b4aaeb75dab3fa4c4dc78b06dfd06e4f80dd177110d09fb9a2d0f3f4ed79e043173ddcfd2cfd97495fe5e417afb5dd868b7729c521b584f501e30a7ead SHA512 2b85897d594e2b727b977ba1058b1e2e6f359a2491799a04527b1ba3a867636a625c81498a1f892cfab68e987398544362397da19466c9dfc949819e5d12067f
-EBUILD rosmaster-1.15.11.ebuild 512 BLAKE2B a25499b4aaeb75dab3fa4c4dc78b06dfd06e4f80dd177110d09fb9a2d0f3f4ed79e043173ddcfd2cfd97495fe5e417afb5dd868b7729c521b584f501e30a7ead SHA512 2b85897d594e2b727b977ba1058b1e2e6f359a2491799a04527b1ba3a867636a625c81498a1f892cfab68e987398544362397da19466c9dfc949819e5d12067f
-EBUILD rosmaster-1.15.13.ebuild 512 BLAKE2B a25499b4aaeb75dab3fa4c4dc78b06dfd06e4f80dd177110d09fb9a2d0f3f4ed79e043173ddcfd2cfd97495fe5e417afb5dd868b7729c521b584f501e30a7ead SHA512 2b85897d594e2b727b977ba1058b1e2e6f359a2491799a04527b1ba3a867636a625c81498a1f892cfab68e987398544362397da19466c9dfc949819e5d12067f
-EBUILD rosmaster-1.15.14.ebuild 512 BLAKE2B c4f1f0980b17e22ff367a964531332b7aef3fb3410571d51bff3eb0c679fbdfe9d0626d69febc331663e0218174cf66471288ae50322d0c15beae027186e583c SHA512 ec0866ef0a94fad936f9930c80827c21ea80c8d2e20203507f925ce10a4cedd3c4a0928f162ec67c9612971df9d7ab663bcdd4b9a8a655fe1d4ad743f0ad6198
-EBUILD rosmaster-1.15.7.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
-EBUILD rosmaster-1.15.8.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
-EBUILD rosmaster-1.15.9.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
-EBUILD rosmaster-9999.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosmaster/metadata.xml b/dev-ros/rosmaster/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rosmaster/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosmaster/rosmaster-1.15.10.ebuild b/dev-ros/rosmaster/rosmaster-1.15.10.ebuild
deleted file mode 100644
index 44c1207c39a0..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.11.ebuild b/dev-ros/rosmaster/rosmaster-1.15.11.ebuild
deleted file mode 100644
index 44c1207c39a0..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.13.ebuild b/dev-ros/rosmaster/rosmaster-1.15.13.ebuild
deleted file mode 100644
index 44c1207c39a0..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.14.ebuild b/dev-ros/rosmaster/rosmaster-1.15.14.ebuild
deleted file mode 100644
index e6a73fab5f78..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.7.ebuild b/dev-ros/rosmaster/rosmaster-1.15.7.ebuild
deleted file mode 100644
index 82438464c6ff..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.8.ebuild b/dev-ros/rosmaster/rosmaster-1.15.8.ebuild
deleted file mode 100644
index 82438464c6ff..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.9.ebuild b/dev-ros/rosmaster/rosmaster-1.15.9.ebuild
deleted file mode 100644
index 82438464c6ff..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmaster/rosmaster-9999.ebuild b/dev-ros/rosmaster/rosmaster-9999.ebuild
deleted file mode 100644
index 82438464c6ff..000000000000
--- a/dev-ros/rosmaster/rosmaster-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
deleted file mode 100644
index 49589c56dc2c..000000000000
--- a/dev-ros/rosmsg/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-EBUILD rosmsg-1.15.10.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
-EBUILD rosmsg-1.15.11.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
-EBUILD rosmsg-1.15.13.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
-EBUILD rosmsg-1.15.14.ebuild 1004 BLAKE2B b1259cfadbad6ba269758d66542ab492370e34b82affc2b05a8f4eb4e5fcc205770f6400645b2be15da30fcc4a6cbd04b5cbec01f57a61d675c914c1583f1f24 SHA512 13b9643465455b0a30a947a88df7588fb63333459da3a62b0077095381cc1a40245807b3ae8e633bf2f75b12dd861ff848e451f54380d560a0196d5ea317ed44
-EBUILD rosmsg-9999.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosmsg/metadata.xml b/dev-ros/rosmsg/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rosmsg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosmsg/rosmsg-1.15.10.ebuild b/dev-ros/rosmsg/rosmsg-1.15.10.ebuild
deleted file mode 100644
index d4be4db4044c..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.15.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosmsg/rosmsg-1.15.11.ebuild b/dev-ros/rosmsg/rosmsg-1.15.11.ebuild
deleted file mode 100644
index d4be4db4044c..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.15.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosmsg/rosmsg-1.15.13.ebuild b/dev-ros/rosmsg/rosmsg-1.15.13.ebuild
deleted file mode 100644
index d4be4db4044c..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.15.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosmsg/rosmsg-1.15.14.ebuild b/dev-ros/rosmsg/rosmsg-1.15.14.ebuild
deleted file mode 100644
index 1fcd5e293d54..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.15.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosmsg/rosmsg-9999.ebuild b/dev-ros/rosmsg/rosmsg-9999.ebuild
deleted file mode 100644
index d4be4db4044c..000000000000
--- a/dev-ros/rosmsg/rosmsg-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
deleted file mode 100644
index 97c5efb52176..000000000000
--- a/dev-ros/rosnode/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosnode-1.15.10.ebuild 658 BLAKE2B 5e7abe60f4ee02dbf749d1c39a25bbaceeb379553faa6f4607dcb0459d7fab7f3c81e1a8e702c36002cf764e14012bdf67d1d47d8bed3acb81b57cb18271c82f SHA512 bbc3f5f60cf01ee7e5d5dd69b639ce9464bfecf979c191c648aa531e4e4574fc4a606662d3cc4b13599b69de38b98d4c0d97ee0d4267c5472c2d3b3963e53e04
-EBUILD rosnode-1.15.11.ebuild 658 BLAKE2B 5e7abe60f4ee02dbf749d1c39a25bbaceeb379553faa6f4607dcb0459d7fab7f3c81e1a8e702c36002cf764e14012bdf67d1d47d8bed3acb81b57cb18271c82f SHA512 bbc3f5f60cf01ee7e5d5dd69b639ce9464bfecf979c191c648aa531e4e4574fc4a606662d3cc4b13599b69de38b98d4c0d97ee0d4267c5472c2d3b3963e53e04
-EBUILD rosnode-1.15.13.ebuild 658 BLAKE2B 5e7abe60f4ee02dbf749d1c39a25bbaceeb379553faa6f4607dcb0459d7fab7f3c81e1a8e702c36002cf764e14012bdf67d1d47d8bed3acb81b57cb18271c82f SHA512 bbc3f5f60cf01ee7e5d5dd69b639ce9464bfecf979c191c648aa531e4e4574fc4a606662d3cc4b13599b69de38b98d4c0d97ee0d4267c5472c2d3b3963e53e04
-EBUILD rosnode-1.15.14.ebuild 658 BLAKE2B bd2c4b736eb39fc19d3fd8881d90b83947aea0f9d934c3c43ec82571dacd6b3678745fcef5ac3f568843bda7b7464ff8aaea5c9f6d62309918cde6666ca83a32 SHA512 c890376ea42ba5ac19e2f1244fbd3c1a7ed93c8c88a9cef7fec215fd282e761582d909e84fd0469959fc9b96777c544e2f96d1dcebe26297dccba5699b199c50
-EBUILD rosnode-1.15.8.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
-EBUILD rosnode-1.15.9.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
-EBUILD rosnode-9999.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosnode/metadata.xml b/dev-ros/rosnode/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rosnode/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosnode/rosnode-1.15.10.ebuild b/dev-ros/rosnode/rosnode-1.15.10.ebuild
deleted file mode 100644
index 991a2183e013..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
diff --git a/dev-ros/rosnode/rosnode-1.15.11.ebuild b/dev-ros/rosnode/rosnode-1.15.11.ebuild
deleted file mode 100644
index 991a2183e013..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
diff --git a/dev-ros/rosnode/rosnode-1.15.13.ebuild b/dev-ros/rosnode/rosnode-1.15.13.ebuild
deleted file mode 100644
index 991a2183e013..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
diff --git a/dev-ros/rosnode/rosnode-1.15.14.ebuild b/dev-ros/rosnode/rosnode-1.15.14.ebuild
deleted file mode 100644
index c5791a712db3..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
diff --git a/dev-ros/rosnode/rosnode-1.15.8.ebuild b/dev-ros/rosnode/rosnode-1.15.8.ebuild
deleted file mode 100644
index 6ac973a5e5a1..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
diff --git a/dev-ros/rosnode/rosnode-1.15.9.ebuild b/dev-ros/rosnode/rosnode-1.15.9.ebuild
deleted file mode 100644
index 6ac973a5e5a1..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
diff --git a/dev-ros/rosnode/rosnode-9999.ebuild b/dev-ros/rosnode/rosnode-9999.ebuild
deleted file mode 100644
index 6ac973a5e5a1..000000000000
--- a/dev-ros/rosnode/rosnode-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	)"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
deleted file mode 100644
index 0dfba3714a6b..000000000000
--- a/dev-ros/rosout/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosout-1.15.10.ebuild 445 BLAKE2B 93d2a83966d5d04e40a269e47c22afa993f6f4d2380c3d7f90ff32c9c327ec0b22339772e493530bdeb68867038008aadafc9139ac46e33e65cb033a7e8a0aea SHA512 a1b6d7242d722f62132aa155570a41aa2b8c3048ee56676e45357e11361c89b023b67be31b0fef848cd8e448b59f5852849d32e215895cfb9816570c6e126913
-EBUILD rosout-1.15.11.ebuild 445 BLAKE2B 93d2a83966d5d04e40a269e47c22afa993f6f4d2380c3d7f90ff32c9c327ec0b22339772e493530bdeb68867038008aadafc9139ac46e33e65cb033a7e8a0aea SHA512 a1b6d7242d722f62132aa155570a41aa2b8c3048ee56676e45357e11361c89b023b67be31b0fef848cd8e448b59f5852849d32e215895cfb9816570c6e126913
-EBUILD rosout-1.15.13.ebuild 445 BLAKE2B 93d2a83966d5d04e40a269e47c22afa993f6f4d2380c3d7f90ff32c9c327ec0b22339772e493530bdeb68867038008aadafc9139ac46e33e65cb033a7e8a0aea SHA512 a1b6d7242d722f62132aa155570a41aa2b8c3048ee56676e45357e11361c89b023b67be31b0fef848cd8e448b59f5852849d32e215895cfb9816570c6e126913
-EBUILD rosout-1.15.14.ebuild 445 BLAKE2B 70dd283faa47f6e48189ebc7f6859097900a6855d001f616f50109f13e5ab3c7919bd58459a2ccc5f939cc9a7a6ca8233db5e29b9c75d5c9e55a9e95e85f7400 SHA512 5938841797232e663da8d7049bcfb1857208d7a57ba2d4105b6abe47e7ffccfc9c1da70552836f4edcbcc42110303fb3dd672d204a1871eb227ba3f7e6a93b68
-EBUILD rosout-1.15.7.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
-EBUILD rosout-1.15.8.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
-EBUILD rosout-1.15.9.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
-EBUILD rosout-9999.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosout/metadata.xml b/dev-ros/rosout/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rosout/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosout/rosout-1.15.10.ebuild b/dev-ros/rosout/rosout-1.15.10.ebuild
deleted file mode 100644
index f6b95451b596..000000000000
--- a/dev-ros/rosout/rosout-1.15.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosout/rosout-1.15.11.ebuild b/dev-ros/rosout/rosout-1.15.11.ebuild
deleted file mode 100644
index f6b95451b596..000000000000
--- a/dev-ros/rosout/rosout-1.15.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosout/rosout-1.15.13.ebuild b/dev-ros/rosout/rosout-1.15.13.ebuild
deleted file mode 100644
index f6b95451b596..000000000000
--- a/dev-ros/rosout/rosout-1.15.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosout/rosout-1.15.14.ebuild b/dev-ros/rosout/rosout-1.15.14.ebuild
deleted file mode 100644
index f046a1ba1d9f..000000000000
--- a/dev-ros/rosout/rosout-1.15.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosout/rosout-1.15.7.ebuild b/dev-ros/rosout/rosout-1.15.7.ebuild
deleted file mode 100644
index 4a60a4d6a5fe..000000000000
--- a/dev-ros/rosout/rosout-1.15.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosout/rosout-1.15.8.ebuild b/dev-ros/rosout/rosout-1.15.8.ebuild
deleted file mode 100644
index 4a60a4d6a5fe..000000000000
--- a/dev-ros/rosout/rosout-1.15.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosout/rosout-1.15.9.ebuild b/dev-ros/rosout/rosout-1.15.9.ebuild
deleted file mode 100644
index 4a60a4d6a5fe..000000000000
--- a/dev-ros/rosout/rosout-1.15.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosout/rosout-9999.ebuild b/dev-ros/rosout/rosout-9999.ebuild
deleted file mode 100644
index 4a60a4d6a5fe..000000000000
--- a/dev-ros/rosout/rosout-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rospack/Manifest b/dev-ros/rospack/Manifest
deleted file mode 100644
index c351fa71798c..000000000000
--- a/dev-ros/rospack/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gentoo.patch 576 BLAKE2B e53b90591c46bc876d0cebdbeb660257c8a5ff3fe7aebc3d895a04011f1bb0fb004fecb375157f3d70811203445db11f2b6bd51e6994ecca71ce9cc132ee33b7 SHA512 85bc49da821ff4a31d6cff838f2ff006625f0f5041c2bfa8f742c92173c48fc6d2a4601e370058478afe66e1b0aa5e237964b950554c40710f9f411e1e04bbad
-DIST rospack-2.6.2.tar.gz 74785 BLAKE2B 1886dce476df98f546d874c60af5860fbe3edfcece3c0c5be2fd8105d8c8b221df4675ff6fcc66312e6f4c08fe75a867b4dea0eba295ada98eebce3976e88743 SHA512 5326238686bb5b8cd707b9440fc4fc57baa846092d086f7fb6a2beab7687b62a7c4afbbe30cf84a848ab5ee66eb40f8489f40341c14753704c8721df93c33711
-EBUILD rospack-2.6.2.ebuild 566 BLAKE2B a73e7d01b79b7741c4c699b407d7e296dff27054e85f8a2bd500697203c6771dfee76c07d4211d79ee2ae1919007e7def08df2e9ebcbd316209e3c3969fc44f3 SHA512 8d34df07bfba48523faf871215380e865c4829cc538cd997080589bd4d8eb8037d1fb655ae1ef9b67482c1fadf2c583b8d6c65ec1fecec2e46b35548bdd4e375
-EBUILD rospack-9999.ebuild 566 BLAKE2B a73e7d01b79b7741c4c699b407d7e296dff27054e85f8a2bd500697203c6771dfee76c07d4211d79ee2ae1919007e7def08df2e9ebcbd316209e3c3969fc44f3 SHA512 8d34df07bfba48523faf871215380e865c4829cc538cd997080589bd4d8eb8037d1fb655ae1ef9b67482c1fadf2c583b8d6c65ec1fecec2e46b35548bdd4e375
-MISC metadata.xml 326 BLAKE2B 3a51d0ee3d4773977d2ff7b6121b0f5d8e63e81e138a9d173f442dfd0625db09241e9919f10a595ad46be4100ace99d07caa06b99800733dab47f876dbf65461 SHA512 5762cbb869763ba7b1a6090100d466dff2233fa04a2e549d9bd75d2044588d76ab4fd70b9137ff18de7235759492e9dc7f24d7dc3ec70d104f4784724e065884
diff --git a/dev-ros/rospack/files/gentoo.patch b/dev-ros/rospack/files/gentoo.patch
deleted file mode 100644
index 7090d7b02dd7..000000000000
--- a/dev-ros/rospack/files/gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: rospack-2.3.1/src/rospack.cpp
-===================================================================
---- rospack-2.3.1.orig/src/rospack.cpp
-+++ rospack-2.3.1/src/rospack.cpp
-@@ -191,6 +191,13 @@ class Stackage
-           break;
-         }
-       }
-+
-+      // On Gentoo we move package.xml to /usr/share/ros_packages/... but need to keep standard stuff in /usr/share, so correct this here.
-+      try {
-+      	fs::path p = fs::canonical("../../" + name_, path_);
-+	path_ = p.string();
-+      }
-+      catch(fs::filesystem_error& e) {};
-     }
- 
-     bool isStack() const
diff --git a/dev-ros/rospack/metadata.xml b/dev-ros/rospack/metadata.xml
deleted file mode 100644
index 14388bf21f86..000000000000
--- a/dev-ros/rospack/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/rospack</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rospack/rospack-2.6.2.ebuild b/dev-ros/rospack/rospack-2.6.2.ebuild
deleted file mode 100644
index e3e141969c87..000000000000
--- a/dev-ros/rospack/rospack-2.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/rospack"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves information about ROS packages available on the filesystem"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/tinyxml2-5:="
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose
-	)"
-RDEPEND="${RDEPEND}
-	dev-ros/ros_environment"
-BDEPEND=">=dev-ros/cmake_modules-0.4.1"
-
-PATCHES=(
-	"${FILESDIR}/gentoo.patch"
-)
diff --git a/dev-ros/rospack/rospack-9999.ebuild b/dev-ros/rospack/rospack-9999.ebuild
deleted file mode 100644
index e3e141969c87..000000000000
--- a/dev-ros/rospack/rospack-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/rospack"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves information about ROS packages available on the filesystem"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/tinyxml2-5:="
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose
-	)"
-RDEPEND="${RDEPEND}
-	dev-ros/ros_environment"
-BDEPEND=">=dev-ros/cmake_modules-0.4.1"
-
-PATCHES=(
-	"${FILESDIR}/gentoo.patch"
-)
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
deleted file mode 100644
index 8cc760ace528..000000000000
--- a/dev-ros/rosparam/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosparam-1.15.10.ebuild 492 BLAKE2B 3d8ca72560a2be15028255af1ad9f0e926f43b76bfcf4c0ee1fd43549ea7466fb1b070a421f2bb8e9299c0ba9d54b9ec126b5099b975fa88389976dfc78e80b3 SHA512 f57762ce39deaa4f2698aa3c9f8ae5471b05e4c6eee714f3639bf7a8dfc247a5cbcbc40f7ba99d6faf91d0ea59cc9d052b79c9b687d47f051ee24fae44894469
-EBUILD rosparam-1.15.11.ebuild 492 BLAKE2B 3d8ca72560a2be15028255af1ad9f0e926f43b76bfcf4c0ee1fd43549ea7466fb1b070a421f2bb8e9299c0ba9d54b9ec126b5099b975fa88389976dfc78e80b3 SHA512 f57762ce39deaa4f2698aa3c9f8ae5471b05e4c6eee714f3639bf7a8dfc247a5cbcbc40f7ba99d6faf91d0ea59cc9d052b79c9b687d47f051ee24fae44894469
-EBUILD rosparam-1.15.13.ebuild 492 BLAKE2B 3d8ca72560a2be15028255af1ad9f0e926f43b76bfcf4c0ee1fd43549ea7466fb1b070a421f2bb8e9299c0ba9d54b9ec126b5099b975fa88389976dfc78e80b3 SHA512 f57762ce39deaa4f2698aa3c9f8ae5471b05e4c6eee714f3639bf7a8dfc247a5cbcbc40f7ba99d6faf91d0ea59cc9d052b79c9b687d47f051ee24fae44894469
-EBUILD rosparam-1.15.14.ebuild 492 BLAKE2B 9622f6a20b7f86bcfdb5ecac72e769638fe06236d661f570f50464199df62186a1fe4ae0d86473223583d9e66c4d04f9b48af94b4b507cfd9c5f395f7461db01 SHA512 57831de255deaa41779b96995d2b0a71b6d4144e27ff9d74178b6546eee5fcea51a0283424884f6ea392b48a56029184cbdba15c3df8e50e34ac8d3431c45204
-EBUILD rosparam-1.15.7.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
-EBUILD rosparam-1.15.8.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
-EBUILD rosparam-1.15.9.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
-EBUILD rosparam-9999.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosparam/metadata.xml b/dev-ros/rosparam/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rosparam/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosparam/rosparam-1.15.10.ebuild b/dev-ros/rosparam/rosparam-1.15.10.ebuild
deleted file mode 100644
index 61ac1e322a5d..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.15.11.ebuild b/dev-ros/rosparam/rosparam-1.15.11.ebuild
deleted file mode 100644
index 61ac1e322a5d..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.11.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.15.13.ebuild b/dev-ros/rosparam/rosparam-1.15.13.ebuild
deleted file mode 100644
index 61ac1e322a5d..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.13.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.15.14.ebuild b/dev-ros/rosparam/rosparam-1.15.14.ebuild
deleted file mode 100644
index 6b09b4ba1cbb..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.14.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.15.7.ebuild b/dev-ros/rosparam/rosparam-1.15.7.ebuild
deleted file mode 100644
index 0e2d39275623..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.15.8.ebuild b/dev-ros/rosparam/rosparam-1.15.8.ebuild
deleted file mode 100644
index 0e2d39275623..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.15.9.ebuild b/dev-ros/rosparam/rosparam-1.15.9.ebuild
deleted file mode 100644
index 0e2d39275623..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-9999.ebuild b/dev-ros/rosparam/rosparam-9999.ebuild
deleted file mode 100644
index 0e2d39275623..000000000000
--- a/dev-ros/rosparam/rosparam-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
deleted file mode 100644
index 9a9f8882d104..000000000000
--- a/dev-ros/rospy/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rospy-1.15.10.ebuild 727 BLAKE2B ed3f1431e8f954adc67a1284d387bd6e5afbbb8380d3f98d5a0308f3192fc743fccda2670a09316f2f03749fd40634190a85671299984cd9fcf62ba9335f0726 SHA512 f4663f6221e330c7d902fc948032daff726f0b78b301eecee22c6a746ba2ae55f9cebc093cf7f875ccb21a0abf178c1cf2da6afda512325d3428908e8fbc6060
-EBUILD rospy-1.15.11.ebuild 727 BLAKE2B ed3f1431e8f954adc67a1284d387bd6e5afbbb8380d3f98d5a0308f3192fc743fccda2670a09316f2f03749fd40634190a85671299984cd9fcf62ba9335f0726 SHA512 f4663f6221e330c7d902fc948032daff726f0b78b301eecee22c6a746ba2ae55f9cebc093cf7f875ccb21a0abf178c1cf2da6afda512325d3428908e8fbc6060
-EBUILD rospy-1.15.13.ebuild 727 BLAKE2B ed3f1431e8f954adc67a1284d387bd6e5afbbb8380d3f98d5a0308f3192fc743fccda2670a09316f2f03749fd40634190a85671299984cd9fcf62ba9335f0726 SHA512 f4663f6221e330c7d902fc948032daff726f0b78b301eecee22c6a746ba2ae55f9cebc093cf7f875ccb21a0abf178c1cf2da6afda512325d3428908e8fbc6060
-EBUILD rospy-1.15.14.ebuild 727 BLAKE2B 41259733f431894b22e694efa70b5b5e3214a674c977ef3cafaa556fef6d31346f65ac70f00ab6ebf1b353ed53224e9ab824f4b2fcb40882b8b2ec03199f1dbb SHA512 98edaab427325db178d6f2e4426096cfc1bafda1c6c22d164e5df251a36916c149ed5115787c6c60d9ec19542e7e139bbe85e949e0a49835ef48045fe6d4ab12
-EBUILD rospy-1.15.7.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
-EBUILD rospy-1.15.8.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
-EBUILD rospy-1.15.9.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
-EBUILD rospy-9999.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rospy/metadata.xml b/dev-ros/rospy/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rospy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rospy/rospy-1.15.10.ebuild b/dev-ros/rospy/rospy-1.15.10.ebuild
deleted file mode 100644
index 47344d9c9de6..000000000000
--- a/dev-ros/rospy/rospy-1.15.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.11.ebuild b/dev-ros/rospy/rospy-1.15.11.ebuild
deleted file mode 100644
index 47344d9c9de6..000000000000
--- a/dev-ros/rospy/rospy-1.15.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.13.ebuild b/dev-ros/rospy/rospy-1.15.13.ebuild
deleted file mode 100644
index 47344d9c9de6..000000000000
--- a/dev-ros/rospy/rospy-1.15.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.14.ebuild b/dev-ros/rospy/rospy-1.15.14.ebuild
deleted file mode 100644
index eb25d2a7442e..000000000000
--- a/dev-ros/rospy/rospy-1.15.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.7.ebuild b/dev-ros/rospy/rospy-1.15.7.ebuild
deleted file mode 100644
index c15250f755ce..000000000000
--- a/dev-ros/rospy/rospy-1.15.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.8.ebuild b/dev-ros/rospy/rospy-1.15.8.ebuild
deleted file mode 100644
index c15250f755ce..000000000000
--- a/dev-ros/rospy/rospy-1.15.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.9.ebuild b/dev-ros/rospy/rospy-1.15.9.ebuild
deleted file mode 100644
index c15250f755ce..000000000000
--- a/dev-ros/rospy/rospy-1.15.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-9999.ebuild b/dev-ros/rospy/rospy-9999.ebuild
deleted file mode 100644
index c15250f755ce..000000000000
--- a/dev-ros/rospy/rospy-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy_tutorials/Manifest b/dev-ros/rospy_tutorials/Manifest
deleted file mode 100644
index cddf1fe0834d..000000000000
--- a/dev-ros/rospy_tutorials/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ros_tutorials-0.10.1.tar.gz 159522 BLAKE2B b0e045c6ee62cb68dfa977d17125af23d8ef80a619e822d245531a6cb3520a4d53120769e74ae2ba9af2813ce968e0c4fb22b7655eadd13b1a720705a9f75374 SHA512 592edb84f2e0ea80b2757ae890f495e8cb93d867b1bc6d64e6446f28fcffbd48c05703ac30ac29fd184a689f465728a5958d8c747587c756b53341c1d0740684
-DIST ros_tutorials-0.10.2.tar.gz 159630 BLAKE2B 6b7ea4c0aba110b746052a42150dd4e9faedbb1e4ab5a44bbef7c1079192238ac22bb18fc9968ea9e4450dde47bf1f5b7dabc0788aa8c232dfef3d1039a63f2e SHA512 73b420acf20a468f51db891fe0b0b33c3c838ea6fab4c03faab9a7abedc3ee68ec27ef0e70869143d0a22941eb77bac1fc80542cc0c14988ff75cb9685c174c5
-EBUILD rospy_tutorials-0.10.1.ebuild 639 BLAKE2B 3b602a52e1c9f45918a4212621203b5a611545ae9ad60826694b52131442c1da2fe4870adec2dc1ff19caa1b42a039b2e241904abfb9d2f0804130f2420b28af SHA512 d6a94c2ed8f1d2d6946d199a15e57bb4d33fb8d13cbc8f748248750240f6b8c71d66ecd4df7f4b4f379c2a70119009f56a4d3da8bd101c54384d9c52a54cfbd5
-EBUILD rospy_tutorials-0.10.2.ebuild 639 BLAKE2B 3b602a52e1c9f45918a4212621203b5a611545ae9ad60826694b52131442c1da2fe4870adec2dc1ff19caa1b42a039b2e241904abfb9d2f0804130f2420b28af SHA512 d6a94c2ed8f1d2d6946d199a15e57bb4d33fb8d13cbc8f748248750240f6b8c71d66ecd4df7f4b4f379c2a70119009f56a4d3da8bd101c54384d9c52a54cfbd5
-EBUILD rospy_tutorials-9999.ebuild 639 BLAKE2B 3b602a52e1c9f45918a4212621203b5a611545ae9ad60826694b52131442c1da2fe4870adec2dc1ff19caa1b42a039b2e241904abfb9d2f0804130f2420b28af SHA512 d6a94c2ed8f1d2d6946d199a15e57bb4d33fb8d13cbc8f748248750240f6b8c71d66ecd4df7f4b4f379c2a70119009f56a4d3da8bd101c54384d9c52a54cfbd5
-MISC metadata.xml 332 BLAKE2B 16b962550ae20fa64a58582eaf57a1abd6304a2708e2539dbc4b8b1f6ba0464b40141742e6768a87a2bf2929a2b84f6baec920e44fb33b04d7e1748acd70bfcc SHA512 44c4d51343043fcf48606163b7f3e5b84465df928b12df089015f638552a49223787ff906f5754347aadac6a802a3201e2a7e1af793b0b8d5ad0003c6f121882
diff --git a/dev-ros/rospy_tutorials/metadata.xml b/dev-ros/rospy_tutorials/metadata.xml
deleted file mode 100644
index 33597496d65f..000000000000
--- a/dev-ros/rospy_tutorials/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
deleted file mode 100644
index ecde7b0dc1db..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roscpp_tutorials
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.2.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.2.ebuild
deleted file mode 100644
index ecde7b0dc1db..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roscpp_tutorials
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
deleted file mode 100644
index ecde7b0dc1db..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roscpp_tutorials
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosserial_arduino/Manifest b/dev-ros/rosserial_arduino/Manifest
deleted file mode 100644
index 94171365a017..000000000000
--- a/dev-ros/rosserial_arduino/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_arduino-0.8.0.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
-EBUILD rosserial_arduino-0.9.1.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
-EBUILD rosserial_arduino-0.9.2.ebuild 548 BLAKE2B a1271d513c2460988419b0f2ec3bc35d47dcc44b73c187e7eb1de5bf2ec97afce57ffd77097e25020be5b7686873c45ddc6a8ca67a61178a092f73ca1fa6ca5c SHA512 748b80c3f90b7313fcb94f25e086f5ed9fe52981c3e6b5972f3931130ee5b25a2cd61337c7b1acc4dd5627c63bf09d427ffb008fa0d0439adb533ac3f90e8484
-EBUILD rosserial_arduino-9999.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_arduino/metadata.xml b/dev-ros/rosserial_arduino/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_arduino/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.8.0.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.8.0.ebuild
deleted file mode 100644
index f444499009fb..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild
deleted file mode 100644
index f444499009fb..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.ebuild
deleted file mode 100644
index 0da31aca2d16..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
deleted file mode 100644
index f444499009fb..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/Manifest b/dev-ros/rosserial_client/Manifest
deleted file mode 100644
index 6707e0e47eb1..000000000000
--- a/dev-ros/rosserial_client/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_client-0.8.0.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
-EBUILD rosserial_client-0.9.1.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
-EBUILD rosserial_client-0.9.2.ebuild 539 BLAKE2B ac54f0f24ff772c2ff086530b72b5e31c850e78dcdbba2992284c59142efa9644a89dc81665f0b6bb6fe1128872c6cc4541e3da6df7b8ad1ba7e95e67f730a17 SHA512 39e8c838aca0de10ddcf112864acf79cab09aa8604310deb2be42b957d89d31d60c2c5059ad449a8a1150b32127e71efd36256edeb15f9af6d1f3f4c91cc632f
-EBUILD rosserial_client-9999.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_client/metadata.xml b/dev-ros/rosserial_client/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_client/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_client/rosserial_client-0.8.0.ebuild b/dev-ros/rosserial_client/rosserial_client-0.8.0.ebuild
deleted file mode 100644
index 6dab12d86ad4..000000000000
--- a/dev-ros/rosserial_client/rosserial_client-0.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generalized client side source for rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild b/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild
deleted file mode 100644
index 6dab12d86ad4..000000000000
--- a/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generalized client side source for rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/rosserial_client-0.9.2.ebuild b/dev-ros/rosserial_client/rosserial_client-0.9.2.ebuild
deleted file mode 100644
index 96de6ddc1bce..000000000000
--- a/dev-ros/rosserial_client/rosserial_client-0.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generalized client side source for rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/rosserial_client-9999.ebuild b/dev-ros/rosserial_client/rosserial_client-9999.ebuild
deleted file mode 100644
index 6dab12d86ad4..000000000000
--- a/dev-ros/rosserial_client/rosserial_client-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generalized client side source for rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/Manifest b/dev-ros/rosserial_embeddedlinux/Manifest
deleted file mode 100644
index 6cb8dfc3465a..000000000000
--- a/dev-ros/rosserial_embeddedlinux/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_embeddedlinux-0.8.0.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
-EBUILD rosserial_embeddedlinux-0.9.1.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
-EBUILD rosserial_embeddedlinux-0.9.2.ebuild 687 BLAKE2B 46e551d2047b5abffec7252d9c717f28704e858c78fa189a9571f662474522ee43ec202bc0b4d01e743cdf9fb32bc35092dc7787379dbf19bd1f76e245ee5f58 SHA512 32682365867fca82b12fd2e4f92b6c2518c8fcec44d97057922475b762fba5c0c3458bc7f1333ab7e532eafecc94296c42db1c1798e7e029051f806f5a24a606
-EBUILD rosserial_embeddedlinux-9999.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_embeddedlinux/metadata.xml b/dev-ros/rosserial_embeddedlinux/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_embeddedlinux/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.8.0.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.8.0.ebuild
deleted file mode 100644
index 49525af06d65..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild
deleted file mode 100644
index 49525af06d65..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild
deleted file mode 100644
index 152ee753e375..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild
deleted file mode 100644
index 49525af06d65..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/Manifest b/dev-ros/rosserial_msgs/Manifest
deleted file mode 100644
index 15ad25d9487e..000000000000
--- a/dev-ros/rosserial_msgs/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_msgs-0.8.0.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
-EBUILD rosserial_msgs-0.9.1.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
-EBUILD rosserial_msgs-0.9.2.ebuild 389 BLAKE2B 77bcabc8d7d8e37eeb3df5b94e7500f4ab454e842cc0d846c7ba54cc35c27e8fd93f11c6fd210a10bb1c3690f1a33874b124f42356ba6d464df7fe918fb46c29 SHA512 8f4627ef74b0f1596aed71088e5f82a12866cb314d8e67800dfcb47df1dba150ded7bb6dd0a97a6c8093044da3e0b959ec7c752d93dd90048324ebd308961def
-EBUILD rosserial_msgs-9999.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_msgs/metadata.xml b/dev-ros/rosserial_msgs/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.8.0.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.8.0.ebuild
deleted file mode 100644
index 711a0ec3fdf5..000000000000
--- a/dev-ros/rosserial_msgs/rosserial_msgs-0.8.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for automatic topic configuration using rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild
deleted file mode 100644
index 711a0ec3fdf5..000000000000
--- a/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for automatic topic configuration using rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild
deleted file mode 100644
index cb49f6afd33e..000000000000
--- a/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for automatic topic configuration using rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
deleted file mode 100644
index 711a0ec3fdf5..000000000000
--- a/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for automatic topic configuration using rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/Manifest b/dev-ros/rosserial_python/Manifest
deleted file mode 100644
index c16b2d2880c3..000000000000
--- a/dev-ros/rosserial_python/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_python-0.8.0.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
-EBUILD rosserial_python-0.9.1.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
-EBUILD rosserial_python-0.9.2.ebuild 586 BLAKE2B d40520623148d422e46a3bfc6b72bdb16506c0cf584f063f4bbcf929cab5f0c0932352475ff57e16a43639eb04696b78e6369c78604d8f3d5a0e67e7066ccf96 SHA512 de09e5dc1a1b70b4a375be0b9204750db412deff7da347f6a31afb93415b08e34346faf924d9b11fea73c55dc151e51cb78ce732cf8be0df1b0efaae9ba66683
-EBUILD rosserial_python-9999.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_python/metadata.xml b/dev-ros/rosserial_python/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_python/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_python/rosserial_python-0.8.0.ebuild b/dev-ros/rosserial_python/rosserial_python-0.8.0.ebuild
deleted file mode 100644
index 2051b6c0c412..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A Python-based implementation of the ROS serial protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild b/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild
deleted file mode 100644
index 2051b6c0c412..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A Python-based implementation of the ROS serial protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/rosserial_python-0.9.2.ebuild b/dev-ros/rosserial_python/rosserial_python-0.9.2.ebuild
deleted file mode 100644
index 29c26a180d10..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A Python-based implementation of the ROS serial protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/rosserial_python-9999.ebuild b/dev-ros/rosserial_python/rosserial_python-9999.ebuild
deleted file mode 100644
index 2051b6c0c412..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A Python-based implementation of the ROS serial protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
deleted file mode 100644
index 7edfc6fff50c..000000000000
--- a/dev-ros/rosserial_server/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_server-0.9.1-r1.ebuild 466 BLAKE2B d6bc721dc8997937793e0e50909b52fb41947acbcbf05820d209fcb3e25cc2bc7f7922312e1e6b0715e242ad94ad943c773035cb3dce19f7095ca09a5616186d SHA512 644e1dc2480508d1cc50abc29a43f6d52a4295d0d4be08404d4f99dc1df895dc4750154440cf5e838fe837642782e5f1cdbead171db23533ca3aebc7580ae916
-EBUILD rosserial_server-0.9.2.ebuild 466 BLAKE2B d6bc721dc8997937793e0e50909b52fb41947acbcbf05820d209fcb3e25cc2bc7f7922312e1e6b0715e242ad94ad943c773035cb3dce19f7095ca09a5616186d SHA512 644e1dc2480508d1cc50abc29a43f6d52a4295d0d4be08404d4f99dc1df895dc4750154440cf5e838fe837642782e5f1cdbead171db23533ca3aebc7580ae916
-EBUILD rosserial_server-9999.ebuild 466 BLAKE2B d6bc721dc8997937793e0e50909b52fb41947acbcbf05820d209fcb3e25cc2bc7f7922312e1e6b0715e242ad94ad943c773035cb3dce19f7095ca09a5616186d SHA512 644e1dc2480508d1cc50abc29a43f6d52a4295d0d4be08404d4f99dc1df895dc4750154440cf5e838fe837642782e5f1cdbead171db23533ca3aebc7580ae916
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_server/metadata.xml b/dev-ros/rosserial_server/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_server/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_server/rosserial_server-0.9.1-r1.ebuild b/dev-ros/rosserial_server/rosserial_server-0.9.1-r1.ebuild
deleted file mode 100644
index 5e8fa7a6b67c..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.9.2.ebuild b/dev-ros/rosserial_server/rosserial_server-0.9.2.ebuild
deleted file mode 100644
index 5e8fa7a6b67c..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.9.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosserial_server/rosserial_server-9999.ebuild b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
deleted file mode 100644
index 5e8fa7a6b67c..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/topic_tools
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/rosserial_tivac/Manifest b/dev-ros/rosserial_tivac/Manifest
deleted file mode 100644
index 9f4cbd18fea8..000000000000
--- a/dev-ros/rosserial_tivac/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_tivac-0.8.0.ebuild 495 BLAKE2B ee7c4642a62436b81de5d95d264d13875aff79b7a068cd6acbd9180d40b79323b7e85cd2290a681ba099b4a411cb051ab04b3a89557ed0da03709957fdb7f97f SHA512 6c84104f6cd96f3a47325ff58310d520d664f039b7aab0572138558f8d635aa59f5f7b9c0cf99ac896ab5714cc73deb7f8a1bbcddef93f9d03a097ff1b760938
-EBUILD rosserial_tivac-0.9.1.ebuild 495 BLAKE2B ee7c4642a62436b81de5d95d264d13875aff79b7a068cd6acbd9180d40b79323b7e85cd2290a681ba099b4a411cb051ab04b3a89557ed0da03709957fdb7f97f SHA512 6c84104f6cd96f3a47325ff58310d520d664f039b7aab0572138558f8d635aa59f5f7b9c0cf99ac896ab5714cc73deb7f8a1bbcddef93f9d03a097ff1b760938
-EBUILD rosserial_tivac-0.9.2.ebuild 495 BLAKE2B ee7c4642a62436b81de5d95d264d13875aff79b7a068cd6acbd9180d40b79323b7e85cd2290a681ba099b4a411cb051ab04b3a89557ed0da03709957fdb7f97f SHA512 6c84104f6cd96f3a47325ff58310d520d664f039b7aab0572138558f8d635aa59f5f7b9c0cf99ac896ab5714cc73deb7f8a1bbcddef93f9d03a097ff1b760938
-EBUILD rosserial_tivac-9999.ebuild 495 BLAKE2B ee7c4642a62436b81de5d95d264d13875aff79b7a068cd6acbd9180d40b79323b7e85cd2290a681ba099b4a411cb051ab04b3a89557ed0da03709957fdb7f97f SHA512 6c84104f6cd96f3a47325ff58310d520d664f039b7aab0572138558f8d635aa59f5f7b9c0cf99ac896ab5714cc73deb7f8a1bbcddef93f9d03a097ff1b760938
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_tivac/metadata.xml b/dev-ros/rosserial_tivac/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_tivac/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.8.0.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.8.0.ebuild
deleted file mode 100644
index edc6bcbd0d2c..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Definitions for rosserial_client targets for TivaC Launchpad evaluation boards"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild
deleted file mode 100644
index edc6bcbd0d2c..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Definitions for rosserial_client targets for TivaC Launchpad evaluation boards"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.ebuild
deleted file mode 100644
index edc6bcbd0d2c..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Definitions for rosserial_client targets for TivaC Launchpad evaluation boards"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-9999.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-9999.ebuild
deleted file mode 100644
index edc6bcbd0d2c..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Definitions for rosserial_client targets for TivaC Launchpad evaluation boards"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/Manifest b/dev-ros/rosserial_windows/Manifest
deleted file mode 100644
index 8a368c3b8dfb..000000000000
--- a/dev-ros/rosserial_windows/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_windows-0.8.0.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
-EBUILD rosserial_windows-0.9.1.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
-EBUILD rosserial_windows-0.9.2.ebuild 702 BLAKE2B 8ef037819bdc4433357d06665e2be29c1b3a175d1084f2b15bf2d75e46ceadcb19e7c6c0077a1d5e209ed7e686688ed7a5dd0e5149127c9a503afbc0677ce156 SHA512 5cb1a8537b9c61bbcf1f8aad9090440bdda81a18cff2c13545dedf239cd037c1c54c895b98a9acdddacfeb01e74a8261bb276a6d27dd3416a0e872a5c3b93125
-EBUILD rosserial_windows-9999.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_windows/metadata.xml b/dev-ros/rosserial_windows/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_windows/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.8.0.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.8.0.ebuild
deleted file mode 100644
index 8b3875a023b5..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild
deleted file mode 100644
index 8b3875a023b5..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.9.2.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.9.2.ebuild
deleted file mode 100644
index 5741c715553c..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.9.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild b/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild
deleted file mode 100644
index 8b3875a023b5..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/Manifest b/dev-ros/rosserial_xbee/Manifest
deleted file mode 100644
index b911d85b1852..000000000000
--- a/dev-ros/rosserial_xbee/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
-DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
-EBUILD rosserial_xbee-0.8.0.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
-EBUILD rosserial_xbee-0.9.1.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
-EBUILD rosserial_xbee-0.9.2.ebuild 649 BLAKE2B 2caf4bfb3d9312fe8442f067844432e8a6049547009ec307b53fd572c141e45a1521b5f584d2c9783e3b674915e03944bb34c103d8657377aceddf170694bcdb SHA512 18debed2bad910dc9ed37389e29e0fe0de390f4cff492e991bc174f2add0ad9e6a0010d4397ead40d02d34032e18e1f5d48376e5999b7a39706afb8105e2279c
-EBUILD rosserial_xbee-9999.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
-MISC metadata.xml 336 BLAKE2B 49ba71a3f79ae7343c045e7533f55203976305bc20dedca417fa42e4583739e999cc833c9123cb30639ed2a9d71c6726971982195d9e11cbbb4bf29177b0a014 SHA512 c14fe3d3dcf7ba4f180339793ba7c6f875ff3d2d5830840f0cb7956a69cc9e70bdc1b8a47e16cc8ee20d01e0d48d273d25ae80b09a31e66a065acf3ba165b4bc
diff --git a/dev-ros/rosserial_xbee/metadata.xml b/dev-ros/rosserial_xbee/metadata.xml
deleted file mode 100644
index cd4a681318f0..000000000000
--- a/dev-ros/rosserial_xbee/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/rosserial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.8.0.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.8.0.ebuild
deleted file mode 100644
index aab6d7663008..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.8.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild
deleted file mode 100644
index aab6d7663008..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.ebuild
deleted file mode 100644
index 0c7384c1e7c8..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild
deleted file mode 100644
index aab6d7663008..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
deleted file mode 100644
index c5a7496397c0..000000000000
--- a/dev-ros/rosservice/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosservice-1.15.10.ebuild 526 BLAKE2B 3b9ea5d200f431087ce8fbc675b42adb19818bb100260e5a8128a6ac56c48442bf3629ec434a48bc4531c164194a693111f62fb21c76c0f0adc58c00bd6bf12b SHA512 4ddb1476e18efd87b1fc017222ee64961f9e9417008bc32a6dbc3b1db926c018b7772fbdd78da9cbe229968ecd4fe33f5486fa6d20e51d98a50f61e05d055196
-EBUILD rosservice-1.15.11.ebuild 526 BLAKE2B 3b9ea5d200f431087ce8fbc675b42adb19818bb100260e5a8128a6ac56c48442bf3629ec434a48bc4531c164194a693111f62fb21c76c0f0adc58c00bd6bf12b SHA512 4ddb1476e18efd87b1fc017222ee64961f9e9417008bc32a6dbc3b1db926c018b7772fbdd78da9cbe229968ecd4fe33f5486fa6d20e51d98a50f61e05d055196
-EBUILD rosservice-1.15.13.ebuild 526 BLAKE2B 3b9ea5d200f431087ce8fbc675b42adb19818bb100260e5a8128a6ac56c48442bf3629ec434a48bc4531c164194a693111f62fb21c76c0f0adc58c00bd6bf12b SHA512 4ddb1476e18efd87b1fc017222ee64961f9e9417008bc32a6dbc3b1db926c018b7772fbdd78da9cbe229968ecd4fe33f5486fa6d20e51d98a50f61e05d055196
-EBUILD rosservice-1.15.14.ebuild 526 BLAKE2B 47fa13ca082931ea78f83542deacaefa2d3ccd0af31ac92308a1c359d963db4c9621c9b940b790cca5b25b2ed46e7021ec3db35acd112c8258992f52e9b84b1b SHA512 c9a84a4e32057eb334275b10abc025cc58896d8c19dee9912600d78c710964765c9a9ee5e2ee24dffedd18ef588f0e83e11c3a835a8ef3cd5313c44ffc5987ef
-EBUILD rosservice-1.15.7.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
-EBUILD rosservice-1.15.8.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
-EBUILD rosservice-1.15.9.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
-EBUILD rosservice-9999.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosservice/metadata.xml b/dev-ros/rosservice/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rosservice/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosservice/rosservice-1.15.10.ebuild b/dev-ros/rosservice/rosservice-1.15.10.ebuild
deleted file mode 100644
index a7c61cee1d7d..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.15.11.ebuild b/dev-ros/rosservice/rosservice-1.15.11.ebuild
deleted file mode 100644
index a7c61cee1d7d..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.15.13.ebuild b/dev-ros/rosservice/rosservice-1.15.13.ebuild
deleted file mode 100644
index a7c61cee1d7d..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.15.14.ebuild b/dev-ros/rosservice/rosservice-1.15.14.ebuild
deleted file mode 100644
index a0668fead1f7..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.15.7.ebuild b/dev-ros/rosservice/rosservice-1.15.7.ebuild
deleted file mode 100644
index f997c822e5bf..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.15.8.ebuild b/dev-ros/rosservice/rosservice-1.15.8.ebuild
deleted file mode 100644
index f997c822e5bf..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.15.9.ebuild b/dev-ros/rosservice/rosservice-1.15.9.ebuild
deleted file mode 100644
index f997c822e5bf..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-9999.ebuild b/dev-ros/rosservice/rosservice-9999.ebuild
deleted file mode 100644
index f997c822e5bf..000000000000
--- a/dev-ros/rosservice/rosservice-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
deleted file mode 100644
index beed1d077a07..000000000000
--- a/dev-ros/rostest/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rostest-1.15.10-r1.ebuild 730 BLAKE2B 2320b251c8b95fb23aa71d9957e6b65873774125334d66a9b0b7b84ab4b8b2c103148bc53736608c941672c1643f8fa7ce40a553c7ef0ce1761b0eb1ad85310e SHA512 7b941ec4405f2d18e5b259e101bf87acec37e9c32638c545f7e01442a19cae1d7b9860caff33688da2dfdba35f00985f92d6e4e7b0cb49b2e5434197685e262a
-EBUILD rostest-1.15.11.ebuild 730 BLAKE2B 2320b251c8b95fb23aa71d9957e6b65873774125334d66a9b0b7b84ab4b8b2c103148bc53736608c941672c1643f8fa7ce40a553c7ef0ce1761b0eb1ad85310e SHA512 7b941ec4405f2d18e5b259e101bf87acec37e9c32638c545f7e01442a19cae1d7b9860caff33688da2dfdba35f00985f92d6e4e7b0cb49b2e5434197685e262a
-EBUILD rostest-1.15.13.ebuild 730 BLAKE2B 2320b251c8b95fb23aa71d9957e6b65873774125334d66a9b0b7b84ab4b8b2c103148bc53736608c941672c1643f8fa7ce40a553c7ef0ce1761b0eb1ad85310e SHA512 7b941ec4405f2d18e5b259e101bf87acec37e9c32638c545f7e01442a19cae1d7b9860caff33688da2dfdba35f00985f92d6e4e7b0cb49b2e5434197685e262a
-EBUILD rostest-1.15.14.ebuild 730 BLAKE2B 2320b251c8b95fb23aa71d9957e6b65873774125334d66a9b0b7b84ab4b8b2c103148bc53736608c941672c1643f8fa7ce40a553c7ef0ce1761b0eb1ad85310e SHA512 7b941ec4405f2d18e5b259e101bf87acec37e9c32638c545f7e01442a19cae1d7b9860caff33688da2dfdba35f00985f92d6e4e7b0cb49b2e5434197685e262a
-EBUILD rostest-1.15.8-r1.ebuild 730 BLAKE2B 2320b251c8b95fb23aa71d9957e6b65873774125334d66a9b0b7b84ab4b8b2c103148bc53736608c941672c1643f8fa7ce40a553c7ef0ce1761b0eb1ad85310e SHA512 7b941ec4405f2d18e5b259e101bf87acec37e9c32638c545f7e01442a19cae1d7b9860caff33688da2dfdba35f00985f92d6e4e7b0cb49b2e5434197685e262a
-EBUILD rostest-1.15.9-r1.ebuild 730 BLAKE2B 2320b251c8b95fb23aa71d9957e6b65873774125334d66a9b0b7b84ab4b8b2c103148bc53736608c941672c1643f8fa7ce40a553c7ef0ce1761b0eb1ad85310e SHA512 7b941ec4405f2d18e5b259e101bf87acec37e9c32638c545f7e01442a19cae1d7b9860caff33688da2dfdba35f00985f92d6e4e7b0cb49b2e5434197685e262a
-EBUILD rostest-9999.ebuild 730 BLAKE2B 2320b251c8b95fb23aa71d9957e6b65873774125334d66a9b0b7b84ab4b8b2c103148bc53736608c941672c1643f8fa7ce40a553c7ef0ce1761b0eb1ad85310e SHA512 7b941ec4405f2d18e5b259e101bf87acec37e9c32638c545f7e01442a19cae1d7b9860caff33688da2dfdba35f00985f92d6e4e7b0cb49b2e5434197685e262a
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rostest/metadata.xml b/dev-ros/rostest/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rostest/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rostest/rostest-1.15.10-r1.ebuild b/dev-ros/rostest/rostest-1.15.10-r1.ebuild
deleted file mode 100644
index 86ab1e25dcc0..000000000000
--- a/dev-ros/rostest/rostest-1.15.10-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-ros/rosservice
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostest/rostest-1.15.11.ebuild b/dev-ros/rostest/rostest-1.15.11.ebuild
deleted file mode 100644
index 86ab1e25dcc0..000000000000
--- a/dev-ros/rostest/rostest-1.15.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-ros/rosservice
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostest/rostest-1.15.13.ebuild b/dev-ros/rostest/rostest-1.15.13.ebuild
deleted file mode 100644
index 86ab1e25dcc0..000000000000
--- a/dev-ros/rostest/rostest-1.15.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-ros/rosservice
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostest/rostest-1.15.14.ebuild b/dev-ros/rostest/rostest-1.15.14.ebuild
deleted file mode 100644
index 86ab1e25dcc0..000000000000
--- a/dev-ros/rostest/rostest-1.15.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-ros/rosservice
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostest/rostest-1.15.8-r1.ebuild b/dev-ros/rostest/rostest-1.15.8-r1.ebuild
deleted file mode 100644
index 86ab1e25dcc0..000000000000
--- a/dev-ros/rostest/rostest-1.15.8-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-ros/rosservice
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostest/rostest-1.15.9-r1.ebuild b/dev-ros/rostest/rostest-1.15.9-r1.ebuild
deleted file mode 100644
index 86ab1e25dcc0..000000000000
--- a/dev-ros/rostest/rostest-1.15.9-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-ros/rosservice
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostest/rostest-9999.ebuild b/dev-ros/rostest/rostest-9999.ebuild
deleted file mode 100644
index 86ab1e25dcc0..000000000000
--- a/dev-ros/rostest/rostest-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-ros/rosservice
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostime/Manifest b/dev-ros/rostime/Manifest
deleted file mode 100644
index e3f20a30b080..000000000000
--- a/dev-ros/rostime/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST roscpp_core-0.7.2.tar.gz 35095 BLAKE2B 065f81f514becd2ea1586735c759be79765eeee1c8a9606261ebd2086cf406c87276b143ace4ac43eeb7f8ee6dccc07812c614e6e185f2354d64b1dfe401b849 SHA512 fb04ee37db14d31b7c06ae3484f5aa414563e96a90b820b7d6e23e921bcd831a8bf1d66c723aef65a617b2da92456345cb796271409c8dc155ef1084926659ef
-EBUILD rostime-0.7.2-r1.ebuild 417 BLAKE2B 5c61dcb6a6655a321f070afeb967a86ca249dd71292159f88feca1adccc146010fe25c3f87022ee88a112ad63ed567988cfd62341252e4c88c70a1bb4922d3a1 SHA512 f0a90e195ad98c3bdbeedf1dc16534df0fec8b38a5475302656e0d92a709762db4cfc205dff5ed1ca2f49753a83cbfd2e8da5e313abdc84f31c0b5c4bedc48ab
-EBUILD rostime-9999.ebuild 417 BLAKE2B 5c61dcb6a6655a321f070afeb967a86ca249dd71292159f88feca1adccc146010fe25c3f87022ee88a112ad63ed567988cfd62341252e4c88c70a1bb4922d3a1 SHA512 f0a90e195ad98c3bdbeedf1dc16534df0fec8b38a5475302656e0d92a709762db4cfc205dff5ed1ca2f49753a83cbfd2e8da5e313abdc84f31c0b5c4bedc48ab
-MISC metadata.xml 330 BLAKE2B 29b9adee2c65256491b9192e5d15f2398d839b011ab15a5383db9472455c8adcc3f4ead321f65943dd8fd6b010514b001248af026b1f5a708316e9ad4a699fb9 SHA512 cfdf921ea410ba8db72aa8bae017f699948dbc789c3068cec5798b5320c1e574bd3c854e05e04053fca24fb6bd6bbf6c847b742b8e636c3c1a4dc920a7262183
diff --git a/dev-ros/rostime/metadata.xml b/dev-ros/rostime/metadata.xml
deleted file mode 100644
index 4e0c376ad93e..000000000000
--- a/dev-ros/rostime/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/roscpp_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rostime/rostime-0.7.2-r1.ebuild b/dev-ros/rostime/rostime-0.7.2-r1.ebuild
deleted file mode 100644
index 27c126dd5ce9..000000000000
--- a/dev-ros/rostime/rostime-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-9999.ebuild b/dev-ros/rostime/rostime-9999.ebuild
deleted file mode 100644
index 27c126dd5ce9..000000000000
--- a/dev-ros/rostime/rostime-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
deleted file mode 100644
index 77afc8fb1cf3..000000000000
--- a/dev-ros/rostopic/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rostopic-1.15.10.ebuild 661 BLAKE2B 3fb5d2acef06664f880d1af9147943b5384ce44a109e857d0f7f9d70870978e08760b9fb67dc7e65da59ef7c8221652bfa695475a1e6ae1899f7c50f5528e61c SHA512 85a8481a49ae471fcd1c95e4fca5675ef5ba0435c1d0e898cf621a8ccd12cd421922bb12b9b567620c3d3322928698b17683d8966226a4579ad5606b5ba3e213
-EBUILD rostopic-1.15.11.ebuild 661 BLAKE2B 3fb5d2acef06664f880d1af9147943b5384ce44a109e857d0f7f9d70870978e08760b9fb67dc7e65da59ef7c8221652bfa695475a1e6ae1899f7c50f5528e61c SHA512 85a8481a49ae471fcd1c95e4fca5675ef5ba0435c1d0e898cf621a8ccd12cd421922bb12b9b567620c3d3322928698b17683d8966226a4579ad5606b5ba3e213
-EBUILD rostopic-1.15.13.ebuild 661 BLAKE2B 3fb5d2acef06664f880d1af9147943b5384ce44a109e857d0f7f9d70870978e08760b9fb67dc7e65da59ef7c8221652bfa695475a1e6ae1899f7c50f5528e61c SHA512 85a8481a49ae471fcd1c95e4fca5675ef5ba0435c1d0e898cf621a8ccd12cd421922bb12b9b567620c3d3322928698b17683d8966226a4579ad5606b5ba3e213
-EBUILD rostopic-1.15.14.ebuild 661 BLAKE2B 29e6a7cadbf3ab05aefda697ee37ae1304c5d143f5c438a7388d35c4d83e38029d85c6ca3d386fdb35a2b1cfb42bc4c57c3e78c86e1e80246d6e6d568cda4a59 SHA512 3003e683cf24b5e850201beb829b0431b0b327a4f9595d9e1dce7f1ae7fe6320a14f87ba314ef94d4f070b7b530c3b866a317524577af83eb7f2e6f567ea0eb0
-EBUILD rostopic-1.15.8.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
-EBUILD rostopic-1.15.9.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
-EBUILD rostopic-9999.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rostopic/metadata.xml b/dev-ros/rostopic/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/rostopic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rostopic/rostopic-1.15.10.ebuild b/dev-ros/rostopic/rostopic-1.15.10.ebuild
deleted file mode 100644
index 9ea612e200ff..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rostopic/rostopic-1.15.11.ebuild b/dev-ros/rostopic/rostopic-1.15.11.ebuild
deleted file mode 100644
index 9ea612e200ff..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rostopic/rostopic-1.15.13.ebuild b/dev-ros/rostopic/rostopic-1.15.13.ebuild
deleted file mode 100644
index 9ea612e200ff..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rostopic/rostopic-1.15.14.ebuild b/dev-ros/rostopic/rostopic-1.15.14.ebuild
deleted file mode 100644
index 5b2b2a10295f..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rostopic/rostopic-1.15.8.ebuild b/dev-ros/rostopic/rostopic-1.15.8.ebuild
deleted file mode 100644
index c436e4f953a2..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rostopic/rostopic-1.15.9.ebuild b/dev-ros/rostopic/rostopic-1.15.9.ebuild
deleted file mode 100644
index c436e4f953a2..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rostopic/rostopic-9999.ebuild b/dev-ros/rostopic/rostopic-9999.ebuild
deleted file mode 100644
index c436e4f953a2..000000000000
--- a/dev-ros/rostopic/rostopic-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rosunit/Manifest b/dev-ros/rosunit/Manifest
deleted file mode 100644
index 03a75e413d54..000000000000
--- a/dev-ros/rosunit/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
-DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
-DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
-DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
-EBUILD rosunit-1.15.5.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
-EBUILD rosunit-1.15.6.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
-EBUILD rosunit-1.15.7.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
-EBUILD rosunit-1.15.8.ebuild 505 BLAKE2B 24f9e9888beb7f14d7b08467eab826897ea50429d71774e55cea157c574cfcbb4ff8054b46490421936a3d1135bd2b5c12ff3fc389ee4ef246a904ace94af8e4 SHA512 deee7e57754944cc2a4cfe88b236ea7670c523b52970b419670fbdb7c8d0b270f2f0a831d2db664cb9005f457ec11912d17394c94af5f44b626c2b88abc013ae
-EBUILD rosunit-9999.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
-MISC metadata.xml 322 BLAKE2B 89acba5cda78d634b982945bba824e948e456acc4701b5c0978e39d66e2aa1c6614917e2f065bd7799d18e2e7bd065e10e9af47258da6290396718a179c245ee SHA512 6493553400ee64b3a7b86fe741f156d48b7fca1efe55ceccff5fc2fed58d1f772e175b35e109e9e5185895b60f30c211e96da3628fbda87c9e0474be5ca0229e
diff --git a/dev-ros/rosunit/metadata.xml b/dev-ros/rosunit/metadata.xml
deleted file mode 100644
index e4e4d97efcdd..000000000000
--- a/dev-ros/rosunit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rosunit/rosunit-1.15.5.ebuild b/dev-ros/rosunit/rosunit-1.15.5.ebuild
deleted file mode 100644
index 198f80e39504..000000000000
--- a/dev-ros/rosunit/rosunit-1.15.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosunit/rosunit-1.15.6.ebuild b/dev-ros/rosunit/rosunit-1.15.6.ebuild
deleted file mode 100644
index 198f80e39504..000000000000
--- a/dev-ros/rosunit/rosunit-1.15.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosunit/rosunit-1.15.7.ebuild b/dev-ros/rosunit/rosunit-1.15.7.ebuild
deleted file mode 100644
index 198f80e39504..000000000000
--- a/dev-ros/rosunit/rosunit-1.15.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosunit/rosunit-1.15.8.ebuild b/dev-ros/rosunit/rosunit-1.15.8.ebuild
deleted file mode 100644
index 5e1930ae53d6..000000000000
--- a/dev-ros/rosunit/rosunit-1.15.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/rosunit/rosunit-9999.ebuild b/dev-ros/rosunit/rosunit-9999.ebuild
deleted file mode 100644
index 198f80e39504..000000000000
--- a/dev-ros/rosunit/rosunit-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
-"
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
deleted file mode 100644
index f8b7d90949aa..000000000000
--- a/dev-ros/roswtf/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD roswtf-1.15.10.ebuild 1251 BLAKE2B 7e1a6dedbaf7d355990c29b1be423dc41528ccc2cd9901d4d517691056e44ec2ba776c1f0c57f21c9ee6f44250507d4872894f62a1480ca357ba63f7a80a3ff5 SHA512 d6b205648ef5482263076bf5344d0628c3f7fca525e4e7b20ba257974fa8f43f1252acb33d7392bd343d32a026c1551676f9f62758a18b01644d2984cbed7b99
-EBUILD roswtf-1.15.11.ebuild 1251 BLAKE2B 7e1a6dedbaf7d355990c29b1be423dc41528ccc2cd9901d4d517691056e44ec2ba776c1f0c57f21c9ee6f44250507d4872894f62a1480ca357ba63f7a80a3ff5 SHA512 d6b205648ef5482263076bf5344d0628c3f7fca525e4e7b20ba257974fa8f43f1252acb33d7392bd343d32a026c1551676f9f62758a18b01644d2984cbed7b99
-EBUILD roswtf-1.15.13.ebuild 1251 BLAKE2B 7e1a6dedbaf7d355990c29b1be423dc41528ccc2cd9901d4d517691056e44ec2ba776c1f0c57f21c9ee6f44250507d4872894f62a1480ca357ba63f7a80a3ff5 SHA512 d6b205648ef5482263076bf5344d0628c3f7fca525e4e7b20ba257974fa8f43f1252acb33d7392bd343d32a026c1551676f9f62758a18b01644d2984cbed7b99
-EBUILD roswtf-1.15.14.ebuild 1251 BLAKE2B aee226562efbe15069025deabf03c4129e1dddba4dca5842062fcb5e0e86b862ac28889f71b4061ce0b84f7ff21f928a3cc9faa761751a59f3150b3b83e7a700 SHA512 d5281e74f919b5a85d6382919dd71d36e3388e1f337cae4402528787c9f55e33ff649b4d83b90bc18cbcc4f4224629ad5dfef9b346d441dd0d7975b6ae81a7ba
-EBUILD roswtf-1.15.8.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
-EBUILD roswtf-1.15.9.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
-EBUILD roswtf-9999.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/roswtf/metadata.xml b/dev-ros/roswtf/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/roswtf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/roswtf/roswtf-1.15.10.ebuild b/dev-ros/roswtf/roswtf-1.15.10.ebuild
deleted file mode 100644
index 4e877541ab42..000000000000
--- a/dev-ros/roswtf/roswtf-1.15.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-BDEPEND="
-	test? (
-		dev-ros/cmake_modules
-	)
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roswtf/roswtf-1.15.11.ebuild b/dev-ros/roswtf/roswtf-1.15.11.ebuild
deleted file mode 100644
index 4e877541ab42..000000000000
--- a/dev-ros/roswtf/roswtf-1.15.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-BDEPEND="
-	test? (
-		dev-ros/cmake_modules
-	)
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roswtf/roswtf-1.15.13.ebuild b/dev-ros/roswtf/roswtf-1.15.13.ebuild
deleted file mode 100644
index 4e877541ab42..000000000000
--- a/dev-ros/roswtf/roswtf-1.15.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-BDEPEND="
-	test? (
-		dev-ros/cmake_modules
-	)
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roswtf/roswtf-1.15.14.ebuild b/dev-ros/roswtf/roswtf-1.15.14.ebuild
deleted file mode 100644
index 4aafd938bdfa..000000000000
--- a/dev-ros/roswtf/roswtf-1.15.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-BDEPEND="
-	test? (
-		dev-ros/cmake_modules
-	)
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roswtf/roswtf-1.15.8.ebuild b/dev-ros/roswtf/roswtf-1.15.8.ebuild
deleted file mode 100644
index e6c601a37116..000000000000
--- a/dev-ros/roswtf/roswtf-1.15.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-BDEPEND="
-	test? (
-		dev-ros/cmake_modules
-	)
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roswtf/roswtf-1.15.9.ebuild b/dev-ros/roswtf/roswtf-1.15.9.ebuild
deleted file mode 100644
index e6c601a37116..000000000000
--- a/dev-ros/roswtf/roswtf-1.15.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-BDEPEND="
-	test? (
-		dev-ros/cmake_modules
-	)
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/roswtf/roswtf-9999.ebuild b/dev-ros/roswtf/roswtf-9999.ebuild
deleted file mode 100644
index e6c601a37116..000000000000
--- a/dev-ros/roswtf/roswtf-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-BDEPEND="
-	test? (
-		dev-ros/cmake_modules
-	)
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/rotate_recovery/Manifest b/dev-ros/rotate_recovery/Manifest
deleted file mode 100644
index 6c3d334ad3eb..000000000000
--- a/dev-ros/rotate_recovery/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD rotate_recovery-1.17.1-r1.ebuild 741 BLAKE2B 38d42d0ed54c4b25b888ce040c8b072e35640003d70b6c7b09dde5b6100c12a40df84473d44125176fa22a8e265781d4f46377a8784c71a2613f2d8b7acc3e89 SHA512 ae42bce20b2545efe22822ee4271320eed173cbe8f874250f85ff50aecf839c93712ea40a9a31524c7418be913ee34cc3d1f882d8f035b032bc01c160ecf3f49
-EBUILD rotate_recovery-9999.ebuild 741 BLAKE2B 38d42d0ed54c4b25b888ce040c8b072e35640003d70b6c7b09dde5b6100c12a40df84473d44125176fa22a8e265781d4f46377a8784c71a2613f2d8b7acc3e89 SHA512 ae42bce20b2545efe22822ee4271320eed173cbe8f874250f85ff50aecf839c93712ea40a9a31524c7418be913ee34cc3d1f882d8f035b032bc01c160ecf3f49
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/rotate_recovery/metadata.xml b/dev-ros/rotate_recovery/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/rotate_recovery/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.17.1-r1.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.17.1-r1.ebuild
deleted file mode 100644
index df5c9a55570a..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-1.17.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild b/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild
deleted file mode 100644
index df5c9a55570a..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles:0
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rqt_action/Manifest b/dev-ros/rqt_action/Manifest
deleted file mode 100644
index bec52a3d5146..000000000000
--- a/dev-ros/rqt_action/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_action-0.4.9.tar.gz 3288 BLAKE2B dab54459bae9975007c50e947d4e8ae6783ce653edc5132636d8a8edc02f55d832ad33910f7daec1c6ff139a4313b96dec64221ef296d6834dbbbdd43fa9cc66 SHA512 e412fe23bca87f2fc55a858ddc153ecfd6fcf7bdc60334d09285e3d44ab6d2cc52680f29d3bfd4fe9ad5bc334c595b311fcea5e835223dd61c19fd0de0489afc
-EBUILD rqt_action-0.4.9.ebuild 482 BLAKE2B 6b5b381bfb239e31fe496d3467c17994b6edb7c241b146818f10cd447878f6e35357d139200e490eae2677a051088b268dd6824a7352b366aef608516790ee0c SHA512 04070f43005559a937372188dc170b20576c901445cf094f6990187dd68466233cc88f681644eb0880ceaa0bddc42e42b851365ba361c9bf43d8848caca66fae
-EBUILD rqt_action-9999.ebuild 482 BLAKE2B 6b5b381bfb239e31fe496d3467c17994b6edb7c241b146818f10cd447878f6e35357d139200e490eae2677a051088b268dd6824a7352b366aef608516790ee0c SHA512 04070f43005559a937372188dc170b20576c901445cf094f6990187dd68466233cc88f681644eb0880ceaa0bddc42e42b851365ba361c9bf43d8848caca66fae
-MISC metadata.xml 343 BLAKE2B 71fe8a99faa6e59b179fd93ab4ca73a5e641c61d87cca8417100f119834532643bba5ba8f3315dc6633fa8185c54d601d5cc3a8c1c54646db209ac8661761f21 SHA512 c4267396a216a68857a3f0aab65724ee65c5feb2354811f35b85a51d83b16ad155db5a6a03569d293a2d66bcb6857cfd45da12236f547ce5b3e5a0f57b6345b3
diff --git a/dev-ros/rqt_action/metadata.xml b/dev-ros/rqt_action/metadata.xml
deleted file mode 100644
index 535c26d8b278..000000000000
--- a/dev-ros/rqt_action/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_action</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_action/rqt_action-0.4.9.ebuild b/dev-ros/rqt_action/rqt_action-0.4.9.ebuild
deleted file mode 100644
index a3246d99959f..000000000000
--- a/dev-ros/rqt_action/rqt_action-0.4.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_action"
-
-inherit ros-catkin
-
-DESCRIPTION="Introspect all available ROS action (from actionlib) types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_action/rqt_action-9999.ebuild b/dev-ros/rqt_action/rqt_action-9999.ebuild
deleted file mode 100644
index a3246d99959f..000000000000
--- a/dev-ros/rqt_action/rqt_action-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_action"
-
-inherit ros-catkin
-
-DESCRIPTION="Introspect all available ROS action (from actionlib) types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_bag/Manifest b/dev-ros/rqt_bag/Manifest
deleted file mode 100644
index 98374449d544..000000000000
--- a/dev-ros/rqt_bag/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_bag-0.5.1.tar.gz 53151 BLAKE2B 4165c2596fa77f059e211f9f760ce4c0634b4f5a1582be34ee40400a2715f1a5c09b2ea3b0aabaf7cf9a75eea1baec8b07220f9297d86b30e58155da05d66234 SHA512 e1b4c15cb085f285911bc8077465616923e6c2954553779c62d7cfb889b56ef88ca0bdf4e3e280fc1f489e3aac49de5d0567703d37f8ef8b1d55aa1e47e92d4f
-EBUILD rqt_bag-0.5.1.ebuild 670 BLAKE2B 4b34e7f81278ecc511795adad21e7257e71b7dd4992b77ce340b10cabafa6954117f9d26c87b1544bb56ad53eebf301c0d7fa06132eef0b50a83acfba795dfab SHA512 c5b33a0f75a8dd934895f912ff4a8059e807e1b8ce3ca0d2d30e4a799f6f85f786ab28adbf56d008b6d82ade019b4bd790da28bfbec45e42a56c8102de637d63
-EBUILD rqt_bag-9999.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
-MISC metadata.xml 340 BLAKE2B 7c032d65d355fab0729f7f0974f3fa388bff06e0a8a4bf529b7d2c7900861aaaec2f725a7e5c0d8c0d9a51ee9b6b3b320364dd8f6d6dc790d9971c648aa426ab SHA512 7cff68ceee26763b2c76f4bbdada55c44fc67699bd59ea7631a73022d12dd2c6fac3b79ab6060807f4ee2588d10c2ca046b36353a635cb19374e6723c49f37c3
diff --git a/dev-ros/rqt_bag/metadata.xml b/dev-ros/rqt_bag/metadata.xml
deleted file mode 100644
index 38c3b872b8df..000000000000
--- a/dev-ros/rqt_bag/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_bag</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_bag/rqt_bag-0.5.1.ebuild b/dev-ros/rqt_bag/rqt_bag-0.5.1.ebuild
deleted file mode 100644
index 9e3b5a9ca419..000000000000
--- a/dev-ros/rqt_bag/rqt_bag-0.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/dev-ros/rqt_bag/rqt_bag-9999.ebuild b/dev-ros/rqt_bag/rqt_bag-9999.ebuild
deleted file mode 100644
index 51bedaaa5154..000000000000
--- a/dev-ros/rqt_bag/rqt_bag-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/dev-ros/rqt_bag_plugins/Manifest b/dev-ros/rqt_bag_plugins/Manifest
deleted file mode 100644
index 3f4a688be86f..000000000000
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_bag-0.5.1.tar.gz 53151 BLAKE2B 4165c2596fa77f059e211f9f760ce4c0634b4f5a1582be34ee40400a2715f1a5c09b2ea3b0aabaf7cf9a75eea1baec8b07220f9297d86b30e58155da05d66234 SHA512 e1b4c15cb085f285911bc8077465616923e6c2954553779c62d7cfb889b56ef88ca0bdf4e3e280fc1f489e3aac49de5d0567703d37f8ef8b1d55aa1e47e92d4f
-EBUILD rqt_bag_plugins-0.5.1.ebuild 903 BLAKE2B 274671bfa03909424fb05f7cfd88c964d3125bdcde1517097753559f1c422314f2a03a40d41bc4a56dfbc80d93912866d3dac6f38597dd56a5399cb213230c68 SHA512 e4866686ecfd2289129bf4fe01a5e91f60e671e50ae24ba57c61b9a3563f281dc0ba014c50af4734ad6cee3480067175cfdedeb07a90d017f70ed215645d964e
-EBUILD rqt_bag_plugins-9999.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
-MISC metadata.xml 340 BLAKE2B 7c032d65d355fab0729f7f0974f3fa388bff06e0a8a4bf529b7d2c7900861aaaec2f725a7e5c0d8c0d9a51ee9b6b3b320364dd8f6d6dc790d9971c648aa426ab SHA512 7cff68ceee26763b2c76f4bbdada55c44fc67699bd59ea7631a73022d12dd2c6fac3b79ab6060807f4ee2588d10c2ca046b36353a635cb19374e6723c49f37c3
diff --git a/dev-ros/rqt_bag_plugins/metadata.xml b/dev-ros/rqt_bag_plugins/metadata.xml
deleted file mode 100644
index 38c3b872b8df..000000000000
--- a/dev-ros/rqt_bag_plugins/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_bag</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.5.1.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.5.1.ebuild
deleted file mode 100644
index 0a3df3567f5a..000000000000
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pycairo[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/pillow[\${PYTHON_USEDEP}]")
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
deleted file mode 100644
index f0c32428d755..000000000000
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pycairo[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/pillow[\${PYTHON_USEDEP}]")
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_console/Manifest b/dev-ros/rqt_console/Manifest
deleted file mode 100644
index f7a85ca2a3df..000000000000
--- a/dev-ros/rqt_console/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_console-0.4.11.tar.gz 27734 BLAKE2B ea8f71871bb4bc5f529c0502b0c02590c937340f9c15d4db09fbf90c47fda2731b978e88292452f217cd0c301e5f40ccaff96ca0f58bb6b3aa580f48cd41540b SHA512 c9ba7bf85c19e8fa7df7786c8d575b7a2658d4567b6b7bf67d949d844ad3b1f1892d844df6fb592d90ff01f64ad16f6b0602a8c64cf44ac09e24bc08c262b827
-EBUILD rqt_console-0.4.11.ebuild 690 BLAKE2B dc3daf73fd8eb07322ed0534ec4f97eda4b9a7acdf317afa08fb57ffa373c10f0079b4b1268d590c0e4ca235c79f78fa44cb1f5fbf9b6ad38fbf8ecd117072b1 SHA512 487f095961ae5cea2ac8a8985ac30a26b97968cc8e4dc2089c96e82a1051cfd82f8c87fbeb5885672c4c6d42d7f5529e8c0143d2808f3eea50f45b54475324d4
-EBUILD rqt_console-9999.ebuild 690 BLAKE2B dc3daf73fd8eb07322ed0534ec4f97eda4b9a7acdf317afa08fb57ffa373c10f0079b4b1268d590c0e4ca235c79f78fa44cb1f5fbf9b6ad38fbf8ecd117072b1 SHA512 487f095961ae5cea2ac8a8985ac30a26b97968cc8e4dc2089c96e82a1051cfd82f8c87fbeb5885672c4c6d42d7f5529e8c0143d2808f3eea50f45b54475324d4
-MISC metadata.xml 344 BLAKE2B e6f145df210b54d5f3e4a6a4a1ec56c5556f6e6b86af379c39806cee3616053780b31147484d958968ff75a52b88a5a349e74e09790f7bb77a1ede7f9b907a4d SHA512 99d895fedf03231f1cd7df6452a8678242197633192da65c8b2f731bb6b6cb5fbd5c0312776bfe2e5df5929f750c9a73a006b059a3a6fba262ec769adc5d09c1
diff --git a/dev-ros/rqt_console/metadata.xml b/dev-ros/rqt_console/metadata.xml
deleted file mode 100644
index 0523d76b75ee..000000000000
--- a/dev-ros/rqt_console/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_console</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_console/rqt_console-0.4.11.ebuild b/dev-ros/rqt_console/rqt_console-0.4.11.ebuild
deleted file mode 100644
index 2f17c1d3201b..000000000000
--- a/dev-ros/rqt_console/rqt_console-0.4.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_console"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and filtering ROS messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_logger_level[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_console/rqt_console-9999.ebuild b/dev-ros/rqt_console/rqt_console-9999.ebuild
deleted file mode 100644
index 2f17c1d3201b..000000000000
--- a/dev-ros/rqt_console/rqt_console-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_console"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and filtering ROS messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_logger_level[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/Manifest b/dev-ros/rqt_controller_manager/Manifest
deleted file mode 100644
index 06804bf7c75d..000000000000
--- a/dev-ros/rqt_controller_manager/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD rqt_controller_manager-0.19.1.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
-EBUILD rqt_controller_manager-0.19.2.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
-EBUILD rqt_controller_manager-0.19.3.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
-EBUILD rqt_controller_manager-0.19.4.ebuild 427 BLAKE2B 756425c7f23b938e0911cf846f3ae8e198a4e75cc6e214bdfae8fbacb8cc994aa67d7332122a0343e9e83095814b3b29f86b5c6493c4ed2a6c078e9e9c6e9ff9 SHA512 c58b4cdf26c2cd4e5f9b7f4de3d54491f854901e9ff3d47f5d25e195142cd36de63a817d4b428c330dc6c697a0b4096b1743b488007a1fc79481b0dc3dfe1edf
-EBUILD rqt_controller_manager-0.19.5.ebuild 427 BLAKE2B 756425c7f23b938e0911cf846f3ae8e198a4e75cc6e214bdfae8fbacb8cc994aa67d7332122a0343e9e83095814b3b29f86b5c6493c4ed2a6c078e9e9c6e9ff9 SHA512 c58b4cdf26c2cd4e5f9b7f4de3d54491f854901e9ff3d47f5d25e195142cd36de63a817d4b428c330dc6c697a0b4096b1743b488007a1fc79481b0dc3dfe1edf
-EBUILD rqt_controller_manager-9999.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/rqt_controller_manager/metadata.xml b/dev-ros/rqt_controller_manager/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/rqt_controller_manager/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.1.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.1.ebuild
deleted file mode 100644
index 235e5e6a6f49..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.2.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.2.ebuild
deleted file mode 100644
index 235e5e6a6f49..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.3.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.3.ebuild
deleted file mode 100644
index 235e5e6a6f49..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.4.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.4.ebuild
deleted file mode 100644
index 5325e3799433..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.ebuild
deleted file mode 100644
index 5325e3799433..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild
deleted file mode 100644
index 235e5e6a6f49..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_dep/Manifest b/dev-ros/rqt_dep/Manifest
deleted file mode 100644
index 75beabfd4e3e..000000000000
--- a/dev-ros/rqt_dep/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_dep-0.4.12.tar.gz 12888 BLAKE2B a265b54a52a9dea66c7e5f35583150da84891ca90298bee0c9ae236ed833d6d305d15f705729335db956a7fd9602260547258f7ed6c3acd3ecb668a3255d028f SHA512 7df25801662cf6eaaf5ab17a4639ce784b4e1886d5f5c9e83ec7daaf212ffef06e9ef192ae41faf8751e6ff87278e6b679b37628f527db46a6bbc7fd915df499
-EBUILD rqt_dep-0.4.12.ebuild 768 BLAKE2B cce2323a9b8a8024502074ff65afdaf5b7616d002cd65b1546d61c17064361b3bfdc4facf8b9bf6f299213032f978adb32487e2c23533beebae2b97a92b8a402 SHA512 763b9e92765fd9eee1d7781baa4ec53329dff01e9812d235806e0b7d71167b7bf7566d45cde18e9d75f3d4263169dbab8d4f0820ebac1850e682f8fbd7f7225a
-EBUILD rqt_dep-9999.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
-MISC metadata.xml 340 BLAKE2B 927a190cc507635bdb48a91539e04023413ca33b9ede6c488307e1579d9ff972ec36e6a0898a41f41c37a50bf468e7474fff3029e3c15e8cd3ad1b26ecd34c36 SHA512 00bf07d0c283a3e8bbe73231bc14fdbb6c324833ed57edaadc820c27186276dfc1bc97fa2e1b11b2602df60cc791212b431b054c5d7ea13946e8a0636487f45e
diff --git a/dev-ros/rqt_dep/metadata.xml b/dev-ros/rqt_dep/metadata.xml
deleted file mode 100644
index b68c9d168192..000000000000
--- a/dev-ros/rqt_dep/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_dep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.12.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.12.ebuild
deleted file mode 100644
index 315de5e38656..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-0.4.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_dep"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/rqt_dep/rqt_dep-9999.ebuild b/dev-ros/rqt_dep/rqt_dep-9999.ebuild
deleted file mode 100644
index 0f0d8315777a..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_dep"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/rqt_graph/Manifest b/dev-ros/rqt_graph/Manifest
deleted file mode 100644
index bf4783bc6521..000000000000
--- a/dev-ros/rqt_graph/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_graph-0.4.14.tar.gz 19068 BLAKE2B c03431d4b72b31a913ea427e6988e0de60ac41384ea0ccdc20d07232230db441398ee93f00017dffa70dc7413e847a9f128a2514d7af9a20e3b79d6b73b89231 SHA512 15871a7b48f4e121d5ed3445bbeb2f051218455c08180aeff24a756e6ee8ede795627a60152472fccbea08bd75adfc78f014c16dc9f108db1c3e0824dc630003
-EBUILD rqt_graph-0.4.14.ebuild 852 BLAKE2B 834744280752f39b5ff0f7cc294c33c1b29f520eb8bb2b1442830738f831a56e293e117b23ea629497bacb07e13677c50261fda72be99faacb23f51a41df865a SHA512 14c6937fbc9c754ad3f0127569ed29b7c7f5224b1248359c573f2799dbedadbdf5660cd5970dade4dc210c113c190c9638d434ac647c39141255683eba708b92
-EBUILD rqt_graph-9999.ebuild 852 BLAKE2B 834744280752f39b5ff0f7cc294c33c1b29f520eb8bb2b1442830738f831a56e293e117b23ea629497bacb07e13677c50261fda72be99faacb23f51a41df865a SHA512 14c6937fbc9c754ad3f0127569ed29b7c7f5224b1248359c573f2799dbedadbdf5660cd5970dade4dc210c113c190c9638d434ac647c39141255683eba708b92
-MISC metadata.xml 342 BLAKE2B f6e5d443fae4f31800497bfbdc9d87a1dd88dceee53a18be96a61609d5fbd4f345812571a46b16d66c70044ac8af2037327988dc8b44162695afc1faf0f03cce SHA512 3e4864aa970db97d22f22510a007e5a59bb707cf08bd7ded5b15d30c48db84ff39b3f58f64284b86175f35f221e5e22a6ebaf62f21774e15ff1c56f818429951
diff --git a/dev-ros/rqt_graph/metadata.xml b/dev-ros/rqt_graph/metadata.xml
deleted file mode 100644
index dd3b919c08ae..000000000000
--- a/dev-ros/rqt_graph/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_graph</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild b/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild
deleted file mode 100644
index 74ebe47da37f..000000000000
--- a/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_graph"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS computation graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_graph/rqt_graph-9999.ebuild b/dev-ros/rqt_graph/rqt_graph-9999.ebuild
deleted file mode 100644
index 74ebe47da37f..000000000000
--- a/dev-ros/rqt_graph/rqt_graph-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_graph"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS computation graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_gui/Manifest b/dev-ros/rqt_gui/Manifest
deleted file mode 100644
index 7535a5c02d41..000000000000
--- a/dev-ros/rqt_gui/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gentoo.patch 765 BLAKE2B 0b0e46dae38aaf5f1bdce5e599b33cdbeff7ed8440f1537b31b559018a0a996cac7a66cdd1ae8935463b37b52a27e933669bd03a4f9617f0ba4de2665e223a4d SHA512 9d34f4e375c08c1b635359e1e9ec178577533e8f8aae99d0071c805a1765da11a4554a51d75ca524798a2d5ad121d4adb5392b9ad3a5f0704168b2bec2c7a38d
-DIST rqt-0.5.2.tar.gz 121619 BLAKE2B a065501ee6f78b3e2867aa9a6fc416b70472a3dcd3bf447ab7c07941284add7fdaffafa4bc370ce73b777b9616544a6650bb94c30fb61bed8ce6381a2d88b5cd SHA512 09093e80daefd530b36c1ef90a350c0c5fa7ba4211b779da38c230df445170e766a737cfadec29997f81968c454daec2ffc2b6cf236e41daa21d9536f498fc17
-EBUILD rqt_gui-0.5.2.ebuild 483 BLAKE2B 9249426e1019c0b531a86f371092da7e959c024e7b714f663fe5fabc9901f441933ff925bad373933465721c908aa920d8b755679e7a52fdf711a9f0ed58b1b7 SHA512 891dd7ee3f60aee49a3ad35889098a4610a713b3cacc54f2e244a486b5e5887f16c76be2636c2fdd641981ed4458b6675d132d707866b53f6f28ecbcd5a29863
-EBUILD rqt_gui-9999.ebuild 483 BLAKE2B 9249426e1019c0b531a86f371092da7e959c024e7b714f663fe5fabc9901f441933ff925bad373933465721c908aa920d8b755679e7a52fdf711a9f0ed58b1b7 SHA512 891dd7ee3f60aee49a3ad35889098a4610a713b3cacc54f2e244a486b5e5887f16c76be2636c2fdd641981ed4458b6675d132d707866b53f6f28ecbcd5a29863
-MISC metadata.xml 336 BLAKE2B 1ad6c48259391fd5411acd1c157e345a57c752542b840988912798e0cb896fecc34400a2f22f6522c080af64dd203d17cf9086a042884007f69671722d182367 SHA512 81d5f275c229e630ea7e36e53058414d6d0eda24be8f63fc6a50e4314072075e48a45e4975afc5b76d7ad2f43d6608ee3525d3d677d7d793d1d0c44d07c9b16e
diff --git a/dev-ros/rqt_gui/files/gentoo.patch b/dev-ros/rqt_gui/files/gentoo.patch
deleted file mode 100644
index abdc30a8ccbd..000000000000
--- a/dev-ros/rqt_gui/files/gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: rqt_gui/src/rqt_gui/ros_plugin_provider.py
-===================================================================
---- rqt_gui.orig/src/rqt_gui/ros_plugin_provider.py
-+++ rqt_gui/src/rqt_gui/ros_plugin_provider.py
-@@ -109,6 +109,10 @@ class RosPluginProvider(PluginProvider):
-     def _parse_plugin_xml(self, package_name, plugin_xml):
-         plugin_descriptors = []
- 
-+        # Gentoo: strip ros_packages to get the real path.
-+        if not os.path.isfile(plugin_xml):
-+            plugin_xml = plugin_xml.replace('ros_packages/', '')
-+
-         if not os.path.isfile(plugin_xml):
-             qCritical('RosPluginProvider._parse_plugin_xml() plugin file "%s" in package "%s" not found' % (plugin_xml, package_name))
-             return plugin_descriptors
diff --git a/dev-ros/rqt_gui/metadata.xml b/dev-ros/rqt_gui/metadata.xml
deleted file mode 100644
index 68bed107402f..000000000000
--- a/dev-ros/rqt_gui/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_gui/rqt_gui-0.5.2.ebuild b/dev-ros/rqt_gui/rqt_gui-0.5.2.ebuild
deleted file mode 100644
index 893e49443842..000000000000
--- a/dev-ros/rqt_gui/rqt_gui-0.5.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Instance of the ROS integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:="
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/rqt_gui/rqt_gui-9999.ebuild b/dev-ros/rqt_gui/rqt_gui-9999.ebuild
deleted file mode 100644
index 893e49443842..000000000000
--- a/dev-ros/rqt_gui/rqt_gui-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Instance of the ROS integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:="
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/rqt_gui_cpp/Manifest b/dev-ros/rqt_gui_cpp/Manifest
deleted file mode 100644
index fd5b0e88ab62..000000000000
--- a/dev-ros/rqt_gui_cpp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt-0.5.2.tar.gz 121619 BLAKE2B a065501ee6f78b3e2867aa9a6fc416b70472a3dcd3bf447ab7c07941284add7fdaffafa4bc370ce73b777b9616544a6650bb94c30fb61bed8ce6381a2d88b5cd SHA512 09093e80daefd530b36c1ef90a350c0c5fa7ba4211b779da38c230df445170e766a737cfadec29997f81968c454daec2ffc2b6cf236e41daa21d9536f498fc17
-EBUILD rqt_gui_cpp-0.5.2.ebuild 550 BLAKE2B 8d6f8b1a22a706b8a751983cf7ac12ab1175caecf383ed34a1415a7fc91e283a36072b49eae1de4c2caceb5fb3bdeeb16638a14d6ae007b8cac9afccf4890f37 SHA512 a8ecb0a4b43dd7e5a55d1ec032230738c9570a53b617b62b8b81f70ff8296f7a9d007c6e848a55d9a031f14cf336b64f092ce19af769df904ba628c2652dcaa7
-EBUILD rqt_gui_cpp-9999.ebuild 550 BLAKE2B 8d6f8b1a22a706b8a751983cf7ac12ab1175caecf383ed34a1415a7fc91e283a36072b49eae1de4c2caceb5fb3bdeeb16638a14d6ae007b8cac9afccf4890f37 SHA512 a8ecb0a4b43dd7e5a55d1ec032230738c9570a53b617b62b8b81f70ff8296f7a9d007c6e848a55d9a031f14cf336b64f092ce19af769df904ba628c2652dcaa7
-MISC metadata.xml 336 BLAKE2B 1ad6c48259391fd5411acd1c157e345a57c752542b840988912798e0cb896fecc34400a2f22f6522c080af64dd203d17cf9086a042884007f69671722d182367 SHA512 81d5f275c229e630ea7e36e53058414d6d0eda24be8f63fc6a50e4314072075e48a45e4975afc5b76d7ad2f43d6608ee3525d3d677d7d793d1d0c44d07c9b16e
diff --git a/dev-ros/rqt_gui_cpp/metadata.xml b/dev-ros/rqt_gui_cpp/metadata.xml
deleted file mode 100644
index 68bed107402f..000000000000
--- a/dev-ros/rqt_gui_cpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_gui_cpp/rqt_gui_cpp-0.5.2.ebuild b/dev-ros/rqt_gui_cpp/rqt_gui_cpp-0.5.2.ebuild
deleted file mode 100644
index 1ce1bdc8377b..000000000000
--- a/dev-ros/rqt_gui_cpp/rqt_gui_cpp-0.5.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Enables GUI plugins to use the C++ client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	>=dev-ros/qt_gui_cpp-0.3.0
-	>=dev-ros/qt_gui-0.3.0
-	dev-ros/roscpp
-	dev-ros/nodelet
-		dev-libs/tinyxml2:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_gui_cpp/rqt_gui_cpp-9999.ebuild b/dev-ros/rqt_gui_cpp/rqt_gui_cpp-9999.ebuild
deleted file mode 100644
index 1ce1bdc8377b..000000000000
--- a/dev-ros/rqt_gui_cpp/rqt_gui_cpp-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Enables GUI plugins to use the C++ client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	>=dev-ros/qt_gui_cpp-0.3.0
-	>=dev-ros/qt_gui-0.3.0
-	dev-ros/roscpp
-	dev-ros/nodelet
-		dev-libs/tinyxml2:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_gui_py/Manifest b/dev-ros/rqt_gui_py/Manifest
deleted file mode 100644
index fad15698ac6b..000000000000
--- a/dev-ros/rqt_gui_py/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt-0.5.2.tar.gz 121619 BLAKE2B a065501ee6f78b3e2867aa9a6fc416b70472a3dcd3bf447ab7c07941284add7fdaffafa4bc370ce73b777b9616544a6650bb94c30fb61bed8ce6381a2d88b5cd SHA512 09093e80daefd530b36c1ef90a350c0c5fa7ba4211b779da38c230df445170e766a737cfadec29997f81968c454daec2ffc2b6cf236e41daa21d9536f498fc17
-EBUILD rqt_gui_py-0.5.2.ebuild 503 BLAKE2B 5888ea5bab0d386127687b0b4bf14d63c3b0d63ea9cc00de83b91994b944b68e7c1ac33e18dce9c1114a12bfedb9bdd479b76e5434988ad47acbdd4c26ebe121 SHA512 ea2907b3b5c61b8d5535303f2fc68a9d91c124c6b874d9aaec9906fb5724317d4c39cbdf07bb6cb21b8d1f3e20c28802b36445b5d360da52af43354eb7490f99
-EBUILD rqt_gui_py-9999.ebuild 503 BLAKE2B 5888ea5bab0d386127687b0b4bf14d63c3b0d63ea9cc00de83b91994b944b68e7c1ac33e18dce9c1114a12bfedb9bdd479b76e5434988ad47acbdd4c26ebe121 SHA512 ea2907b3b5c61b8d5535303f2fc68a9d91c124c6b874d9aaec9906fb5724317d4c39cbdf07bb6cb21b8d1f3e20c28802b36445b5d360da52af43354eb7490f99
-MISC metadata.xml 336 BLAKE2B 1ad6c48259391fd5411acd1c157e345a57c752542b840988912798e0cb896fecc34400a2f22f6522c080af64dd203d17cf9086a042884007f69671722d182367 SHA512 81d5f275c229e630ea7e36e53058414d6d0eda24be8f63fc6a50e4314072075e48a45e4975afc5b76d7ad2f43d6608ee3525d3d677d7d793d1d0c44d07c9b16e
diff --git a/dev-ros/rqt_gui_py/metadata.xml b/dev-ros/rqt_gui_py/metadata.xml
deleted file mode 100644
index 68bed107402f..000000000000
--- a/dev-ros/rqt_gui_py/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_gui_py/rqt_gui_py-0.5.2.ebuild b/dev-ros/rqt_gui_py/rqt_gui_py-0.5.2.ebuild
deleted file mode 100644
index d34926edc393..000000000000
--- a/dev-ros/rqt_gui_py/rqt_gui_py-0.5.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Enables GUI plugins to use the Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/rqt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_gui_py/rqt_gui_py-9999.ebuild b/dev-ros/rqt_gui_py/rqt_gui_py-9999.ebuild
deleted file mode 100644
index d34926edc393..000000000000
--- a/dev-ros/rqt_gui_py/rqt_gui_py-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Enables GUI plugins to use the Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/rqt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_image_view/Manifest b/dev-ros/rqt_image_view/Manifest
deleted file mode 100644
index 5b70502d6285..000000000000
--- a/dev-ros/rqt_image_view/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_image_view-0.4.16.tar.gz 14850 BLAKE2B 9e5c9017166db13f3c2c28d851b932a9854718170da51c840a52c17031bd7604eeb4097d2d60d5504d8d0430efc908a0629bb6d9c986884c6bb63449225b6e44 SHA512 62ee991bd613577f0676d55305c6c95f4687aee7990feebc1178dcaa40e85c61e7a76c11b9393e83aaddba4347a16016a126edffb4511c3d38902136eac62752
-EBUILD rqt_image_view-0.4.16.ebuild 631 BLAKE2B f8e01de0c3e023c5564b5310558dae31143c45b607702988b6c8de59f85ca67de30b602144a995e992a86ab5ef27b5fdec227fe4ede6deb57448f2d7fed433e2 SHA512 301800eb5b1a8e527505269b703593f531ef84fb9ec88ada2c05ed105598dec3345e6bf48c55a32b012f9eea3b6171b016c8e0aa85bb6fd6734c108b98bf9b3f
-EBUILD rqt_image_view-9999.ebuild 631 BLAKE2B f8e01de0c3e023c5564b5310558dae31143c45b607702988b6c8de59f85ca67de30b602144a995e992a86ab5ef27b5fdec227fe4ede6deb57448f2d7fed433e2 SHA512 301800eb5b1a8e527505269b703593f531ef84fb9ec88ada2c05ed105598dec3345e6bf48c55a32b012f9eea3b6171b016c8e0aa85bb6fd6734c108b98bf9b3f
-MISC metadata.xml 347 BLAKE2B 7b425df61e1887f3b385f6dd4db1e3240aa3a35c755b98ab3b50670e5f4bfa8b7647602fcfbbc021e4e582b5c0e0a53aa5c27eaf62174ff7765cfd266df39a03 SHA512 8f958cbb4fa5b3a377238d63893281f62fd58bac2a00ce656c6a1be0966af567e64408dce81cd1cd9ccc8f65a04032954ed7ae6e1c6b2ecd448aa6f58a5cd51d
diff --git a/dev-ros/rqt_image_view/metadata.xml b/dev-ros/rqt_image_view/metadata.xml
deleted file mode 100644
index ddaa66db2d28..000000000000
--- a/dev-ros/rqt_image_view/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_image_view</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild b/dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild
deleted file mode 100644
index 6ed30f7ba659..000000000000
--- a/dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_image_view"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying images using image_transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	media-libs/opencv:=
-	dev-ros/image_transport
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/rqt_gui_cpp-0.3
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_image_view/rqt_image_view-9999.ebuild b/dev-ros/rqt_image_view/rqt_image_view-9999.ebuild
deleted file mode 100644
index 6ed30f7ba659..000000000000
--- a/dev-ros/rqt_image_view/rqt_image_view-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_image_view"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying images using image_transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	media-libs/opencv:=
-	dev-ros/image_transport
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/rqt_gui_cpp-0.3
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_launch/Manifest b/dev-ros/rqt_launch/Manifest
deleted file mode 100644
index f673bd298fce..000000000000
--- a/dev-ros/rqt_launch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_launch-0.4.9.tar.gz 11629 BLAKE2B a2bcb23e5051d43656e636ad654262d68ce69f6edc1ebb24698701564fcd2cec57796019c3cb8c723b697290680365d2b26a38917f19747573609dc04c194f2b SHA512 927ef766836b99686f8c5c8c4ded0bfab5825819f72ae15c0aee817d43f36b280a2143df0e59fe17ab20e4e57ca8002cdf18b6a485f95155e199e062b71fd9b1
-EBUILD rqt_launch-0.4.9.ebuild 633 BLAKE2B f6d805fd8533bd751bfba0fe241bc86f711098ff4705f50c674b09a64734feca3ed152c0ebc00aecf33c37416417ed9f79253379f7a8a88bc3c22457eeb6aaeb SHA512 0f9f7d1e2fa2ca4a097c2961f43b61dec14683306bb08ff41c45c332dc7d4c383a3842f356e27563d9723a92153f69358099dc1318ad026afd33668e181d7a9e
-EBUILD rqt_launch-9999.ebuild 633 BLAKE2B f6d805fd8533bd751bfba0fe241bc86f711098ff4705f50c674b09a64734feca3ed152c0ebc00aecf33c37416417ed9f79253379f7a8a88bc3c22457eeb6aaeb SHA512 0f9f7d1e2fa2ca4a097c2961f43b61dec14683306bb08ff41c45c332dc7d4c383a3842f356e27563d9723a92153f69358099dc1318ad026afd33668e181d7a9e
-MISC metadata.xml 343 BLAKE2B 5c58a0ebe3fb925a30e81afe1b557e04230f6d5836946263bb700f15366b4282d0c46f18ff502ce61af1d730f86358328ade98635279c346d9c282b47b37a2aa SHA512 8e1646a2695f0b771ada175365dfdda43443f91c2fc2f01886a99776241b43ef2a10b1a93abd985089b2c15e8115912d2a68813a997d7e49fe16c331cdc61b9b
diff --git a/dev-ros/rqt_launch/metadata.xml b/dev-ros/rqt_launch/metadata.xml
deleted file mode 100644
index 993248de398f..000000000000
--- a/dev-ros/rqt_launch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_launch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_launch/rqt_launch-0.4.9.ebuild b/dev-ros/rqt_launch/rqt_launch-0.4.9.ebuild
deleted file mode 100644
index 3a4d4bd89d35..000000000000
--- a/dev-ros/rqt_launch/rqt_launch-0.4.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_launch"
-
-inherit ros-catkin
-
-DESCRIPTION="Easy view of .launch files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_launch/rqt_launch-9999.ebuild b/dev-ros/rqt_launch/rqt_launch-9999.ebuild
deleted file mode 100644
index 3a4d4bd89d35..000000000000
--- a/dev-ros/rqt_launch/rqt_launch-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_launch"
-
-inherit ros-catkin
-
-DESCRIPTION="Easy view of .launch files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_logger_level/Manifest b/dev-ros/rqt_logger_level/Manifest
deleted file mode 100644
index d45d5e0dbf2d..000000000000
--- a/dev-ros/rqt_logger_level/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_logger_level-0.4.11.tar.gz 6193 BLAKE2B f3970477b4b3a91c5bc8c5682e5d915ce74f2c9bd64ff5c79bd52f4d97db6e5d1638b197197ed8a43a0aca9cc65fe7d68eae549d399087683b8b9d3e465c34d4 SHA512 94ddae15665e4a0ec11aeb5996509b58d8d9d4cfd7111b53a7e0eae6a812fd914fde4dc31a5dd3906ffc3d96ad9b2e9adfe0296a3d84173914864b6da041ca17
-EBUILD rqt_logger_level-0.4.11.ebuild 633 BLAKE2B 98fa361f03b90d4365bec1c1d1ee7a929cdb165533852cb2c8af06e79a497ee613e5aa0be4a909fe1bc6a66f444550362bf35a08de6e5bff0c887687683e29d2 SHA512 d914f9c4ccedc1b3be6f936fe001cab1ee207cc40dab762aacb920fb3b4de880029efd5ad1177a391d918d2fa19fe43ed77bf08893dfe50dc47ea24bdfb0eb1c
-EBUILD rqt_logger_level-9999.ebuild 633 BLAKE2B 98fa361f03b90d4365bec1c1d1ee7a929cdb165533852cb2c8af06e79a497ee613e5aa0be4a909fe1bc6a66f444550362bf35a08de6e5bff0c887687683e29d2 SHA512 d914f9c4ccedc1b3be6f936fe001cab1ee207cc40dab762aacb920fb3b4de880029efd5ad1177a391d918d2fa19fe43ed77bf08893dfe50dc47ea24bdfb0eb1c
-MISC metadata.xml 349 BLAKE2B 2a541f18a2315c419d993eb10e01a8962640f9e760daf7b1c86634b0eccd69f8ac5eaa737759392ed51a0d83bcb93b8922d28d758cce13918b0df7f3738efc21 SHA512 b095d6f4979ebb9e7744263cbeed4cb2b76e6916fdf424b2dd9c3b5bf98abb8010cd6445bd4bdf80cb2c61596bb651d4cec9f6391a31b2b167e46612c3f106d4
diff --git a/dev-ros/rqt_logger_level/metadata.xml b/dev-ros/rqt_logger_level/metadata.xml
deleted file mode 100644
index 92c9972736ad..000000000000
--- a/dev-ros/rqt_logger_level/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_logger_level</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.11.ebuild b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.11.ebuild
deleted file mode 100644
index 6c0c5dcb45ec..000000000000
--- a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_logger_level"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for configuring the logger level of ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_logger_level/rqt_logger_level-9999.ebuild b/dev-ros/rqt_logger_level/rqt_logger_level-9999.ebuild
deleted file mode 100644
index 6c0c5dcb45ec..000000000000
--- a/dev-ros/rqt_logger_level/rqt_logger_level-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_logger_level"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for configuring the logger level of ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_moveit/Manifest b/dev-ros/rqt_moveit/Manifest
deleted file mode 100644
index 8c945bf4eb1f..000000000000
--- a/dev-ros/rqt_moveit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_moveit-0.5.10.tar.gz 8234 BLAKE2B 4cb8b0a5e1ab70ad598b9a8c99410f7c6306db65e54b9d187846c1d998024a7cd4ea34dc5da03bf279bbb618bbe1902f26f030d72d20dc38da9b55318943bba1 SHA512 b6444eb9cbe12bf8ab1c51af507f36d2af4632da65a4a90535db4af12eb085ade8ce26917bb7cfa0c0ff67b1f6e92ed12eef8c3b548f23ccf7f8c2632711a4d1
-EBUILD rqt_moveit-0.5.10.ebuild 647 BLAKE2B bc180e5cbffb2cde5429191e3ed8b9102d7525798bbf1b55eb01b42914184e25a3051ee78611aa5f7301eac1b97b51eb9a3e119c73cd3e7da6e1ee36a79f9d87 SHA512 a25f9f5e71e233218897b3a3dc5fdfaf5879b52782e40832583a2e8b31556c1996a699f0d8a0f718f53d659422f0b7caae71cc3936a449278de261fc2fd97292
-EBUILD rqt_moveit-9999.ebuild 647 BLAKE2B 3605e38bf34f1db0f60da4134561cfc620e1e1b687c26f0eeaf3ae5fde7a49b5797a03c0aec5a321dbf1bcaa7b86485610a6d802ce32b2a556f652215d2a4769 SHA512 a5a65999654c248df2663ff2301e2017bcb097bf3843e6e221f3bc67627096f408c3abe762180af91a6511676ec1af5f78ec733342cc596ae780d2ea64de5c0c
-MISC metadata.xml 343 BLAKE2B b4fcb1a4f573d0d5c85c969dfca7e649072de3a75090f259ebef06e6393b98dd02de633feee9367b1cd7b1e3890baab42b277ed35e7a4f5b117487cf34c497ad SHA512 3d61aad07dfaa548a772e3b246ef9a2177af190f6fe5a84bfe3bf9087a3b9245e9d86d9307c558df20f835dba4aa19270cb1ac87e39b842a521b28d05015b41a
diff --git a/dev-ros/rqt_moveit/metadata.xml b/dev-ros/rqt_moveit/metadata.xml
deleted file mode 100644
index 193441f5d02f..000000000000
--- a/dev-ros/rqt_moveit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_moveit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_moveit/rqt_moveit-0.5.10.ebuild b/dev-ros/rqt_moveit/rqt_moveit-0.5.10.ebuild
deleted file mode 100644
index b9499031ec56..000000000000
--- a/dev-ros/rqt_moveit/rqt_moveit-0.5.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_moveit"
-
-inherit ros-catkin
-
-DESCRIPTION="Assists monitoring tasks for MoveIt! motion planner"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_topic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_moveit/rqt_moveit-9999.ebuild b/dev-ros/rqt_moveit/rqt_moveit-9999.ebuild
deleted file mode 100644
index a6a3f9d5a672..000000000000
--- a/dev-ros/rqt_moveit/rqt_moveit-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_moveit"
-
-inherit ros-catkin
-
-DESCRIPTION="Assists monitoring tasks for MoveIt! motion planner"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_topic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_msg/Manifest b/dev-ros/rqt_msg/Manifest
deleted file mode 100644
index 6d9f21ed726a..000000000000
--- a/dev-ros/rqt_msg/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_msg-0.4.10.tar.gz 7042 BLAKE2B d095dca56f59c85554882a5272d2cab9bea002a4e78652c62bcde6c145e00b16afef4d061ab53d7684824211ed782476aff1ec0a91a07c0d92a743aeb49ee3aa SHA512 6a4a67ebb51f7a488efb8560366a47eb594be46615cf6f16d302608f07d51a7606d3e276bc82faa0bedf340fec1748a56c071543a26130adbe5233117b396ee8
-EBUILD rqt_msg-0.4.10.ebuild 781 BLAKE2B 414479c6f491c2d2b285bee415c025ee37264f5ad9fb157cd2ab1783b8bee2aee719492ad33c74261e14ba4ac3c728c46b64e61900d542da08d93bd04c7a8700 SHA512 57ddca92f2cea7ba94aa3b357effb96f8ffbbc710bae50ffa5e0544df7287c7ff9e2029e68ffa11dc2a229fba1d6f8d0a40c41297dc740bf114f668d2f92e57a
-EBUILD rqt_msg-9999.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
-MISC metadata.xml 340 BLAKE2B 9cb4142da0cdedd0703bff53259fc3aa2a4d16e50db4b4ad6c7cd4c4cf19a1ad66151b9e8878f0e7a9e626e8dc36aaa351eecc69572df658242bcfbabea6e978 SHA512 c83e6a46e7f9fff4f86fc4aa4d16941dcc3f2391833f69df5c9a04d8109571fdf8bb2ad9d9b1a32d20abef162a353e21f873f3f8ac915e3409b1857ffd6a346e
diff --git a/dev-ros/rqt_msg/metadata.xml b/dev-ros/rqt_msg/metadata.xml
deleted file mode 100644
index 81e9ed381f9c..000000000000
--- a/dev-ros/rqt_msg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_msg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.10.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.10.ebuild
deleted file mode 100644
index 6f493e14862b..000000000000
--- a/dev-ros/rqt_msg/rqt_msg-0.4.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_msg"
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_msg/rqt_msg-9999.ebuild b/dev-ros/rqt_msg/rqt_msg-9999.ebuild
deleted file mode 100644
index d88c80ad96cd..000000000000
--- a/dev-ros/rqt_msg/rqt_msg-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_msg"
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_nav_view/Manifest b/dev-ros/rqt_nav_view/Manifest
deleted file mode 100644
index d165b5c02c85..000000000000
--- a/dev-ros/rqt_nav_view/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_nav_view-0.5.7.tar.gz 7261 BLAKE2B 7da874ab19dfa5d08da04b6cf1a38e7e3528cdcb303d7415654d091cde3858a04c97178bc43a3f7e7357203e69ed08068062d261510075aefabed2d0641b7874 SHA512 a8c4544bc4bd11a7e2d7a60786033c82206c3e4ac822c7d72199af465c7d8488584906906b2a3e124b271171717256c1412697b1ac0dcf02c8c5bcd3faae232e
-EBUILD rqt_nav_view-0.5.7.ebuild 762 BLAKE2B 504e8da4b8ae91f65bb534e6f21811d7cd5638d88c35ae8e40e1e4e5ca858f531f3b49436bb6c69cd0870bb50bdc0f077fc61c68f3f47822abd42924c485a7ef SHA512 ed3387e6903e4be789cee1ed0b8dd018f71d7b578faa04c30a93285ec3c84a77f96a866163ffcce3fe963d270282e706bbc95b8e9553e228e3012f7ed87c4b74
-EBUILD rqt_nav_view-9999.ebuild 762 BLAKE2B 504e8da4b8ae91f65bb534e6f21811d7cd5638d88c35ae8e40e1e4e5ca858f531f3b49436bb6c69cd0870bb50bdc0f077fc61c68f3f47822abd42924c485a7ef SHA512 ed3387e6903e4be789cee1ed0b8dd018f71d7b578faa04c30a93285ec3c84a77f96a866163ffcce3fe963d270282e706bbc95b8e9553e228e3012f7ed87c4b74
-MISC metadata.xml 345 BLAKE2B 88d04cb9c030cb2b2d19a78937d7e48d1551357d943f5242140637cd0f3a7c461a0336654726c5537e1796e8b6345cd5dbf7432ac03784c2c642082e4e2fe7a6 SHA512 375aa420215242e8d27eaa0e80e9a5bb8ea93a19f24998b23bc2bac92b1265b586e9d7ed2676223bec6ab566673721cd6f257dfedf50c4721bd9bbf22cf23936
diff --git a/dev-ros/rqt_nav_view/metadata.xml b/dev-ros/rqt_nav_view/metadata.xml
deleted file mode 100644
index af8be110b3cf..000000000000
--- a/dev-ros/rqt_nav_view/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_nav_view</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_nav_view/rqt_nav_view-0.5.7.ebuild b/dev-ros/rqt_nav_view/rqt_nav_view-0.5.7.ebuild
deleted file mode 100644
index 3056a083f3d7..000000000000
--- a/dev-ros/rqt_nav_view/rqt_nav_view-0.5.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_nav_view"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a gui for viewing navigation maps and paths"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_nav_view/rqt_nav_view-9999.ebuild b/dev-ros/rqt_nav_view/rqt_nav_view-9999.ebuild
deleted file mode 100644
index 3056a083f3d7..000000000000
--- a/dev-ros/rqt_nav_view/rqt_nav_view-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_nav_view"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a gui for viewing navigation maps and paths"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_plot/Manifest b/dev-ros/rqt_plot/Manifest
deleted file mode 100644
index 5a6630ce6da7..000000000000
--- a/dev-ros/rqt_plot/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_plot-0.4.13.tar.gz 20082 BLAKE2B 89d3653fddf7db0beae573aefcd115258db5e05e0a41a00fcdcbad70779a0e0e64a6b7fa5aff4b620af2099b6af424f5b235f7e7c25bb64b35b46a0a26c05bff SHA512 dc1a94ec74050313f7c6dcc308f56afff8e4fb31f9f8679e9d6f341e6d77f63ba94fc53c57ecde1a472f9b8c26c8d14307b8451ca7fb6c3fcf77f4b0a4bdcb6a
-EBUILD rqt_plot-0.4.13.ebuild 1026 BLAKE2B 97d48fdaf88711b8acb1d8603a4c864c689e3fe1a85456970b76b2a405588472d4475ec0767d69c6cf5a92bc6ad0e803b39fc6a2fbdc850f9bb061b1d239af86 SHA512 9a321883121d79bbd9b013f5b6fe947f98dfa7b0786b982ea33d29ae8e190f7572c99752fa1d6c8a93792e2c936f3df5771eca590ba25ee34c6c4ba578370d6c
-EBUILD rqt_plot-9999.ebuild 1026 BLAKE2B 147f73f1513eb2b0fb0277838264cae156c1f50e13ec4576632b8096bd30f1a4c6f366cb125cba80e91615077b2ca405a17438e6af931dfeef933d32a458dc5b SHA512 471f7cd60e7af6a9c2b6eff17c59ddb88ad99aabff2fcba46a8c567f2aadfe91e480467168248dda80688f2a366e0eec14f945b140d8be1b179de664c2cfb357
-MISC metadata.xml 341 BLAKE2B e3915c2b300ff09e51ed605acfb7ddbe0ff2e20c7a6d916ea416f35ae4331f9cb981eba2f384d47574d492a169dc030444554a9dd99e5af5ccec041c1783dff7 SHA512 c91ec837bf8b3c53f1236f8b216ecab95f37e29cd449e07188ff039502396e6798613fdfe1f1b2fb6ece4bec9e21d51753b3ecbc8c52a8870527d276fe78ed8c
diff --git a/dev-ros/rqt_plot/metadata.xml b/dev-ros/rqt_plot/metadata.xml
deleted file mode 100644
index 142ab0e10b9c..000000000000
--- a/dev-ros/rqt_plot/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_plot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_plot/rqt_plot-0.4.13.ebuild b/dev-ros/rqt_plot/rqt_plot-0.4.13.ebuild
deleted file mode 100644
index cd9938c0d4f2..000000000000
--- a/dev-ros/rqt_plot/rqt_plot-0.4.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_plot"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin visualizing numeric values in a 2D plot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/pyqtgraph[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_plot/rqt_plot-9999.ebuild b/dev-ros/rqt_plot/rqt_plot-9999.ebuild
deleted file mode 100644
index 84ec25dcda92..000000000000
--- a/dev-ros/rqt_plot/rqt_plot-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_plot"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin visualizing numeric values in a 2D plot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/pyqtgraph[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_pose_view/Manifest b/dev-ros/rqt_pose_view/Manifest
deleted file mode 100644
index ff7b18e0788e..000000000000
--- a/dev-ros/rqt_pose_view/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_pose_view-0.5.11.tar.gz 8572 BLAKE2B 38529a9153b713a1893f3c3d9e4a275c7506fd7e17dc3cf78b18e789c658d3e64775f51f3d9310cb1b1ea3546c189583478a82bc4b324d692244efaea8191247 SHA512 da6f3c670c84b360320e5e49a35d7f24776f004f8ec15141b8ea6c10ff3b98748cd7fbaada7a11b6aff8a7bcb13ca83d641e6ca446ad2e712e3a6d367223e322
-EBUILD rqt_pose_view-0.5.11.ebuild 824 BLAKE2B a2cf32894e9eacfd2463ef659a9388b6437c51c348b476e1abbfe1f32fd9ab6dd6cd3242ad543a4878182c75a5f18d82f9b98800940db9a066de92401771d3dc SHA512 e74fd52ed56a854cb02a29d2dd4db18329da4f05c517752136690688dd1ef54f3c10e591ee97d15a90bdc453505b7701e8683967b4de1e26bbb96ca98a18a2df
-EBUILD rqt_pose_view-9999.ebuild 824 BLAKE2B 44c14e4297f6ddf62fbb9f0f0d4d8a64a02ac6f8538d5bfd2a8392a14539a8d58efc919b49ab8a784d20f96868fd3308145c051144e277845fa447cabf85d9a8 SHA512 5a6285018588f9d7d52f4524d9b537f3e48b08eb0c1f991a10b638708f270166da3137a1e81d39ec5b46644484e0c0a4945f04d52a657f0b170c6362ac0719de
-MISC metadata.xml 346 BLAKE2B 66dfcad3d4f14d0707ee644bee16df478a8cf036a1dc5e2e9cf758ccbe97dcca5e9707f04551b3768b6e7ab4c17c5a96763fed5817da19ba6ab283178d59598b SHA512 3908dfd3fe1d1b6f457cef9049ea99fd317f42369ea2d13d6f91b1c00dce2d7d000eb01ce561ee0ea65da80d7d042262acb93e67525db9408b80727862c6f079
diff --git a/dev-ros/rqt_pose_view/metadata.xml b/dev-ros/rqt_pose_view/metadata.xml
deleted file mode 100644
index 47507ce9b96b..000000000000
--- a/dev-ros/rqt_pose_view/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_pose_view</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.11.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.11.ebuild
deleted file mode 100644
index cd3b6a564f73..000000000000
--- a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_pose_view"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing 3D poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyopengl[\${PYTHON_USEDEP}]")
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_pose_view/rqt_pose_view-9999.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-9999.ebuild
deleted file mode 100644
index 903a748d5bfa..000000000000
--- a/dev-ros/rqt_pose_view/rqt_pose_view-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_pose_view"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing 3D poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyopengl[\${PYTHON_USEDEP}]")
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_publisher/Manifest b/dev-ros/rqt_publisher/Manifest
deleted file mode 100644
index 89d00d33c3cd..000000000000
--- a/dev-ros/rqt_publisher/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_publisher-0.4.10.tar.gz 10726 BLAKE2B b8b06570bd74c80de5227b5ba5e9b08716a53cb91627f033767f3e4e39df5aae071ef6a215f15b1cb25aa397f558641edc88eac69a9291288975eca005cc882e SHA512 b3786a9431691419155f8ac6e865d65b6c4cbae1189a7d2ac66338399285d266cf860a4ccfe49cb45d361a57333136afc1d96a655f13265cf054868efccf3a07
-EBUILD rqt_publisher-0.4.10.ebuild 769 BLAKE2B 1ad8246893f0653f79b574316a82076327b877b3ca6ab240b3de6aab5b2dcbaf72fe43d8195032aec1defb37091db79b685841378dac8e9bade69a07e28e13f3 SHA512 a27c66d936ee4934ed5bad453a97adfe3e47e0fd56347a243403eef9ab08cc81e48a4cdb7177c6e8859dd95173b66d477ab7a5894d85e1a8e9af10b5f4bf8b4b
-EBUILD rqt_publisher-9999.ebuild 769 BLAKE2B 9486a720d528505fce4ccca7d4a09760c184783edaababc513b42503da39993da9e8ba80a5abfb8e33c4007ae4706a92a47c4a94a2d561c8d313e43b16b76b89 SHA512 d21e0a36a12e3549d96529a78023546da818ee460a5b786f4a07f8da5e88f24fbef3f38965aab5c2a5729ab56503d265df6b51562f1842ee6eae514b04e06b22
-MISC metadata.xml 346 BLAKE2B 1022f058f196aa4c8a56e76ac3185aaef32512bbfb57c6b021381bf94215804eb6aec08fdd88b9956817625839d001856ceb0754919de242a57ecdfcbfee3365 SHA512 a9c573789324d5de77c4cbc8e6ae391dd7f5a18ef3c44b9be114d0657b6f6056be654f6ddd1707ce3851cf69c193b6a45c69a36d7448a080d750521e3da94bb7
diff --git a/dev-ros/rqt_publisher/metadata.xml b/dev-ros/rqt_publisher/metadata.xml
deleted file mode 100644
index 54e7c78642d9..000000000000
--- a/dev-ros/rqt_publisher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_publisher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_publisher/rqt_publisher-0.4.10.ebuild b/dev-ros/rqt_publisher/rqt_publisher-0.4.10.ebuild
deleted file mode 100644
index 87a23cd47743..000000000000
--- a/dev-ros/rqt_publisher/rqt_publisher-0.4.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_publisher"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for publishing arbitrary messages with fixed or computed field values"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_publisher/rqt_publisher-9999.ebuild b/dev-ros/rqt_publisher/rqt_publisher-9999.ebuild
deleted file mode 100644
index 5320800e2fde..000000000000
--- a/dev-ros/rqt_publisher/rqt_publisher-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_publisher"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for publishing arbitrary messages with fixed or computed field values"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_common/Manifest b/dev-ros/rqt_py_common/Manifest
deleted file mode 100644
index 23eeaaacec93..000000000000
--- a/dev-ros/rqt_py_common/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt-0.5.2.tar.gz 121619 BLAKE2B a065501ee6f78b3e2867aa9a6fc416b70472a3dcd3bf447ab7c07941284add7fdaffafa4bc370ce73b777b9616544a6650bb94c30fb61bed8ce6381a2d88b5cd SHA512 09093e80daefd530b36c1ef90a350c0c5fa7ba4211b779da38c230df445170e766a737cfadec29997f81968c454daec2ffc2b6cf236e41daa21d9536f498fc17
-EBUILD rqt_py_common-0.5.2.ebuild 736 BLAKE2B 5033f9fc2bc57dd9f9c33cf9ce54c7be3b4b75de5e5d53cf1ad615f9bd8bf56470b99a44e5df1f29dfe9e1007e9bf343b9e176c957f823dec88699373071094a SHA512 4231a76d261b436f86cfbb12d6b71d01dc0efd1ac2f3c4b64c55ead921454175ca09bb50347e2c7420b0157c48202918a23574f8eae33d926567e303ee15f6a3
-EBUILD rqt_py_common-9999.ebuild 736 BLAKE2B 5033f9fc2bc57dd9f9c33cf9ce54c7be3b4b75de5e5d53cf1ad615f9bd8bf56470b99a44e5df1f29dfe9e1007e9bf343b9e176c957f823dec88699373071094a SHA512 4231a76d261b436f86cfbb12d6b71d01dc0efd1ac2f3c4b64c55ead921454175ca09bb50347e2c7420b0157c48202918a23574f8eae33d926567e303ee15f6a3
-MISC metadata.xml 336 BLAKE2B 1ad6c48259391fd5411acd1c157e345a57c752542b840988912798e0cb896fecc34400a2f22f6522c080af64dd203d17cf9086a042884007f69671722d182367 SHA512 81d5f275c229e630ea7e36e53058414d6d0eda24be8f63fc6a50e4314072075e48a45e4975afc5b76d7ad2f43d6608ee3525d3d677d7d793d1d0c44d07c9b16e
diff --git a/dev-ros/rqt_py_common/metadata.xml b/dev-ros/rqt_py_common/metadata.xml
deleted file mode 100644
index 68bed107402f..000000000000
--- a/dev-ros/rqt_py_common/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_py_common/rqt_py_common-0.5.2.ebuild b/dev-ros/rqt_py_common/rqt_py_common-0.5.2.ebuild
deleted file mode 100644
index 7f032e6025de..000000000000
--- a/dev-ros/rqt_py_common/rqt_py_common-0.5.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-ROS_SUBDIR=${PN}
-# Tests have messages
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for rqt plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild b/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild
deleted file mode 100644
index 7f032e6025de..000000000000
--- a/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-ROS_SUBDIR=${PN}
-# Tests have messages
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for rqt plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rqt_py_console/Manifest b/dev-ros/rqt_py_console/Manifest
deleted file mode 100644
index 50cd19639aea..000000000000
--- a/dev-ros/rqt_py_console/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_py_console-0.4.10.tar.gz 5658 BLAKE2B 837f172c250a6a12bb56b1b5b7640ddff2a573a5299c2165b597e1ded542992463006ac8b0a051d63d61e0431a5bbdea151ea3dd6693b5b93386bf02d4fbf8d4 SHA512 d121e166f88a54f70b27b6d44f2159ccdd3b862afd7adab57f3532fb6376709a9ce193628a912c839b5dae5e72e346317f6dc457832493d6b74e8fb2b78cb708
-EBUILD rqt_py_console-0.4.10.ebuild 637 BLAKE2B b06b32bd908753ce365e3716bb28854d9c23b706bd3408dd327df54687a7857e1c43ae782b598819f3065c782e89cd5742449a921037c4f1b3b82f1ac8b6ece7 SHA512 5f98ac49d9c7e5667decc0006e2f9afe4084a2910575f2da4619836acf38e32c1fd2ebb44e583feb9ce1dd893431b9d877cc50884ccb4e881474694a77ce1f18
-EBUILD rqt_py_console-9999.ebuild 637 BLAKE2B 77e4ed1b48ae9073f7980c96aab255ce931e919de2dfe9684944f7efddd652f1f5bce83ea12c967721d2bfffe3a6738295a1bcf607de64d69334c2e4730659ab SHA512 61cf5bcf9f4607fd28537972825503f53f3497a0d3def0ce9c46fe030c99c613a18eaeaa0dc9f341673b0a2119675bbf65ce3202e92c674c7110ffd74a830d54
-MISC metadata.xml 347 BLAKE2B 1ccca08796e6d30610cdf129f60a00741bb8dcc27df48d1161bdb504ac5beb31f076cf0fdd87c2a33140ed5ea851def2f7ced5ac9621e458fecdb4d017b5fae6 SHA512 8dd37d7b158acd7e92e4b5e93c6c37a143e3d4dff3a4022529676454ab3ed406b43afc8a0242a5526c0d157a82ce3fd8f09ad9912885377392190b31c8bad748
diff --git a/dev-ros/rqt_py_console/metadata.xml b/dev-ros/rqt_py_console/metadata.xml
deleted file mode 100644
index 4c5f92e03ec6..000000000000
--- a/dev-ros/rqt_py_console/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_py_console</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_py_console/rqt_py_console-0.4.10.ebuild b/dev-ros/rqt_py_console/rqt_py_console-0.4.10.ebuild
deleted file mode 100644
index 474d032774d8..000000000000
--- a/dev-ros/rqt_py_console/rqt_py_console-0.4.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_py_console"
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin providing an interactive Python console"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_console/rqt_py_console-9999.ebuild b/dev-ros/rqt_py_console/rqt_py_console-9999.ebuild
deleted file mode 100644
index 46f53c8850d9..000000000000
--- a/dev-ros/rqt_py_console/rqt_py_console-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_py_console"
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin providing an interactive Python console"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_reconfigure/Manifest b/dev-ros/rqt_reconfigure/Manifest
deleted file mode 100644
index ef3586932095..000000000000
--- a/dev-ros/rqt_reconfigure/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_reconfigure-0.5.4.tar.gz 31640 BLAKE2B 6751492454eb4bdf368de771c016cf712042ae1676a3890b819aecf6285aa1937f5f0528651ce7fb0e935e595d8ef3094ecb0a7a282f4b44f8d5107891329b32 SHA512 ae2e2286bfb974b53070359fdaed9345191674142ca11bbc7bc823c166fe2df5c035b6623b6566b189367f77312e08c30b1ba25cfcc5f2d7d49092380a9bc1da
-EBUILD rqt_reconfigure-0.5.4.ebuild 746 BLAKE2B 6ab552a9c5632c55baa9a066bb64fc896198750cc390a43cffcab301ddde49b4f5258371b311f8739035e757b55081eb2b7158f72b40a407022dd5c074a1423f SHA512 65a3caa617e0f04c54ae343deb9860cf078a94feb457fd2d8e831e9a2df11880008097843f6608e10cd80bdc7a559d0ac31f035d13e5b53b73881b5732277ed7
-EBUILD rqt_reconfigure-9999.ebuild 746 BLAKE2B 6ab552a9c5632c55baa9a066bb64fc896198750cc390a43cffcab301ddde49b4f5258371b311f8739035e757b55081eb2b7158f72b40a407022dd5c074a1423f SHA512 65a3caa617e0f04c54ae343deb9860cf078a94feb457fd2d8e831e9a2df11880008097843f6608e10cd80bdc7a559d0ac31f035d13e5b53b73881b5732277ed7
-MISC metadata.xml 348 BLAKE2B 0d0bf948f45a0fad3c7258dcfebb64e6d5218aac06c1520363676338cd6f8cf989dae3b7e95ffda3298616062bd0c5d3cad34eff450ec27bc28bd9f95ff1d103 SHA512 97e8deea3f8be09ddfa2ac325572ed96c949516cb6871da4a54a976b5dc29ab5fbe46d9e4fe9b12e283f0bd7aa80fcec8ad4efca33f4bb46750d934b47cb8bdf
diff --git a/dev-ros/rqt_reconfigure/metadata.xml b/dev-ros/rqt_reconfigure/metadata.xml
deleted file mode 100644
index a5384035ec33..000000000000
--- a/dev-ros/rqt_reconfigure/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_reconfigure</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.4.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.4.ebuild
deleted file mode 100644
index caa683099283..000000000000
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
-
-# Tests fail with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit ros-catkin
-
-DESCRIPTION="Provides the way to view and edit the parameters from dynamic_reconfigure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild
deleted file mode 100644
index caa683099283..000000000000
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
-
-# Tests fail with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit ros-catkin
-
-DESCRIPTION="Provides the way to view and edit the parameters from dynamic_reconfigure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/dev-ros/rqt_robot_dashboard/Manifest b/dev-ros/rqt_robot_dashboard/Manifest
deleted file mode 100644
index 1c591d5a4d4d..000000000000
--- a/dev-ros/rqt_robot_dashboard/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_robot_dashboard-0.5.8.tar.gz 2050593 BLAKE2B 0900714cb4a4d480c5f8cc2fb19bfd15132c6a4cb7756046283f052dbd4a80ea8facd073b832a99485ce2ef54c306b52aee510c19a0f6869788bd18273701e88 SHA512 90c624fd97a745f4e0bc9bb25918ab8a8ba2e6631235a5b4ccea89f1275813fd0432a51a1d378cb094638a6ae9abd0882c0635a9c22a7ad6fc8631c3ecf66781
-EBUILD rqt_robot_dashboard-0.5.8.ebuild 785 BLAKE2B df827847e783f10487cb413450ee8e95cc7afd2778feb68fee6a1a3f375924b8de9570ff643d87cd4601bf57b915372d7a985d18aeefbb08b940e4b72fdcfccb SHA512 73fc67a3230f6633e7695e9879e400c18f27a20c831088a7bd8a343625eec45db598a87044223378ad99cad468218266cc2652d8062f544516c42c2eab104e49
-EBUILD rqt_robot_dashboard-9999.ebuild 785 BLAKE2B df827847e783f10487cb413450ee8e95cc7afd2778feb68fee6a1a3f375924b8de9570ff643d87cd4601bf57b915372d7a985d18aeefbb08b940e4b72fdcfccb SHA512 73fc67a3230f6633e7695e9879e400c18f27a20c831088a7bd8a343625eec45db598a87044223378ad99cad468218266cc2652d8062f544516c42c2eab104e49
-MISC metadata.xml 352 BLAKE2B a84f5b12e7d50bcbe1617402cb44705a09d0d9b3009a3734e75103f26c1271a205211ca6c1b3ac147b4bb6d4b4ffcffebdac1130ba04b17650164fb5c98f75be SHA512 87431773644332ebebf9cc0ec2deda09fb1a44f3607b0717dbf87efad9a7d049be5946e7109128ed5bd46c114542a7bc461cb93046ddc9393c5df1b925c2cff8
diff --git a/dev-ros/rqt_robot_dashboard/metadata.xml b/dev-ros/rqt_robot_dashboard/metadata.xml
deleted file mode 100644
index d60560dc4b3a..000000000000
--- a/dev-ros/rqt_robot_dashboard/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_robot_dashboard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.8.ebuild b/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.8.ebuild
deleted file mode 100644
index 0ecc74fb3c1e..000000000000
--- a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_dashboard"
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for building robot dashboard plugins in rqt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_nav_view[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_robot_monitor[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-9999.ebuild b/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-9999.ebuild
deleted file mode 100644
index 0ecc74fb3c1e..000000000000
--- a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_dashboard"
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for building robot dashboard plugins in rqt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_nav_view[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_robot_monitor[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_monitor/Manifest b/dev-ros/rqt_robot_monitor/Manifest
deleted file mode 100644
index e0236e0025b3..000000000000
--- a/dev-ros/rqt_robot_monitor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_robot_monitor-0.5.13.tar.gz 15140 BLAKE2B 6c59e7a65cc709d48148df1f757261e5fe70872106b6fe2fc5b1d809340a62321c9d56bf245b5d9fedc87113fd18b5e0ce279245794b2a678f405ea409d72531 SHA512 68b9c57130fed3c4e16a437038c5498ec069440c5064470cc442c051387988f1075dec5dd65191d332c68554d76d2be091d90f5cbc9e2218e849a42ace069045
-EBUILD rqt_robot_monitor-0.5.13.ebuild 845 BLAKE2B 383aa16befa5d9bdfe89644a275d7afdfd373c1382228ec61c7ff06c0560f97ae5b20db6f25a6e5964773b15f228e6f19f480ce787c3468e3f6d7fbdf63736b8 SHA512 dfee20b821d73999a195c3a06694d579097acbe70bb79a5d73ebaae31a0db522c20a41bbcb7d2fd70c72fdca65ec354295bec5ae80a979350e78f843a51c90ab
-EBUILD rqt_robot_monitor-9999.ebuild 845 BLAKE2B 383aa16befa5d9bdfe89644a275d7afdfd373c1382228ec61c7ff06c0560f97ae5b20db6f25a6e5964773b15f228e6f19f480ce787c3468e3f6d7fbdf63736b8 SHA512 dfee20b821d73999a195c3a06694d579097acbe70bb79a5d73ebaae31a0db522c20a41bbcb7d2fd70c72fdca65ec354295bec5ae80a979350e78f843a51c90ab
-MISC metadata.xml 350 BLAKE2B db4d3df1b0fabb8aeb65f498f78e8e466bb37ef1a18a8b5b2c1f57678836e46c889b485d63c956324fabf905e63236a4b576a8fefeff24f9f6e09f9e2a65dce1 SHA512 c23ca1553096a388e8e9b99d41aac6eaa20d10af84374d4667f3cd258fae0f8de55f5113a315896f1f12449624284a6d4d01a1a10c23e84631901ca5cf404cc5
diff --git a/dev-ros/rqt_robot_monitor/metadata.xml b/dev-ros/rqt_robot_monitor/metadata.xml
deleted file mode 100644
index cf368df08f83..000000000000
--- a/dev-ros/rqt_robot_monitor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_robot_monitor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild
deleted file mode 100644
index a0787380331e..000000000000
--- a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_monitor"
-
-inherit ros-catkin
-
-DESCRIPTION="Displays messages that are published by diagnostic_aggregator"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-9999.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-9999.ebuild
deleted file mode 100644
index a0787380331e..000000000000
--- a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_monitor"
-
-inherit ros-catkin
-
-DESCRIPTION="Displays messages that are published by diagnostic_aggregator"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_steering/Manifest b/dev-ros/rqt_robot_steering/Manifest
deleted file mode 100644
index 65ac3afaed19..000000000000
--- a/dev-ros/rqt_robot_steering/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_robot_steering-0.5.12.tar.gz 6767 BLAKE2B 52a49b53ff0d9e31293c358ec52e79e91e08dcc00f18ab79f4bc4f02b6fe5aa662433266257f82579cf909495c5fcb4438d5c5b2c182bc53429037180de233c5 SHA512 840850d45451cb9c9b0024f525a80691ee189405a7a837e7df922de9db5b0fd4ea607be84f5e65288d91a4981c098a6ff84a4e54d1870a7c5600a6b4ef6a55f6
-EBUILD rqt_robot_steering-0.5.12.ebuild 604 BLAKE2B d3fb8ccd2454d9d86606ceebe8c7712110ee1385ce4605a41abd8f81f5b397d049798928e9d19ded0caaf3d31b763ec783d494dee4b1c6d3dd4c4ebeaf946f89 SHA512 b70155f933ec87d6410407187569f61c95bd3131a7289af8ec914ea50bf34d941ccc8f3097fc6ade51d0e87a2f5d5be1caa0be0322adc078425bebbd341679be
-EBUILD rqt_robot_steering-9999.ebuild 604 BLAKE2B 78a25688c870543a1f80064194cc99abc95e731eaa0d93d1ea9fb1343978538e8816f0ee5fa60a365b4971e9da8818caa344edee152fd7f5f58343bdbecbc4f2 SHA512 c795894933eea730883ff0dd3fd3f38b9d2d29bc9992229e2e8dce297128360c6804e72b304d7f2e5ebedc41e5b72deacd372cabcd7177f7be0195f3aa5f0cbb
-MISC metadata.xml 351 BLAKE2B 89e578a7740206c60db8a6321653cbd8bf015b19ef150333f3746a37d10bb946a92329b4e21aee3e5002af8f34644036128f7d7544e2a5dc2a10a57486f9f812 SHA512 5492307747c7407cd932394d05d41e833e2324bba873f1293b3ca8b4516d93dce9ef30449c4944de2efc9bf0042d215d5059adebce8b852c4bc4b52ff898c21c
diff --git a/dev-ros/rqt_robot_steering/metadata.xml b/dev-ros/rqt_robot_steering/metadata.xml
deleted file mode 100644
index 4080be08c143..000000000000
--- a/dev-ros/rqt_robot_steering/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_robot_steering</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.12.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.12.ebuild
deleted file mode 100644
index 431c84edf965..000000000000
--- a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.12.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_steering"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for steering a robot using Twist messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild
deleted file mode 100644
index c20ddb8f846d..000000000000
--- a/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_steering"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for steering a robot using Twist messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_runtime_monitor/Manifest b/dev-ros/rqt_runtime_monitor/Manifest
deleted file mode 100644
index d5b7f9a52bb3..000000000000
--- a/dev-ros/rqt_runtime_monitor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_runtime_monitor-0.5.9.tar.gz 6943 BLAKE2B 51e96d0463909bf6648de9f75b687b18bba76249aba3ccbfaa1671604e07cc61d2d0744e23bea8452e26bb5297a99543c2714231aa236fc46dc5a9b37fe53bda SHA512 fd6cfb1dae53f7278c1c0ebb8a1ef331640d235cc29a8a3f056004a0a6a420ced912d2c3114fca441e29e9066c0f33b6534b404a70b7a5560e5fbaba046e2672
-EBUILD rqt_runtime_monitor-0.5.9.ebuild 637 BLAKE2B b8f07558e73894e7b8f558bf6711ff0f852df340b2445f2fd4bc2f102a4dc655789f93875aadac1b6b4c1736a8594459694d1412b4e6858715681c20157bb5f6 SHA512 bedbf21328126eebad51e5b83360375cd0eef04e4b88a1ca3da20fa98164391cc961f2c817504b83ac5df5bea592804fe652e20ec79702b342b25036440d53cd
-EBUILD rqt_runtime_monitor-9999.ebuild 637 BLAKE2B 94ad53d4be80ee8de9755b5ff94804a9768cbccda2fed8ef6008d1442954635f20218b01a0e37116e918097fdf797ca9844bd87bb940e2f5b3c07220276448f8 SHA512 1500ad24cacbb54f4921e87e70cb47c498aab25d7dd4b98068e21875d4ba639ccdcfb344340d86d76491cd48534a2ebdd3752154a13313384dd3662b9fab3617
-MISC metadata.xml 352 BLAKE2B b370d544b1f449428a16279103f4330794e64b412521246e24c90eb9936ad3f6a78a19a42936e9877a10890ef5ab56ae82e50160c7c4df2e85861824ecff674a SHA512 176c78d19326b6b2a07015f78750a85a28af5e468d677958eff187dd30048ab9d4c52d0c70aee1d22299ded13887a8345d7c423e00ca8d9f3b7b682a548081ef
diff --git a/dev-ros/rqt_runtime_monitor/metadata.xml b/dev-ros/rqt_runtime_monitor/metadata.xml
deleted file mode 100644
index f61aa4336103..000000000000
--- a/dev-ros/rqt_runtime_monitor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_runtime_monitor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.9.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.9.ebuild
deleted file mode 100644
index 5e331b7e803c..000000000000
--- a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_runtime_monitor"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin viewing DiagnosticsArray messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-9999.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-9999.ebuild
deleted file mode 100644
index f15b3cdd299d..000000000000
--- a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_runtime_monitor"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin viewing DiagnosticsArray messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_rviz/Manifest b/dev-ros/rqt_rviz/Manifest
deleted file mode 100644
index b6e1c87eb2f7..000000000000
--- a/dev-ros/rqt_rviz/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_rviz-0.7.0.tar.gz 7569 BLAKE2B 0024c333c6337892b6aba745c527c2ccc3426b5220dd89cf60c2daf381f23a817c89b372c6c7957545d5cad115c07f059fdea00981487987c3c1508b709c5e42 SHA512 efbff6163b26ef43a27dd3c6a1a013f691856c816f3f85b3fb39c7f373aa6d88876259aac2b94afac90bf3d16c56f329376fcbef7defc2d3bf745bb85c380fda
-EBUILD rqt_rviz-0.7.0.ebuild 529 BLAKE2B f831d78a77c74e315a77b345e0c6af21768e73e54c1da2827d54c4d37a9f270d1c0d54551c2392d5c7b82975e3cb755b344f6b674dd1345d37e56392d221d9c2 SHA512 18441832d04a2438b240ac45e829d01979aa4c0451dc500a26e72f14f75867d99be0702d06a6086a8502638e8128db74b60bb68ccd71b9d6e050fc5cd428764b
-EBUILD rqt_rviz-9999.ebuild 529 BLAKE2B b269fd2402f60dfb8e6d84c293faaf5cfaf56696e9cdafa7ee7b4c8d0b8fb21222b920f16306b2f551be02109a4037845932fd337a5bc54ae5b4a6ace7dedfe6 SHA512 631e9128f4462460af3bff1cb3e6b91198947763135df23a50d175ea0ee282276369ad68c6c8f789177ebdab3be521604a1871c70a17d5b365de661eadabd085
-MISC metadata.xml 341 BLAKE2B f91c3496db89894941d456e4a6d9fc2f4e9f1f73bfb76f735c1a46773032911dd3bd598a4420b0d0a994d2277ddaa58995c1831dc231f67fbc5e1b34ca4356f9 SHA512 164cd8efbbc0d2f5597a5ebeb954b9f4ff854e0e5ebb7f72b9cc05597d52a2b2103b7d4fd2f30d17702f2d7a883e7f2fb29c36b922530fcf1bd4bf92527de9a9
diff --git a/dev-ros/rqt_rviz/metadata.xml b/dev-ros/rqt_rviz/metadata.xml
deleted file mode 100644
index 4ca31ec8cb99..000000000000
--- a/dev-ros/rqt_rviz/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_rviz</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_rviz/rqt_rviz-0.7.0.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.7.0.ebuild
deleted file mode 100644
index 47315bb2d7e1..000000000000
--- a/dev-ros/rqt_rviz/rqt_rviz-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin embedding RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/pluginlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_cpp
-	>=dev-ros/qt_gui_cpp-0.3
-	dev-qt/qtwidgets:5
-	dev-ros/rviz
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_rviz/rqt_rviz-9999.ebuild b/dev-ros/rqt_rviz/rqt_rviz-9999.ebuild
deleted file mode 100644
index 86e0acc0c884..000000000000
--- a/dev-ros/rqt_rviz/rqt_rviz-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin embedding RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/pluginlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_cpp
-	>=dev-ros/qt_gui_cpp-0.3
-	dev-qt/qtwidgets:5
-	dev-ros/rviz
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_service_caller/Manifest b/dev-ros/rqt_service_caller/Manifest
deleted file mode 100644
index 51450900ee31..000000000000
--- a/dev-ros/rqt_service_caller/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_service_caller-0.4.10.tar.gz 7402 BLAKE2B bbba811d0833edd7173c0c66a88e8ab30959a67e4f1108a552ed69f1fffc0415b5cb862f4ff1daa5dcb2251c7da8b7caa0d68ec4c061374b953d71b52af4467b SHA512 015b843db3a07f043a62f95a66fa17bffff80c13fb3577095d3f38229f414b662ffa5c2c3c629425d2373d965f40cca842cbc78b1dd79bc3fa3e40f06eddce7b
-EBUILD rqt_service_caller-0.4.10.ebuild 586 BLAKE2B 21c6017408da6bf249a36e566a15939216b37ba915216091b284d35e7189587edb8f35bede3a66b6bd5661eb597e490badbe43aa4e2a32ab5101704c9dfc45c0 SHA512 5b6652e30efb753ffed7ce352ddfcc6287eb9910ee3094956b11d1a5a4bd6b7da31637e2db9d1526644952046a4730ad5c52ece069e8bb9870ff3dac4eada1bf
-EBUILD rqt_service_caller-9999.ebuild 586 BLAKE2B a56f23f70f70d55d125cee3a8acb14ebef9158be8f7d6452d8f0193143d50de8be5c71837c9fbfc0282bd5b8dd32f26b82971b567023b257eec659667d71fcf1 SHA512 1b65b030ce144ac25bd9167f7a3b4e49a0a06a70a077186b7715dafd8f870bbf630c95260b872a5d7d70baaa9bfdd26b351f2f0937b1ecf54d3b4657050b4342
-MISC metadata.xml 351 BLAKE2B 9f363753dc7d5ec581301610085f58de3cd09d7d899f19c0bf48cc544dfa4e02cb3481195330bcd8c891ff8266071ca8a46cf360530ea67a16e52e781dfea615 SHA512 3ec56c8171ed73e599ed370507b385e0fdc3bf00f5ef709474dbfc5fd1a577ac6ad84c0c17b4a2e12e2834b59d3180a983e2aa6f4a59c113a8e0b407a4591670
diff --git a/dev-ros/rqt_service_caller/metadata.xml b/dev-ros/rqt_service_caller/metadata.xml
deleted file mode 100644
index 682523da8330..000000000000
--- a/dev-ros/rqt_service_caller/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_service_caller</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.10.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.10.ebuild
deleted file mode 100644
index 256f3a0fafa8..000000000000
--- a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_service_caller"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for calling arbitrary services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_service_caller/rqt_service_caller-9999.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-9999.ebuild
deleted file mode 100644
index 68e3fdbd40e2..000000000000
--- a/dev-ros/rqt_service_caller/rqt_service_caller-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_service_caller"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for calling arbitrary services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_shell/Manifest b/dev-ros/rqt_shell/Manifest
deleted file mode 100644
index 920ad6c9fc1c..000000000000
--- a/dev-ros/rqt_shell/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_shell-0.4.11.tar.gz 7077 BLAKE2B 23a9ffb0903dc912a7a995d308234def49698c9db430b7195ed6a95b5876f2bb73c28c1a1214ec6e74f6ca6bd8c292dd3140ddd5b08880414672d8a7177dc6e3 SHA512 d8e72b136515b1ad2dae6cddbf308cce52512430610455cbcf5963c91d22616844b720658c8658227d44525b62b00d4bc43caf16fbc733be4088991f404591dc
-EBUILD rqt_shell-0.4.11.ebuild 576 BLAKE2B 2873bf7c0d1fec2be6aa7d48b021254f862a9f161ee81bd636459698509f8e1c15a95111e8e13daa44b260294cb9c9cc0e42f45ed5ace82473df978a5826b29c SHA512 435c629d4ad7bec72dadb9e9a7196d04f6d81856a43944f28e0583579f330d62bff6d6a03d8ff058e91be79e051e635733355e5932285fb4d470659079722a3a
-EBUILD rqt_shell-9999.ebuild 576 BLAKE2B 38a6240bfe600dc4a283a20a1a8f1c3a02a009d96e696455a7391d27016f293fb13dae6c39e606a821f0e79bf29630f57055bdc880a198e8563ca90117edcedc SHA512 67ebfd21a2515d63c6f8bcca5081fff4de821105620cc9f25a1df185a7b760fac39ed3ebcbcce0c4b751b08875262d115df5199bb8b339e731f2b6725c42072a
-MISC metadata.xml 342 BLAKE2B df3f5849111f802a7f48e63e885f190cc6011dbd5e6fddc2103ac2bb2c99a41438dadba5a9db19ef108a07d03fc679905f9a7fb0707d9d878cad7e0f73eb23f2 SHA512 9460580aa376083998fcd34dc127bd080c347bc33cd2f65c18cf2710d19968ed5684eccbb3e1213f4507cd19ccd44db6dbea3a283d9bc746e8642b6ac564340f
diff --git a/dev-ros/rqt_shell/metadata.xml b/dev-ros/rqt_shell/metadata.xml
deleted file mode 100644
index 53229f685034..000000000000
--- a/dev-ros/rqt_shell/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_shell</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_shell/rqt_shell-0.4.11.ebuild b/dev-ros/rqt_shell/rqt_shell-0.4.11.ebuild
deleted file mode 100644
index 556657691279..000000000000
--- a/dev-ros/rqt_shell/rqt_shell-0.4.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_shell"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin providing an interactive shell"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_shell/rqt_shell-9999.ebuild b/dev-ros/rqt_shell/rqt_shell-9999.ebuild
deleted file mode 100644
index 8e1d4bb5ae68..000000000000
--- a/dev-ros/rqt_shell/rqt_shell-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_shell"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin providing an interactive shell"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_srv/Manifest b/dev-ros/rqt_srv/Manifest
deleted file mode 100644
index 40af6b8be21a..000000000000
--- a/dev-ros/rqt_srv/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_srv-0.4.9.tar.gz 3712 BLAKE2B a8f8493e9ca15150153d0a7df2eca63d93b1bc730273d15b4a03edbb532979f2c9635c6138ce1612b295e069af24b25b1cdf95b98f7c734cda333ceea5264926 SHA512 42c2e9bc9a45c960b51adce98d18d0f6d2821d2dea3d1d586522e273b04158a3a0df6e7b1bcadceb8052bdc8cf4f9c19ce73b7d415e015468247ea94a73a23dd
-EBUILD rqt_srv-0.4.9.ebuild 557 BLAKE2B 24ab8f5dd40c477684fd05e21f781530af88e6736854a379a002ac9a43db307e70a1262d700cddbaace6a230ab5263e0f299e90114aae8b7a94a05ab53c2e05a SHA512 003a567f79ee8d3faba17c8016a810bf8b5974f4d7ac8c423f7d13f7ee7c52cfcce0e68be1d8aa2f1eb779504ea499e6d7a581bbf54f44f1895abfe28122fee1
-EBUILD rqt_srv-9999.ebuild 557 BLAKE2B 628b12c13742dc1d55fb32af5a66810c11aff1462c688440d6a45889f7c0c98da56b642e0139f7f4029bba32a0198d0f6d7e9463e44b66e9875baf17b36efd28 SHA512 c1494231b631bba4f93240ef17f86ed917a3a390cf44b7c79a06501c1bca998fc0c02ea76abb1e01c45f8ec962babd4d69b58b94f1ff734f46b964350f529dca
-MISC metadata.xml 340 BLAKE2B 070c0db748956afb7504f20360ab9eae30ee4b067f2f9c00f2d2729272774537ea4a1724b08f03d2ae4d80ca790236a2cc71ae51c78efc027d75d7cdcce04864 SHA512 2b03f1372c8597cd300f07483ed3a0c7cba3a7c0ca9657ab83e995426217f677d8818bd22461d7e52546ec69472c006c92b83a07e67fb55cb44df97fb8c2f966
diff --git a/dev-ros/rqt_srv/metadata.xml b/dev-ros/rqt_srv/metadata.xml
deleted file mode 100644
index defc4cb407d6..000000000000
--- a/dev-ros/rqt_srv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_srv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_srv/rqt_srv-0.4.9.ebuild b/dev-ros/rqt_srv/rqt_srv-0.4.9.ebuild
deleted file mode 100644
index 3793ad4f32ee..000000000000
--- a/dev-ros/rqt_srv/rqt_srv-0.4.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_srv"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_srv/rqt_srv-9999.ebuild b/dev-ros/rqt_srv/rqt_srv-9999.ebuild
deleted file mode 100644
index 03edbbca41b5..000000000000
--- a/dev-ros/rqt_srv/rqt_srv-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_srv"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_tf_tree/Manifest b/dev-ros/rqt_tf_tree/Manifest
deleted file mode 100644
index bb06fcb3a79e..000000000000
--- a/dev-ros/rqt_tf_tree/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yaml.patch 626 BLAKE2B b6fddb180dc4a058e2bc7691f875d8b5eca4191a78d1bf4656aa9792f63caf2a6be1b39342f406a0bf0298903df04e9498693edcfdb4f726545f1527ccde6256 SHA512 05dedc11ab9f5c249ab7eefa28f2abb7bbf9fdea66fc81fe10892afc590360bd251385b936d8a987150b75b74a088aff51c02bd2ce94d87a0cd5b43b051827aa
-DIST rqt_tf_tree-0.6.2.tar.gz 8513 BLAKE2B 31207aaa5152c82fd0f728f12348110c7b161b2b36b74330876ccfd8044c98d177341d1ab08860275c6db2f1a043f934b9c2354efa431ea46697fa6af8f29d4e SHA512 1aa03dd674dbb0122c24dcac363850d08b04f2b1aebbfa0c1d3baa3c4b1c9e802a45dabb638d149c03386415601c4751e67b0edae00a577792a37867fb76b69b
-EBUILD rqt_tf_tree-0.6.2.ebuild 895 BLAKE2B 1284f4d9e1da5ef37cbad13ef0c3bee4ef4040091895de85f995211688146d03fae8dec00f0d16703e7bd5a6c9a2fcaaf9a7f4bf82a9d6ba56d344f6b04ebcc7 SHA512 836bac913c95f3a3393bd273758b2cfe58b901788a395076f44e0fd7118549fef55bf06edf451c54e92f2e6d15985acfdca1fd943989482975e7e5c7e47d6084
-EBUILD rqt_tf_tree-9999.ebuild 895 BLAKE2B 1284f4d9e1da5ef37cbad13ef0c3bee4ef4040091895de85f995211688146d03fae8dec00f0d16703e7bd5a6c9a2fcaaf9a7f4bf82a9d6ba56d344f6b04ebcc7 SHA512 836bac913c95f3a3393bd273758b2cfe58b901788a395076f44e0fd7118549fef55bf06edf451c54e92f2e6d15985acfdca1fd943989482975e7e5c7e47d6084
-MISC metadata.xml 344 BLAKE2B 17b378d3d5eae984315f1eac037979422a12bb9a61cb603151aea323d37f7539b71c30fdb6b3aee4efadc9a1cc6a831d49a63732fa75c922d0d2bc298172dd70 SHA512 9760e19a43b9f4b75f066276f0785519065b7b835f3475d96d3c74c9886810461abd88f13f34047df98d466a2c2d00f1ec6c4c4fe7071fe6811826f7d4a8bad5
diff --git a/dev-ros/rqt_tf_tree/files/yaml.patch b/dev-ros/rqt_tf_tree/files/yaml.patch
deleted file mode 100644
index c1435cc59ab6..000000000000
--- a/dev-ros/rqt_tf_tree/files/yaml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rqt_tf_tree-0.6.1/src/rqt_tf_tree/dotcode_tf.py
-===================================================================
---- rqt_tf_tree-0.6.1.orig/src/rqt_tf_tree/dotcode_tf.py
-+++ rqt_tf_tree-0.6.1/src/rqt_tf_tree/dotcode_tf.py
-@@ -93,7 +93,7 @@ class RosTfTreeDotcodeGenerator(object):
-             self.listen_duration = 0
- 
-             yaml_data = tf2_frame_srv().frame_yaml
--            data = yaml_parser.load(yaml_data)
-+            data = yaml_parser.safe_load(yaml_data)
-             self.graph = self.generate(data, timer.now().to_sec())
-             self.dotcode = self.dotcode_factory.create_dot(self.graph)
- 
diff --git a/dev-ros/rqt_tf_tree/metadata.xml b/dev-ros/rqt_tf_tree/metadata.xml
deleted file mode 100644
index ed19faf3bc61..000000000000
--- a/dev-ros/rqt_tf_tree/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_tf_tree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild
deleted file mode 100644
index 29eb0bd0e67a..000000000000
--- a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_tf_tree"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS TF frame tree"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]") )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-9999.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-9999.ebuild
deleted file mode 100644
index 29eb0bd0e67a..000000000000
--- a/dev-ros/rqt_tf_tree/rqt_tf_tree-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_tf_tree"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS TF frame tree"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]") )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rqt_top/Manifest b/dev-ros/rqt_top/Manifest
deleted file mode 100644
index 3f8de7c125e3..000000000000
--- a/dev-ros/rqt_top/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_top-0.4.10.tar.gz 6662 BLAKE2B 23de23cf8685b4dd2d118c3b47d941695872c4a0e44538a4e6dec95cd95ce70f4c5361d65123e6cffa872d6b00166839d03ee4eb6b4ff03314cfbd5b4299fac7 SHA512 719fb16be898e37014167c31987e3f54bab7526e54bbed09bbb264f32b28f998c8b3341850c7eaf49201eaa29fcf19df7407543fc8d1511ddefb73696295d29c
-EBUILD rqt_top-0.4.10.ebuild 520 BLAKE2B f7c9c197c581edf5f5f879d7b37de26498c9e26574f7ce0bfe224cdf6014fcecca1914ab618a39be51326b5ec4ae98d093b537d9a7375b13e38c62757e96f1ca SHA512 a99d36519aba45ea7ac2e71a04d10c767c3707d08e07088a34bffeacf58eae365671abda3b153d8a68f2f64a937e1589aedb45abe67859ac2faea70de16d97df
-EBUILD rqt_top-9999.ebuild 520 BLAKE2B 69f6b7b448850c8021078fe43de32d904c165fd09633a5de0263cd524b17b1ac61ee48ec575d86c73fde894fcb606c731e7e51fb54a1e06d1454337f2bafcd20 SHA512 8c54187fdf31f5e8b48774314bec119952c3236bfb7d1860c1f60dd8c6e9d6e0d203ba1a7098b32a6bfe01d43f3ca6e74f474f0e879ce9c5b4bf4f371f82dca2
-MISC metadata.xml 340 BLAKE2B 210e0b6e6e6d4eb6a2a759f9afb9c61210ee61a8c79d09ecaae641d6f3caff671da5007d3f0e11f00984c31cd99d06d327fae4df663b57e736966ba3e0ebd135 SHA512 cb34a2a11c65dc8c90ae2000a701a5edbc115fc6f9685bc736a7747afc01a2d6db4505292f30f6df184236ade67a6fdd49c67b4ac4c3a52bf70a3df483a23306
diff --git a/dev-ros/rqt_top/metadata.xml b/dev-ros/rqt_top/metadata.xml
deleted file mode 100644
index 41805f9034f0..000000000000
--- a/dev-ros/rqt_top/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_top</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_top/rqt_top-0.4.10.ebuild b/dev-ros/rqt_top/rqt_top-0.4.10.ebuild
deleted file mode 100644
index b312ed9dd5a4..000000000000
--- a/dev-ros/rqt_top/rqt_top-0.4.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_top"
-
-inherit ros-catkin
-
-DESCRIPTION="RQT plugin for monitoring ROS processes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_top/rqt_top-9999.ebuild b/dev-ros/rqt_top/rqt_top-9999.ebuild
deleted file mode 100644
index 1ef0fdf3d25e..000000000000
--- a/dev-ros/rqt_top/rqt_top-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_top"
-
-inherit ros-catkin
-
-DESCRIPTION="RQT plugin for monitoring ROS processes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_topic/Manifest b/dev-ros/rqt_topic/Manifest
deleted file mode 100644
index 51b5097a6524..000000000000
--- a/dev-ros/rqt_topic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_topic-0.4.12.tar.gz 9104 BLAKE2B e40341efb53c25cadbf4143f73f8c36ffb5635212f1f4f26f937d4bbfb7ca9b70a596dab98ad1a941ae72e26e86741893a52ca22b0353e36bfbe5a016c675836 SHA512 1e124e10aade7150c4f0599ec0aba04a0bee25253318a4cc99d03164575ba79d4a8cbef170b527c5209989c480d9ce6d00c4267d96976500fcc9f9ba6fb11ba7
-EBUILD rqt_topic-0.4.12.ebuild 650 BLAKE2B d6207d32f0492ae233d1c3c833a5405190e8972c021be95cf5bfff722055a482598d712bb3022850a8008a4f3e3d706ad65a3c112a92d1c2d4814125f3f14578 SHA512 77012707abfce9e77446721d9b745034af05deb784e3be4ed358abcb0885dc054e0069ee1f1720f00f54f9d22b0f4e80b8bd8d0a4940bba13a7df98832eb4042
-EBUILD rqt_topic-9999.ebuild 650 BLAKE2B d6207d32f0492ae233d1c3c833a5405190e8972c021be95cf5bfff722055a482598d712bb3022850a8008a4f3e3d706ad65a3c112a92d1c2d4814125f3f14578 SHA512 77012707abfce9e77446721d9b745034af05deb784e3be4ed358abcb0885dc054e0069ee1f1720f00f54f9d22b0f4e80b8bd8d0a4940bba13a7df98832eb4042
-MISC metadata.xml 342 BLAKE2B 22f1ab0567e6ec5607c03966c6f1c25679abe4a46d6b373f5c1b3a7b70e8cddc6a1174ab8bbf8c5709ffba81889301c943887ae8aeccd04f6b08df4978ae0d13 SHA512 944c22d1759f9327e64ab2a35e89e50e4c4bce4abe3fb6dddb31b4daee2d3ff3939e698e8b318946e2c6f384f6c07331a706b64bd13085f2154c27ecc27de884
diff --git a/dev-ros/rqt_topic/metadata.xml b/dev-ros/rqt_topic/metadata.xml
deleted file mode 100644
index b4e90dc0ed35..000000000000
--- a/dev-ros/rqt_topic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_topic</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild b/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild
deleted file mode 100644
index e99b6145b05f..000000000000
--- a/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_topic"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying debug information about ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_topic/rqt_topic-9999.ebuild b/dev-ros/rqt_topic/rqt_topic-9999.ebuild
deleted file mode 100644
index e99b6145b05f..000000000000
--- a/dev-ros/rqt_topic/rqt_topic-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_topic"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying debug information about ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_web/Manifest b/dev-ros/rqt_web/Manifest
deleted file mode 100644
index 820ac5679f87..000000000000
--- a/dev-ros/rqt_web/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rqt_web-0.4.10.tar.gz 6119 BLAKE2B 6afc8392d799eee835ec2b7d99b6254735a0756937f25021e3b1754380ce17c903288b854ef2cd87fd67613d6ca2759144edb03ba08a7bb8adf0aefde9624e9b SHA512 bdb3c2c241d7e4a9fb363e38d8776ce05affbb7b5d2d798e2ca9cb48532258d95af03adf9fce693fe7df0ea66034482537ff931d62edded3704eb48b3fd47d33
-EBUILD rqt_web-0.4.10.ebuild 555 BLAKE2B f411b556512923afe2999c1145bca2ae430673cd345a43bf15582edb7a1720961bdd30121b90d6a3fb0216255859985fa84be4a9e3324089f33e0a2018bcc5d3 SHA512 a3eeebf8943ae12103a4bf2dec2ed4b6d47d18c2eea10f580cd76ecf1e27f350cf901bd0a5ebdfba37869356867b3e6f0173867a6ba5d2b559e8be952b1be47b
-EBUILD rqt_web-9999.ebuild 555 BLAKE2B 205a357c9326b7b1c6b0cfccee5752955cee49d815e3466ff52721c33ba9f86079b4ec4d197bc4b29abdb15521a3e0942ae41dbe587ef2bcf41695de1d0a7372 SHA512 a4a23a3fb7008a3e5df093377a6dfab81877d1fe813ae13944b4edb1bfed78bcae8b0f1adfff64f3cb7b8e3d72d726dc2d642ebcd72308f73748b1c14a15a877
-MISC metadata.xml 340 BLAKE2B a6f52df957c21b6f090a0bc154703cfa2287a7ff38fcca1eb4bd69a545edce6beb58855fa5aeaa1cb953a20f9c22c56b828f1df02e053c3e0229cc93c26f04f2 SHA512 5af844cfa7d4aecc040ff23d9211ee5c5828aff543cc9ddda55e6c13cfa4a29bf72e898b008f616249e1bbf05001e8010f1d89d776a65778b8e9666d0257e1db
diff --git a/dev-ros/rqt_web/metadata.xml b/dev-ros/rqt_web/metadata.xml
deleted file mode 100644
index 09c07e79d45f..000000000000
--- a/dev-ros/rqt_web/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rqt_web</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rqt_web/rqt_web-0.4.10.ebuild b/dev-ros/rqt_web/rqt_web-0.4.10.ebuild
deleted file mode 100644
index a60dd51d9372..000000000000
--- a/dev-ros/rqt_web/rqt_web-0.4.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_web"
-
-inherit ros-catkin
-
-DESCRIPTION="Simple web content viewer for rqt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_web/rqt_web-9999.ebuild b/dev-ros/rqt_web/rqt_web-9999.ebuild
deleted file mode 100644
index 60b0b9016d48..000000000000
--- a/dev-ros/rqt_web/rqt_web-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_web"
-
-inherit ros-catkin
-
-DESCRIPTION="Simple web content viewer for rqt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
deleted file mode 100644
index 67e696a412f5..000000000000
--- a/dev-ros/rviz/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yamlcpp.patch 435 BLAKE2B de34251a6eac3d860ce42defab5a157294b7f541fd508e6ce400f3c4c6d8ffacbb3f131dff7b453e09c6e6d03b10d7f0ecd8c665759d1f6c1195fae59919fa21 SHA512 f9da2a7cf56aa5b19648bdbe7b40ca5947f6dd140ef7bd65b860b8fea0dd16e42ad92b0b04a28276a6c053fde46ba6865846402e89d64dedc2ac6083b4036c2a
-DIST rviz-1.14.19.tar.gz 5133178 BLAKE2B 046696291be81d6fcad64bdf99dca4514c407db0d31d0252cc381b0f2d565fec6daf942037c4aea9c00706cb32063554d4bc75296bc861f73610b16cc425bbdc SHA512 5ac3ad3d5a8f5a644f4eade63c2a5ea23701ba16842606de362a817f0541b880b1b0c0daeb7a883f1bcac880e4b498e68151e4a01b3704e69ee96121f5f16149
-EBUILD rviz-1.14.19.ebuild 1789 BLAKE2B fdf1ff5faadf1db4cfe223cbdcade831c128f88b643cc1eb5c1a419a2f7554105277ce09f3600c1ad30350051002028ff0b600c990fba40c203365de6b56f796 SHA512 2ef9134403504e6f007ef87f21cb081ff0bbb82631123e1c428ae50719d6451ee5e277142920a648bf9a53c2fe416df82fde488cbd867c475feb960d8e71d6c6
-EBUILD rviz-9999.ebuild 1789 BLAKE2B fdf1ff5faadf1db4cfe223cbdcade831c128f88b643cc1eb5c1a419a2f7554105277ce09f3600c1ad30350051002028ff0b600c990fba40c203365de6b56f796 SHA512 2ef9134403504e6f007ef87f21cb081ff0bbb82631123e1c428ae50719d6451ee5e277142920a648bf9a53c2fe416df82fde488cbd867c475feb960d8e71d6c6
-MISC metadata.xml 337 BLAKE2B 7a8932b503a69c523ed91eac0b3f286c0aeb9883709af787a8dbf16862056484e97928a94fbc238fc9cec781402cc639f1d963302418e5a09dbe80209ecb5ab6 SHA512 de7dc3480eef9fa198e8d6e9f8f722fb42c8984ca877cf05a890ead1450b0f39aa90b69a82876b1a1958d930b09bef8b20ef7e5a24d8777b9ccd1b6c49d01932
diff --git a/dev-ros/rviz/files/yamlcpp.patch b/dev-ros/rviz/files/yamlcpp.patch
deleted file mode 100644
index a0c9151d0cd0..000000000000
--- a/dev-ros/rviz/files/yamlcpp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: rviz-1.14.8/src/rviz/CMakeLists.txt
-===================================================================
---- rviz-1.14.8.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.8/src/rviz/CMakeLists.txt
-@@ -1,4 +1,8 @@
--find_package(yaml-cpp REQUIRED)
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(YAML_CPP yaml-cpp)
-+if(NOT YAML_CPP_FOUND)
-+  find_package(yaml-cpp REQUIRED)
-+endif()
- 
- include_directories(${YAML_CPP_INCLUDE_DIR})
- 
diff --git a/dev-ros/rviz/metadata.xml b/dev-ros/rviz/metadata.xml
deleted file mode 100644
index bbed85fd754b..000000000000
--- a/dev-ros/rviz/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/rviz</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rviz/rviz-1.14.19.ebuild b/dev-ros/rviz/rviz-1.14.19.ebuild
deleted file mode 100644
index 47dd81d1836e..000000000000
--- a/dev-ros/rviz/rviz-1.14.19.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit ros-catkin virtualx
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	media-libs/assimp:=
-	dev-games/ogre:=[-double-precision]
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp:=
-	dev-libs/urdfdom:=
-	dev-libs/tinyxml2:=
-
-	dev-ros/angles:0
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-BDEPEND="
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/yamlcpp.patch"
-)
-
-src_test() {
-	virtx ros-catkin_src_test
-}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
deleted file mode 100644
index 47dd81d1836e..000000000000
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit ros-catkin virtualx
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	media-libs/assimp:=
-	dev-games/ogre:=[-double-precision]
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp:=
-	dev-libs/urdfdom:=
-	dev-libs/tinyxml2:=
-
-	dev-ros/angles:0
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
-BDEPEND="
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/yamlcpp.patch"
-)
-
-src_test() {
-	virtx ros-catkin_src_test
-}
diff --git a/dev-ros/rviz_imu_plugin/Manifest b/dev-ros/rviz_imu_plugin/Manifest
deleted file mode 100644
index ced8d2ec5b82..000000000000
--- a/dev-ros/rviz_imu_plugin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
-DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
-EBUILD rviz_imu_plugin-1.2.2.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
-EBUILD rviz_imu_plugin-1.2.3.ebuild 466 BLAKE2B 0f3fbc1f3eb677bcc3fbadf4b395ae778e951182e623d6f7cb790e22f18e0fd098cd315ac23ef87357608a21d310f793b448c9910f80e269fc52a87cea525e89 SHA512 9a54e21791e387a418c570381343585d0973e96c9736edb6e9917d84d14c047d14fcd7666a93a1ecdb33b2350e91713697cebd5ed7fa587de11fa9e712713f5d
-EBUILD rviz_imu_plugin-9999.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
-MISC metadata.xml 337 BLAKE2B 0abae17ee07ca90a37714a843e0d3b46df6597fe58a0c3969d159e68d5461c84c17db4d6e97e224cd3fe199b5133999737059a255bea804f62f9e2058bad7e77 SHA512 72ffa991c3259c010e5ebb87fc756d91190cb767d4534735dd5e3a9271c78d1b3a36852ceff70d24e77ecec59967e916c6f2625a6b20de6b3a9642af8906408d
diff --git a/dev-ros/rviz_imu_plugin/metadata.xml b/dev-ros/rviz_imu_plugin/metadata.xml
deleted file mode 100644
index 4ea7057e97a6..000000000000
--- a/dev-ros/rviz_imu_plugin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ccny-ros-pkg/imu_tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild
deleted file mode 100644
index 93876d505729..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RVIZ plugin for IMU visualization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-ros/roscpp
-	dev-ros/rviz
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.ebuild
deleted file mode 100644
index c30e89f04cff..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RVIZ plugin for IMU visualization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-ros/roscpp
-	dev-ros/rviz
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
deleted file mode 100644
index 93876d505729..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RVIZ plugin for IMU visualization"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-ros/roscpp
-	dev-ros/rviz
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_plugin_tutorials/Manifest b/dev-ros/rviz_plugin_tutorials/Manifest
deleted file mode 100644
index bc5361368c98..000000000000
--- a/dev-ros/rviz_plugin_tutorials/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD rviz_plugin_tutorials-0.11.0.ebuild 482 BLAKE2B 91f8032d683c27004000fe658666791de41a8121fe3c3f6de51c10f1f827663d40af4e92929431327898f86f42c988144e0ba2e4e911a76d5b2ec9401b1a8aab SHA512 dbe1defae2c6d557360c5766e2400d0713020528a48ea724d8fdda7e2f36882a602a650534daa7374ab528b7bd3fde78fcb10c4bd389ed94016f81d4210609d8
-EBUILD rviz_plugin_tutorials-9999.ebuild 482 BLAKE2B 91f8032d683c27004000fe658666791de41a8121fe3c3f6de51c10f1f827663d40af4e92929431327898f86f42c988144e0ba2e4e911a76d5b2ec9401b1a8aab SHA512 dbe1defae2c6d557360c5766e2400d0713020528a48ea724d8fdda7e2f36882a602a650534daa7374ab528b7bd3fde78fcb10c4bd389ed94016f81d4210609d8
-MISC metadata.xml 356 BLAKE2B 0e15a7c0c742df1f97b9674aaf9d0eb7c67544d269b644e0b19163a9a9bcaf8b0451f24ba2c2344acbbcd4856cf79f916e5d974bf5afde6f3c389b7ad7b8c45e SHA512 8e6b4b0942d77ede0e3e96b2f45a1dbddb293fe6235fb1a9e642dff5f483e5a272d18da8ad0d80e6bfa487eacff11d5a53089371a06c7d9c5fba56b3f3c147bb
diff --git a/dev-ros/rviz_plugin_tutorials/metadata.xml b/dev-ros/rviz_plugin_tutorials/metadata.xml
deleted file mode 100644
index ade798056081..000000000000
--- a/dev-ros/rviz_plugin_tutorials/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild
deleted file mode 100644
index b6065822cd59..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to write plugins for RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rviz
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
deleted file mode 100644
index b6065822cd59..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to write plugins for RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rviz
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/Manifest b/dev-ros/rviz_python_tutorial/Manifest
deleted file mode 100644
index b636562f8612..000000000000
--- a/dev-ros/rviz_python_tutorial/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD rviz_python_tutorial-0.11.0.ebuild 428 BLAKE2B 911132522b1480b333f05d3b75f07d619f73b7bc640e3f76f28bb4a23c4327687e04b2f99591c73cbb2929922d7f8cf46dd76fefab6a8ad64c2513050f9e485e SHA512 c6b7e2717b4ef796c85863e5025f31eb7c231f29f28d4075918e694b795ffdc1c2cdfce08a34589d3c187c8e2f7c5c3c18097d9e4888489815db0e4f77174504
-EBUILD rviz_python_tutorial-9999.ebuild 428 BLAKE2B 911132522b1480b333f05d3b75f07d619f73b7bc640e3f76f28bb4a23c4327687e04b2f99591c73cbb2929922d7f8cf46dd76fefab6a8ad64c2513050f9e485e SHA512 c6b7e2717b4ef796c85863e5025f31eb7c231f29f28d4075918e694b795ffdc1c2cdfce08a34589d3c187c8e2f7c5c3c18097d9e4888489815db0e4f77174504
-MISC metadata.xml 356 BLAKE2B 0e15a7c0c742df1f97b9674aaf9d0eb7c67544d269b644e0b19163a9a9bcaf8b0451f24ba2c2344acbbcd4856cf79f916e5d974bf5afde6f3c389b7ad7b8c45e SHA512 8e6b4b0942d77ede0e3e96b2f45a1dbddb293fe6235fb1a9e642dff5f483e5a272d18da8ad0d80e6bfa487eacff11d5a53089371a06c7d9c5fba56b3f3c147bb
diff --git a/dev-ros/rviz_python_tutorial/metadata.xml b/dev-ros/rviz_python_tutorial/metadata.xml
deleted file mode 100644
index ade798056081..000000000000
--- a/dev-ros/rviz_python_tutorial/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.11.0.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.11.0.ebuild
deleted file mode 100644
index 4cda6202a37c..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.11.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to call into rviz internals from python scripts"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rviz[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild
deleted file mode 100644
index 4cda6202a37c..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to call into rviz internals from python scripts"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rviz[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/self_test/Manifest b/dev-ros/self_test/Manifest
deleted file mode 100644
index 9e5809453ecf..000000000000
--- a/dev-ros/self_test/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
-DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
-DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
-DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
-DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
-DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
-DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
-EBUILD self_test-1.10.1-r1.ebuild 573 BLAKE2B 699878dcef9e5e499d6092b413982a0a80f526c5135e59f33909fd3ed77efa4b44947d4820c96ca8cb7c3719b25b5ae258a1884e0f7df96fe0fce6b9ff32b702 SHA512 1f4ef3f072d9f554062f44b3897ab065880e6d3ea8e78978d8b3a71fb0e7a50803ffad78cdff7cd6aaf7f16c64c14816f47a03fe68d1e28f1581fa4a8390a2f6
-EBUILD self_test-1.10.2-r1.ebuild 573 BLAKE2B 699878dcef9e5e499d6092b413982a0a80f526c5135e59f33909fd3ed77efa4b44947d4820c96ca8cb7c3719b25b5ae258a1884e0f7df96fe0fce6b9ff32b702 SHA512 1f4ef3f072d9f554062f44b3897ab065880e6d3ea8e78978d8b3a71fb0e7a50803ffad78cdff7cd6aaf7f16c64c14816f47a03fe68d1e28f1581fa4a8390a2f6
-EBUILD self_test-1.10.3-r1.ebuild 573 BLAKE2B 699878dcef9e5e499d6092b413982a0a80f526c5135e59f33909fd3ed77efa4b44947d4820c96ca8cb7c3719b25b5ae258a1884e0f7df96fe0fce6b9ff32b702 SHA512 1f4ef3f072d9f554062f44b3897ab065880e6d3ea8e78978d8b3a71fb0e7a50803ffad78cdff7cd6aaf7f16c64c14816f47a03fe68d1e28f1581fa4a8390a2f6
-EBUILD self_test-1.10.4-r1.ebuild 573 BLAKE2B 699878dcef9e5e499d6092b413982a0a80f526c5135e59f33909fd3ed77efa4b44947d4820c96ca8cb7c3719b25b5ae258a1884e0f7df96fe0fce6b9ff32b702 SHA512 1f4ef3f072d9f554062f44b3897ab065880e6d3ea8e78978d8b3a71fb0e7a50803ffad78cdff7cd6aaf7f16c64c14816f47a03fe68d1e28f1581fa4a8390a2f6
-EBUILD self_test-1.11.0.ebuild 573 BLAKE2B 699878dcef9e5e499d6092b413982a0a80f526c5135e59f33909fd3ed77efa4b44947d4820c96ca8cb7c3719b25b5ae258a1884e0f7df96fe0fce6b9ff32b702 SHA512 1f4ef3f072d9f554062f44b3897ab065880e6d3ea8e78978d8b3a71fb0e7a50803ffad78cdff7cd6aaf7f16c64c14816f47a03fe68d1e28f1581fa4a8390a2f6
-EBUILD self_test-1.9.4-r1.ebuild 573 BLAKE2B 699878dcef9e5e499d6092b413982a0a80f526c5135e59f33909fd3ed77efa4b44947d4820c96ca8cb7c3719b25b5ae258a1884e0f7df96fe0fce6b9ff32b702 SHA512 1f4ef3f072d9f554062f44b3897ab065880e6d3ea8e78978d8b3a71fb0e7a50803ffad78cdff7cd6aaf7f16c64c14816f47a03fe68d1e28f1581fa4a8390a2f6
-EBUILD self_test-1.9.6-r1.ebuild 573 BLAKE2B 699878dcef9e5e499d6092b413982a0a80f526c5135e59f33909fd3ed77efa4b44947d4820c96ca8cb7c3719b25b5ae258a1884e0f7df96fe0fce6b9ff32b702 SHA512 1f4ef3f072d9f554062f44b3897ab065880e6d3ea8e78978d8b3a71fb0e7a50803ffad78cdff7cd6aaf7f16c64c14816f47a03fe68d1e28f1581fa4a8390a2f6
-EBUILD self_test-9999.ebuild 573 BLAKE2B 699878dcef9e5e499d6092b413982a0a80f526c5135e59f33909fd3ed77efa4b44947d4820c96ca8cb7c3719b25b5ae258a1884e0f7df96fe0fce6b9ff32b702 SHA512 1f4ef3f072d9f554062f44b3897ab065880e6d3ea8e78978d8b3a71fb0e7a50803ffad78cdff7cd6aaf7f16c64c14816f47a03fe68d1e28f1581fa4a8390a2f6
-MISC metadata.xml 330 BLAKE2B a856cefc508ebf638d764bbfad848bae8140bb8f4f8e0fcde5ade3d168cff85647d3f803f92fd05824d459cd1e723d86ff48b21c07211b27527d251bb7eb90fd SHA512 d6abd3b4af2ba8eb1de110f8b59296f327e83ced62d9618e1dd2be6d39e04e4bad27a32aa78f9e7358b2f22f872aa96bbdac1da860c6af37ebff054d6e5c7f67
diff --git a/dev-ros/self_test/metadata.xml b/dev-ros/self_test/metadata.xml
deleted file mode 100644
index dd82416e0b4a..000000000000
--- a/dev-ros/self_test/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/diagnostics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/self_test/self_test-1.10.1-r1.ebuild b/dev-ros/self_test/self_test-1.10.1-r1.ebuild
deleted file mode 100644
index fa3beed86db3..000000000000
--- a/dev-ros/self_test/self_test-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/self_test/self_test-1.10.2-r1.ebuild b/dev-ros/self_test/self_test-1.10.2-r1.ebuild
deleted file mode 100644
index fa3beed86db3..000000000000
--- a/dev-ros/self_test/self_test-1.10.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/self_test/self_test-1.10.3-r1.ebuild b/dev-ros/self_test/self_test-1.10.3-r1.ebuild
deleted file mode 100644
index fa3beed86db3..000000000000
--- a/dev-ros/self_test/self_test-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/self_test/self_test-1.10.4-r1.ebuild b/dev-ros/self_test/self_test-1.10.4-r1.ebuild
deleted file mode 100644
index fa3beed86db3..000000000000
--- a/dev-ros/self_test/self_test-1.10.4-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/self_test/self_test-1.11.0.ebuild b/dev-ros/self_test/self_test-1.11.0.ebuild
deleted file mode 100644
index fa3beed86db3..000000000000
--- a/dev-ros/self_test/self_test-1.11.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/self_test/self_test-1.9.4-r1.ebuild b/dev-ros/self_test/self_test-1.9.4-r1.ebuild
deleted file mode 100644
index fa3beed86db3..000000000000
--- a/dev-ros/self_test/self_test-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/self_test/self_test-1.9.6-r1.ebuild b/dev-ros/self_test/self_test-1.9.6-r1.ebuild
deleted file mode 100644
index fa3beed86db3..000000000000
--- a/dev-ros/self_test/self_test-1.9.6-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/self_test/self_test-9999.ebuild b/dev-ros/self_test/self_test-9999.ebuild
deleted file mode 100644
index fa3beed86db3..000000000000
--- a/dev-ros/self_test/self_test-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/sensor_msgs/Manifest b/dev-ros/sensor_msgs/Manifest
deleted file mode 100644
index 79eba8cd17b7..000000000000
--- a/dev-ros/sensor_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD sensor_msgs-1.13.0.ebuild 561 BLAKE2B 76325bc750b51027805fd67c23c0b0d843a7418d99334ddd384840d593b1c4de7ffdaf4b52963f4dbbcfab2d2daa84d6ceb21a25164ed9e87195ceaf109f7cc6 SHA512 cd916b8e427bdd568940be9aed1a9ec9b47abb5d1a9b3e2ec6a8434cf521c61eda1b293ac114293f0a1f5512aa369ac2069b13329037bee59b0aaa9f50365c19
-EBUILD sensor_msgs-1.13.1.ebuild 561 BLAKE2B 1e979a1a3d9f4de334b845d1e61d4e6f595faf99f68fe8834a9b213e09a42a96264cf65bc136186b8415c481ac071ff4fa7eae417c153f2950fa839a44d7d52f SHA512 a07a4dc421e5b5ecd4885e991a31bec7d4beba4374eb461a4f9a480d1d38fc10b4e3adf7453cd1fb2e8cb6c7e1f3b9b77cc5851c00fa40f34a801e57e200675c
-EBUILD sensor_msgs-9999.ebuild 561 BLAKE2B 76325bc750b51027805fd67c23c0b0d843a7418d99334ddd384840d593b1c4de7ffdaf4b52963f4dbbcfab2d2daa84d6ceb21a25164ed9e87195ceaf109f7cc6 SHA512 cd916b8e427bdd568940be9aed1a9ec9b47abb5d1a9b3e2ec6a8434cf521c61eda1b293ac114293f0a1f5512aa369ac2069b13329037bee59b0aaa9f50365c19
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/sensor_msgs/metadata.xml b/dev-ros/sensor_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/sensor_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild
deleted file mode 100644
index aff165c07cee..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors: cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.13.1.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.13.1.ebuild
deleted file mode 100644
index 21e93c307997..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors: cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild b/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
deleted file mode 100644
index aff165c07cee..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors: cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/settlerlib/Manifest b/dev-ros/settlerlib/Manifest
deleted file mode 100644
index e77e7141cbb4..000000000000
--- a/dev-ros/settlerlib/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
-EBUILD settlerlib-0.10.14.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
-EBUILD settlerlib-0.10.15.ebuild 519 BLAKE2B 6ff2d710bd16ff3188e2dad5176a78ad87af0e98e8ef79dbf3c0d7958bb025497d2c9b1bd710a9262bb2beba98e4caabc794e82a7b7a49c3fd62611eea528561 SHA512 29163c9967448c89d20433bb63bbdb15ec3428b1acb8ebd271ff943239c09edaff20b5dc31ddf22d2bb576a20c638c67b045b453838d3abe2b3535965c5035ce
-EBUILD settlerlib-9999.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
-MISC metadata.xml 341 BLAKE2B c80b993e6483b6fa0df3594be12dcbd50d32e06b62ec367aaf09aea509c4483b2ae6c0128ce8f0b7abc944262e19c5bca486eda3963ab2a6e74ac1de853a048d SHA512 a902456a8c726af9cb5382d37743c4559aab652e1555863f8d96afa3ff6ae508d290f4a9d50f5e022d23edc5273c9b384c91ecc741306f78dce2cd77c891624f
diff --git a/dev-ros/settlerlib/metadata.xml b/dev-ros/settlerlib/metadata.xml
deleted file mode 100644
index 59b441a1c13c..000000000000
--- a/dev-ros/settlerlib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/calibration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild b/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
deleted file mode 100644
index 8279f8dc7bae..000000000000
--- a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/rosconsole
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/settlerlib/settlerlib-0.10.15.ebuild b/dev-ros/settlerlib/settlerlib-0.10.15.ebuild
deleted file mode 100644
index f002fa2984e2..000000000000
--- a/dev-ros/settlerlib/settlerlib-0.10.15.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/rosconsole
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/settlerlib/settlerlib-9999.ebuild b/dev-ros/settlerlib/settlerlib-9999.ebuild
deleted file mode 100644
index 8279f8dc7bae..000000000000
--- a/dev-ros/settlerlib/settlerlib-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/rosconsole
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/shape_msgs/Manifest b/dev-ros/shape_msgs/Manifest
deleted file mode 100644
index f401ff31e6d7..000000000000
--- a/dev-ros/shape_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD shape_msgs-1.13.0.ebuild 478 BLAKE2B 438d32c87d5ed97472bc22e145fab4ac30c15c145b2616c7ea07594c634987de3eb0ab38dec55525b8a7fb8b9b0ac2a0e4948445ce7047b460c3e8e508267fdd SHA512 c28e23d4e19fddfd55e54dbe53433a2b5f199a7d322a5d7b916ee19750e4bcda5ecade89cdcb8c788073bb793f42ccc052e90228cc1cc37e3ce9f64c074c5bea
-EBUILD shape_msgs-1.13.1.ebuild 478 BLAKE2B 6824b8976ba4ccaf4b823f8919081c170f7b31bd262174051a8b10c836f7beb11d0deef2d4fe6f8c2bc41f5394b2cfcecea9d3f2b6626e270812f366c44723ec SHA512 26cf23d4ed670605f171af678515802596c66b341c12ffe38b7d33132f454362a0b50628407e0541ee953f1379f76d62e9e25b835a3a69716c188377a2bed27c
-EBUILD shape_msgs-9999.ebuild 478 BLAKE2B 438d32c87d5ed97472bc22e145fab4ac30c15c145b2616c7ea07594c634987de3eb0ab38dec55525b8a7fb8b9b0ac2a0e4948445ce7047b460c3e8e508267fdd SHA512 c28e23d4e19fddfd55e54dbe53433a2b5f199a7d322a5d7b916ee19750e4bcda5ecade89cdcb8c788073bb793f42ccc052e90228cc1cc37e3ce9f64c074c5bea
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/shape_msgs/metadata.xml b/dev-ros/shape_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/shape_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/shape_msgs/shape_msgs-1.13.0.ebuild b/dev-ros/shape_msgs/shape_msgs-1.13.0.ebuild
deleted file mode 100644
index 824dbef9db8a..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes: simple solid object primitives, planes, and meshes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/shape_msgs/shape_msgs-1.13.1.ebuild b/dev-ros/shape_msgs/shape_msgs-1.13.1.ebuild
deleted file mode 100644
index 253266e5baeb..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes: simple solid object primitives, planes, and meshes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/shape_msgs/shape_msgs-9999.ebuild b/dev-ros/shape_msgs/shape_msgs-9999.ebuild
deleted file mode 100644
index 824dbef9db8a..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes: simple solid object primitives, planes, and meshes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach/Manifest b/dev-ros/smach/Manifest
deleted file mode 100644
index e8ee0283161c..000000000000
--- a/dev-ros/smach/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST executive_smach-2.5.0.tar.gz 42305 BLAKE2B 0b220f7aeec00c8e625c64f169f76ba8e35a5669b55f1a71073c419c7ad82c1d0cdb0d40f9eb3a3b2db7aa593b8d5867ececbcc5037af1022fcdfd6c09f1ed9e SHA512 83d557c450e28502f22dd39f7b3aec2a64faec565d25ed60832a8915f88d6541aaa906de61d3588e2ceaf8a2bc9d41f64376663322d570fbcce284b617193bb1
-EBUILD smach-2.5.0.ebuild 373 BLAKE2B 0949bab25f522079f3b10d10e2211cc43024082f5d86b128686e66c4c7442892e7e16ee1729e377de05cc750c0ab5bf730141582d021059449ea6de869ffd452 SHA512 fbc19b2aaff43936506da552d6963f72e14645c34560159d15fd47cc8533cb19212e7f9b3aea418ca41b86ed69b1cee5e26a25b54fb25982ba56fa6b0f1b2202
-EBUILD smach-9999.ebuild 373 BLAKE2B 0949bab25f522079f3b10d10e2211cc43024082f5d86b128686e66c4c7442892e7e16ee1729e377de05cc750c0ab5bf730141582d021059449ea6de869ffd452 SHA512 fbc19b2aaff43936506da552d6963f72e14645c34560159d15fd47cc8533cb19212e7f9b3aea418ca41b86ed69b1cee5e26a25b54fb25982ba56fa6b0f1b2202
-MISC metadata.xml 334 BLAKE2B 37a8e391b5307ad6103a0bb4fa560040cc7a77fd787faa3ff611de812317dc86ac3f4d57f1175ae49f70b295dd2b90e9faf847d66b7426fec9d3cf1f1ca6d6ad SHA512 2fe94a01bef006cef08656f1d9fa9c1d548d52b4b4b91720308ed0cfe526806c7cf3b5f9aa35abe3dfe0a6cbbb5ec131efdaa655d008eaf542111adb807ee24e
diff --git a/dev-ros/smach/metadata.xml b/dev-ros/smach/metadata.xml
deleted file mode 100644
index 5eefb0c15e88..000000000000
--- a/dev-ros/smach/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/executive_smach</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/smach/smach-2.5.0.ebuild b/dev-ros/smach/smach-2.5.0.ebuild
deleted file mode 100644
index 194897b43b81..000000000000
--- a/dev-ros/smach/smach-2.5.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Task-level architecture for rapidly creating complex robot behavior"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach/smach-9999.ebuild b/dev-ros/smach/smach-9999.ebuild
deleted file mode 100644
index 194897b43b81..000000000000
--- a/dev-ros/smach/smach-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Task-level architecture for rapidly creating complex robot behavior"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach_msgs/Manifest b/dev-ros/smach_msgs/Manifest
deleted file mode 100644
index c9f839067117..000000000000
--- a/dev-ros/smach_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST executive_smach-2.5.0.tar.gz 42305 BLAKE2B 0b220f7aeec00c8e625c64f169f76ba8e35a5669b55f1a71073c419c7ad82c1d0cdb0d40f9eb3a3b2db7aa593b8d5867ececbcc5037af1022fcdfd6c09f1ed9e SHA512 83d557c450e28502f22dd39f7b3aec2a64faec565d25ed60832a8915f88d6541aaa906de61d3588e2ceaf8a2bc9d41f64376663322d570fbcce284b617193bb1
-EBUILD smach_msgs-2.5.0.ebuild 452 BLAKE2B d91a5851d336e5469999ee6a4a45ea7a64b22908eddeb3e134ce211ca1a8921f7e19acc0693d795c44705d3a2e3bea1e74e6b911f94ef08bcdae776ab3892221 SHA512 6f25b044018a788407d42745e6a16f1dcacc124d956ba42d35d631232dae1b97b45e4753ea95ca89a9e0f717abf9006dc3b56c0003cb3223ea6b8eaa84a6010b
-EBUILD smach_msgs-9999.ebuild 452 BLAKE2B d91a5851d336e5469999ee6a4a45ea7a64b22908eddeb3e134ce211ca1a8921f7e19acc0693d795c44705d3a2e3bea1e74e6b911f94ef08bcdae776ab3892221 SHA512 6f25b044018a788407d42745e6a16f1dcacc124d956ba42d35d631232dae1b97b45e4753ea95ca89a9e0f717abf9006dc3b56c0003cb3223ea6b8eaa84a6010b
-MISC metadata.xml 334 BLAKE2B 37a8e391b5307ad6103a0bb4fa560040cc7a77fd787faa3ff611de812317dc86ac3f4d57f1175ae49f70b295dd2b90e9faf847d66b7426fec9d3cf1f1ca6d6ad SHA512 2fe94a01bef006cef08656f1d9fa9c1d548d52b4b4b91720308ed0cfe526806c7cf3b5f9aa35abe3dfe0a6cbbb5ec131efdaa655d008eaf542111adb807ee24e
diff --git a/dev-ros/smach_msgs/metadata.xml b/dev-ros/smach_msgs/metadata.xml
deleted file mode 100644
index 5eefb0c15e88..000000000000
--- a/dev-ros/smach_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/executive_smach</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/smach_msgs/smach_msgs-2.5.0.ebuild b/dev-ros/smach_msgs/smach_msgs-2.5.0.ebuild
deleted file mode 100644
index 43513fe5132f..000000000000
--- a/dev-ros/smach_msgs/smach_msgs-2.5.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Set of messages that are used by the introspection interfaces for smach"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach_msgs/smach_msgs-9999.ebuild b/dev-ros/smach_msgs/smach_msgs-9999.ebuild
deleted file mode 100644
index 43513fe5132f..000000000000
--- a/dev-ros/smach_msgs/smach_msgs-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Set of messages that are used by the introspection interfaces for smach"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smach_ros/Manifest b/dev-ros/smach_ros/Manifest
deleted file mode 100644
index 646c2b89a496..000000000000
--- a/dev-ros/smach_ros/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST executive_smach-2.5.0.tar.gz 42305 BLAKE2B 0b220f7aeec00c8e625c64f169f76ba8e35a5669b55f1a71073c419c7ad82c1d0cdb0d40f9eb3a3b2db7aa593b8d5867ececbcc5037af1022fcdfd6c09f1ed9e SHA512 83d557c450e28502f22dd39f7b3aec2a64faec565d25ed60832a8915f88d6541aaa906de61d3588e2ceaf8a2bc9d41f64376663322d570fbcce284b617193bb1
-EBUILD smach_ros-2.5.0.ebuild 886 BLAKE2B e65a06e8a1f63d47126cc487ac68ac59a3e019fc349721bb33b1883b04a182d1f5856f778a8c3eecbcd57129b12a3c83b860bd8d99033e0d7808a13c4b91ae60 SHA512 f3648f842d3afb36594c9c8f843547338d582bca9ff6006b70a7bdbaa3be04f524305a8f4cd6292446ae156a91f6f057a4c57d0c60acf5ba472fcbbcd3477a2f
-EBUILD smach_ros-9999.ebuild 886 BLAKE2B e65a06e8a1f63d47126cc487ac68ac59a3e019fc349721bb33b1883b04a182d1f5856f778a8c3eecbcd57129b12a3c83b860bd8d99033e0d7808a13c4b91ae60 SHA512 f3648f842d3afb36594c9c8f843547338d582bca9ff6006b70a7bdbaa3be04f524305a8f4cd6292446ae156a91f6f057a4c57d0c60acf5ba472fcbbcd3477a2f
-MISC metadata.xml 334 BLAKE2B 37a8e391b5307ad6103a0bb4fa560040cc7a77fd787faa3ff611de812317dc86ac3f4d57f1175ae49f70b295dd2b90e9faf847d66b7426fec9d3cf1f1ca6d6ad SHA512 2fe94a01bef006cef08656f1d9fa9c1d548d52b4b4b91720308ed0cfe526806c7cf3b5f9aa35abe3dfe0a6cbbb5ec131efdaa655d008eaf542111adb807ee24e
diff --git a/dev-ros/smach_ros/metadata.xml b/dev-ros/smach_ros/metadata.xml
deleted file mode 100644
index 5eefb0c15e88..000000000000
--- a/dev-ros/smach_ros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/executive_smach</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/smach_ros/smach_ros-2.5.0.ebuild b/dev-ros/smach_ros/smach_ros-2.5.0.ebuild
deleted file mode 100644
index ad6de87c90ae..000000000000
--- a/dev-ros/smach_ros/smach_ros-2.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extensions for the SMACH library to integrate it tightly with ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/smach[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/smach_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/smach_ros/smach_ros-9999.ebuild b/dev-ros/smach_ros/smach_ros-9999.ebuild
deleted file mode 100644
index ad6de87c90ae..000000000000
--- a/dev-ros/smach_ros/smach_ros-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extensions for the SMACH library to integrate it tightly with ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/smach[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/smach_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/smclib/Manifest b/dev-ros/smclib/Manifest
deleted file mode 100644
index 1005264904ed..000000000000
--- a/dev-ros/smclib/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
-DIST bond_core-1.8.6.tar.gz 33915 BLAKE2B 7d75a9fce73974f1ca131807b9f7e9084dc8204861d85a10f8bf38dacbbe2b25bdbad6d8719374b95f6fffb18f7078cdbabd3353487e8a96420b7afd7498fdcd SHA512 862f3779e7b63c462118b8d0d17ed405c914792bd6293e12b4dbf2499f459566669cb60d8c207e29e386e32a2065c5c0ac7a98c4372d4eded4f107c8537c9bbf
-EBUILD smclib-1.8.5.ebuild 367 BLAKE2B 9daf6abe03aa5f84efd4c4aa74dd2d34f6b70addd1d02382ce4c937878d6d05215d5c8b8ffac98ddd99d88ff66e2241ac739552aa0acdcb78a387b750b51e882 SHA512 1b72233830837618182fd169132da5282b52a719cb09f4d6b37aae8b367bc0cdefef4fc1cceff74199dab6cff46f02c7d1745e59288e2132b04115995ab8e823
-EBUILD smclib-1.8.6.ebuild 367 BLAKE2B 9daf6abe03aa5f84efd4c4aa74dd2d34f6b70addd1d02382ce4c937878d6d05215d5c8b8ffac98ddd99d88ff66e2241ac739552aa0acdcb78a387b750b51e882 SHA512 1b72233830837618182fd169132da5282b52a719cb09f4d6b37aae8b367bc0cdefef4fc1cceff74199dab6cff46f02c7d1745e59288e2132b04115995ab8e823
-EBUILD smclib-9999.ebuild 367 BLAKE2B 9daf6abe03aa5f84efd4c4aa74dd2d34f6b70addd1d02382ce4c937878d6d05215d5c8b8ffac98ddd99d88ff66e2241ac739552aa0acdcb78a387b750b51e882 SHA512 1b72233830837618182fd169132da5282b52a719cb09f4d6b37aae8b367bc0cdefef4fc1cceff74199dab6cff46f02c7d1745e59288e2132b04115995ab8e823
-MISC metadata.xml 328 BLAKE2B 5ed9601fcd46b742df6972b9d4e6af0263afbe4e0e273d34b4a9f9cdf16e0dae073408d43cf361fd79c04e136d369fe64d16b90ec57e06871780aa9761bd6091 SHA512 cc8310ee68b4b4e23ff680d14afb426aa8ea41cf1ff6b4d779778d4e882ea30e1de65d08049fb4f9a7bdd95d7d02b66be4d48113eb512c6843f6d3d9e80dc131
diff --git a/dev-ros/smclib/metadata.xml b/dev-ros/smclib/metadata.xml
deleted file mode 100644
index 9ae2e2f3192e..000000000000
--- a/dev-ros/smclib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/bond_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/smclib/smclib-1.8.5.ebuild b/dev-ros/smclib/smclib-1.8.5.ebuild
deleted file mode 100644
index eb5955f865ee..000000000000
--- a/dev-ros/smclib/smclib-1.8.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The SMC converts the description of a state machine into source code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smclib/smclib-1.8.6.ebuild b/dev-ros/smclib/smclib-1.8.6.ebuild
deleted file mode 100644
index eb5955f865ee..000000000000
--- a/dev-ros/smclib/smclib-1.8.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The SMC converts the description of a state machine into source code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/smclib/smclib-9999.ebuild b/dev-ros/smclib/smclib-9999.ebuild
deleted file mode 100644
index eb5955f865ee..000000000000
--- a/dev-ros/smclib/smclib-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The SMC converts the description of a state machine into source code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stage_ros/Manifest b/dev-ros/stage_ros/Manifest
deleted file mode 100644
index 6990d19d9c88..000000000000
--- a/dev-ros/stage_ros/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX tests.patch 362 BLAKE2B 1c57128de8575dbdcdbb09717eb839998ab9efe3c8dc796702773fe68661353324d3359ebc2e7725bc8ba673e7f460b82b255aae8125302265eed59c74e5d212 SHA512 b0a7afe2fdfe4af6a79039f6580bf584e67b34b10eb4cca90ef7d4433e0b84658f9fa60a3f3dc4014333406e4b97b74e28b453b0259e59df1558d7ffe371313e
-DIST stage_ros-1.8.0.tar.gz 59891 BLAKE2B a70708ce0e30418116a1b7b4a2f6b9bfa1e8f03b6562013f51a49e3a349ab0d7d8c090f61d620e4ef7c8d2e19f77165c04b05fb5ceeab061e9d88895cbb6eef7 SHA512 d953e819d1955e7b1f0ca5a3d91e5b052b485045c057ecfe210e8b31dd3b4aa3418ac642dbad87ce8925e74295661a9fee9b10d826c2b1a2a17f8ec478a87927
-EBUILD stage_ros-1.8.0-r1.ebuild 677 BLAKE2B 0622a812c1467bdeed91dca3c64c415774388a2ae4fe0031f5eedb3d18e9000bc505e5a0200af6b9a06feee75e6b428d10403b17a16425697947bea2731209d0 SHA512 7ba47ae5f37f62794f2065bff6d3b381f22cb165344d2e1bd3326c3695d239410399991c9f4c756cdf303b886995701eea0c88eb3a7a8643523330f4f8475b82
-EBUILD stage_ros-9999.ebuild 677 BLAKE2B 0622a812c1467bdeed91dca3c64c415774388a2ae4fe0031f5eedb3d18e9000bc505e5a0200af6b9a06feee75e6b428d10403b17a16425697947bea2731209d0 SHA512 7ba47ae5f37f62794f2065bff6d3b381f22cb165344d2e1bd3326c3695d239410399991c9f4c756cdf303b886995701eea0c88eb3a7a8643523330f4f8475b82
-MISC metadata.xml 339 BLAKE2B 016897de064da1b2827b9e0953a89ce8a83641dabb345f8c3564c392ae9e44fc6de83dd9670ddacf6b739d81451ccbb5ce6c0ea17fb1af310e5c9790f387553c SHA512 8b76dbeb00fe07e484b6624ff4493f7e58a7ded51e4ebe7f730da5c119afac2abdd8e7f3d11645319a210bfd54ce5af4c9ace40e686be54e718ede1127046c16
diff --git a/dev-ros/stage_ros/files/tests.patch b/dev-ros/stage_ros/files/tests.patch
deleted file mode 100644
index e3cf108bbef5..000000000000
--- a/dev-ros/stage_ros/files/tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: stage_ros-1.8.0/test/intensity_test.py
-===================================================================
---- stage_ros-1.8.0.orig/test/intensity_test.py
-+++ stage_ros-1.8.0/test/intensity_test.py
-@@ -3,7 +3,7 @@
- import unittest
- import rospy
- import time
--import Queue as queue
-+import queue
- from sensor_msgs.msg import LaserScan
- 
- PKG = "stage_ros"
diff --git a/dev-ros/stage_ros/metadata.xml b/dev-ros/stage_ros/metadata.xml
deleted file mode 100644
index 9f345665be41..000000000000
--- a/dev-ros/stage_ros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-simulation/stage_ros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild b/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild
deleted file mode 100644
index 9c59aa8cdcd6..000000000000
--- a/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS specific hooks and tools for the Stage simulator"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/geometry_msgs
-	dev-ros/nav_msgs
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-ros/sensor_msgs
-	dev-ros/std_msgs
-	dev-ros/tf
-	x11-libs/fltk
-	>=sci-electronics/Stage-4.3:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )
-"
-BDEPEND="
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/stage_ros/stage_ros-9999.ebuild b/dev-ros/stage_ros/stage_ros-9999.ebuild
deleted file mode 100644
index 9c59aa8cdcd6..000000000000
--- a/dev-ros/stage_ros/stage_ros-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS specific hooks and tools for the Stage simulator"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/geometry_msgs
-	dev-ros/nav_msgs
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-ros/sensor_msgs
-	dev-ros/std_msgs
-	dev-ros/tf
-	x11-libs/fltk
-	>=sci-electronics/Stage-4.3:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest )
-"
-BDEPEND="
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/std_msgs/Manifest b/dev-ros/std_msgs/Manifest
deleted file mode 100644
index 83bb4459672d..000000000000
--- a/dev-ros/std_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST std_msgs-0.5.13.tar.gz 6557 BLAKE2B a07995e1f51319dcbc18d2f9fbaeb4bb208b00003dc85a2f7a15268e2391be55f2d1a4cfe7f980c5c19d7acb56c1073ddd05ac65a5bf2f690dd45856f83714a7 SHA512 a81af8d100b38fa6b093ad46ae0bc9916f3704ee7518aa68a31d96166d60e6f0fa4d2de4d0ba3b0d6ae7d209307fb2d2958fa53ffc3db8c0da49154a1d19f40d
-EBUILD std_msgs-0.5.13.ebuild 334 BLAKE2B 0ad143c6e6d432d992da4fe152c05de46df413ca1210b1115306a4ea4d98c0f20caf61ce894d7c143abf18da92f84344cdba10bf6bd81cb87a3d4dc486851154 SHA512 f389639d2f58f85ffc29a82e9a831b40fd01ba7ca9cebb8fe96e93ea13bd20c496bfe18d454bfb28d3dba137a4545c5aaa89e17e11e2b45a349dada0cbd85d3a
-EBUILD std_msgs-9999.ebuild 334 BLAKE2B 0ad143c6e6d432d992da4fe152c05de46df413ca1210b1115306a4ea4d98c0f20caf61ce894d7c143abf18da92f84344cdba10bf6bd81cb87a3d4dc486851154 SHA512 f389639d2f58f85ffc29a82e9a831b40fd01ba7ca9cebb8fe96e93ea13bd20c496bfe18d454bfb28d3dba137a4545c5aaa89e17e11e2b45a349dada0cbd85d3a
-MISC metadata.xml 327 BLAKE2B 1358dfee87d853b0397e6b8341dfcf225c61460ba883a601bc88b1a0aa36a409085ce042f9efd2fc18533bc2565de05bc51636185f6f8ee6821a0230a5b6f474 SHA512 8cbbf5cfd1541663b2ead079ffdbf003a45731d7a093312b9ef8113055b32eaaf9ebc98755aa26e11020150c90e5f03fcdf401be25b451dbc8c1464d8397b222
diff --git a/dev-ros/std_msgs/metadata.xml b/dev-ros/std_msgs/metadata.xml
deleted file mode 100644
index 9b1ebe9b50ee..000000000000
--- a/dev-ros/std_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/std_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/std_msgs/std_msgs-0.5.13.ebuild b/dev-ros/std_msgs/std_msgs-0.5.13.ebuild
deleted file mode 100644
index 175f7b9d6ed4..000000000000
--- a/dev-ros/std_msgs/std_msgs-0.5.13.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/std_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-
-inherit ${SCM} ros-catkin
-
-DESCRIPTION="Standard ROS Messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_msgs/std_msgs-9999.ebuild b/dev-ros/std_msgs/std_msgs-9999.ebuild
deleted file mode 100644
index 175f7b9d6ed4..000000000000
--- a/dev-ros/std_msgs/std_msgs-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/std_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-
-inherit ${SCM} ros-catkin
-
-DESCRIPTION="Standard ROS Messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_srvs/Manifest b/dev-ros/std_srvs/Manifest
deleted file mode 100644
index 3db2e32bd254..000000000000
--- a/dev-ros/std_srvs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ros_comm_msgs-1.11.3.tar.gz 2483 BLAKE2B dd6753d0cd5f285cce9343e29c3c593260708bcc7627850564fe6e3975511b55359ee790d6ddf6066e8433c2fa03bc576d9f7ec41ee0a5a362a9e42be2c87e65 SHA512 e7afef3326fbbfa9435ecaed9a553de74d694def975e5e2bdaff6cc671c8001cdef540defb90df936c0731bfa5d3d7d6e00300847271cd8d3c00ec59b24f1207
-EBUILD std_srvs-1.11.3.ebuild 357 BLAKE2B b09255da8ebdd5fa1f09f872e1e0be7439697d0415be822f994eaa5fb43678d20363d63114213bbb2ec9d8cbbeb9b506197a0012b762cb51b6bd34ccad871fec SHA512 1f79302f57d86f93b0ee48dde78cd9fe16efc51807d3d10553a27f0eacfca15765cbe36395bd028a9e965f73dfcd5bf44813390d1f94cc3972b9e93e0dce3b3e
-EBUILD std_srvs-9999.ebuild 357 BLAKE2B b09255da8ebdd5fa1f09f872e1e0be7439697d0415be822f994eaa5fb43678d20363d63114213bbb2ec9d8cbbeb9b506197a0012b762cb51b6bd34ccad871fec SHA512 1f79302f57d86f93b0ee48dde78cd9fe16efc51807d3d10553a27f0eacfca15765cbe36395bd028a9e965f73dfcd5bf44813390d1f94cc3972b9e93e0dce3b3e
-MISC metadata.xml 332 BLAKE2B 7942db85cc27688399e5521b48849909d06b367a934fe10a486c6c1dc8e894a5781202cefcce29492ce62eed72c288a2803ecccd24395eda93bfec2d7edd5b39 SHA512 4c6ee03f69eeaa12affbc06aa409e83c8e6955ff5fa10e18332c7e647bce3a6f40c43ff4fd08f20578b6651b34fd13fb02474f4c6a9659ffb3ce2341bc2381ce
diff --git a/dev-ros/std_srvs/metadata.xml b/dev-ros/std_srvs/metadata.xml
deleted file mode 100644
index 02fcd6b01352..000000000000
--- a/dev-ros/std_srvs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/std_srvs/std_srvs-1.11.3.ebuild b/dev-ros/std_srvs/std_srvs-1.11.3.ebuild
deleted file mode 100644
index 52fdbcd95ba5..000000000000
--- a/dev-ros/std_srvs/std_srvs-1.11.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Messages relating to ROS comm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/std_srvs/std_srvs-9999.ebuild b/dev-ros/std_srvs/std_srvs-9999.ebuild
deleted file mode 100644
index 52fdbcd95ba5..000000000000
--- a/dev-ros/std_srvs/std_srvs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Messages relating to ROS comm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/Manifest b/dev-ros/stereo_image_proc/Manifest
deleted file mode 100644
index 01653b8ce28f..000000000000
--- a/dev-ros/stereo_image_proc/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
-DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
-DIST image_pipeline-1.17.0.tar.gz 154211 BLAKE2B 221c549d6794f3567706e724a48d52fa4d7f395b30f477a12750f4707d70782496a0110df9f89e83aa11ea95dbd65acab18eff13a8beb026091abd209370cbd4 SHA512 c5bc227f13415f6fe31eb2cee015f8671433b427044b8f8842d0e5d1ef19aff21f66e40945bb09227442ab5c4c49aae3217b56dac03b358804567cff4189efeb
-EBUILD stereo_image_proc-1.15.2-r1.ebuild 708 BLAKE2B bd954d075b6c09b19f0bacccdbc781f837c9f137cb00d7b604beeaf3b62f2f7a40afade485e5820f9a71b11cfb577ec4a914bea32476141b1fe7daf2f5c32c68 SHA512 e1e895aedf1b6be36e9aac4064f59e1ac4d176b1cc0819bd08c79fe5f1bbdea888676ad6d8db77e1ee3738eb396ed832c6a9b30cadc656fceee97ebcc0475fea
-EBUILD stereo_image_proc-1.15.3-r1.ebuild 708 BLAKE2B bd954d075b6c09b19f0bacccdbc781f837c9f137cb00d7b604beeaf3b62f2f7a40afade485e5820f9a71b11cfb577ec4a914bea32476141b1fe7daf2f5c32c68 SHA512 e1e895aedf1b6be36e9aac4064f59e1ac4d176b1cc0819bd08c79fe5f1bbdea888676ad6d8db77e1ee3738eb396ed832c6a9b30cadc656fceee97ebcc0475fea
-EBUILD stereo_image_proc-1.16.0.ebuild 708 BLAKE2B bd954d075b6c09b19f0bacccdbc781f837c9f137cb00d7b604beeaf3b62f2f7a40afade485e5820f9a71b11cfb577ec4a914bea32476141b1fe7daf2f5c32c68 SHA512 e1e895aedf1b6be36e9aac4064f59e1ac4d176b1cc0819bd08c79fe5f1bbdea888676ad6d8db77e1ee3738eb396ed832c6a9b30cadc656fceee97ebcc0475fea
-EBUILD stereo_image_proc-1.17.0.ebuild 708 BLAKE2B bd954d075b6c09b19f0bacccdbc781f837c9f137cb00d7b604beeaf3b62f2f7a40afade485e5820f9a71b11cfb577ec4a914bea32476141b1fe7daf2f5c32c68 SHA512 e1e895aedf1b6be36e9aac4064f59e1ac4d176b1cc0819bd08c79fe5f1bbdea888676ad6d8db77e1ee3738eb396ed832c6a9b30cadc656fceee97ebcc0475fea
-EBUILD stereo_image_proc-9999.ebuild 708 BLAKE2B bd954d075b6c09b19f0bacccdbc781f837c9f137cb00d7b604beeaf3b62f2f7a40afade485e5820f9a71b11cfb577ec4a914bea32476141b1fe7daf2f5c32c68 SHA512 e1e895aedf1b6be36e9aac4064f59e1ac4d176b1cc0819bd08c79fe5f1bbdea888676ad6d8db77e1ee3738eb396ed832c6a9b30cadc656fceee97ebcc0475fea
-MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/stereo_image_proc/metadata.xml b/dev-ros/stereo_image_proc/metadata.xml
deleted file mode 100644
index a96f24591a70..000000000000
--- a/dev-ros/stereo_image_proc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_pipeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2-r1.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2-r1.ebuild
deleted file mode 100644
index 138ad0e98af9..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.15.3-r1.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.15.3-r1.ebuild
deleted file mode 100644
index 138ad0e98af9..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.15.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.16.0.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.16.0.ebuild
deleted file mode 100644
index 138ad0e98af9..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.16.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.17.0.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.17.0.ebuild
deleted file mode 100644
index 138ad0e98af9..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.17.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
deleted file mode 100644
index 138ad0e98af9..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/stereo_msgs/Manifest b/dev-ros/stereo_msgs/Manifest
deleted file mode 100644
index cf91e8ba43a2..000000000000
--- a/dev-ros/stereo_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD stereo_msgs-1.13.0.ebuild 460 BLAKE2B 93fa5c003de0f86b0ddbae4bfa155b7678445eb0306d6cd8f92b097b12a1fb6e0d4c7defcc5041179e4dac2a224d248e8b130fe25363cdb1d1d97bd2e2349f01 SHA512 0e4299c33327decc91386aa54698d44966e7484ad960b485b9337b29478fdc2111fed3b179b86f81e7a02c7a4adf94daf178b6d668a8b4002ada0b9f79552019
-EBUILD stereo_msgs-1.13.1.ebuild 460 BLAKE2B 4d81809234dde84722cb99471d50352a823a3b373ccb248396bc15de069032f857fdc048b5741fee08c50bbd18d76a7f24f6b83f2bb7bd30e879f6cb649823b2 SHA512 e098fadaf48d824d129462480ede6e0ebcaada12d453ceda7aa5298bc515a71437577374f5fe39b99d664d1e050eee5c8817832f5bc780ee655ceafdca1a75e3
-EBUILD stereo_msgs-9999.ebuild 460 BLAKE2B 93fa5c003de0f86b0ddbae4bfa155b7678445eb0306d6cd8f92b097b12a1fb6e0d4c7defcc5041179e4dac2a224d248e8b130fe25363cdb1d1d97bd2e2349f01 SHA512 0e4299c33327decc91386aa54698d44966e7484ad960b485b9337b29478fdc2111fed3b179b86f81e7a02c7a4adf94daf178b6d668a8b4002ada0b9f79552019
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/stereo_msgs/metadata.xml b/dev-ros/stereo_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/stereo_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.13.0.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.13.0.ebuild
deleted file mode 100644
index 1154173356b6..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages specific to stereo processing, such as disparity images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.13.1.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.13.1.ebuild
deleted file mode 100644
index b6832f6bac0c..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages specific to stereo processing, such as disparity images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild b/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild
deleted file mode 100644
index 1154173356b6..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages specific to stereo processing, such as disparity images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/test_bond/Manifest b/dev-ros/test_bond/Manifest
deleted file mode 100644
index 64801d9a657d..000000000000
--- a/dev-ros/test_bond/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
-DIST bond_core-1.8.6.tar.gz 33915 BLAKE2B 7d75a9fce73974f1ca131807b9f7e9084dc8204861d85a10f8bf38dacbbe2b25bdbad6d8719374b95f6fffb18f7078cdbabd3353487e8a96420b7afd7498fdcd SHA512 862f3779e7b63c462118b8d0d17ed405c914792bd6293e12b4dbf2499f459566669cb60d8c207e29e386e32a2065c5c0ac7a98c4372d4eded4f107c8537c9bbf
-EBUILD test_bond-1.8.5.ebuild 573 BLAKE2B 649e47d71d398681a58a737333f17a649e48be58a45c96a60a1367d1b69dcc0e0bde4de1aac3f24dedbfc9b062ddd239cafdd8de42bea6291e4c2cf7ab3de0d0 SHA512 b3119efbc7feaefba028d234df671ee3263f67ef28022c8609efe1821b44951a907e7c6f1b5ccfec15eaeefed2f15cd599afc30258c3f6eed3604b10255d404d
-EBUILD test_bond-1.8.6.ebuild 573 BLAKE2B 649e47d71d398681a58a737333f17a649e48be58a45c96a60a1367d1b69dcc0e0bde4de1aac3f24dedbfc9b062ddd239cafdd8de42bea6291e4c2cf7ab3de0d0 SHA512 b3119efbc7feaefba028d234df671ee3263f67ef28022c8609efe1821b44951a907e7c6f1b5ccfec15eaeefed2f15cd599afc30258c3f6eed3604b10255d404d
-EBUILD test_bond-9999.ebuild 573 BLAKE2B 649e47d71d398681a58a737333f17a649e48be58a45c96a60a1367d1b69dcc0e0bde4de1aac3f24dedbfc9b062ddd239cafdd8de42bea6291e4c2cf7ab3de0d0 SHA512 b3119efbc7feaefba028d234df671ee3263f67ef28022c8609efe1821b44951a907e7c6f1b5ccfec15eaeefed2f15cd599afc30258c3f6eed3604b10255d404d
-MISC metadata.xml 328 BLAKE2B 5ed9601fcd46b742df6972b9d4e6af0263afbe4e0e273d34b4a9f9cdf16e0dae073408d43cf361fd79c04e136d369fe64d16b90ec57e06871780aa9761bd6091 SHA512 cc8310ee68b4b4e23ff680d14afb426aa8ea41cf1ff6b4d779778d4e882ea30e1de65d08049fb4f9a7bdd95d7d02b66be4d48113eb512c6843f6d3d9e80dc131
diff --git a/dev-ros/test_bond/metadata.xml b/dev-ros/test_bond/metadata.xml
deleted file mode 100644
index 9ae2e2f3192e..000000000000
--- a/dev-ros/test_bond/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/bond_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_bond/test_bond-1.8.5.ebuild b/dev-ros/test_bond/test_bond-1.8.5.ebuild
deleted file mode 100644
index cd85cdd267fc..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_bond/test_bond-1.8.6.ebuild b/dev-ros/test_bond/test_bond-1.8.6.ebuild
deleted file mode 100644
index cd85cdd267fc..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_bond/test_bond-9999.ebuild b/dev-ros/test_bond/test_bond-9999.ebuild
deleted file mode 100644
index cd85cdd267fc..000000000000
--- a/dev-ros/test_bond/test_bond-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
deleted file mode 100644
index 91839d568f0f..000000000000
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX gcc6.patch 487 BLAKE2B 9301c9e8e22bb780ea2d91a0055fc0f2f03af1ce3fefeb3bf8c5d53d544f1b73b5420a3cf510c6adc71a615ddfea2894c9ff1fbc4655a403b5b599753a25727e SHA512 20b0cf8ed7774493fa0626fd89932368d6bcbb50e4719cbd29c58012d5bd60357392984959452f8ba12266c54cbd8d825d972de2a3f46f067bda164868d32f86
-DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
-DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
-DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
-DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
-DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
-DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
-DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
-EBUILD test_diagnostic_aggregator-1.10.1.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
-EBUILD test_diagnostic_aggregator-1.10.2.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
-EBUILD test_diagnostic_aggregator-1.10.3.ebuild 649 BLAKE2B c3cbbbf061d69d5a11d888c81701069dc59c927d372d8b5a096df539325962354a3f7b50f2b00e4cdc4dded3d2ab30bf9c39cf8dfd6bbb8aff06dbfffa884c7f SHA512 b32db928704d60159f5802abd8d8a2bada6196803ece3d9ad624b98a1419d0724cf8dc876cdfa8fa7456a773e30c610d3055db7c9446edcc4d03422660166e58
-EBUILD test_diagnostic_aggregator-1.10.4.ebuild 649 BLAKE2B c3cbbbf061d69d5a11d888c81701069dc59c927d372d8b5a096df539325962354a3f7b50f2b00e4cdc4dded3d2ab30bf9c39cf8dfd6bbb8aff06dbfffa884c7f SHA512 b32db928704d60159f5802abd8d8a2bada6196803ece3d9ad624b98a1419d0724cf8dc876cdfa8fa7456a773e30c610d3055db7c9446edcc4d03422660166e58
-EBUILD test_diagnostic_aggregator-1.11.0.ebuild 649 BLAKE2B b4a32c52cf87fe7fc3e1f47898725ed385b02fe06d4aaf1e30539ce67f2bc25dfd37c948076a28c667280382af046ea4e789faec6019b4badfd32cb57e3c88bd SHA512 139ce40bf5c4364c90b8462ccd57887f15c19703b8758f020d748daaba5a27a94b8eb4728293ab48457140786cc655d1bb57c2746b192a7bead72113ca066336
-EBUILD test_diagnostic_aggregator-1.9.4.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
-EBUILD test_diagnostic_aggregator-1.9.6.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
-EBUILD test_diagnostic_aggregator-9999.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
-MISC metadata.xml 330 BLAKE2B a856cefc508ebf638d764bbfad848bae8140bb8f4f8e0fcde5ade3d168cff85647d3f803f92fd05824d459cd1e723d86ff48b21c07211b27527d251bb7eb90fd SHA512 d6abd3b4af2ba8eb1de110f8b59296f327e83ced62d9618e1dd2be6d39e04e4bad27a32aa78f9e7358b2f22f872aa96bbdac1da860c6af37ebff054d6e5c7f67
diff --git a/dev-ros/test_diagnostic_aggregator/files/gcc6.patch b/dev-ros/test_diagnostic_aggregator/files/gcc6.patch
deleted file mode 100644
index 2819decf3a76..000000000000
--- a/dev-ros/test_diagnostic_aggregator/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: test_diagnostic_aggregator/CMakeLists.txt
-===================================================================
---- test_diagnostic_aggregator.orig/CMakeLists.txt
-+++ test_diagnostic_aggregator/CMakeLists.txt
-@@ -9,7 +9,7 @@ catkin_package(DEPENDS diagnostic_aggreg
-                LIBRARIES ${PROJECT_NAME}
- )
- 
--include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
-+include_directories(${catkin_INCLUDE_DIRS})
- include_directories(include)
- 
- add_library(test_diagnostic_aggregator
diff --git a/dev-ros/test_diagnostic_aggregator/metadata.xml b/dev-ros/test_diagnostic_aggregator/metadata.xml
deleted file mode 100644
index dd82416e0b4a..000000000000
--- a/dev-ros/test_diagnostic_aggregator/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/diagnostics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.1.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.1.ebuild
deleted file mode 100644
index fcaf935a3f4e..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.2.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.2.ebuild
deleted file mode 100644
index fcaf935a3f4e..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.3.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.3.ebuild
deleted file mode 100644
index 4e25b72d4cd8..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.4.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.4.ebuild
deleted file mode 100644
index 4e25b72d4cd8..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.11.0.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.11.0.ebuild
deleted file mode 100644
index 58f42fd7efc3..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.11.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild
deleted file mode 100644
index fcaf935a3f4e..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.6.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.6.ebuild
deleted file mode 100644
index fcaf935a3f4e..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
deleted file mode 100644
index fcaf935a3f4e..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="diagnostic_aggregator tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_aggregator
-	dev-ros/diagnostic_msgs
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/rostest
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_nodelet/Manifest b/dev-ros/test_nodelet/Manifest
deleted file mode 100644
index c733ba8860a3..000000000000
--- a/dev-ros/test_nodelet/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX gcc6.patch 487 BLAKE2B 30f0092f37d10831053ac74ecabf13d591e4da145772e4b42b352bc9d7299f013737b64ab8f88145100d6490f5a7b3041780d11dc45fea62ae4264be05ceec43 SHA512 1258e607c9fdd0a645e3396186408be7628ba53b6b1994a00552be48b65b413038818cb414ccf521c404a80373094059d0478f859540dff23141f14b50cfaeb3
-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
-DIST nodelet_core-1.10.2.tar.gz 46049 BLAKE2B 19da87672c965fa84e6b8ae48eb3d40514dad79611a27c5d632c2300e2cb7b269abb1b3862390795b55e3bec3a48c686f5af19c4aa627faf975dcaa7e2b32c19 SHA512 5f9827a8b5e491640c57bfb242ffc266291825dbc6ba452ad5be6d7bd2168872205378cc1eac398afff1a8fb0ce3763ce36a1eff627644037f799b87ee86fc99
-EBUILD test_nodelet-1.10.0.ebuild 661 BLAKE2B 595be0457dd39d3dd9c8bb2f7f2ebc132afd5fa01c5261ac2c92c88ff38f212f6cd23c4ebb5e87cc4f620174ccdf914b907cdbdcc865252f8a10cc476edd5b91 SHA512 5eb9ebd871b693186ca890150faec461880cd3194fe0efc05142c38e9d8d4995dce7ba91af43806b7f295560cdabaef0faa02ebca2a4bebfc9564f1cd0b00ee3
-EBUILD test_nodelet-1.10.1.ebuild 661 BLAKE2B d84a52b248634cf969b6a0a150901b9c1a337e72541f58f304b04acc07057e977ccfa76bffd9ebcbd0a747a4b20827154f1e638dc0083cc15a6da09c59015780 SHA512 4421b77c9e9f40885e5040f1e3e8c0f8f581fad0a807b7fc891ffa544b113359b55a5ba98648299c50a87885d7374ee51ec507e5dd6ef991254a1c7a1366cf91
-EBUILD test_nodelet-1.10.2.ebuild 661 BLAKE2B 1e44fe23e92c7750b7a68dc5948d0ecedf4c8a5bfdf6623846a58d38800c4139eab05c660cace3ade3ed81c3d1f669e7650b582b26cb06a2e30849fdd8db4799 SHA512 5b0cd2c078793129fc13e07f80bce43d2c6d17fdf1307d1c559d5447a042f7d559ab324c39d16c62449e6778de856805cef637ed7016aaa67edaf4fa3dfccf07
-EBUILD test_nodelet-9999.ebuild 661 BLAKE2B 595be0457dd39d3dd9c8bb2f7f2ebc132afd5fa01c5261ac2c92c88ff38f212f6cd23c4ebb5e87cc4f620174ccdf914b907cdbdcc865252f8a10cc476edd5b91 SHA512 5eb9ebd871b693186ca890150faec461880cd3194fe0efc05142c38e9d8d4995dce7ba91af43806b7f295560cdabaef0faa02ebca2a4bebfc9564f1cd0b00ee3
-MISC metadata.xml 331 BLAKE2B 9cdba9b3243ff84970d32b4e3eefc05cb7623a2ca0182a8a2ce02c30e31ebfbbd256e7e8067e69f2276675067a8d1b6330ea421f4b112e9b487047f12ce13553 SHA512 7c8b10d8f28ca71b613b548d444c4c0f20cc50800976f9f4f5af5514f9cc1a3d2250678d5bedb8df52aa21e619069898caef2bdc51530bf1bcdacfa69fbe922b
diff --git a/dev-ros/test_nodelet/files/gcc6.patch b/dev-ros/test_nodelet/files/gcc6.patch
deleted file mode 100644
index 102fe01879d6..000000000000
--- a/dev-ros/test_nodelet/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: test_nodelet/CMakeLists.txt
-===================================================================
---- test_nodelet.orig/CMakeLists.txt
-+++ test_nodelet/CMakeLists.txt
-@@ -8,7 +8,7 @@ catkin_package()
- if(CATKIN_ENABLE_TESTING)
-   find_package(Boost REQUIRED thread)
-   find_package(catkin REQUIRED nodelet pluginlib rostest)
--  include_directories(SYSTEM ${BOOST_INCLUDE_DIRS}
-+  include_directories(${BOOST_INCLUDE_DIRS}
-                              ${catkin_INCLUDE_DIRS}
-   )
- 
diff --git a/dev-ros/test_nodelet/metadata.xml b/dev-ros/test_nodelet/metadata.xml
deleted file mode 100644
index 5265d8ee1ea1..000000000000
--- a/dev-ros/test_nodelet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/nodelet_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild b/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild
deleted file mode 100644
index 2ce8ca8b3e39..000000000000
--- a/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/nodelet
-		dev-ros/pluginlib
-		dev-ros/rostest
-		dev-libs/boost
-		dev-cpp/gtest
-		dev-ros/rosbash
-	)
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_nodelet/test_nodelet-1.10.1.ebuild b/dev-ros/test_nodelet/test_nodelet-1.10.1.ebuild
deleted file mode 100644
index 93882088eff5..000000000000
--- a/dev-ros/test_nodelet/test_nodelet-1.10.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/nodelet
-		dev-ros/pluginlib
-		dev-ros/rostest
-		dev-libs/boost
-		dev-cpp/gtest
-		dev-ros/rosbash
-	)
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_nodelet/test_nodelet-1.10.2.ebuild b/dev-ros/test_nodelet/test_nodelet-1.10.2.ebuild
deleted file mode 100644
index 6906c506edc5..000000000000
--- a/dev-ros/test_nodelet/test_nodelet-1.10.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/nodelet
-		dev-ros/pluginlib
-		dev-ros/rostest
-		dev-libs/boost
-		dev-cpp/gtest
-		dev-ros/rosbash
-	)
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_nodelet/test_nodelet-9999.ebuild b/dev-ros/test_nodelet/test_nodelet-9999.ebuild
deleted file mode 100644
index 2ce8ca8b3e39..000000000000
--- a/dev-ros/test_nodelet/test_nodelet-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/nodelet
-		dev-ros/pluginlib
-		dev-ros/rostest
-		dev-libs/boost
-		dev-cpp/gtest
-		dev-ros/rosbash
-	)
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_nodelet_topic_tools/Manifest b/dev-ros/test_nodelet_topic_tools/Manifest
deleted file mode 100644
index bca3140294ec..000000000000
--- a/dev-ros/test_nodelet_topic_tools/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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
-DIST nodelet_core-1.10.2.tar.gz 46049 BLAKE2B 19da87672c965fa84e6b8ae48eb3d40514dad79611a27c5d632c2300e2cb7b269abb1b3862390795b55e3bec3a48c686f5af19c4aa627faf975dcaa7e2b32c19 SHA512 5f9827a8b5e491640c57bfb242ffc266291825dbc6ba452ad5be6d7bd2168872205378cc1eac398afff1a8fb0ce3763ce36a1eff627644037f799b87ee86fc99
-EBUILD test_nodelet_topic_tools-1.10.0.ebuild 681 BLAKE2B 6886013421f857e8e7ed5a337674f9cc2cee65fee504bd6cd24a7d11a135bcaf9b2a53a3fbdb9e31954e1a4632548585194c3ce2e15f865b9a9a9172ec8c64c3 SHA512 3b7cc612fa9bfc74c2fda44296b5790b9ee6b74a76f56f8e3714f6b50f4110052e8aaddeda6759e91dfaedb3291329830041980fd103557687cccf3acd0d7cd7
-EBUILD test_nodelet_topic_tools-1.10.1.ebuild 681 BLAKE2B c7b96ba97ecac07da0e77724237e584e65aa500b1a1820aac007842456db412472f6502180aaa86c345c928106cc9a18fdbff45ba6f564997456139cd3526c27 SHA512 d4eac84421e4dd03a3d369776ff58fafa8242bf8fe91b4e23d3ec9a6446fbf5f5c9f63459e73967b08368aa2b1a62908be2f7372c56ec1b1626069431dc81b62
-EBUILD test_nodelet_topic_tools-1.10.2.ebuild 681 BLAKE2B b11a0454ba6382975074a94591019d5cee156c5a9e9b434bc4eebf10843642a5b8b654d2c3888abf58a9839878be51aa9c81ca86fff1b7a7a748507048d3af31 SHA512 56f2b130ed56bcca39328d7d669ca987d67ecc3d7137949786b25f262ce6dd3eb9e4df58ca59ed7115de039ab6b3bdcf0483ad19cf0d3e7e1c89ae86d1d52815
-EBUILD test_nodelet_topic_tools-9999.ebuild 681 BLAKE2B 6886013421f857e8e7ed5a337674f9cc2cee65fee504bd6cd24a7d11a135bcaf9b2a53a3fbdb9e31954e1a4632548585194c3ce2e15f865b9a9a9172ec8c64c3 SHA512 3b7cc612fa9bfc74c2fda44296b5790b9ee6b74a76f56f8e3714f6b50f4110052e8aaddeda6759e91dfaedb3291329830041980fd103557687cccf3acd0d7cd7
-MISC metadata.xml 331 BLAKE2B 9cdba9b3243ff84970d32b4e3eefc05cb7623a2ca0182a8a2ce02c30e31ebfbbd256e7e8067e69f2276675067a8d1b6330ea421f4b112e9b487047f12ce13553 SHA512 7c8b10d8f28ca71b613b548d444c4c0f20cc50800976f9f4f5af5514f9cc1a3d2250678d5bedb8df52aa21e619069898caef2bdc51530bf1bcdacfa69fbe922b
diff --git a/dev-ros/test_nodelet_topic_tools/metadata.xml b/dev-ros/test_nodelet_topic_tools/metadata.xml
deleted file mode 100644
index 5265d8ee1ea1..000000000000
--- a/dev-ros/test_nodelet_topic_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/nodelet_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.0.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.0.ebuild
deleted file mode 100644
index fd5981e14d7e..000000000000
--- a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet topic tools unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.1.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.1.ebuild
deleted file mode 100644
index 32d32ddb7ee5..000000000000
--- a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet topic tools unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.2.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.2.ebuild
deleted file mode 100644
index 2ce4b28f37d7..000000000000
--- a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet topic tools unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-9999.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-9999.ebuild
deleted file mode 100644
index fd5981e14d7e..000000000000
--- a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelet topic tools unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
deleted file mode 100644
index 6c9cffac3643..000000000000
--- a/dev-ros/test_rosbag/Manifest
+++ /dev/null
@@ -1,148 +0,0 @@
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST test_rosbag-1.15.11-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
-DIST test_rosbag-1.15.11-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
-DIST test_rosbag-1.15.11-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
-DIST test_rosbag-1.15.11-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
-DIST test_rosbag-1.15.11-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
-DIST test_rosbag-1.15.11-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
-DIST test_rosbag-1.15.11-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
-DIST test_rosbag-1.15.11-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
-DIST test_rosbag-1.15.11-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
-DIST test_rosbag-1.15.11-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
-DIST test_rosbag-1.15.11-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
-DIST test_rosbag-1.15.11-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
-DIST test_rosbag-1.15.11-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
-DIST test_rosbag-1.15.11-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
-DIST test_rosbag-1.15.11-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
-DIST test_rosbag-1.15.11-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
-DIST test_rosbag-1.15.11-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
-DIST test_rosbag-1.15.11-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
-DIST test_rosbag-1.15.11-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
-DIST test_rosbag-1.15.11-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
-DIST test_rosbag-1.15.11-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
-DIST test_rosbag-1.15.11-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
-DIST test_rosbag-1.15.11-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
-DIST test_rosbag-1.15.11-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
-DIST test_rosbag-1.15.11-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
-DIST test_rosbag-1.15.11-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
-DIST test_rosbag-1.15.11-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
-DIST test_rosbag-1.15.11-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
-DIST test_rosbag-1.15.11-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
-DIST test_rosbag-1.15.11-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
-DIST test_rosbag-1.15.11-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
-DIST test_rosbag-1.15.11-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
-DIST test_rosbag-1.15.11-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
-DIST test_rosbag-1.15.11-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
-DIST test_rosbag-1.15.11-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
-DIST test_rosbag-1.15.13-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
-DIST test_rosbag-1.15.13-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
-DIST test_rosbag-1.15.13-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
-DIST test_rosbag-1.15.13-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
-DIST test_rosbag-1.15.13-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
-DIST test_rosbag-1.15.13-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
-DIST test_rosbag-1.15.13-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
-DIST test_rosbag-1.15.13-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
-DIST test_rosbag-1.15.13-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
-DIST test_rosbag-1.15.13-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
-DIST test_rosbag-1.15.13-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
-DIST test_rosbag-1.15.13-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
-DIST test_rosbag-1.15.13-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
-DIST test_rosbag-1.15.13-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
-DIST test_rosbag-1.15.13-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
-DIST test_rosbag-1.15.13-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
-DIST test_rosbag-1.15.13-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
-DIST test_rosbag-1.15.13-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
-DIST test_rosbag-1.15.13-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
-DIST test_rosbag-1.15.13-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
-DIST test_rosbag-1.15.13-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
-DIST test_rosbag-1.15.13-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
-DIST test_rosbag-1.15.13-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
-DIST test_rosbag-1.15.13-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
-DIST test_rosbag-1.15.13-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
-DIST test_rosbag-1.15.13-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
-DIST test_rosbag-1.15.13-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
-DIST test_rosbag-1.15.13-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
-DIST test_rosbag-1.15.13-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
-DIST test_rosbag-1.15.13-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
-DIST test_rosbag-1.15.13-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
-DIST test_rosbag-1.15.13-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
-DIST test_rosbag-1.15.13-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
-DIST test_rosbag-1.15.13-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
-DIST test_rosbag-1.15.13-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
-DIST test_rosbag-1.15.14-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
-DIST test_rosbag-1.15.14-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
-DIST test_rosbag-1.15.14-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
-DIST test_rosbag-1.15.14-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
-DIST test_rosbag-1.15.14-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
-DIST test_rosbag-1.15.14-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
-DIST test_rosbag-1.15.14-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
-DIST test_rosbag-1.15.14-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
-DIST test_rosbag-1.15.14-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
-DIST test_rosbag-1.15.14-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
-DIST test_rosbag-1.15.14-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
-DIST test_rosbag-1.15.14-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
-DIST test_rosbag-1.15.14-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
-DIST test_rosbag-1.15.14-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
-DIST test_rosbag-1.15.14-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
-DIST test_rosbag-1.15.14-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
-DIST test_rosbag-1.15.14-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
-DIST test_rosbag-1.15.14-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
-DIST test_rosbag-1.15.14-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
-DIST test_rosbag-1.15.14-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
-DIST test_rosbag-1.15.14-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
-DIST test_rosbag-1.15.14-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
-DIST test_rosbag-1.15.14-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
-DIST test_rosbag-1.15.14-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
-DIST test_rosbag-1.15.14-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
-DIST test_rosbag-1.15.14-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
-DIST test_rosbag-1.15.14-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
-DIST test_rosbag-1.15.14-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
-DIST test_rosbag-1.15.14-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
-DIST test_rosbag-1.15.14-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
-DIST test_rosbag-1.15.14-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
-DIST test_rosbag-1.15.14-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
-DIST test_rosbag-1.15.14-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
-DIST test_rosbag-1.15.14-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
-DIST test_rosbag-1.15.14-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
-DIST test_rosbag-9999-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
-DIST test_rosbag-9999-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
-DIST test_rosbag-9999-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
-DIST test_rosbag-9999-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
-DIST test_rosbag-9999-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
-DIST test_rosbag-9999-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
-DIST test_rosbag-9999-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
-DIST test_rosbag-9999-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
-DIST test_rosbag-9999-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
-DIST test_rosbag-9999-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
-DIST test_rosbag-9999-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
-DIST test_rosbag-9999-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
-DIST test_rosbag-9999-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
-DIST test_rosbag-9999-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
-DIST test_rosbag-9999-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
-DIST test_rosbag-9999-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
-DIST test_rosbag-9999-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
-DIST test_rosbag-9999-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
-DIST test_rosbag-9999-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
-DIST test_rosbag-9999-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
-DIST test_rosbag-9999-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
-DIST test_rosbag-9999-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
-DIST test_rosbag-9999-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
-DIST test_rosbag-9999-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
-DIST test_rosbag-9999-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
-DIST test_rosbag-9999-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
-DIST test_rosbag-9999-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
-DIST test_rosbag-9999-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
-DIST test_rosbag-9999-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
-DIST test_rosbag-9999-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
-DIST test_rosbag-9999-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
-DIST test_rosbag-9999-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
-DIST test_rosbag-9999-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
-DIST test_rosbag-9999-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
-DIST test_rosbag-9999-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
-EBUILD test_rosbag-1.15.11.ebuild 2470 BLAKE2B 656bfeea03500c1d7b085c5dbde2fb0a115c4340fe7061c49421f6fa032dc7253fab7e5c05283d0487db316a1b5e293793b5dd1296684c045942813c5d4776ee SHA512 84b1c41500030992196d669cbd4cb98b29bf4af689e6f592ca8e209988dfe312237d185208ea597baf70ff1aba70e18e43837a07ab19544ecc4cb5de4ab9f7dd
-EBUILD test_rosbag-1.15.13.ebuild 2470 BLAKE2B 656bfeea03500c1d7b085c5dbde2fb0a115c4340fe7061c49421f6fa032dc7253fab7e5c05283d0487db316a1b5e293793b5dd1296684c045942813c5d4776ee SHA512 84b1c41500030992196d669cbd4cb98b29bf4af689e6f592ca8e209988dfe312237d185208ea597baf70ff1aba70e18e43837a07ab19544ecc4cb5de4ab9f7dd
-EBUILD test_rosbag-1.15.14.ebuild 2470 BLAKE2B 656bfeea03500c1d7b085c5dbde2fb0a115c4340fe7061c49421f6fa032dc7253fab7e5c05283d0487db316a1b5e293793b5dd1296684c045942813c5d4776ee SHA512 84b1c41500030992196d669cbd4cb98b29bf4af689e6f592ca8e209988dfe312237d185208ea597baf70ff1aba70e18e43837a07ab19544ecc4cb5de4ab9f7dd
-EBUILD test_rosbag-9999.ebuild 2470 BLAKE2B 656bfeea03500c1d7b085c5dbde2fb0a115c4340fe7061c49421f6fa032dc7253fab7e5c05283d0487db316a1b5e293793b5dd1296684c045942813c5d4776ee SHA512 84b1c41500030992196d669cbd4cb98b29bf4af689e6f592ca8e209988dfe312237d185208ea597baf70ff1aba70e18e43837a07ab19544ecc4cb5de4ab9f7dd
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_rosbag/metadata.xml b/dev-ros/test_rosbag/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_rosbag/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.11.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.11.ebuild
deleted file mode 100644
index af5ea8f23bd6..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.15.11.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-TEST_DATA="constants_gen1.bag
-constants_gen2.bag
-converged_gen1.bag
-converged_gen2.bag
-converged_gen3.bag
-converged_gen4.bag
-convergent_gen1.bag
-convergent_gen2.bag
-migrated_addsub_gen1.bag
-migrated_explicit_gen1.bag
-migrated_explicit_gen2.bag
-migrated_explicit_gen3.bag
-migrated_explicit_gen4.bag
-migrated_implicit_gen1.bag
-migrated_implicit_gen2.bag
-migrated_implicit_gen3.bag
-migrated_implicit_gen4.bag
-migrated_mixed_gen1.bag
-migrated_mixed_gen2.bag
-migrated_mixed_gen3.bag
-migrated_mixed_gen4.bag
-partially_migrated_gen1.bag
-partially_migrated_gen2.bag
-partially_migrated_gen3.bag
-partially_migrated_gen4.bag
-renamed_gen1.bag
-renamed_gen2.bag
-renamed_gen3.bag
-renamed_gen4.bag
-subunmigrated_gen1.bag
-unmigrated_gen1.bag
-"
-ROSBAG_DATA="
-test_indexed_1.2.bag
-chatter_50hz.bag
-test_future_version_2.1.bag
-test_rosbag_latched_pub.bag
-"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/test_rosbag/${i} -> ${P}-${i}"
-done
-for i in ${ROSBAG_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/rosbag/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost
-		app-arch/bzip2
-		dev-ros/rosout
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${TEST_DATA} ${ROSBAG_DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/test_rosbag/#file://${S}/#g" \
-		-i bag_migration_tests/CMakeLists.txt \
-		-i CMakeLists.txt || die
-	sed -e "s#http://download.ros.org/data/rosbag/#file://${S}/#g" \
-		-i bag_migration_tests/CMakeLists.txt \
-		-i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.13.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.13.ebuild
deleted file mode 100644
index af5ea8f23bd6..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.15.13.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-TEST_DATA="constants_gen1.bag
-constants_gen2.bag
-converged_gen1.bag
-converged_gen2.bag
-converged_gen3.bag
-converged_gen4.bag
-convergent_gen1.bag
-convergent_gen2.bag
-migrated_addsub_gen1.bag
-migrated_explicit_gen1.bag
-migrated_explicit_gen2.bag
-migrated_explicit_gen3.bag
-migrated_explicit_gen4.bag
-migrated_implicit_gen1.bag
-migrated_implicit_gen2.bag
-migrated_implicit_gen3.bag
-migrated_implicit_gen4.bag
-migrated_mixed_gen1.bag
-migrated_mixed_gen2.bag
-migrated_mixed_gen3.bag
-migrated_mixed_gen4.bag
-partially_migrated_gen1.bag
-partially_migrated_gen2.bag
-partially_migrated_gen3.bag
-partially_migrated_gen4.bag
-renamed_gen1.bag
-renamed_gen2.bag
-renamed_gen3.bag
-renamed_gen4.bag
-subunmigrated_gen1.bag
-unmigrated_gen1.bag
-"
-ROSBAG_DATA="
-test_indexed_1.2.bag
-chatter_50hz.bag
-test_future_version_2.1.bag
-test_rosbag_latched_pub.bag
-"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/test_rosbag/${i} -> ${P}-${i}"
-done
-for i in ${ROSBAG_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/rosbag/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost
-		app-arch/bzip2
-		dev-ros/rosout
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${TEST_DATA} ${ROSBAG_DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/test_rosbag/#file://${S}/#g" \
-		-i bag_migration_tests/CMakeLists.txt \
-		-i CMakeLists.txt || die
-	sed -e "s#http://download.ros.org/data/rosbag/#file://${S}/#g" \
-		-i bag_migration_tests/CMakeLists.txt \
-		-i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.14.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.14.ebuild
deleted file mode 100644
index af5ea8f23bd6..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.15.14.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-TEST_DATA="constants_gen1.bag
-constants_gen2.bag
-converged_gen1.bag
-converged_gen2.bag
-converged_gen3.bag
-converged_gen4.bag
-convergent_gen1.bag
-convergent_gen2.bag
-migrated_addsub_gen1.bag
-migrated_explicit_gen1.bag
-migrated_explicit_gen2.bag
-migrated_explicit_gen3.bag
-migrated_explicit_gen4.bag
-migrated_implicit_gen1.bag
-migrated_implicit_gen2.bag
-migrated_implicit_gen3.bag
-migrated_implicit_gen4.bag
-migrated_mixed_gen1.bag
-migrated_mixed_gen2.bag
-migrated_mixed_gen3.bag
-migrated_mixed_gen4.bag
-partially_migrated_gen1.bag
-partially_migrated_gen2.bag
-partially_migrated_gen3.bag
-partially_migrated_gen4.bag
-renamed_gen1.bag
-renamed_gen2.bag
-renamed_gen3.bag
-renamed_gen4.bag
-subunmigrated_gen1.bag
-unmigrated_gen1.bag
-"
-ROSBAG_DATA="
-test_indexed_1.2.bag
-chatter_50hz.bag
-test_future_version_2.1.bag
-test_rosbag_latched_pub.bag
-"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/test_rosbag/${i} -> ${P}-${i}"
-done
-for i in ${ROSBAG_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/rosbag/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost
-		app-arch/bzip2
-		dev-ros/rosout
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${TEST_DATA} ${ROSBAG_DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/test_rosbag/#file://${S}/#g" \
-		-i bag_migration_tests/CMakeLists.txt \
-		-i CMakeLists.txt || die
-	sed -e "s#http://download.ros.org/data/rosbag/#file://${S}/#g" \
-		-i bag_migration_tests/CMakeLists.txt \
-		-i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosbag/test_rosbag-9999.ebuild b/dev-ros/test_rosbag/test_rosbag-9999.ebuild
deleted file mode 100644
index af5ea8f23bd6..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-9999.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-TEST_DATA="constants_gen1.bag
-constants_gen2.bag
-converged_gen1.bag
-converged_gen2.bag
-converged_gen3.bag
-converged_gen4.bag
-convergent_gen1.bag
-convergent_gen2.bag
-migrated_addsub_gen1.bag
-migrated_explicit_gen1.bag
-migrated_explicit_gen2.bag
-migrated_explicit_gen3.bag
-migrated_explicit_gen4.bag
-migrated_implicit_gen1.bag
-migrated_implicit_gen2.bag
-migrated_implicit_gen3.bag
-migrated_implicit_gen4.bag
-migrated_mixed_gen1.bag
-migrated_mixed_gen2.bag
-migrated_mixed_gen3.bag
-migrated_mixed_gen4.bag
-partially_migrated_gen1.bag
-partially_migrated_gen2.bag
-partially_migrated_gen3.bag
-partially_migrated_gen4.bag
-renamed_gen1.bag
-renamed_gen2.bag
-renamed_gen3.bag
-renamed_gen4.bag
-subunmigrated_gen1.bag
-unmigrated_gen1.bag
-"
-ROSBAG_DATA="
-test_indexed_1.2.bag
-chatter_50hz.bag
-test_future_version_2.1.bag
-test_rosbag_latched_pub.bag
-"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-for i in ${TEST_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/test_rosbag/${i} -> ${P}-${i}"
-done
-for i in ${ROSBAG_DATA}; do
-	SRC_URI="${SRC_URI}
-		http://download.ros.org/data/rosbag/${i} -> ${P}-${i}"
-done
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost
-		app-arch/bzip2
-		dev-ros/rosout
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	for i in ${TEST_DATA} ${ROSBAG_DATA}; do
-		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
-	done
-	sed -e "s#http://download.ros.org/data/test_rosbag/#file://${S}/#g" \
-		-i bag_migration_tests/CMakeLists.txt \
-		-i CMakeLists.txt || die
-	sed -e "s#http://download.ros.org/data/rosbag/#file://${S}/#g" \
-		-i bag_migration_tests/CMakeLists.txt \
-		-i CMakeLists.txt || die
-}
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
deleted file mode 100644
index 0b24980de460..000000000000
--- a/dev-ros/test_rosbag_storage/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_rosbag_storage-1.15.10.ebuild 465 BLAKE2B 34c4c6a5b4dd5994296e0de0caca6e00b04fa44292d6e6c3b4052fa96536f1b02b4a30d5385b0cc7745b64cf3cc38a0da6544ba486b704dde9e18fbe6f2d8d23 SHA512 fec456fe44002bb25f5c0b6377d54e2512a71eed69d7cc1805af28f7e930e067281b718a9fba6769a65fb5f4058953b9b2c8e55cd57d79d1d8528b4d1ba26b63
-EBUILD test_rosbag_storage-1.15.11.ebuild 465 BLAKE2B 34c4c6a5b4dd5994296e0de0caca6e00b04fa44292d6e6c3b4052fa96536f1b02b4a30d5385b0cc7745b64cf3cc38a0da6544ba486b704dde9e18fbe6f2d8d23 SHA512 fec456fe44002bb25f5c0b6377d54e2512a71eed69d7cc1805af28f7e930e067281b718a9fba6769a65fb5f4058953b9b2c8e55cd57d79d1d8528b4d1ba26b63
-EBUILD test_rosbag_storage-1.15.13.ebuild 465 BLAKE2B 34c4c6a5b4dd5994296e0de0caca6e00b04fa44292d6e6c3b4052fa96536f1b02b4a30d5385b0cc7745b64cf3cc38a0da6544ba486b704dde9e18fbe6f2d8d23 SHA512 fec456fe44002bb25f5c0b6377d54e2512a71eed69d7cc1805af28f7e930e067281b718a9fba6769a65fb5f4058953b9b2c8e55cd57d79d1d8528b4d1ba26b63
-EBUILD test_rosbag_storage-1.15.14.ebuild 465 BLAKE2B 1d4282645a9c406f369e504ec4738c1687a1b91ffc4a1a06a303ecc7a423691f9f30701160ffe99bf5d45b4291920736afcf761c52285d0c71374c097e609ae9 SHA512 2f6056f0f458200c691f1c700b02d8b0a5e7becc9b189a99317ee8b01d901fc6d1b8c41effc4e62d5411e18b19e542d682ddc758b5af855f9d3d5e20f81cf940
-EBUILD test_rosbag_storage-1.15.8.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
-EBUILD test_rosbag_storage-1.15.9.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
-EBUILD test_rosbag_storage-9999.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_rosbag_storage/metadata.xml b/dev-ros/test_rosbag_storage/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_rosbag_storage/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.10.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.10.ebuild
deleted file mode 100644
index 56f714211def..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rosbag_storage
-	dev-ros/rosbag
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.11.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.11.ebuild
deleted file mode 100644
index 56f714211def..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rosbag_storage
-	dev-ros/rosbag
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.13.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.13.ebuild
deleted file mode 100644
index 56f714211def..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rosbag_storage
-	dev-ros/rosbag
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.14.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.14.ebuild
deleted file mode 100644
index 3397c0ef7ed1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rosbag_storage
-	dev-ros/rosbag
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.8.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.8.ebuild
deleted file mode 100644
index 9b630af5d5f8..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rosbag_storage
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.9.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.9.ebuild
deleted file mode 100644
index 258d31bf3e94..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rosbag_storage
-	dev-ros/rosbag
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
deleted file mode 100644
index 258d31bf3e94..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rosbag_storage
-	dev-ros/rosbag
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
deleted file mode 100644
index 2055f3918e34..000000000000
--- a/dev-ros/test_roscpp/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX tests.patch 512 BLAKE2B 1744807e87cdf18c3c2d74e971828a3f34986f2aff6c17e663e464a7ad522abdbaf96f20771c0f699ef24a5afd572a4a6431a7f21b851e95408e1c7c57032694 SHA512 2f923f01f7b5c869ff1279e6cb1d82f0699388c16caa615b84dd6b3f914355a79ffddb55491bea227980404ff85b3663f51c84e242d5540e3c88f10d912cdca7
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_roscpp-1.15.10-r1.ebuild 895 BLAKE2B 299b7449fc6ff9a6a5945e49991e3a0fce8be9c1ce468c95cc747a7ca488094aefbb9309de2e5c82090aeb4cc7ca2a168c769af07245b856e7125c667ca27d9a SHA512 a4146d773146a7edc353522ca31705f71abaf4a4cc54b0aa19997be2bb9b7f6ae2d13472526614b1494c0e3aaa85baeaeac646663de0912fab3fad17fca5d75b
-EBUILD test_roscpp-1.15.11.ebuild 895 BLAKE2B 299b7449fc6ff9a6a5945e49991e3a0fce8be9c1ce468c95cc747a7ca488094aefbb9309de2e5c82090aeb4cc7ca2a168c769af07245b856e7125c667ca27d9a SHA512 a4146d773146a7edc353522ca31705f71abaf4a4cc54b0aa19997be2bb9b7f6ae2d13472526614b1494c0e3aaa85baeaeac646663de0912fab3fad17fca5d75b
-EBUILD test_roscpp-1.15.13.ebuild 895 BLAKE2B 299b7449fc6ff9a6a5945e49991e3a0fce8be9c1ce468c95cc747a7ca488094aefbb9309de2e5c82090aeb4cc7ca2a168c769af07245b856e7125c667ca27d9a SHA512 a4146d773146a7edc353522ca31705f71abaf4a4cc54b0aa19997be2bb9b7f6ae2d13472526614b1494c0e3aaa85baeaeac646663de0912fab3fad17fca5d75b
-EBUILD test_roscpp-1.15.14.ebuild 895 BLAKE2B 299b7449fc6ff9a6a5945e49991e3a0fce8be9c1ce468c95cc747a7ca488094aefbb9309de2e5c82090aeb4cc7ca2a168c769af07245b856e7125c667ca27d9a SHA512 a4146d773146a7edc353522ca31705f71abaf4a4cc54b0aa19997be2bb9b7f6ae2d13472526614b1494c0e3aaa85baeaeac646663de0912fab3fad17fca5d75b
-EBUILD test_roscpp-1.15.7-r1.ebuild 660 BLAKE2B b599b531ac5a30ccb6531895467c24b8dfcec7c9b4a8f9d60faed5c8a457667bbfa8e9574ed780fd112e86ae09ea6f28acc12e48a3be534bee036c50f768f0f9 SHA512 b445ca7b9bb77c9c5030bc55096e3aa3e3018fd0132a4ee4e43ce34bb998abac58029cbc11eda1c8eb06cb1ef13722631c1369c6e70158afffcfca73e335a539
-EBUILD test_roscpp-1.15.8-r1.ebuild 895 BLAKE2B 299b7449fc6ff9a6a5945e49991e3a0fce8be9c1ce468c95cc747a7ca488094aefbb9309de2e5c82090aeb4cc7ca2a168c769af07245b856e7125c667ca27d9a SHA512 a4146d773146a7edc353522ca31705f71abaf4a4cc54b0aa19997be2bb9b7f6ae2d13472526614b1494c0e3aaa85baeaeac646663de0912fab3fad17fca5d75b
-EBUILD test_roscpp-1.15.9-r1.ebuild 895 BLAKE2B 299b7449fc6ff9a6a5945e49991e3a0fce8be9c1ce468c95cc747a7ca488094aefbb9309de2e5c82090aeb4cc7ca2a168c769af07245b856e7125c667ca27d9a SHA512 a4146d773146a7edc353522ca31705f71abaf4a4cc54b0aa19997be2bb9b7f6ae2d13472526614b1494c0e3aaa85baeaeac646663de0912fab3fad17fca5d75b
-EBUILD test_roscpp-9999.ebuild 895 BLAKE2B 299b7449fc6ff9a6a5945e49991e3a0fce8be9c1ce468c95cc747a7ca488094aefbb9309de2e5c82090aeb4cc7ca2a168c769af07245b856e7125c667ca27d9a SHA512 a4146d773146a7edc353522ca31705f71abaf4a4cc54b0aa19997be2bb9b7f6ae2d13472526614b1494c0e3aaa85baeaeac646663de0912fab3fad17fca5d75b
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_roscpp/files/tests.patch b/dev-ros/test_roscpp/files/tests.patch
deleted file mode 100644
index 80c18962dee0..000000000000
--- a/dev-ros/test_roscpp/files/tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: test_roscpp/test/src/CMakeLists.txt
-===================================================================
---- test_roscpp.orig/test/src/CMakeLists.txt
-+++ test_roscpp/test/src/CMakeLists.txt
-@@ -290,6 +290,7 @@ if(TARGET tests)
-     ${PROJECT_NAME}-left_right
-     ${PROJECT_NAME}-string_msg_expect
-     ${PROJECT_NAME}-publisher
-+    ${PROJECT_NAME}-publisher_rate
-     ${PROJECT_NAME}-subscriber
-     ${PROJECT_NAME}-stamped_topic_statistics_empty_timestamp
-     ${PROJECT_NAME}-topic_statistic_frequency
diff --git a/dev-ros/test_roscpp/metadata.xml b/dev-ros/test_roscpp/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_roscpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.10-r1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.10-r1.ebuild
deleted file mode 100644
index f361fe9e6e25..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.10-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	# Sometimes high number of tests running in parallel make them fail
-	# https://bugs.gentoo.org/738620
-	ros-catkin_src_test -j 1
-}
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.11.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.11.ebuild
deleted file mode 100644
index f361fe9e6e25..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	# Sometimes high number of tests running in parallel make them fail
-	# https://bugs.gentoo.org/738620
-	ros-catkin_src_test -j 1
-}
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.13.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.13.ebuild
deleted file mode 100644
index f361fe9e6e25..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.13.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	# Sometimes high number of tests running in parallel make them fail
-	# https://bugs.gentoo.org/738620
-	ros-catkin_src_test -j 1
-}
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.14.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.14.ebuild
deleted file mode 100644
index f361fe9e6e25..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.14.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	# Sometimes high number of tests running in parallel make them fail
-	# https://bugs.gentoo.org/738620
-	ros-catkin_src_test -j 1
-}
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.7-r1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.7-r1.ebuild
deleted file mode 100644
index d23034ac3e30..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.7-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.8-r1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.8-r1.ebuild
deleted file mode 100644
index f361fe9e6e25..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.8-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	# Sometimes high number of tests running in parallel make them fail
-	# https://bugs.gentoo.org/738620
-	ros-catkin_src_test -j 1
-}
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.9-r1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.9-r1.ebuild
deleted file mode 100644
index f361fe9e6e25..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.9-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	# Sometimes high number of tests running in parallel make them fail
-	# https://bugs.gentoo.org/738620
-	ros-catkin_src_test -j 1
-}
diff --git a/dev-ros/test_roscpp/test_roscpp-9999.ebuild b/dev-ros/test_roscpp/test_roscpp-9999.ebuild
deleted file mode 100644
index f361fe9e6e25..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	# Sometimes high number of tests running in parallel make them fail
-	# https://bugs.gentoo.org/738620
-	ros-catkin_src_test -j 1
-}
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
deleted file mode 100644
index b997074fb6ea..000000000000
--- a/dev-ros/test_rosgraph/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_rosgraph-1.15.10.ebuild 510 BLAKE2B 382d62773752ff15bc623162e895539469b6efd98db83e6dd5ea255bc2417cf850c72cc47cb45e2c9078de708f9b1c22ac9a881fdd6a8ab243e7502c707e3199 SHA512 770669c3faf6acead18da9b7e445a62242b814322d6b69a161839c42e7018467162b6f8ce00bc89122a26935c1bdb1ad9eb0224f2e9b1b8008740bec62f3b8a7
-EBUILD test_rosgraph-1.15.11.ebuild 510 BLAKE2B 382d62773752ff15bc623162e895539469b6efd98db83e6dd5ea255bc2417cf850c72cc47cb45e2c9078de708f9b1c22ac9a881fdd6a8ab243e7502c707e3199 SHA512 770669c3faf6acead18da9b7e445a62242b814322d6b69a161839c42e7018467162b6f8ce00bc89122a26935c1bdb1ad9eb0224f2e9b1b8008740bec62f3b8a7
-EBUILD test_rosgraph-1.15.13.ebuild 510 BLAKE2B 382d62773752ff15bc623162e895539469b6efd98db83e6dd5ea255bc2417cf850c72cc47cb45e2c9078de708f9b1c22ac9a881fdd6a8ab243e7502c707e3199 SHA512 770669c3faf6acead18da9b7e445a62242b814322d6b69a161839c42e7018467162b6f8ce00bc89122a26935c1bdb1ad9eb0224f2e9b1b8008740bec62f3b8a7
-EBUILD test_rosgraph-1.15.14.ebuild 510 BLAKE2B 4f27e462033b5a49a4de912b7b880a8b2ccfca46b70f7e7eb9a06a2e1c4f4c1620fd6c1bb95588e5faf30f2401d2ff579ad10e9ca6966c34e80f1254e50894d9 SHA512 0cfe4f53f572a59e65dd9f3907c5f1b85d2de46b0dc30f827194ffcaba9e07d591c44e1f559e2b6c6ce2ef8544a89ecd9a2648b41850ae591d833beac66a12fd
-EBUILD test_rosgraph-1.15.7.ebuild 421 BLAKE2B 511420303458e310ce9aa7247d12fec089f2caf0e73abea4145c7a530c819fe62042cbaf8bcc2f2c13d51fd8b7099234e725e79efd630db2adc01675ac636951 SHA512 b43c9865b12656ec3dbcbc14b29cf258fa7f4093c8a528f6dc68ddbbeeb8fc72579f9d37ef3703e24d27c51dff6a5dde1855837eac1173734ca2cc457b2c1b08
-EBUILD test_rosgraph-1.15.8.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
-EBUILD test_rosgraph-1.15.9.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
-EBUILD test_rosgraph-9999.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_rosgraph/metadata.xml b/dev-ros/test_rosgraph/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_rosgraph/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.10.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.10.ebuild
deleted file mode 100644
index 63863b4ad56b..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.11.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.11.ebuild
deleted file mode 100644
index 63863b4ad56b..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.13.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.13.ebuild
deleted file mode 100644
index 63863b4ad56b..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.13.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.14.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.14.ebuild
deleted file mode 100644
index 67da37d85e90..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild
deleted file mode 100644
index 17776e85e11b..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.8.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.8.ebuild
deleted file mode 100644
index 71104c076e50..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.9.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.9.ebuild
deleted file mode 100644
index 71104c076e50..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild b/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
deleted file mode 100644
index 71104c076e50..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
deleted file mode 100644
index 3956763b5a2c..000000000000
--- a/dev-ros/test_roslaunch/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_roslaunch-1.15.10.ebuild 581 BLAKE2B 52ab99c09f873d9e147832a2a64467cba685509112af203c220189ae63f3a049c42e32f9d148c3b67d33edb8955ea81e1995c8ec5a534056a8ebfe1db63e0ea9 SHA512 7b5aadcb55285e7377899cb70f41941d1541d26d9ab221c54553deb017831147823bda1afa71ea90dfff956937d903c7de2d524a40a8474e3e024cdc1430c3e5
-EBUILD test_roslaunch-1.15.11.ebuild 581 BLAKE2B 52ab99c09f873d9e147832a2a64467cba685509112af203c220189ae63f3a049c42e32f9d148c3b67d33edb8955ea81e1995c8ec5a534056a8ebfe1db63e0ea9 SHA512 7b5aadcb55285e7377899cb70f41941d1541d26d9ab221c54553deb017831147823bda1afa71ea90dfff956937d903c7de2d524a40a8474e3e024cdc1430c3e5
-EBUILD test_roslaunch-1.15.13.ebuild 581 BLAKE2B 52ab99c09f873d9e147832a2a64467cba685509112af203c220189ae63f3a049c42e32f9d148c3b67d33edb8955ea81e1995c8ec5a534056a8ebfe1db63e0ea9 SHA512 7b5aadcb55285e7377899cb70f41941d1541d26d9ab221c54553deb017831147823bda1afa71ea90dfff956937d903c7de2d524a40a8474e3e024cdc1430c3e5
-EBUILD test_roslaunch-1.15.14.ebuild 581 BLAKE2B cfddaca063d3d847cc26c03b406fd95f18a7f8227b4f1998a216ba357d421bc7e8b5b2ac0995fab74da55e8c36b6bdd65e79ed74f6f8723cf9dc0ec7ac741096 SHA512 1de7e40a811168f15dafb47867ba1f07e685a38eafa5b27c036b672566418d8a3f0229a3c0a05e71763e836f1465d4fd38f030b62b70249044d7bd27161b9466
-EBUILD test_roslaunch-1.15.8.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
-EBUILD test_roslaunch-1.15.9.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
-EBUILD test_roslaunch-9999.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_roslaunch/metadata.xml b/dev-ros/test_roslaunch/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_roslaunch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.10.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.10.ebuild
deleted file mode 100644
index b506232d6f4b..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.11.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.11.ebuild
deleted file mode 100644
index b506232d6f4b..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.13.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.13.ebuild
deleted file mode 100644
index b506232d6f4b..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.14.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.14.ebuild
deleted file mode 100644
index b523e729a28f..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild
deleted file mode 100644
index 3ebd0d435c48..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.9.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.9.ebuild
deleted file mode 100644
index 3ebd0d435c48..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
deleted file mode 100644
index 3ebd0d435c48..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
deleted file mode 100644
index 65874e7ba764..000000000000
--- a/dev-ros/test_roslib_comm/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_roslib_comm-1.15.10.ebuild 706 BLAKE2B d829ac240a72ceb0b2f471cafcef8df98caafb964f353ea0d4bf5faab1eee38b892e3cb738026ce8051ec6057914f4b5a55d93608dca96607f8ebd2c829dd36c SHA512 7135a1d03ad39137581c79d0b473014aa8d27c8f0ac7a9271103fd753ca836d5123fa8b4314fbcc958f975699f82f6e36733de0cd8f7a02692c8d7e340afdacd
-EBUILD test_roslib_comm-1.15.11.ebuild 706 BLAKE2B d829ac240a72ceb0b2f471cafcef8df98caafb964f353ea0d4bf5faab1eee38b892e3cb738026ce8051ec6057914f4b5a55d93608dca96607f8ebd2c829dd36c SHA512 7135a1d03ad39137581c79d0b473014aa8d27c8f0ac7a9271103fd753ca836d5123fa8b4314fbcc958f975699f82f6e36733de0cd8f7a02692c8d7e340afdacd
-EBUILD test_roslib_comm-1.15.13.ebuild 706 BLAKE2B d829ac240a72ceb0b2f471cafcef8df98caafb964f353ea0d4bf5faab1eee38b892e3cb738026ce8051ec6057914f4b5a55d93608dca96607f8ebd2c829dd36c SHA512 7135a1d03ad39137581c79d0b473014aa8d27c8f0ac7a9271103fd753ca836d5123fa8b4314fbcc958f975699f82f6e36733de0cd8f7a02692c8d7e340afdacd
-EBUILD test_roslib_comm-1.15.14.ebuild 706 BLAKE2B b4dce8d38f3258a23c5c3ad8bfea4ab15a364aca64baeddcb2299cb74739dc375343b65b2596e185e5fc1ed8235ee4c54495eab76fe05037a824b7c14bc42141 SHA512 f5ec27ced6b637f6fa447a9146a6560d1036e81c730d134fe7f6161771571f404a22885df5b71c003a27bd19c1b357d910738ae810286b07749c9143c980f0c6
-EBUILD test_roslib_comm-1.15.8.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
-EBUILD test_roslib_comm-1.15.9.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
-EBUILD test_roslib_comm-9999.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_roslib_comm/metadata.xml b/dev-ros/test_roslib_comm/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_roslib_comm/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.10.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.10.ebuild
deleted file mode 100644
index e4dc35ffaea9..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.11.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.11.ebuild
deleted file mode 100644
index e4dc35ffaea9..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.13.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.13.ebuild
deleted file mode 100644
index e4dc35ffaea9..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.14.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.14.ebuild
deleted file mode 100644
index 577fa63bdb1e..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.8.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.8.ebuild
deleted file mode 100644
index d53ce85e7df6..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.9.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.9.ebuild
deleted file mode 100644
index d53ce85e7df6..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild
deleted file mode 100644
index d53ce85e7df6..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
deleted file mode 100644
index 774806c5ade6..000000000000
--- a/dev-ros/test_rosmaster/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_rosmaster-1.15.10.ebuild 783 BLAKE2B 004586236178305c6652839892f87a786efff23a57b6891f42dd5b8fa136a732085dda3860c72e20e300ee09cd9458606f13651eb0c16fcc48b39d4fb5d228ff SHA512 c456107a41e4ee63a7c6d77e71efca13ceeb2c8f793e72c10acaad8d1953405c41363983a6969ca0d48cc7287c4e606402fd85da77635bb5bac816e36fcbcfd1
-EBUILD test_rosmaster-1.15.11.ebuild 783 BLAKE2B 004586236178305c6652839892f87a786efff23a57b6891f42dd5b8fa136a732085dda3860c72e20e300ee09cd9458606f13651eb0c16fcc48b39d4fb5d228ff SHA512 c456107a41e4ee63a7c6d77e71efca13ceeb2c8f793e72c10acaad8d1953405c41363983a6969ca0d48cc7287c4e606402fd85da77635bb5bac816e36fcbcfd1
-EBUILD test_rosmaster-1.15.13.ebuild 783 BLAKE2B 004586236178305c6652839892f87a786efff23a57b6891f42dd5b8fa136a732085dda3860c72e20e300ee09cd9458606f13651eb0c16fcc48b39d4fb5d228ff SHA512 c456107a41e4ee63a7c6d77e71efca13ceeb2c8f793e72c10acaad8d1953405c41363983a6969ca0d48cc7287c4e606402fd85da77635bb5bac816e36fcbcfd1
-EBUILD test_rosmaster-1.15.14.ebuild 783 BLAKE2B 2e625723e996fe7c1a5a3a1cee3aaa9f41edc0336f5784a581709c58dfecc9465a0ba47f9590cf5ef4fe5a00e52d1351e45313dfda84569d3dc3cb5a7afc203a SHA512 37f01ad5af87a6e003859c0515f426fd2ee59fc46da43ca86c506d5b6ed87cdde57ac9e0e9c6a3a970ace25f8f9e8e38b9a8de7238f91e186926e3e299409b56
-EBUILD test_rosmaster-1.15.8.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
-EBUILD test_rosmaster-1.15.9.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
-EBUILD test_rosmaster-9999.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_rosmaster/metadata.xml b/dev-ros/test_rosmaster/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_rosmaster/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.10.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.10.ebuild
deleted file mode 100644
index 2e62994a05c3..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.11.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.11.ebuild
deleted file mode 100644
index 2e62994a05c3..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.13.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.13.ebuild
deleted file mode 100644
index 2e62994a05c3..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.14.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.14.ebuild
deleted file mode 100644
index cae4f9c033c3..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.14.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.8.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.8.ebuild
deleted file mode 100644
index 6a163fb0f0ad..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.9.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.9.ebuild
deleted file mode 100644
index 6a163fb0f0ad..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild b/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
deleted file mode 100644
index 6a163fb0f0ad..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
deleted file mode 100644
index 872cd0c7402f..000000000000
--- a/dev-ros/test_rosparam/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_rosparam-1.15.10.ebuild 600 BLAKE2B b51b6d1981df545993b81a00d805e66a65e5d04b2454270192d95e2a7546141fb614b7983ec653baf96ba4f989c2e51f0761e66a80fa2c195393e9c1bcdbdf97 SHA512 4b560c3bd4e5dca6c77c6197e9533bdeaf780832104ec64fb5171754abd09491ec4b102fd7578fc704b4918317ac533e77d081d00f040514c5cf6ebc796a60ae
-EBUILD test_rosparam-1.15.11.ebuild 600 BLAKE2B b51b6d1981df545993b81a00d805e66a65e5d04b2454270192d95e2a7546141fb614b7983ec653baf96ba4f989c2e51f0761e66a80fa2c195393e9c1bcdbdf97 SHA512 4b560c3bd4e5dca6c77c6197e9533bdeaf780832104ec64fb5171754abd09491ec4b102fd7578fc704b4918317ac533e77d081d00f040514c5cf6ebc796a60ae
-EBUILD test_rosparam-1.15.13.ebuild 600 BLAKE2B b51b6d1981df545993b81a00d805e66a65e5d04b2454270192d95e2a7546141fb614b7983ec653baf96ba4f989c2e51f0761e66a80fa2c195393e9c1bcdbdf97 SHA512 4b560c3bd4e5dca6c77c6197e9533bdeaf780832104ec64fb5171754abd09491ec4b102fd7578fc704b4918317ac533e77d081d00f040514c5cf6ebc796a60ae
-EBUILD test_rosparam-1.15.14.ebuild 600 BLAKE2B f06ce5a6c68235aad41f1cab28f79c3a7de4301afc12561063fbe9246a3a9657131e028fe31dda5eccdb3cba245ae3af4b78fbffcef460bb5ffc78fcffa86e9e SHA512 7b80a7439643fc33e816a86f49141f7107ba092f40b3f9969ee972ab7bb566e60a4f342d7fd8628ce4b9f6bc6ebdc790b6a01d325774dcf3c80c09db3b661306
-EBUILD test_rosparam-1.15.7.ebuild 511 BLAKE2B a324a281705bc80360f1c447f7191aae44dbef988217d13d3addcee32bd91b705aa947a53c778f9cf6e3e442cba7c6e64f8cf46100727be29f99f76bb8c0a8cf SHA512 f1d00655518e6aea60aef0100c357b6526d38354ce03b98c7baaf2d76c1d4cbb6a6c1f11877c1847bf6ecd61393f577c9330814b3876832736ee12f5db1325d5
-EBUILD test_rosparam-1.15.8.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
-EBUILD test_rosparam-1.15.9.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
-EBUILD test_rosparam-9999.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_rosparam/metadata.xml b/dev-ros/test_rosparam/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_rosparam/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.10.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.10.ebuild
deleted file mode 100644
index 108cabfb7564..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.11.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.11.ebuild
deleted file mode 100644
index 108cabfb7564..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.13.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.13.ebuild
deleted file mode 100644
index 108cabfb7564..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.14.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.14.ebuild
deleted file mode 100644
index 261604eec47c..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild
deleted file mode 100644
index 16022d629a45..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.8.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.8.ebuild
deleted file mode 100644
index 712bc9fd620e..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.9.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.9.ebuild
deleted file mode 100644
index 712bc9fd620e..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rosparam/test_rosparam-9999.ebuild b/dev-ros/test_rosparam/test_rosparam-9999.ebuild
deleted file mode 100644
index 712bc9fd620e..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	)"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
deleted file mode 100644
index 2745a131600a..000000000000
--- a/dev-ros/test_rospy/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_rospy-1.15.10.ebuild 1013 BLAKE2B e524efc6aee0a4d784dacd1f80857f0c46f2a44976c52df8a3f949a9dd79b2ee6cea38fdaca917552985c37fbce7fa7a956614c04f7b3f41a4d8737bd4dcc404 SHA512 2d6f0e11e8f25209c4e25c3adf43e5e145b4ed81e4ce61140c72733ac40f05646daed99f8c5b4b4e69c942798408bc832ba94c5d4c18049a3263d86e00a8b559
-EBUILD test_rospy-1.15.11.ebuild 1013 BLAKE2B e524efc6aee0a4d784dacd1f80857f0c46f2a44976c52df8a3f949a9dd79b2ee6cea38fdaca917552985c37fbce7fa7a956614c04f7b3f41a4d8737bd4dcc404 SHA512 2d6f0e11e8f25209c4e25c3adf43e5e145b4ed81e4ce61140c72733ac40f05646daed99f8c5b4b4e69c942798408bc832ba94c5d4c18049a3263d86e00a8b559
-EBUILD test_rospy-1.15.13.ebuild 1013 BLAKE2B e524efc6aee0a4d784dacd1f80857f0c46f2a44976c52df8a3f949a9dd79b2ee6cea38fdaca917552985c37fbce7fa7a956614c04f7b3f41a4d8737bd4dcc404 SHA512 2d6f0e11e8f25209c4e25c3adf43e5e145b4ed81e4ce61140c72733ac40f05646daed99f8c5b4b4e69c942798408bc832ba94c5d4c18049a3263d86e00a8b559
-EBUILD test_rospy-1.15.14.ebuild 1013 BLAKE2B 20d7dbcd2efb7d0ce02c6a72d72f5b92648b4c5f49746ec7c3f68d882eec80770cb7d55d5fb1f0243b0f44133087679efb9610eae106c03b815910e75de6c94e SHA512 e7a7f94a23397b9647d5f9803df8ba13992e75837b2d0c658e0ac5175e26b1887cdd57fc8e86c508ab127d82d1d08493b3075046854f154e9e4979d4bf329328
-EBUILD test_rospy-1.15.8.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
-EBUILD test_rospy-1.15.9.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
-EBUILD test_rospy-9999.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_rospy/metadata.xml b/dev-ros/test_rospy/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_rospy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_rospy/test_rospy-1.15.10.ebuild b/dev-ros/test_rospy/test_rospy-1.15.10.ebuild
deleted file mode 100644
index af5f3520b53e..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.15.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rospy/test_rospy-1.15.11.ebuild b/dev-ros/test_rospy/test_rospy-1.15.11.ebuild
deleted file mode 100644
index af5f3520b53e..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.15.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rospy/test_rospy-1.15.13.ebuild b/dev-ros/test_rospy/test_rospy-1.15.13.ebuild
deleted file mode 100644
index af5f3520b53e..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.15.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rospy/test_rospy-1.15.14.ebuild b/dev-ros/test_rospy/test_rospy-1.15.14.ebuild
deleted file mode 100644
index 77c19fe38c01..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.15.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rospy/test_rospy-1.15.8.ebuild b/dev-ros/test_rospy/test_rospy-1.15.8.ebuild
deleted file mode 100644
index 5b429c7f5335..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.15.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rospy/test_rospy-1.15.9.ebuild b/dev-ros/test_rospy/test_rospy-1.15.9.ebuild
deleted file mode 100644
index 5b429c7f5335..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.15.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rospy/test_rospy-9999.ebuild b/dev-ros/test_rospy/test_rospy-9999.ebuild
deleted file mode 100644
index 5b429c7f5335..000000000000
--- a/dev-ros/test_rospy/test_rospy-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
deleted file mode 100644
index 58be11609c24..000000000000
--- a/dev-ros/test_rosservice/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD test_rosservice-1.15.10.ebuild 747 BLAKE2B ee2ed54c8d72484922df3e9d7296d7985eb33ad8c56c5c55ef5a45ffd1267313c762f820d8dc69250727f9a6664c003b2ca0674bca74ff77380d1eb1fcbd3d01 SHA512 e67ba7aae73f2d0794d15fb3a75ffba10f0e8099bda9d457fc08b7365ab3c1931afadb2636d6f8998fa1e81ae18265cfe0a8c18b6663a59b85e902e856ca3ad7
-EBUILD test_rosservice-1.15.11.ebuild 747 BLAKE2B ee2ed54c8d72484922df3e9d7296d7985eb33ad8c56c5c55ef5a45ffd1267313c762f820d8dc69250727f9a6664c003b2ca0674bca74ff77380d1eb1fcbd3d01 SHA512 e67ba7aae73f2d0794d15fb3a75ffba10f0e8099bda9d457fc08b7365ab3c1931afadb2636d6f8998fa1e81ae18265cfe0a8c18b6663a59b85e902e856ca3ad7
-EBUILD test_rosservice-1.15.13.ebuild 747 BLAKE2B ee2ed54c8d72484922df3e9d7296d7985eb33ad8c56c5c55ef5a45ffd1267313c762f820d8dc69250727f9a6664c003b2ca0674bca74ff77380d1eb1fcbd3d01 SHA512 e67ba7aae73f2d0794d15fb3a75ffba10f0e8099bda9d457fc08b7365ab3c1931afadb2636d6f8998fa1e81ae18265cfe0a8c18b6663a59b85e902e856ca3ad7
-EBUILD test_rosservice-1.15.14.ebuild 747 BLAKE2B fd2f9104a49e43ff7f985977b6a70a90f641cb5b0045c1e49ed869a90e3f26d6c1fa1f961e15323c3a4adb60853b2c02d5aff3f24ec10d0f1499a4af424951fb SHA512 4ba630323e72fd692bb8a2f56a8c115263e130a2a0b47a98809590a6dcfeaa11292b5345d7ab4c4d9e93b8a137de6230aaa13e7297b26ca634dc193d2937213a
-EBUILD test_rosservice-1.15.8.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
-EBUILD test_rosservice-1.15.9.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
-EBUILD test_rosservice-9999.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_rosservice/metadata.xml b/dev-ros/test_rosservice/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/test_rosservice/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.10.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.10.ebuild
deleted file mode 100644
index b73420876103..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.15.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.11.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.11.ebuild
deleted file mode 100644
index b73420876103..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.15.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.13.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.13.ebuild
deleted file mode 100644
index b73420876103..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.15.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.14.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.14.ebuild
deleted file mode 100644
index fbb51ec0c1c0..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.15.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild
deleted file mode 100644
index 7f51764ff341..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.9.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.9.ebuild
deleted file mode 100644
index 7f51764ff341..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.15.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_rosservice/test_rosservice-9999.ebuild b/dev-ros/test_rosservice/test_rosservice-9999.ebuild
deleted file mode 100644
index 7f51764ff341..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/test_tf2/Manifest b/dev-ros/test_tf2/Manifest
deleted file mode 100644
index c262f6551dfe..000000000000
--- a/dev-ros/test_tf2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD test_tf2-0.7.5-r1.ebuild 792 BLAKE2B cd9b0f163e6552c709b4342fe66d1ef95a8e09b66b8eff24ad9adbd638a26db2069ed0bd67ded44690c99fb3223bf177bb989d9d93163e2b9f512760c4f38975 SHA512 9209e30d6e676c8c62cc760aeceb26aa087311947432c776d19edb8dac6ff2dd84107d1b87420d2774d3a28eef7d0b1c8fa58d8756980ece7ea7cb76c55780e7
-EBUILD test_tf2-0.7.6.ebuild 792 BLAKE2B cd9b0f163e6552c709b4342fe66d1ef95a8e09b66b8eff24ad9adbd638a26db2069ed0bd67ded44690c99fb3223bf177bb989d9d93163e2b9f512760c4f38975 SHA512 9209e30d6e676c8c62cc760aeceb26aa087311947432c776d19edb8dac6ff2dd84107d1b87420d2774d3a28eef7d0b1c8fa58d8756980ece7ea7cb76c55780e7
-EBUILD test_tf2-9999.ebuild 792 BLAKE2B cd9b0f163e6552c709b4342fe66d1ef95a8e09b66b8eff24ad9adbd638a26db2069ed0bd67ded44690c99fb3223bf177bb989d9d93163e2b9f512760c4f38975 SHA512 9209e30d6e676c8c62cc760aeceb26aa087311947432c776d19edb8dac6ff2dd84107d1b87420d2774d3a28eef7d0b1c8fa58d8756980ece7ea7cb76c55780e7
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/test_tf2/metadata.xml b/dev-ros/test_tf2/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/test_tf2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild b/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
deleted file mode 100644
index 3482393f54a3..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_eigen
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_msgs
-	dev-ros/rosbash
-	sci-libs/orocos_kdl
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-cpp/gtest
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.7.6.ebuild b/dev-ros/test_tf2/test_tf2-0.7.6.ebuild
deleted file mode 100644
index 3482393f54a3..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.7.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_eigen
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_msgs
-	dev-ros/rosbash
-	sci-libs/orocos_kdl
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-cpp/gtest
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-9999.ebuild b/dev-ros/test_tf2/test_tf2-9999.ebuild
deleted file mode 100644
index 3482393f54a3..000000000000
--- a/dev-ros/test_tf2/test_tf2-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_eigen
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_msgs
-	dev-ros/rosbash
-	sci-libs/orocos_kdl
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-cpp/gtest
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
deleted file mode 100644
index 803c9933a3c5..000000000000
--- a/dev-ros/tf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yaml.patch 559 BLAKE2B 228004c7cc268ebe011dfc8f83aeec9a32e98566c970b7e94b8fcd19879ad1974038fdee9b850ca7bebc770e96cf8b81a92ae9583188191de86e7d5a4100b835 SHA512 67f8aeee746fc3137310fc5eb127d8dc12be2c33b38b2237b6889f7837d2637125394ebe5d22c6dfee28787fecf0cf48be3168c09a50c435dde7040eed39dfc3
-DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
-EBUILD tf-1.13.2-r4.ebuild 1168 BLAKE2B ad119ddebd7ebbf5a63645858bc3f1de1d8dd398e064485d5fa4394409561808c2c4d8c359858bea04c07430361351c197ec5a0ea4dace494988e43f63b887cd SHA512 70623099f220705f029d0285bc2d02d631bd982b4e3f5bbcbbd2dad13542a05f2d3d3678e8e8601f845ce4d4944a5264cf04fa7ea3f5b38c7b12fef5b7eb2a57
-EBUILD tf-9999.ebuild 1168 BLAKE2B ad119ddebd7ebbf5a63645858bc3f1de1d8dd398e064485d5fa4394409561808c2c4d8c359858bea04c07430361351c197ec5a0ea4dace494988e43f63b887cd SHA512 70623099f220705f029d0285bc2d02d631bd982b4e3f5bbcbbd2dad13542a05f2d3d3678e8e8601f845ce4d4944a5264cf04fa7ea3f5b38c7b12fef5b7eb2a57
-MISC metadata.xml 327 BLAKE2B 566ab6c75daafd1554630fd8762bebc05fa3a002b3f785b59a69d77653167d6d2c0cce2e20067ead12cd5075da7c7d6e40f70e21b4628e419c43252c6d878500 SHA512 fd1f0d017b6a422df2fcdd7797ec631ac8b2afaa706338848b941c39e4d3d82549969f0018162da22cb9499a114a4a4a58a945b284585b30c7eff589ecf975d5
diff --git a/dev-ros/tf/files/yaml.patch b/dev-ros/tf/files/yaml.patch
deleted file mode 100644
index 344ef80417ae..000000000000
--- a/dev-ros/tf/files/yaml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tf/src/tf/listener.py
-===================================================================
---- tf.orig/src/tf/listener.py
-+++ tf/src/tf/listener.py
-@@ -94,7 +94,7 @@ class Transformer(object):
- 
-     def getFrameStrings(self):
-         """ Not a recommended API, only here for backwards compatibility """
--        data = yaml.load(self._buffer.all_frames_as_yaml()) or {}
-+        data = yaml.safe_load(self._buffer.all_frames_as_yaml()) or {}
-         return [p for p, _ in data.items()]
- 
-     def getLatestCommonTime(self, source_frame, dest_frame):
diff --git a/dev-ros/tf/metadata.xml b/dev-ros/tf/metadata.xml
deleted file mode 100644
index 0717de2e0623..000000000000
--- a/dev-ros/tf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf/tf-1.13.2-r4.ebuild b/dev-ros/tf/tf-1.13.2-r4.ebuild
deleted file mode 100644
index 77026fbea1aa..000000000000
--- a/dev-ros/tf/tf-1.13.2-r4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles:0
-	dev-ros/message_filters
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/tf/tf-9999.ebuild b/dev-ros/tf/tf-9999.ebuild
deleted file mode 100644
index 77026fbea1aa..000000000000
--- a/dev-ros/tf/tf-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles:0
-	dev-ros/message_filters
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
deleted file mode 100644
index 8a9096b3c6ec..000000000000
--- a/dev-ros/tf2/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2-0.7.2-r1.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
-EBUILD tf2-0.7.3-r1.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
-EBUILD tf2-0.7.5-r1.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
-EBUILD tf2-0.7.6.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
-EBUILD tf2-9999.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2/metadata.xml b/dev-ros/tf2/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2/tf2-0.7.2-r1.ebuild b/dev-ros/tf2/tf2-0.7.2-r1.ebuild
deleted file mode 100644
index 401a57c0c955..000000000000
--- a/dev-ros/tf2/tf2-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-ros/rostime
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/roscpp dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2/tf2-0.7.3-r1.ebuild b/dev-ros/tf2/tf2-0.7.3-r1.ebuild
deleted file mode 100644
index 401a57c0c955..000000000000
--- a/dev-ros/tf2/tf2-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-ros/rostime
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/roscpp dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2/tf2-0.7.5-r1.ebuild b/dev-ros/tf2/tf2-0.7.5-r1.ebuild
deleted file mode 100644
index 401a57c0c955..000000000000
--- a/dev-ros/tf2/tf2-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-ros/rostime
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/roscpp dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2/tf2-0.7.6.ebuild b/dev-ros/tf2/tf2-0.7.6.ebuild
deleted file mode 100644
index 401a57c0c955..000000000000
--- a/dev-ros/tf2/tf2-0.7.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-ros/rostime
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/roscpp dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2/tf2-9999.ebuild b/dev-ros/tf2/tf2-9999.ebuild
deleted file mode 100644
index 401a57c0c955..000000000000
--- a/dev-ros/tf2/tf2-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-ros/rostime
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/roscpp dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2_bullet/Manifest b/dev-ros/tf2_bullet/Manifest
deleted file mode 100644
index 12b5af56da98..000000000000
--- a/dev-ros/tf2_bullet/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_bullet-0.7.2.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
-EBUILD tf2_bullet-0.7.3.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
-EBUILD tf2_bullet-0.7.5.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
-EBUILD tf2_bullet-0.7.6.ebuild 457 BLAKE2B 1de38d726609c6569109189ac8d1bfb48482d7e90bc8d365b700e1ec22a69d7b172e15a41669e20739a67401913c05295b5d059caa3dad2514a035386d37edf7 SHA512 6889b9578544e58b21e68e051c754fe40fb2bc485869995858f3065b3ca033d48ca241d357952e17a35b40cfdc1672e9b712c3efbd336940916e62cab61d0342
-EBUILD tf2_bullet-9999.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_bullet/metadata.xml b/dev-ros/tf2_bullet/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_bullet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild
deleted file mode 100644
index 39232f6342a4..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.7.3.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.7.3.ebuild
deleted file mode 100644
index 39232f6342a4..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.7.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.7.5.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.7.5.ebuild
deleted file mode 100644
index 39232f6342a4..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.7.6.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.7.6.ebuild
deleted file mode 100644
index 27a56c4a1f9b..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.7.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild b/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
deleted file mode 100644
index 39232f6342a4..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-ros/tf2_eigen/Manifest b/dev-ros/tf2_eigen/Manifest
deleted file mode 100644
index 7c62d57bbc84..000000000000
--- a/dev-ros/tf2_eigen/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_eigen-0.7.2.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
-EBUILD tf2_eigen-0.7.3.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
-EBUILD tf2_eigen-0.7.5.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
-EBUILD tf2_eigen-0.7.6.ebuild 450 BLAKE2B 9d73585249b715aac23b767606ed5ae3fe3e03be53a2fda8c626d0b4737db1f88f4f7a1420ad1f03ff873d47b017c104e18243276ce730e8cc365d37ca60a47a SHA512 3321e9d47ac19ee98ff9277c7014c33e056b3b9ea8f6ab9cec4ce718be9808c7587ff0bd1b11fa80b2eae404843a5243ecb0ecaf2ad5501477f8400851b41f8f
-EBUILD tf2_eigen-9999.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_eigen/metadata.xml b/dev-ros/tf2_eigen/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_eigen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild
deleted file mode 100644
index 81e3e1a7ddd9..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.7.3.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.7.3.ebuild
deleted file mode 100644
index 81e3e1a7ddd9..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.7.5.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.7.5.ebuild
deleted file mode 100644
index 81e3e1a7ddd9..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.7.6.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.7.6.ebuild
deleted file mode 100644
index 71831bfac320..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.7.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild b/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
deleted file mode 100644
index 81e3e1a7ddd9..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/tf2_geometry_msgs/Manifest b/dev-ros/tf2_geometry_msgs/Manifest
deleted file mode 100644
index 8116bd688a90..000000000000
--- a/dev-ros/tf2_geometry_msgs/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_geometry_msgs-0.7.2.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
-EBUILD tf2_geometry_msgs-0.7.3.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
-EBUILD tf2_geometry_msgs-0.7.5.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
-EBUILD tf2_geometry_msgs-0.7.6.ebuild 743 BLAKE2B 4dc74fb75c95ad7065cf2334aa6eed5ee20e584e2264bd28792254eb15be04f0fb0a33b38c696b936d867534a25f59e63cf163f5ecd33b45d9f7490981e8b826 SHA512 608bd221bf30dafd9714c4be90523dc663c40ba88ce8860ec53ab676256b0a4619a4be9bf0350606647c576410c54b8a64c0c6c1114c19c282b684d5d2680a8f
-EBUILD tf2_geometry_msgs-9999.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_geometry_msgs/metadata.xml b/dev-ros/tf2_geometry_msgs/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_geometry_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.2.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.2.ebuild
deleted file mode 100644
index 388537a8dcc4..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/tf2
-	sci-libs/orocos_kdl
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.3.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.3.ebuild
deleted file mode 100644
index 388537a8dcc4..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/tf2
-	sci-libs/orocos_kdl
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.5.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.5.ebuild
deleted file mode 100644
index 388537a8dcc4..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/tf2
-	sci-libs/orocos_kdl
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.6.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.6.ebuild
deleted file mode 100644
index 3c795fbda7d4..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/tf2
-	sci-libs/orocos_kdl
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
deleted file mode 100644
index 388537a8dcc4..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/tf2
-	sci-libs/orocos_kdl
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/tf2_kdl/Manifest b/dev-ros/tf2_kdl/Manifest
deleted file mode 100644
index 87464f0c8033..000000000000
--- a/dev-ros/tf2_kdl/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_kdl-0.7.2.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
-EBUILD tf2_kdl-0.7.3.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
-EBUILD tf2_kdl-0.7.5.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
-EBUILD tf2_kdl-0.7.6.ebuild 609 BLAKE2B e1949ce0e6c71cc2a547a71b207719488f07ce32f363e2e45628acc2d81c284359a5eaeddf544db00528bbb423ffd32718e3471d10d989a783eaae3827593a1c SHA512 2caebe19a5fb96d39700bb9c6b1abb8f470e005a6eff52d00f5cdca8bb87772140244d706591318f1ce136e0e8b973296414d172ad66e7dee3aefc602ba6a110
-EBUILD tf2_kdl-9999.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_kdl/metadata.xml b/dev-ros/tf2_kdl/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_kdl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild
deleted file mode 100644
index 91b549006511..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-cpp/eigen:3
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.7.3.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.7.3.ebuild
deleted file mode 100644
index 91b549006511..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.7.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-cpp/eigen:3
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.7.5.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.7.5.ebuild
deleted file mode 100644
index 91b549006511..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.7.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-cpp/eigen:3
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.7.6.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.7.6.ebuild
deleted file mode 100644
index 63d78e6201ce..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.7.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-cpp/eigen:3
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild b/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
deleted file mode 100644
index 91b549006511..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	dev-cpp/eigen:3
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_msgs/Manifest b/dev-ros/tf2_msgs/Manifest
deleted file mode 100644
index 7a5d74f6d6d1..000000000000
--- a/dev-ros/tf2_msgs/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_msgs-0.7.2.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
-EBUILD tf2_msgs-0.7.3.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
-EBUILD tf2_msgs-0.7.5.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
-EBUILD tf2_msgs-0.7.6.ebuild 414 BLAKE2B acf9d1f5fe53343c6e84e19a5ea7859b012c77b4484267653a60e08d533ec74afbb94f744ee305b60c7873f65311eb15c7113983f1245965ce9ef1e1f869b127 SHA512 9f1c1db891501862f1865e577e759140ea47ba48d43680c2570e3c6e0d11919fe4da45877a2c9832d26d130c495d491477b3e06648b4e823925875ae5d4da080
-EBUILD tf2_msgs-9999.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_msgs/metadata.xml b/dev-ros/tf2_msgs/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild
deleted file mode 100644
index 779b1cb8ae1c..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.7.3.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.7.3.ebuild
deleted file mode 100644
index 779b1cb8ae1c..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.7.5.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.7.5.ebuild
deleted file mode 100644
index 779b1cb8ae1c..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.7.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.7.6.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.7.6.ebuild
deleted file mode 100644
index e3ab05052c74..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.7.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
deleted file mode 100644
index 779b1cb8ae1c..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/Manifest b/dev-ros/tf2_py/Manifest
deleted file mode 100644
index 541a16138725..000000000000
--- a/dev-ros/tf2_py/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_py-0.7.2.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
-EBUILD tf2_py-0.7.3.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
-EBUILD tf2_py-0.7.5.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
-EBUILD tf2_py-0.7.6.ebuild 390 BLAKE2B cb79575cab1de6ff45b4b9a0648fc8409da5e06a13dc033a2c43f81667374c660cdba12de8cf45d218cc80cfbe74c2d82cb0f79a4abdf01022a0a427f708b5aa SHA512 044260cfc67be10cf00fb6694f2f9334253f89e1677f4065d839ba50b7f4d6a72ba0fed5cff0b46e05c4d451ea7978f2805c971bfeb6cc4effa2db7b1be9531e
-EBUILD tf2_py-9999.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_py/metadata.xml b/dev-ros/tf2_py/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_py/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_py/tf2_py-0.7.2.ebuild b/dev-ros/tf2_py/tf2_py-0.7.2.ebuild
deleted file mode 100644
index 2bae9efadc93..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.7.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.7.3.ebuild b/dev-ros/tf2_py/tf2_py-0.7.3.ebuild
deleted file mode 100644
index 2bae9efadc93..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.7.5.ebuild b/dev-ros/tf2_py/tf2_py-0.7.5.ebuild
deleted file mode 100644
index 2bae9efadc93..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.7.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.7.6.ebuild b/dev-ros/tf2_py/tf2_py-0.7.6.ebuild
deleted file mode 100644
index 77c587eae514..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.7.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-9999.ebuild b/dev-ros/tf2_py/tf2_py-9999.ebuild
deleted file mode 100644
index 2bae9efadc93..000000000000
--- a/dev-ros/tf2_py/tf2_py-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_ros/Manifest b/dev-ros/tf2_ros/Manifest
deleted file mode 100644
index 517400f8379a..000000000000
--- a/dev-ros/tf2_ros/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_ros-0.7.2-r1.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
-EBUILD tf2_ros-0.7.3-r1.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
-EBUILD tf2_ros-0.7.5-r1.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
-EBUILD tf2_ros-0.7.6.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
-EBUILD tf2_ros-9999.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_ros/metadata.xml b/dev-ros/tf2_ros/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_ros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_ros/tf2_ros-0.7.2-r1.ebuild b/dev-ros/tf2_ros/tf2_ros-0.7.2-r1.ebuild
deleted file mode 100644
index fd5e26d28f9f..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_ros/tf2_ros-0.7.3-r1.ebuild b/dev-ros/tf2_ros/tf2_ros-0.7.3-r1.ebuild
deleted file mode 100644
index fd5e26d28f9f..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_ros/tf2_ros-0.7.5-r1.ebuild b/dev-ros/tf2_ros/tf2_ros-0.7.5-r1.ebuild
deleted file mode 100644
index fd5e26d28f9f..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_ros/tf2_ros-0.7.6.ebuild b/dev-ros/tf2_ros/tf2_ros-0.7.6.ebuild
deleted file mode 100644
index fd5e26d28f9f..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.7.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_ros/tf2_ros-9999.ebuild b/dev-ros/tf2_ros/tf2_ros-9999.ebuild
deleted file mode 100644
index fd5e26d28f9f..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-
-src_test() {
-	# Needed for tests to find internal launch file
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_sensor_msgs/Manifest b/dev-ros/tf2_sensor_msgs/Manifest
deleted file mode 100644
index bee00e7f93c6..000000000000
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_sensor_msgs-0.7.2.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
-EBUILD tf2_sensor_msgs-0.7.3.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
-EBUILD tf2_sensor_msgs-0.7.5.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
-EBUILD tf2_sensor_msgs-0.7.6.ebuild 950 BLAKE2B fd907359db741a3482e4ca30db85b5e44404861486c4fcfdeef52d2099894b93b4599bc776a496b857e785e2a445ef2fb5da18348ec8529381718e2b6c4743ac SHA512 21453243cbb1a44e4b808b06a4cc0a8eba69c687ef2bef5cec170ba6426e8655e2f0170f1dd0201b0148627970b25db15ebe5161ab871db24d323030ce99776f
-EBUILD tf2_sensor_msgs-9999.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_sensor_msgs/metadata.xml b/dev-ros/tf2_sensor_msgs/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_sensor_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild
deleted file mode 100644
index b6d6fb7ff23f..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/cmake_modules
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.3.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.3.ebuild
deleted file mode 100644
index b6d6fb7ff23f..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/cmake_modules
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.5.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.5.ebuild
deleted file mode 100644
index b6d6fb7ff23f..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/cmake_modules
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.6.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.6.ebuild
deleted file mode 100644
index e7dd2d1b54d3..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/cmake_modules
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
deleted file mode 100644
index b6d6fb7ff23f..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-		dev-cpp/gtest
-	)
-	dev-ros/cmake_modules
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/tf2_tools/Manifest b/dev-ros/tf2_tools/Manifest
deleted file mode 100644
index 96f89f4ca010..000000000000
--- a/dev-ros/tf2_tools/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
-DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
-EBUILD tf2_tools-0.7.2.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
-EBUILD tf2_tools-0.7.3.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
-EBUILD tf2_tools-0.7.5.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
-EBUILD tf2_tools-0.7.6.ebuild 614 BLAKE2B 332cb3280d992975adc852ebbdeec97fba835bbc6b8edd3c30ee75b3500983aeee33f2edf496b6cab56b0714e8e2a9d5069a35fb0bbc682c5ad5a7e132dd6a58 SHA512 7b5c0de56b648a33e698938e1839c7009af5dec9cd32616e65d5c3fe63d64b0961c1d0baf6d0a3a8b0eadef10b8b9d40cbd1a1851a9acc7917ed7a0b6a59475d
-EBUILD tf2_tools-9999.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
-MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_tools/metadata.xml b/dev-ros/tf2_tools/metadata.xml
deleted file mode 100644
index 98bbce13cf53..000000000000
--- a/dev-ros/tf2_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild b/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild
deleted file mode 100644
index 96f06f51e767..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.7.3.ebuild b/dev-ros/tf2_tools/tf2_tools-0.7.3.ebuild
deleted file mode 100644
index 96f06f51e767..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.7.5.ebuild b/dev-ros/tf2_tools/tf2_tools-0.7.5.ebuild
deleted file mode 100644
index 96f06f51e767..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.7.6.ebuild b/dev-ros/tf2_tools/tf2_tools-0.7.6.ebuild
deleted file mode 100644
index 3a969500d193..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.7.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-9999.ebuild b/dev-ros/tf2_tools/tf2_tools-9999.ebuild
deleted file mode 100644
index 96f06f51e767..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for 2nd gen Transform library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf_conversions/Manifest b/dev-ros/tf_conversions/Manifest
deleted file mode 100644
index 52a5aee79b3f..000000000000
--- a/dev-ros/tf_conversions/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
-EBUILD tf_conversions-1.13.2-r1.ebuild 920 BLAKE2B ff0f5bdf1a3956cbf688eb611f853952efd7ebaf5fefc40a845ebfc9f91f8c319f283120b64d280109631f478d8d36cf7252a3cc89c388b8823973d6ff6eabb3 SHA512 a76ecc61f4ad91392bc745cda8abbb6cc5ca6c802a968af3ff900006602eb4c11ea02bef0d5a371ee58e5d2e348927faa655c748441fd8eeeb2e2cd2dadcf0c3
-EBUILD tf_conversions-9999.ebuild 920 BLAKE2B ff0f5bdf1a3956cbf688eb611f853952efd7ebaf5fefc40a845ebfc9f91f8c319f283120b64d280109631f478d8d36cf7252a3cc89c388b8823973d6ff6eabb3 SHA512 a76ecc61f4ad91392bc745cda8abbb6cc5ca6c802a968af3ff900006602eb4c11ea02bef0d5a371ee58e5d2e348927faa655c748441fd8eeeb2e2cd2dadcf0c3
-MISC metadata.xml 327 BLAKE2B 566ab6c75daafd1554630fd8762bebc05fa3a002b3f785b59a69d77653167d6d2c0cce2e20067ead12cd5075da7c7d6e40f70e21b4628e419c43252c6d878500 SHA512 fd1f0d017b6a422df2fcdd7797ec631ac8b2afaa706338848b941c39e4d3d82549969f0018162da22cb9499a114a4a4a58a945b284585b30c7eff589ecf975d5
diff --git a/dev-ros/tf_conversions/metadata.xml b/dev-ros/tf_conversions/metadata.xml
deleted file mode 100644
index 0717de2e0623..000000000000
--- a/dev-ros/tf_conversions/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/tf_conversions/tf_conversions-1.13.2-r1.ebuild b/dev-ros/tf_conversions/tf_conversions-1.13.2-r1.ebuild
deleted file mode 100644
index c717bec23799..000000000000
--- a/dev-ros/tf_conversions/tf_conversions-1.13.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Functions to convert common tf datatypes into those used by other libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/kdl_conversions
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/tf_conversions/tf_conversions-9999.ebuild b/dev-ros/tf_conversions/tf_conversions-9999.ebuild
deleted file mode 100644
index c717bec23799..000000000000
--- a/dev-ros/tf_conversions/tf_conversions-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Functions to convert common tf datatypes into those used by other libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/kdl_conversions
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/theora_image_transport/Manifest b/dev-ros/theora_image_transport/Manifest
deleted file mode 100644
index ebf9ff97bf1a..000000000000
--- a/dev-ros/theora_image_transport/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
-EBUILD theora_image_transport-1.14.0.ebuild 750 BLAKE2B ff776dbe00269593180d20263c294df48124987571964bb67713c79b053d603f59d45446fd5bd0c3d0ff223ebdd9dbc503f12c6b6ee12ef885cdd2261329ec9e SHA512 d9cd8a1d42bdc3ace4be1c84955f5f6b12e5f72fefb552cdb334e5fe9d5279c9a576c651576c5988dc45ae1dbf5b0031f3f1d06ed5d5e3a37c58c54aacc56b0c
-EBUILD theora_image_transport-9999.ebuild 750 BLAKE2B ff776dbe00269593180d20263c294df48124987571964bb67713c79b053d603f59d45446fd5bd0c3d0ff223ebdd9dbc503f12c6b6ee12ef885cdd2261329ec9e SHA512 d9cd8a1d42bdc3ace4be1c84955f5f6b12e5f72fefb552cdb334e5fe9d5279c9a576c651576c5988dc45ae1dbf5b0031f3f1d06ed5d5e3a37c58c54aacc56b0c
-MISC metadata.xml 353 BLAKE2B 7f332f592b523257e6ac30fe1b079b1d954cbb2bc691b4ad0293bb10e6930b226e2e9864a280c27c12a90a9b6b80c083a87cca0f3fc239c0cc206602563379e8 SHA512 aa3bd03ae6d8c3288bc2bdf48520f484e46dbb586cd9e2b918b66aa10d5a14b553f120bf7b85e22647d20ffd7ee56cd743750265d730a01ed23dafb3aef68af7
diff --git a/dev-ros/theora_image_transport/metadata.xml b/dev-ros/theora_image_transport/metadata.xml
deleted file mode 100644
index 76ac742a0d7e..000000000000
--- a/dev-ros/theora_image_transport/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/theora_image_transport/theora_image_transport-1.14.0.ebuild b/dev-ros/theora_image_transport/theora_image_transport-1.14.0.ebuild
deleted file mode 100644
index 1b9ba86f85e6..000000000000
--- a/dev-ros/theora_image_transport/theora_image_transport-1.14.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin for transparently sending an image stream encoded with the Theora codec"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_transport
-	media-libs/opencv
-	dev-ros/rosbag
-	dev-ros/pluginlib
-	media-libs/libogg
-	media-libs/libtheora[encode]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
diff --git a/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild b/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild
deleted file mode 100644
index 1b9ba86f85e6..000000000000
--- a/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin for transparently sending an image stream encoded with the Theora codec"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_transport
-	media-libs/opencv
-	dev-ros/rosbag
-	dev-ros/pluginlib
-	media-libs/libogg
-	media-libs/libtheora[encode]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
diff --git a/dev-ros/timestamp_tools/Manifest b/dev-ros/timestamp_tools/Manifest
deleted file mode 100644
index 7b42f518ac1f..000000000000
--- a/dev-ros/timestamp_tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST driver_common-1.6.9.tar.gz 15374 BLAKE2B 88bcba03596d9a641091d37db8329807cfa0d4dd766298a25f8e41b6da567eb246fdd8c4c8a39698b60a47a118b81b15c3ac93154490a1258d93d3e2fbd5c049 SHA512 1a5f7d261a3e754b380824256d35432cee521b7d255a7f152b6a69d5181ea45a2bbca7a7c6d4e0bea753c8f3c59018a63357c87d2535a9cb55ba311f11e5d749
-EBUILD timestamp_tools-1.6.9.ebuild 410 BLAKE2B 043eabedd01847e1e1dfa2da8e2538337679e5cb6e09b1898209c34c68c1532933ad87f3320d6b9fc36999b30aec033f956944df9fc6da61e03d35d7323349e9 SHA512 f46612714bc069857e1d1d6dac23b467d7019f6834282b5656ae86a3a7fd2eba35305dda41addc553d9af3f84e644bee35e79108c26ad148eb77657a23debec7
-EBUILD timestamp_tools-9999.ebuild 410 BLAKE2B 043eabedd01847e1e1dfa2da8e2538337679e5cb6e09b1898209c34c68c1532933ad87f3320d6b9fc36999b30aec033f956944df9fc6da61e03d35d7323349e9 SHA512 f46612714bc069857e1d1d6dac23b467d7019f6834282b5656ae86a3a7fd2eba35305dda41addc553d9af3f84e644bee35e79108c26ad148eb77657a23debec7
-MISC metadata.xml 340 BLAKE2B e50014d12cb0b21d5216163c1d9fd9822407c47af9460ab0d840f8aa130783ea9f5f5ca0027cb498307eaaae90c4b29691e9e140c0db675c7c503f73b12dfff3 SHA512 86f03cd767867cd7abb2c35ff6793bc66cd8c3a0c90cabd1b55699207974d49963a93e0cebffcfaa017acc2cf432a6bdb1f7532797f0d33cbc04966cc2697efe
diff --git a/dev-ros/timestamp_tools/metadata.xml b/dev-ros/timestamp_tools/metadata.xml
deleted file mode 100644
index a6e8cff19b00..000000000000
--- a/dev-ros/timestamp_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/driver_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/timestamp_tools/timestamp_tools-1.6.9.ebuild b/dev-ros/timestamp_tools/timestamp_tools-1.6.9.ebuild
deleted file mode 100644
index efb32587375a..000000000000
--- a/dev-ros/timestamp_tools/timestamp_tools-1.6.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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-drivers/driver_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Classes to help timestamp hardware events"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
deleted file mode 100644
index efb32587375a..000000000000
--- a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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-drivers/driver_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Classes to help timestamp hardware events"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
deleted file mode 100644
index a3759c265632..000000000000
--- a/dev-ros/topic_tools/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-EBUILD topic_tools-1.15.11.ebuild 896 BLAKE2B ada9b57381ae080c76f775cb7d24cb659ac741ae073a3b92b76e8a828bf7c1bc3dc007ff44103b72aaad2c615a0234d9dd0a6386f1695e90c4ab7b1fdfdae42f SHA512 08d06c91cc8136049f47c17df3217ae3dfbf56aec73008ba20a98c991617ef5ac19ce533ecab2de0b05a2834d989dcca9ca78ff7dd97dd52bd88c681a9d20444
-EBUILD topic_tools-1.15.13.ebuild 896 BLAKE2B ada9b57381ae080c76f775cb7d24cb659ac741ae073a3b92b76e8a828bf7c1bc3dc007ff44103b72aaad2c615a0234d9dd0a6386f1695e90c4ab7b1fdfdae42f SHA512 08d06c91cc8136049f47c17df3217ae3dfbf56aec73008ba20a98c991617ef5ac19ce533ecab2de0b05a2834d989dcca9ca78ff7dd97dd52bd88c681a9d20444
-EBUILD topic_tools-1.15.14.ebuild 896 BLAKE2B dccf32299ef64da19cb1f30231143eefe2f5bf0432d08f30ba6e9e1fd1ba225854207595fb57db9d5c77840ce2beabc5c0849612770aa41fbf86ee209eee8a9c SHA512 4a1f86e2de204d05def83d92f6a66df6ea64b0c7e3eb8bd2b0d6fd9da28f2115f08070425e30587a3693d8d259ac3d01d3e1b3e42ea99b7d9a934ed23aaeb313
-EBUILD topic_tools-9999.ebuild 896 BLAKE2B ada9b57381ae080c76f775cb7d24cb659ac741ae073a3b92b76e8a828bf7c1bc3dc007ff44103b72aaad2c615a0234d9dd0a6386f1695e90c4ab7b1fdfdae42f SHA512 08d06c91cc8136049f47c17df3217ae3dfbf56aec73008ba20a98c991617ef5ac19ce533ecab2de0b05a2834d989dcca9ca78ff7dd97dd52bd88c681a9d20444
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/topic_tools/metadata.xml b/dev-ros/topic_tools/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/topic_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/topic_tools/topic_tools-1.15.11.ebuild b/dev-ros/topic_tools/topic_tools-1.15.11.ebuild
deleted file mode 100644
index d5d3a70a1518..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.15.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/topic_tools/topic_tools-1.15.13.ebuild b/dev-ros/topic_tools/topic_tools-1.15.13.ebuild
deleted file mode 100644
index d5d3a70a1518..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.15.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/topic_tools/topic_tools-1.15.14.ebuild b/dev-ros/topic_tools/topic_tools-1.15.14.ebuild
deleted file mode 100644
index e11896922fa9..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.15.14.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/topic_tools/topic_tools-9999.ebuild b/dev-ros/topic_tools/topic_tools-9999.ebuild
deleted file mode 100644
index d5d3a70a1518..000000000000
--- a/dev-ros/topic_tools/topic_tools-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/trajectory_msgs/Manifest b/dev-ros/trajectory_msgs/Manifest
deleted file mode 100644
index 82129a06cc43..000000000000
--- a/dev-ros/trajectory_msgs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD trajectory_msgs-1.13.0.ebuild 438 BLAKE2B 34903f79dec266fa8866558b9b48061b9438cef551dcd8d9509a7e6b1ac5f790d8920df7ff0afe8e10aa81278ce3b112eaede77de8507df046eece1c01ab0cc5 SHA512 77e99f8383ad913ed10dbb42a339828eda78fb433882e816cefabb1b03dc4011e89ff8b8dfa756209e44aa4b0764b6697be9621a7c5951cfed1b33a88c1b7970
-EBUILD trajectory_msgs-1.13.1.ebuild 438 BLAKE2B c9e3cf28dc88d096a8785513c91d2681c1e412cdc6eaac4e3252cebb561122ca7c9e0793cb6bf8c27e98bb5e1d58619779706aba3a1923af4e0a4766d8115b09 SHA512 b18a549203320499654e4391fe57bbf1e5c369a4e382233e673ea42c3be129ff8ca2272139c16aa2e7d3fe5fdce10565f8414c733d823ce7093a83045e73f570
-EBUILD trajectory_msgs-9999.ebuild 438 BLAKE2B 34903f79dec266fa8866558b9b48061b9438cef551dcd8d9509a7e6b1ac5f790d8920df7ff0afe8e10aa81278ce3b112eaede77de8507df046eece1c01ab0cc5 SHA512 77e99f8383ad913ed10dbb42a339828eda78fb433882e816cefabb1b03dc4011e89ff8b8dfa756209e44aa4b0764b6697be9621a7c5951cfed1b33a88c1b7970
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/trajectory_msgs/metadata.xml b/dev-ros/trajectory_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/trajectory_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-1.13.0.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.13.0.ebuild
deleted file mode 100644
index 90cbd29ccbf4..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining robot trajectories"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-1.13.1.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.13.1.ebuild
deleted file mode 100644
index 77149f01e309..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining robot trajectories"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild
deleted file mode 100644
index 90cbd29ccbf4..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining robot trajectories"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/transmission_interface/Manifest b/dev-ros/transmission_interface/Manifest
deleted file mode 100644
index 44f77b62c601..000000000000
--- a/dev-ros/transmission_interface/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
-EBUILD transmission_interface-0.19.1.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
-EBUILD transmission_interface-0.19.2.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
-EBUILD transmission_interface-0.19.3.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
-EBUILD transmission_interface-0.19.4.ebuild 693 BLAKE2B 7bc97259441054d58c554ad12d24e47d84e7a998b4d5a938ee444620c4034c1c607b0b1e6843aed82d76eb2ec701889ffc00babd0cd7101b4b2fefb1a3a35142 SHA512 c36a887ee7a82ac3b282d06e3a87ff0252e41fdecb8ed3ac134af45360bccf50c87a9b2aef379e6d7a5710babb56065398521b74cf497f26f2fc16597f3d8f9f
-EBUILD transmission_interface-0.19.5.ebuild 693 BLAKE2B 7bc97259441054d58c554ad12d24e47d84e7a998b4d5a938ee444620c4034c1c607b0b1e6843aed82d76eb2ec701889ffc00babd0cd7101b4b2fefb1a3a35142 SHA512 c36a887ee7a82ac3b282d06e3a87ff0252e41fdecb8ed3ac134af45360bccf50c87a9b2aef379e6d7a5710babb56065398521b74cf497f26f2fc16597f3d8f9f
-EBUILD transmission_interface-9999.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
-MISC metadata.xml 339 BLAKE2B e6fefc73bff9617071ddde45bc4b7f1a58faa466d186a47a323e339ee0c7698499126b2d2e552192502fd52d3c9ee4f6d442b0c09ca590703952bfc45b78e5fd SHA512 f8306e30cce34842ff264b89b656048ec1108aed2aa1f846854c697cebec4c6bb42f544ef8f0908f976b7374eb228a25287cd02d92dde54ba75d13227afd71fc
diff --git a/dev-ros/transmission_interface/metadata.xml b/dev-ros/transmission_interface/metadata.xml
deleted file mode 100644
index 0acb45192a07..000000000000
--- a/dev-ros/transmission_interface/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-controls/ros_control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild
deleted file mode 100644
index eeacb3a95b5b..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-libs/tinyxml
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.2.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.2.ebuild
deleted file mode 100644
index eeacb3a95b5b..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.19.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-libs/tinyxml
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.3.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.3.ebuild
deleted file mode 100644
index eeacb3a95b5b..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.19.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-libs/tinyxml
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.4.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.4.ebuild
deleted file mode 100644
index 92d38e504c33..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.19.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-libs/tinyxml
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.5.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.5.ebuild
deleted file mode 100644
index 92d38e504c33..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.19.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-libs/tinyxml
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/transmission_interface/transmission_interface-9999.ebuild b/dev-ros/transmission_interface/transmission_interface-9999.ebuild
deleted file mode 100644
index eeacb3a95b5b..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transmission Interface"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hardware_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-libs/tinyxml
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/turtle_actionlib/Manifest b/dev-ros/turtle_actionlib/Manifest
deleted file mode 100644
index 9b0f9e1727fa..000000000000
--- a/dev-ros/turtle_actionlib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST common_tutorials-0.2.0.tar.gz 12624 BLAKE2B 051e8e980e23dc2ecac2bfb534a8d820b2d2ee3d84b7e42e7ebc538e82560a7ea7e84972a6d6ab5f0c441eba7cf8c7aa2b3b5aced00f73ffc0f0537a3df0c547 SHA512 a3f537199c3ed143ef6c44edaf3fe427374027ed33478f9d440adc62697ace7e69c09cc5b5cacc76d2062eabc32138cbb08314dfd3d4af6f45f0147cb39bf2d9
-EBUILD turtle_actionlib-0.2.0-r1.ebuild 605 BLAKE2B fa15d4616ac1a1a2a6c9d9fc9278c03ac48a9d216802d269d27c85889dbf180cb30af6d24d69abc5f56656282c92feb1e2a142772185c9c259417bba74c95bb9 SHA512 16248edbd71773b5e5f5762ca8133e11f20740803081c6cb7c24eae681bb3c337092f490935d803d2d836eb94512a5f339008d617a8acf0cbdea274ad9b555d2
-EBUILD turtle_actionlib-9999.ebuild 605 BLAKE2B fa15d4616ac1a1a2a6c9d9fc9278c03ac48a9d216802d269d27c85889dbf180cb30af6d24d69abc5f56656282c92feb1e2a142772185c9c259417bba74c95bb9 SHA512 16248edbd71773b5e5f5762ca8133e11f20740803081c6cb7c24eae681bb3c337092f490935d803d2d836eb94512a5f339008d617a8acf0cbdea274ad9b555d2
-MISC metadata.xml 335 BLAKE2B a0188a143e0644b95b351037361ac43ba5392f4b919132542a72b35240697f665230056bdbcbb7ac72aaa83ad927d7dc6a476102a07ad0ccb321ba4f757b712c SHA512 e6e7a5d1e1ca928bcd3e14aa935369bd95f3d54811bde7df12e5878cd489a9d12b0f36c6294768e62286fdefd65109f100a46b7f10a4cc1cc2515b95733af841
diff --git a/dev-ros/turtle_actionlib/metadata.xml b/dev-ros/turtle_actionlib/metadata.xml
deleted file mode 100644
index 18730473acf0..000000000000
--- a/dev-ros/turtle_actionlib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.2.0-r1.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.2.0-r1.ebuild
deleted file mode 100644
index 21f40653b5e4..000000000000
--- a/dev-ros/turtle_actionlib/turtle_actionlib-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write an action server and client with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	dev-ros/actionlib_msgs
-	dev-ros/angles:0
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/turtlesim
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild
deleted file mode 100644
index 21f40653b5e4..000000000000
--- a/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write an action server and client with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	dev-ros/actionlib_msgs
-	dev-ros/angles:0
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/turtlesim
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf/Manifest b/dev-ros/turtle_tf/Manifest
deleted file mode 100644
index dc016d6e37d3..000000000000
--- a/dev-ros/turtle_tf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST geometry_tutorials-0.2.3.tar.gz 16105 BLAKE2B 331e9d3f156610ef62242d4ade54c5b5e7b688ca6299e0b3d1bc8f9ceaed66e97df609e595d8c8d83b0a281e403f5f20434e990553f1391d39d85348df397fa8 SHA512 3dbc22f50abf790340711cd7f297c2fb9561bb0f1037cf8988b8304f3f862eb66cb07604b571cb7d2acaba04aba567b903a578998a5ff18673c125b337c9d635
-EBUILD turtle_tf-0.2.3.ebuild 647 BLAKE2B dfc787a8486998f36d144d21df2da1d370896ebbf1a6b85131203a10698930725cbf9f9668c5d8ed618a131ce3c960c9d9adf7fc1a0c1d6d6f9e555652d2b0f0 SHA512 9513aa11640eeebed7d7e6fef2bc2f61eacd4d70e0337aea127a0ef28603bb18f658b897a353f056c22ef4a3da54c6cdc9cb94679f24d46370739855fd9aeae7
-EBUILD turtle_tf-9999.ebuild 647 BLAKE2B dfc787a8486998f36d144d21df2da1d370896ebbf1a6b85131203a10698930725cbf9f9668c5d8ed618a131ce3c960c9d9adf7fc1a0c1d6d6f9e555652d2b0f0 SHA512 9513aa11640eeebed7d7e6fef2bc2f61eacd4d70e0337aea127a0ef28603bb18f658b897a353f056c22ef4a3da54c6cdc9cb94679f24d46370739855fd9aeae7
-MISC metadata.xml 337 BLAKE2B 715f0d08c1c7f779b140bb6d10fe0f03266901f0bc1e5720070ca3ceaa208bdc6305ada0f54fafc0d7653db5a5c1bcdc21a2f377b5215db4e5348b67175fe163 SHA512 4ef1d852cf68a3f4ec154b57ad05fb7cb00f7c654da060cfb56be921d710392b3df343683e346c9a2d4912066abfd645d3aa7fbb73f6cc80e69b9f40d2efb160
diff --git a/dev-ros/turtle_tf/metadata.xml b/dev-ros/turtle_tf/metadata.xml
deleted file mode 100644
index bea6a2615ec7..000000000000
--- a/dev-ros/turtle_tf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/turtle_tf/turtle_tf-0.2.3.ebuild b/dev-ros/turtle_tf/turtle_tf-0.2.3.ebuild
deleted file mode 100644
index 3435ed62c77e..000000000000
--- a/dev-ros/turtle_tf/turtle_tf-0.2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write a tf broadcaster and listener with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf/turtle_tf-9999.ebuild b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
deleted file mode 100644
index 3435ed62c77e..000000000000
--- a/dev-ros/turtle_tf/turtle_tf-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write a tf broadcaster and listener with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/Manifest b/dev-ros/turtle_tf2/Manifest
deleted file mode 100644
index f7dc500b6473..000000000000
--- a/dev-ros/turtle_tf2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST geometry_tutorials-0.2.3.tar.gz 16105 BLAKE2B 331e9d3f156610ef62242d4ade54c5b5e7b688ca6299e0b3d1bc8f9ceaed66e97df609e595d8c8d83b0a281e403f5f20434e990553f1391d39d85348df397fa8 SHA512 3dbc22f50abf790340711cd7f297c2fb9561bb0f1037cf8988b8304f3f862eb66cb07604b571cb7d2acaba04aba567b903a578998a5ff18673c125b337c9d635
-EBUILD turtle_tf2-0.2.3.ebuild 727 BLAKE2B 59ccaa041cf829840b8d20b79a4ec9f0835bdded9481552be8cbf3cefe7d7ac61977dc2312bb062ac3c0e8a997c71327dfe246de1642f04f4a3f389ea00a3a70 SHA512 e1fe98d1650d27903d0831ede09c5074dd937e36ae05eec4feae90d3a3962cbe0c80341a74e702919b75c05193c13976dd35dc5cd24347850232cb511e1f861b
-EBUILD turtle_tf2-9999.ebuild 727 BLAKE2B 59ccaa041cf829840b8d20b79a4ec9f0835bdded9481552be8cbf3cefe7d7ac61977dc2312bb062ac3c0e8a997c71327dfe246de1642f04f4a3f389ea00a3a70 SHA512 e1fe98d1650d27903d0831ede09c5074dd937e36ae05eec4feae90d3a3962cbe0c80341a74e702919b75c05193c13976dd35dc5cd24347850232cb511e1f861b
-MISC metadata.xml 337 BLAKE2B 715f0d08c1c7f779b140bb6d10fe0f03266901f0bc1e5720070ca3ceaa208bdc6305ada0f54fafc0d7653db5a5c1bcdc21a2f377b5215db4e5348b67175fe163 SHA512 4ef1d852cf68a3f4ec154b57ad05fb7cb00f7c654da060cfb56be921d710392b3df343683e346c9a2d4912066abfd645d3aa7fbb73f6cc80e69b9f40d2efb160
diff --git a/dev-ros/turtle_tf2/metadata.xml b/dev-ros/turtle_tf2/metadata.xml
deleted file mode 100644
index bea6a2615ec7..000000000000
--- a/dev-ros/turtle_tf2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/geometry_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/turtle_tf2/turtle_tf2-0.2.3.ebuild b/dev-ros/turtle_tf2/turtle_tf2-0.2.3.ebuild
deleted file mode 100644
index 2726f4e96371..000000000000
--- a/dev-ros/turtle_tf2/turtle_tf2-0.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write a tf2 broadcaster and listener with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
deleted file mode 100644
index 2726f4e96371..000000000000
--- a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write a tf2 broadcaster and listener with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtlesim/Manifest b/dev-ros/turtlesim/Manifest
deleted file mode 100644
index d50035669680..000000000000
--- a/dev-ros/turtlesim/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ros_tutorials-0.10.1.tar.gz 159522 BLAKE2B b0e045c6ee62cb68dfa977d17125af23d8ef80a619e822d245531a6cb3520a4d53120769e74ae2ba9af2813ce968e0c4fb22b7655eadd13b1a720705a9f75374 SHA512 592edb84f2e0ea80b2757ae890f495e8cb93d867b1bc6d64e6446f28fcffbd48c05703ac30ac29fd184a689f465728a5958d8c747587c756b53341c1d0740684
-DIST ros_tutorials-0.10.2.tar.gz 159630 BLAKE2B 6b7ea4c0aba110b746052a42150dd4e9faedbb1e4ab5a44bbef7c1079192238ac22bb18fc9968ea9e4450dde47bf1f5b7dabc0788aa8c232dfef3d1039a63f2e SHA512 73b420acf20a468f51db891fe0b0b33c3c838ea6fab4c03faab9a7abedc3ee68ec27ef0e70869143d0a22941eb77bac1fc80542cc0c14988ff75cb9685c174c5
-EBUILD turtlesim-0.10.1-r1.ebuild 735 BLAKE2B 0571b13ae42fb94d702504bd5aa60a7a32635a32bd42472ca8d709df418713f5a5dd87420c521f6c0c6c669dd2be379e81daaff935e9ce3f17705b620162a938 SHA512 2ca32b81e2d655cf245a87e8be8109a221600f6e9c66536c25ffdc3cd0b1f790bde7a3143f25bcbd18d3fb3dcfda425c1e7d646901f2740a8a1ef00a9e53f468
-EBUILD turtlesim-0.10.2-r1.ebuild 735 BLAKE2B 0571b13ae42fb94d702504bd5aa60a7a32635a32bd42472ca8d709df418713f5a5dd87420c521f6c0c6c669dd2be379e81daaff935e9ce3f17705b620162a938 SHA512 2ca32b81e2d655cf245a87e8be8109a221600f6e9c66536c25ffdc3cd0b1f790bde7a3143f25bcbd18d3fb3dcfda425c1e7d646901f2740a8a1ef00a9e53f468
-EBUILD turtlesim-9999.ebuild 735 BLAKE2B 0571b13ae42fb94d702504bd5aa60a7a32635a32bd42472ca8d709df418713f5a5dd87420c521f6c0c6c669dd2be379e81daaff935e9ce3f17705b620162a938 SHA512 2ca32b81e2d655cf245a87e8be8109a221600f6e9c66536c25ffdc3cd0b1f790bde7a3143f25bcbd18d3fb3dcfda425c1e7d646901f2740a8a1ef00a9e53f468
-MISC metadata.xml 332 BLAKE2B 16b962550ae20fa64a58582eaf57a1abd6304a2708e2539dbc4b8b1f6ba0464b40141742e6768a87a2bf2929a2b84f6baec920e44fb33b04d7e1748acd70bfcc SHA512 44c4d51343043fcf48606163b7f3e5b84465df928b12df089015f638552a49223787ff906f5754347aadac6a802a3201e2a7e1af793b0b8d5ad0003c6f121882
diff --git a/dev-ros/turtlesim/metadata.xml b/dev-ros/turtlesim/metadata.xml
deleted file mode 100644
index 33597496d65f..000000000000
--- a/dev-ros/turtlesim/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/turtlesim/turtlesim-0.10.1-r1.ebuild b/dev-ros/turtlesim/turtlesim-0.10.1-r1.ebuild
deleted file mode 100644
index 0e9deeacfe70..000000000000
--- a/dev-ros/turtlesim/turtlesim-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tool made for teaching ROS and ROS packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/roslib
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/turtlesim/turtlesim-0.10.2-r1.ebuild b/dev-ros/turtlesim/turtlesim-0.10.2-r1.ebuild
deleted file mode 100644
index 0e9deeacfe70..000000000000
--- a/dev-ros/turtlesim/turtlesim-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tool made for teaching ROS and ROS packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/roslib
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/turtlesim/turtlesim-9999.ebuild b/dev-ros/turtlesim/turtlesim-9999.ebuild
deleted file mode 100644
index 0e9deeacfe70..000000000000
--- a/dev-ros/turtlesim/turtlesim-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tool made for teaching ROS and ROS packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-	dev-ros/roslib
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/unique_id/Manifest b/dev-ros/unique_id/Manifest
deleted file mode 100644
index 9461213ba782..000000000000
--- a/dev-ros/unique_id/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX tests.patch 644 BLAKE2B bbe5ff5cc6e7a514475500e3460f438db5eaeefa84f2c0569561e396eb9f04644c2380668a1ca7c317c0f28db9d5b47fcaa283362d1f0fb3fd1b1cdc6770102f SHA512 fbcb1a7a515a3832b3d86e045953e3809811daddb83bdbed7eaf7528ce5afd148f0fbfc5cb4aea458ac5e8852ef9dcdf614128d04523c5a6f73a9a9538640a53
-DIST unique_identifier-1.0.6.tar.gz 12305 BLAKE2B 3aa8ba6a7386588f56546e42efd61cc52a6a7c44444462c55f26830e162eafbc49a7aaca2315d965d75f8f0151467147af7db8a0fbe96def66c33e81371e069c SHA512 d81409786a311fd1d23937fd24bf0365920f6b9cd7b4ba9803935844c0dab0a1765b2790f88673fe8fffea70ff13161ddadc7644bc8d39e3f0c255007b267156
-EBUILD unique_id-1.0.6.ebuild 944 BLAKE2B a60ff413935866b3054b3ee9bcb07f3b0b37a3490ac6720a4cf1b8a45fb824560b3a910f2791799a9b2504022f89039513de0d6d8bde8aa342729f6d70225d5f SHA512 94e7630018ebafd9a4ce68b0f365e92169d8929b052dfc11e56a6598f530cf0c06dc0ad5d9798d7f62a27b283009af4aec887c4a8f789923ffa2568c6c1af020
-EBUILD unique_id-9999.ebuild 944 BLAKE2B a60ff413935866b3054b3ee9bcb07f3b0b37a3490ac6720a4cf1b8a45fb824560b3a910f2791799a9b2504022f89039513de0d6d8bde8aa342729f6d70225d5f SHA512 94e7630018ebafd9a4ce68b0f365e92169d8929b052dfc11e56a6598f530cf0c06dc0ad5d9798d7f62a27b283009af4aec887c4a8f789923ffa2568c6c1af020
-MISC metadata.xml 352 BLAKE2B c5f0fa1bd0f710827610c87abd68d3f390b8b36a32ba4e17489d61f379f556140019ec03b9c829e8e2fa5bc181b1f0cf26b00bea20f7821988674368b2031938 SHA512 ef486232f122be910050a9e3b77326ec149b61d707e3eda1d39ed7e048e1d9b04752e43e0ae53b1ad8ee8b9de01a97042390526c3ea8292d75f120ba9f1d05fb
diff --git a/dev-ros/unique_id/files/tests.patch b/dev-ros/unique_id/files/tests.patch
deleted file mode 100644
index b64a1be5e38b..000000000000
--- a/dev-ros/unique_id/files/tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: unique_id/tests/test_unique_id.py
-===================================================================
---- unique_id.orig/tests/test_unique_id.py
-+++ unique_id/tests/test_unique_id.py
-@@ -20,10 +20,10 @@ class TestPythonUUID(unittest.TestCase):
-     def test_random_uuids(self):
-         N = 1000
-         uu = []
--        for i in xrange(N):
-+        for i in range(N):
-             uu.append(fromRandom())
-             self.assertEqual(type(uu[i]), uuid.UUID)
--            for j in xrange(i-1, -1, -1):
-+            for j in range(i-1, -1, -1):
-                 self.assertNotEqual(uu[i], uu[j])
- 
-     # UUID generation from URL tests
diff --git a/dev-ros/unique_id/metadata.xml b/dev-ros/unique_id/metadata.xml
deleted file mode 100644
index 1176d94b88cc..000000000000
--- a/dev-ros/unique_id/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/unique_id/unique_id-1.0.6.ebuild b/dev-ros/unique_id/unique_id-1.0.6.ebuild
deleted file mode 100644
index 32432dfa5632..000000000000
--- a/dev-ros/unique_id/unique_id-1.0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-geographic-info/unique_identifier"
-VER_PREFIX=unique_identifier-
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Python and C++ interfaces for universally unique identifiers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	# Those tests fail and are commented as undefined behavior in the code
-	export GTEST_FILTER='-BoostUUID.fromUrnString:BoostUUID.fromTooLongString:BoostUUID2.fromUrnString:BoostUUID2.fromTooLongString'
-	ros-catkin_src_test
-}
diff --git a/dev-ros/unique_id/unique_id-9999.ebuild b/dev-ros/unique_id/unique_id-9999.ebuild
deleted file mode 100644
index 32432dfa5632..000000000000
--- a/dev-ros/unique_id/unique_id-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-geographic-info/unique_identifier"
-VER_PREFIX=unique_identifier-
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Python and C++ interfaces for universally unique identifiers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	# Those tests fail and are commented as undefined behavior in the code
-	export GTEST_FILTER='-BoostUUID.fromUrnString:BoostUUID.fromTooLongString:BoostUUID2.fromUrnString:BoostUUID2.fromTooLongString'
-	ros-catkin_src_test
-}
diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
deleted file mode 100644
index a1f5ae9f922e..000000000000
--- a/dev-ros/urdf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST urdf-1.13.2.tar.gz 43588 BLAKE2B f3e97170e1930361803be2c86322ab95b62bca519127bdc3ad73065d764eaca87c2790fc1d4823e53167c853c164fc1020e1f208b6e5af025b1bb96cc0420dc2 SHA512 d22e8a647a701ff18a446d9d92511a01266b8a34c11f9f238bbc79373fa3849ebc3a11a56fea7beb4a41f893ffa30ddd5e3a6361751a6d720de6be6c6184fe41
-EBUILD urdf-1.13.2-r3.ebuild 761 BLAKE2B c21608c0e20141d8d28f6c8ce16e3fc06d1a3fe8f57838f79bd8883bbae08d970c71c854f881ea157ab7aed0d4d1dce3927e2a3037ab61fbb357dfe5ad74e9a6 SHA512 9c356fc2c09a6c0de398fde6ed1cd0e9330229caa535dc55b7ca003ccbceb644940bb1666bfcef145083436bd7d796e163d918d5a6bb0bbada209f05f959a177
-EBUILD urdf-9999.ebuild 761 BLAKE2B c21608c0e20141d8d28f6c8ce16e3fc06d1a3fe8f57838f79bd8883bbae08d970c71c854f881ea157ab7aed0d4d1dce3927e2a3037ab61fbb357dfe5ad74e9a6 SHA512 9c356fc2c09a6c0de398fde6ed1cd0e9330229caa535dc55b7ca003ccbceb644940bb1666bfcef145083436bd7d796e163d918d5a6bb0bbada209f05f959a177
-MISC metadata.xml 323 BLAKE2B e3da7b5be3eda31c2a1b6fbf7c2fbd73459d0a91d03083c1fae4ae48db17e24c5ea1526ff0ab0be47c7d2b785b392a5738c3a6792ae1776039e4fd2c527c4677 SHA512 76d44f0ff923e65928e9dd96b5e6364a3a83d3de884635d23bb63cebbdb858a19e77770740fe09b4f3b366f96bb9be5934137759b2a5af0b08bd068279af3609
diff --git a/dev-ros/urdf/metadata.xml b/dev-ros/urdf/metadata.xml
deleted file mode 100644
index 14686ad5d5a7..000000000000
--- a/dev-ros/urdf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/urdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/urdf/urdf-1.13.2-r3.ebuild b/dev-ros/urdf/urdf-1.13.2-r3.ebuild
deleted file mode 100644
index c80c4e8e0d24..000000000000
--- a/dev-ros/urdf/urdf-1.13.2-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/urdfdom-3.0.1:=
-	dev-libs/urdfdom_headers
-	dev-ros/urdf_parser_plugin
-	dev-ros/pluginlib
-	dev-ros/rosconsole_bridge
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/tinyxml
-	dev-libs/tinyxml2:=
-	dev-ros/class_loader:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/urdf/urdf-9999.ebuild b/dev-ros/urdf/urdf-9999.ebuild
deleted file mode 100644
index c80c4e8e0d24..000000000000
--- a/dev-ros/urdf/urdf-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/urdfdom-3.0.1:=
-	dev-libs/urdfdom_headers
-	dev-ros/urdf_parser_plugin
-	dev-ros/pluginlib
-	dev-ros/rosconsole_bridge
-		dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-libs/tinyxml
-	dev-libs/tinyxml2:=
-	dev-ros/class_loader:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] dev-cpp/gtest )"
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/urdf_parser_plugin/Manifest b/dev-ros/urdf_parser_plugin/Manifest
deleted file mode 100644
index a814cbfb28dc..000000000000
--- a/dev-ros/urdf_parser_plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST urdf-1.13.2.tar.gz 43588 BLAKE2B f3e97170e1930361803be2c86322ab95b62bca519127bdc3ad73065d764eaca87c2790fc1d4823e53167c853c164fc1020e1f208b6e5af025b1bb96cc0420dc2 SHA512 d22e8a647a701ff18a446d9d92511a01266b8a34c11f9f238bbc79373fa3849ebc3a11a56fea7beb4a41f893ffa30ddd5e3a6361751a6d720de6be6c6184fe41
-EBUILD urdf_parser_plugin-1.13.2.ebuild 349 BLAKE2B 5053898ad6814a286526be45e4e6fba56df3358bbfe5dba23721bb39675a6e0d9a39dd8be9ed4cc63187a7b0bd521e3bd185646e47b1fc483fe7fc500a2136c8 SHA512 8cb31ad4ae397d1eb6317004555ff290e40e7feac53f77574675eba5e02cfb57fb5c799e599c28abf5033726c63f672eba9ff8959b1e63132b3daa04769634db
-EBUILD urdf_parser_plugin-9999.ebuild 349 BLAKE2B 5053898ad6814a286526be45e4e6fba56df3358bbfe5dba23721bb39675a6e0d9a39dd8be9ed4cc63187a7b0bd521e3bd185646e47b1fc483fe7fc500a2136c8 SHA512 8cb31ad4ae397d1eb6317004555ff290e40e7feac53f77574675eba5e02cfb57fb5c799e599c28abf5033726c63f672eba9ff8959b1e63132b3daa04769634db
-MISC metadata.xml 323 BLAKE2B e3da7b5be3eda31c2a1b6fbf7c2fbd73459d0a91d03083c1fae4ae48db17e24c5ea1526ff0ab0be47c7d2b785b392a5738c3a6792ae1776039e4fd2c527c4677 SHA512 76d44f0ff923e65928e9dd96b5e6364a3a83d3de884635d23bb63cebbdb858a19e77770740fe09b4f3b366f96bb9be5934137759b2a5af0b08bd068279af3609
diff --git a/dev-ros/urdf_parser_plugin/metadata.xml b/dev-ros/urdf_parser_plugin/metadata.xml
deleted file mode 100644
index 14686ad5d5a7..000000000000
--- a/dev-ros/urdf_parser_plugin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/urdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.2.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.2.ebuild
deleted file mode 100644
index ef001155f19c..000000000000
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ base class for URDF parsers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/urdfdom_headers"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild
deleted file mode 100644
index ef001155f19c..000000000000
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ base class for URDF parsers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/urdfdom_headers"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/urdf_tutorial/Manifest b/dev-ros/urdf_tutorial/Manifest
deleted file mode 100644
index 2d4cef23ff50..000000000000
--- a/dev-ros/urdf_tutorial/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST urdf_tutorial-0.5.0.tar.gz 865623 BLAKE2B 15a8337ba15c7e94a661c72a562ab4a31ca470d5d2c995aecddea69611616a2671809e085aac2857d9d2a298d92f1b5d52c11859d39c41508d7927b3d18e9607 SHA512 70390e767d7b1ace1e52d5e78b0b6775800fdc5e12d52e56603505276a9da14204bb58d680e1d9748530d0821e082c772c948947554bf48c1a9cba814495e8ed
-EBUILD urdf_tutorial-0.5.0.ebuild 491 BLAKE2B 3244aac95cc7de1aa427a626ccbe3a99ab5eb16ccaa4aab2ec03c4684364cef9937229eef088d3271f351257245556b9044ef7588e58bc5c6afd9739c687a14d SHA512 c3826f7e80abac1f64f02a3d5a392b4bc9193106b2f804a4797f5bbda72ec3c0e28422e0c2c9554ee108a9967d439be1630407eb5dbcb1827a9e5044bb1a9362
-EBUILD urdf_tutorial-9999.ebuild 491 BLAKE2B 3244aac95cc7de1aa427a626ccbe3a99ab5eb16ccaa4aab2ec03c4684364cef9937229eef088d3271f351257245556b9044ef7588e58bc5c6afd9739c687a14d SHA512 c3826f7e80abac1f64f02a3d5a392b4bc9193106b2f804a4797f5bbda72ec3c0e28422e0c2c9554ee108a9967d439be1630407eb5dbcb1827a9e5044bb1a9362
-MISC metadata.xml 332 BLAKE2B 2bc2b6c08527729386cb10b8fb1776dbf67849586aad9650b76979e0ab4557f0028aea2ee049e3817a90f4a71e37ee2f48ea0c50a08435ef12064acb54cdd23a SHA512 0cdaa61853b2bf299c9f5e2f0c859ae77657c2e141635e6bcf022a274b6f97be053dce9af279a71f499de5a72fa07600354192d887698bb59c4302e05b72b541
diff --git a/dev-ros/urdf_tutorial/metadata.xml b/dev-ros/urdf_tutorial/metadata.xml
deleted file mode 100644
index 63865e19f1af..000000000000
--- a/dev-ros/urdf_tutorial/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/urdf_tutorial</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild
deleted file mode 100644
index eb0fb1a2bf27..000000000000
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="URDF tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/urdf
-	dev-ros/joint_state_publisher
-	dev-ros/joint_state_publisher_gui
-	dev-ros/robot_state_publisher
-	dev-ros/rviz
-	dev-ros/xacro
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}] )
-"
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
deleted file mode 100644
index eb0fb1a2bf27..000000000000
--- a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="URDF tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/urdf
-	dev-ros/joint_state_publisher
-	dev-ros/joint_state_publisher_gui
-	dev-ros/robot_state_publisher
-	dev-ros/rviz
-	dev-ros/xacro
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}] )
-"
diff --git a/dev-ros/urg_c/Manifest b/dev-ros/urg_c/Manifest
deleted file mode 100644
index 0ae13790530a..000000000000
--- a/dev-ros/urg_c/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST urg_c-1.0.405.tar.gz 106200 BLAKE2B 58092c8734db5ff0b63588b8a72bf9bc982ab96781b1a91b69038a50d47059169827bf9c48c6c440db3060f6de3633ce70a035f71c1b781fe5241d301075e55a SHA512 08e07c95c93c4793a14b9794d51ec351c64f17ecb1cdc75fd35e6c08d8c3b445e3c919c38ec915e461dbf06dad0976d80995a967e1884b9ab5854715f5f9f425
-EBUILD urg_c-1.0.405.ebuild 321 BLAKE2B 8517e389029b79563976c9f6c73eed40c9d9912a42b114d8c9fc7d79ee9d4ff9a1152e2113a212a6f10b21b4ba980a0e8b4bdb15516832736063c20f6f209bb5 SHA512 e68eb8b4b4038b1ae1147787e481d575a1514d3f65a858ff7019d1dfc3194c82ea23bdd509e11c652391488f59e5e88c64035d11b5be3093c117e601e066d792
-EBUILD urg_c-9999.ebuild 321 BLAKE2B 8517e389029b79563976c9f6c73eed40c9d9912a42b114d8c9fc7d79ee9d4ff9a1152e2113a212a6f10b21b4ba980a0e8b4bdb15516832736063c20f6f209bb5 SHA512 e68eb8b4b4038b1ae1147787e481d575a1514d3f65a858ff7019d1dfc3194c82ea23bdd509e11c652391488f59e5e88c64035d11b5be3093c117e601e066d792
-MISC metadata.xml 332 BLAKE2B 429edee9bb4552a3a7bb929b4835cd1e628dfc20d71d255463ed23daa72519a4ba14f450943a875a6068fc907287c3a5031227886c521d940fbf9ab527e0ae74 SHA512 a5f01af3e18363815f4ab9c36a6f34dc33dfc0891bf3464f0f596ff2621d6d412d881d4c961bfb8e1dfce2dad07fd9ffa6acc3c233b7848bbfb260fac21d2ba8
diff --git a/dev-ros/urg_c/metadata.xml b/dev-ros/urg_c/metadata.xml
deleted file mode 100644
index a0f4fc12c5b2..000000000000
--- a/dev-ros/urg_c/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/urg_c</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/urg_c/urg_c-1.0.405.ebuild b/dev-ros/urg_c/urg_c-1.0.405.ebuild
deleted file mode 100644
index f17b499fdaab..000000000000
--- a/dev-ros/urg_c/urg_c-1.0.405.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/urg_c"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="URG Helper / URG Widget / URG Library / urg_c"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-ros/urg_c/urg_c-9999.ebuild b/dev-ros/urg_c/urg_c-9999.ebuild
deleted file mode 100644
index f17b499fdaab..000000000000
--- a/dev-ros/urg_c/urg_c-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/urg_c"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="URG Helper / URG Widget / URG Library / urg_c"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest
deleted file mode 100644
index afa918a56243..000000000000
--- a/dev-ros/urg_node/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST urg_node-0.1.15.tar.gz 21048 BLAKE2B 1a4db87f40e7f895c5e56d3ea5fa1457dd47ce84dd3a5cf18973a8d246e5e86d6c0492a74b43e3407c54415d6dce61dd696c953328997290ab4ceb26c2135e2c SHA512 df505f6ad1a5ff088870a5bc85cc59e96a19a60be63b278d55a048cb812f49e30be2f7dbaff74aab52863598180dfce3f411cbf09ad5f54f130fce9992baeb87
-EBUILD urg_node-0.1.15.ebuild 770 BLAKE2B 79c4aec001214a5588a806582308f18cdb66cc981490340086129e58caf858c2b37ad0a0646eb8ed4074b9ac8226447fe756beae02ec4fd439b9ee4bf6b0aa4d SHA512 c8bd72e192dbb407ecb3c9cc595617ac1bfdb93649d63bcb890f012e548b542de894c137ed0d6282c70d7ad2d830ed1e5bd5f89ac870b7e40719d9e9f27d4576
-EBUILD urg_node-9999.ebuild 770 BLAKE2B 79c4aec001214a5588a806582308f18cdb66cc981490340086129e58caf858c2b37ad0a0646eb8ed4074b9ac8226447fe756beae02ec4fd439b9ee4bf6b0aa4d SHA512 c8bd72e192dbb407ecb3c9cc595617ac1bfdb93649d63bcb890f012e548b542de894c137ed0d6282c70d7ad2d830ed1e5bd5f89ac870b7e40719d9e9f27d4576
-MISC metadata.xml 335 BLAKE2B 8e08edb6f0a5a139d8529a4661a0c48d0c641e93980324a4a9ff40aa82562cfcbb54c09646d5aaca022bbcfeeb9240f1ab83cb20126fb834baeef80100e4521f SHA512 e7b018e3e01253bee3e70cb6efe08e6a4479ecaca842aed34ff86ffb5846724d171620948acc23c434115cc54037b45f1664099e6d7dea375bc313a10c61ba42
diff --git a/dev-ros/urg_node/metadata.xml b/dev-ros/urg_node/metadata.xml
deleted file mode 100644
index 615946d581de..000000000000
--- a/dev-ros/urg_node/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/urg_node</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/urg_node/urg_node-0.1.15.ebuild b/dev-ros/urg_node/urg_node-0.1.15.ebuild
deleted file mode 100644
index 0b173d1c9c2f..000000000000
--- a/dev-ros/urg_node/urg_node-0.1.15.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-drivers/urg_node"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-
-# https://bugs.gentoo.org/735106
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for the Hokuyo urg_c library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/urg_c
-	dev-ros/tf
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/diagnostic_updater
-	dev-ros/laser_proc
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/roslint
-		dev-ros/roslaunch
-	)
-"
diff --git a/dev-ros/urg_node/urg_node-9999.ebuild b/dev-ros/urg_node/urg_node-9999.ebuild
deleted file mode 100644
index 0b173d1c9c2f..000000000000
--- a/dev-ros/urg_node/urg_node-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-drivers/urg_node"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-
-# https://bugs.gentoo.org/735106
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for the Hokuyo urg_c library"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/urg_c
-	dev-ros/tf
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/diagnostic_updater
-	dev-ros/laser_proc
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/roslint
-		dev-ros/roslaunch
-	)
-"
diff --git a/dev-ros/uuid_msgs/Manifest b/dev-ros/uuid_msgs/Manifest
deleted file mode 100644
index 70a4eea764a0..000000000000
--- a/dev-ros/uuid_msgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST unique_identifier-1.0.6.tar.gz 12305 BLAKE2B 3aa8ba6a7386588f56546e42efd61cc52a6a7c44444462c55f26830e162eafbc49a7aaca2315d965d75f8f0151467147af7db8a0fbe96def66c33e81371e069c SHA512 d81409786a311fd1d23937fd24bf0365920f6b9cd7b4ba9803935844c0dab0a1765b2790f88673fe8fffea70ff13161ddadc7644bc8d39e3f0c255007b267156
-EBUILD uuid_msgs-1.0.6.ebuild 475 BLAKE2B 781c40fcb149f9b6f9e24ec0b6c1d66b81a595253ad57d3315c673a735f4df4f485486d407d0ff979282757e0f9577dd91b2cb7116d028a13092644a4a787a54 SHA512 a2c1195973cb5f8310dd54f49a08a0fa2807e22bdfd4bbc7656e45a624ee1a1c70b7a9c3d206811e70ac5c82ccd2cfcfc048854848a056e2fdef278dbf254646
-EBUILD uuid_msgs-9999.ebuild 475 BLAKE2B 781c40fcb149f9b6f9e24ec0b6c1d66b81a595253ad57d3315c673a735f4df4f485486d407d0ff979282757e0f9577dd91b2cb7116d028a13092644a4a787a54 SHA512 a2c1195973cb5f8310dd54f49a08a0fa2807e22bdfd4bbc7656e45a624ee1a1c70b7a9c3d206811e70ac5c82ccd2cfcfc048854848a056e2fdef278dbf254646
-MISC metadata.xml 352 BLAKE2B c5f0fa1bd0f710827610c87abd68d3f390b8b36a32ba4e17489d61f379f556140019ec03b9c829e8e2fa5bc181b1f0cf26b00bea20f7821988674368b2031938 SHA512 ef486232f122be910050a9e3b77326ec149b61d707e3eda1d39ed7e048e1d9b04752e43e0ae53b1ad8ee8b9de01a97042390526c3ea8292d75f120ba9f1d05fb
diff --git a/dev-ros/uuid_msgs/metadata.xml b/dev-ros/uuid_msgs/metadata.xml
deleted file mode 100644
index 1176d94b88cc..000000000000
--- a/dev-ros/uuid_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/uuid_msgs/uuid_msgs-1.0.6.ebuild b/dev-ros/uuid_msgs/uuid_msgs-1.0.6.ebuild
deleted file mode 100644
index 46de7ab7ce7a..000000000000
--- a/dev-ros/uuid_msgs/uuid_msgs-1.0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-geographic-info/unique_identifier"
-VER_PREFIX=unique_identifier-
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS messages for universally unique identifiers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/uuid_msgs/uuid_msgs-9999.ebuild b/dev-ros/uuid_msgs/uuid_msgs-9999.ebuild
deleted file mode 100644
index 46de7ab7ce7a..000000000000
--- a/dev-ros/uuid_msgs/uuid_msgs-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-geographic-info/unique_identifier"
-VER_PREFIX=unique_identifier-
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS messages for universally unique identifiers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/visp_auto_tracker/Manifest b/dev-ros/visp_auto_tracker/Manifest
deleted file mode 100644
index bc23be44851e..000000000000
--- a/dev-ros/visp_auto_tracker/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
-DIST vision_visp-0.13.1.tar.gz 1015139 BLAKE2B 8550c32b39cb94785221d924a97795d5b865327bbb8d570131fccf91c95eaee47f242eea5826efb04b083bf467ae8400729a40cb992fe5f1e689648718958d63 SHA512 bf40f4b81a56cec1031d1d2988f6fa41b542af07b63cdd6f3994d5000f7f3e5c721580cba206918d648db5c0cfb422d06829385da94dade4b31a5e8dcf916ddb
-EBUILD visp_auto_tracker-0.12.1.ebuild 831 BLAKE2B 57c695cf0ba9a0214997333195f095dacfb4a6a2ad757a07e845eba11928015a70e272d2dfd29a7ed35962563b3cd40eff898ad3642ed4a3f87c428791f930e1 SHA512 fc180f7527a3688aad544b409f4c8aafec418ea4c27edc4aac15b9a9c9f3ac33661eb3839c27159f1581230371c4636e90b33e08f9ea76d33340b3e14f9f0159
-EBUILD visp_auto_tracker-0.13.1.ebuild 831 BLAKE2B 57c695cf0ba9a0214997333195f095dacfb4a6a2ad757a07e845eba11928015a70e272d2dfd29a7ed35962563b3cd40eff898ad3642ed4a3f87c428791f930e1 SHA512 fc180f7527a3688aad544b409f4c8aafec418ea4c27edc4aac15b9a9c9f3ac33661eb3839c27159f1581230371c4636e90b33e08f9ea76d33340b3e14f9f0159
-EBUILD visp_auto_tracker-9999.ebuild 831 BLAKE2B 57c695cf0ba9a0214997333195f095dacfb4a6a2ad757a07e845eba11928015a70e272d2dfd29a7ed35962563b3cd40eff898ad3642ed4a3f87c428791f930e1 SHA512 fc180f7527a3688aad544b409f4c8aafec418ea4c27edc4aac15b9a9c9f3ac33661eb3839c27159f1581230371c4636e90b33e08f9ea76d33340b3e14f9f0159
-MISC metadata.xml 334 BLAKE2B e801c8eb4cd9e8e9a72038c502229181950691797bf3833e43e4d48c5674c2ec65effc7790de655a4d3ffe18837fda483ace821d9dd19057f8417c856267d638 SHA512 b15aadab13b3dcf6650802c5f2ae0d512fbb18add8c2c30b2dc3eba70f0ae3092d1311426607684223d35b4e46d34b1573e07eb6eeb02f19fc19a837e29bc965
diff --git a/dev-ros/visp_auto_tracker/metadata.xml b/dev-ros/visp_auto_tracker/metadata.xml
deleted file mode 100644
index 375352ceff95..000000000000
--- a/dev-ros/visp_auto_tracker/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lagadic/vision_visp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild
deleted file mode 100644
index 0570a723d72e..000000000000
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=
-	media-libs/opencv:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.13.1.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.13.1.ebuild
deleted file mode 100644
index 0570a723d72e..000000000000
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.13.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=
-	media-libs/opencv:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
deleted file mode 100644
index 0570a723d72e..000000000000
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=
-	media-libs/opencv:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_bridge/Manifest b/dev-ros/visp_bridge/Manifest
deleted file mode 100644
index 8dd31c2df6ad..000000000000
--- a/dev-ros/visp_bridge/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX gcc6.patch 362 BLAKE2B 07aa55e77c23987add38afbb9612a4ac17d4295a51deff3986c9fa4eacf2604815d2cb654169c03c2943c7e6e0d8041ab1a3f380656643f660f176abfa347e67 SHA512 b4fc5219f35ac7ce1a81cf7b82ce0aebaef61b6e20cf42e62a1811c996dd0a68fe92dc49642ff38454c5d1f5496dbe954ba4029c93791f8ddefe71118377a03f
-DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
-DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
-DIST vision_visp-0.13.1.tar.gz 1015139 BLAKE2B 8550c32b39cb94785221d924a97795d5b865327bbb8d570131fccf91c95eaee47f242eea5826efb04b083bf467ae8400729a40cb992fe5f1e689648718958d63 SHA512 bf40f4b81a56cec1031d1d2988f6fa41b542af07b63cdd6f3994d5000f7f3e5c721580cba206918d648db5c0cfb422d06829385da94dade4b31a5e8dcf916ddb
-EBUILD visp_bridge-0.11.1.ebuild 762 BLAKE2B 5ef20780ecd532b788613af374bae30f4d80377b37b36d50a12ed4cbc95833319f86e98b6fcc0b8681bd7544a410576578bc709afe9615882d92a35640e7a5c8 SHA512 56078ac8cdae3b6bb5dabceb26576dba868f5c7f671135d0d778f145bb6112bd52b3391ed7fd79f7476996d59a4bf635474acd20f7e4bed9a5c26d06067579c4
-EBUILD visp_bridge-0.12.1.ebuild 760 BLAKE2B ddcf1687ccddff262c4d300546216ded28d23254dbcc96e599c85cb5f6bd65a7c61f1e63b5caf672294ea67553807ddec9dc3b8839c2929a45eac9c4cd286079 SHA512 13c7150afcc6f650f4e485f580635ff1195c78668f1d19c6bf307e9f0088e58e6b4477ad9054375447270ccacbf1a5ab9e0fd9bcacb50ecfbfb8b0701a8add1c
-EBUILD visp_bridge-0.13.1.ebuild 760 BLAKE2B a95aed5aa6d0244752ed0e5b29975636bba291ff963911cf4aac658c4b8ad95362690c4842f83b8b7d7467903d931fc073ee1610d0a278b6fad617fc7aed012b SHA512 98ba7237aae6e47fe0171c195dc4a9c63324171e73d57f3866c9dd0d5cfac108f467d68ed9555a15e54677cbfb08fcd239a93e2c6a49f4fcc5d7ab470cfaa64b
-EBUILD visp_bridge-9999.ebuild 760 BLAKE2B ddcf1687ccddff262c4d300546216ded28d23254dbcc96e599c85cb5f6bd65a7c61f1e63b5caf672294ea67553807ddec9dc3b8839c2929a45eac9c4cd286079 SHA512 13c7150afcc6f650f4e485f580635ff1195c78668f1d19c6bf307e9f0088e58e6b4477ad9054375447270ccacbf1a5ab9e0fd9bcacb50ecfbfb8b0701a8add1c
-MISC metadata.xml 334 BLAKE2B e801c8eb4cd9e8e9a72038c502229181950691797bf3833e43e4d48c5674c2ec65effc7790de655a4d3ffe18837fda483ace821d9dd19057f8417c856267d638 SHA512 b15aadab13b3dcf6650802c5f2ae0d512fbb18add8c2c30b2dc3eba70f0ae3092d1311426607684223d35b4e46d34b1573e07eb6eeb02f19fc19a837e29bc965
diff --git a/dev-ros/visp_bridge/files/gcc6.patch b/dev-ros/visp_bridge/files/gcc6.patch
deleted file mode 100644
index 9840509437b5..000000000000
--- a/dev-ros/visp_bridge/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: visp_bridge/CMakeLists.txt
-===================================================================
---- visp_bridge.orig/CMakeLists.txt
-+++ visp_bridge/CMakeLists.txt
-@@ -36,7 +36,7 @@ catkin_package(
- 
- include_directories(include)
- 
--include_directories(SYSTEM
-+include_directories(
-   ${VISP_INCLUDE_DIRS}
-   ${catkin_INCLUDE_DIRS}
-   ${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/visp_bridge/metadata.xml b/dev-ros/visp_bridge/metadata.xml
deleted file mode 100644
index 375352ceff95..000000000000
--- a/dev-ros/visp_bridge/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lagadic/vision_visp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/visp_bridge/visp_bridge-0.11.1.ebuild b/dev-ros/visp_bridge/visp_bridge-0.11.1.ebuild
deleted file mode 100644
index ad50242778c0..000000000000
--- a/dev-ros/visp_bridge/visp_bridge-0.11.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS structures and ViSP structures"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/ViSP:=[xml]
-	dev-ros/roscpp
-	dev-ros/camera_calibration_parsers
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_bridge/visp_bridge-0.12.1.ebuild b/dev-ros/visp_bridge/visp_bridge-0.12.1.ebuild
deleted file mode 100644
index 897184ef36a1..000000000000
--- a/dev-ros/visp_bridge/visp_bridge-0.12.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS structures and ViSP structures"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/ViSP:=[xml]
-	dev-ros/roscpp
-	dev-ros/camera_calibration_parsers
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_bridge/visp_bridge-0.13.1.ebuild b/dev-ros/visp_bridge/visp_bridge-0.13.1.ebuild
deleted file mode 100644
index e8f2d8fe1a98..000000000000
--- a/dev-ros/visp_bridge/visp_bridge-0.13.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS structures and ViSP structures"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/ViSP:=[xml]
-	dev-ros/roscpp
-	dev-ros/camera_calibration_parsers
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_bridge/visp_bridge-9999.ebuild b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
deleted file mode 100644
index 897184ef36a1..000000000000
--- a/dev-ros/visp_bridge/visp_bridge-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS structures and ViSP structures"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/ViSP:=[xml]
-	dev-ros/roscpp
-	dev-ros/camera_calibration_parsers
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/Manifest b/dev-ros/visp_camera_calibration/Manifest
deleted file mode 100644
index bc7d4d25e771..000000000000
--- a/dev-ros/visp_camera_calibration/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX gcc6.patch 421 BLAKE2B cf5b648dbd6d5121db22cee0aaddd9a359a87e9305e3887b4ec15b148e2921baf2562c9c377abb6c848088ce9592952bf537469fbe68cc025ad6e32db8817c61 SHA512 a4ed8165e1a8099d79bfe48563558bbb6de20b90dcc7def4b9dbb46a6c1115cbacfe09ed0c3ddb2b654914fe3b49554f11453fc3d2c87c8841b6755a24f08c4e
-DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
-DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
-DIST vision_visp-0.13.1.tar.gz 1015139 BLAKE2B 8550c32b39cb94785221d924a97795d5b865327bbb8d570131fccf91c95eaee47f242eea5826efb04b083bf467ae8400729a40cb992fe5f1e689648718958d63 SHA512 bf40f4b81a56cec1031d1d2988f6fa41b542af07b63cdd6f3994d5000f7f3e5c721580cba206918d648db5c0cfb422d06829385da94dade4b31a5e8dcf916ddb
-EBUILD visp_camera_calibration-0.11.1.ebuild 792 BLAKE2B db393f726d448787244777fe03c8f5d1c0f3d7bbae3167b4c8be442a36c7c18967f9db73d1397da68ae5114f191aec69279ec35819b92936cd2456a5af50fa9b SHA512 1c5d49edccab9e4831dc742661e9060835d4af2e57ecb75abff215068f29aa136dc0be33f4770a159bb5f1ebee77aa738cf4aa9f9e32aab86ad5581d7dd54f98
-EBUILD visp_camera_calibration-0.12.1.ebuild 790 BLAKE2B ec466d93cb7d09767206de7f1acdc684fbdba7d3e05f567fe36d0f5d4654d7236e52cb8810eb68c0ecfcaa3fa9b2a962202eb61d54ac305b13d3ba02386b91be SHA512 44d964629d1f0f45f2ece96f014a4f1ba587ed57028042ec75f3fbad01d78d1df2e0d1746a0fbd709bbe1541828f9861ab448148edbe061c3052f5e83d221268
-EBUILD visp_camera_calibration-0.13.1.ebuild 790 BLAKE2B cf3decdd32a9d2b461001609fb5a2f01780b68603b6a1b1893cebb2d3101fae599e6429256acc3b6350615f728667079c9ae88ccc361fa9462972444d123127b SHA512 84bcbeaa2be41e7d7dbbc6059a1680da562255d24d71898c3551caace2047805c9f532646dbe03ff56820c4931d512165a4d17a836582933a55ccee11a1c8862
-EBUILD visp_camera_calibration-9999.ebuild 790 BLAKE2B ec466d93cb7d09767206de7f1acdc684fbdba7d3e05f567fe36d0f5d4654d7236e52cb8810eb68c0ecfcaa3fa9b2a962202eb61d54ac305b13d3ba02386b91be SHA512 44d964629d1f0f45f2ece96f014a4f1ba587ed57028042ec75f3fbad01d78d1df2e0d1746a0fbd709bbe1541828f9861ab448148edbe061c3052f5e83d221268
-MISC metadata.xml 334 BLAKE2B e801c8eb4cd9e8e9a72038c502229181950691797bf3833e43e4d48c5674c2ec65effc7790de655a4d3ffe18837fda483ace821d9dd19057f8417c856267d638 SHA512 b15aadab13b3dcf6650802c5f2ae0d512fbb18add8c2c30b2dc3eba70f0ae3092d1311426607684223d35b4e46d34b1573e07eb6eeb02f19fc19a837e29bc965
diff --git a/dev-ros/visp_camera_calibration/files/gcc6.patch b/dev-ros/visp_camera_calibration/files/gcc6.patch
deleted file mode 100644
index 48a77c9eee15..000000000000
--- a/dev-ros/visp_camera_calibration/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: visp_camera_calibration/CMakeLists.txt
-===================================================================
---- visp_camera_calibration.orig/CMakeLists.txt
-+++ visp_camera_calibration/CMakeLists.txt
-@@ -13,7 +13,7 @@ find_package(catkin REQUIRED COMPONENTS
- 
- find_package(VISP REQUIRED)
- 
--include_directories(SYSTEM
-+include_directories(
-   ${BULLET_INCLUDE_DIRS}
-   ${Boost_INCLUDE_DIRS}
-   ${VISP_INCLUDE_DIRS}
diff --git a/dev-ros/visp_camera_calibration/metadata.xml b/dev-ros/visp_camera_calibration/metadata.xml
deleted file mode 100644
index 375352ceff95..000000000000
--- a/dev-ros/visp_camera_calibration/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lagadic/vision_visp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild
deleted file mode 100644
index c68c3131f198..000000000000
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/roscpp
-	dev-ros/visp_bridge
-	sci-libs/ViSP:=[X]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.ebuild
deleted file mode 100644
index 7e2b91a99ee2..000000000000
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/roscpp
-	dev-ros/visp_bridge
-	sci-libs/ViSP:=[X]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.13.1.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.13.1.ebuild
deleted file mode 100644
index fb49d2ad3934..000000000000
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.13.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/roscpp
-	dev-ros/visp_bridge
-	sci-libs/ViSP:=[X]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
deleted file mode 100644
index 7e2b91a99ee2..000000000000
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/roscpp
-	dev-ros/visp_bridge
-	sci-libs/ViSP:=[X]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_hand2eye_calibration/Manifest b/dev-ros/visp_hand2eye_calibration/Manifest
deleted file mode 100644
index 98382c17f393..000000000000
--- a/dev-ros/visp_hand2eye_calibration/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
-DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
-DIST vision_visp-0.13.1.tar.gz 1015139 BLAKE2B 8550c32b39cb94785221d924a97795d5b865327bbb8d570131fccf91c95eaee47f242eea5826efb04b083bf467ae8400729a40cb992fe5f1e689648718958d63 SHA512 bf40f4b81a56cec1031d1d2988f6fa41b542af07b63cdd6f3994d5000f7f3e5c721580cba206918d648db5c0cfb422d06829385da94dade4b31a5e8dcf916ddb
-EBUILD visp_hand2eye_calibration-0.11.1.ebuild 709 BLAKE2B 5a1c93863cc2608c6030d419b95786b221fc4805af01788631664fc65aa8f755bd638f93b39ec13417bc31e592513856a10d16c1b170aa0744e1e5ca65c04fa1 SHA512 e4731b6b68149f26e8e7f93614ffbd7f5eef997905c9d68131c1ee0981aa8130052915b649a613a086b2fad7b8a73185c5d2db5f51d7ba8dd1222145245cfece
-EBUILD visp_hand2eye_calibration-0.12.1.ebuild 707 BLAKE2B bd4e7297978f1004ee8ac249e18d3de727d4aa2ef54195b6200dd00e787da79b9927c4abb1ebf45fa726aee6525cb453a2a510b9ceadf8fe8aab7af4ef18a063 SHA512 bc3f3ec2ef481f6bcbc5bca8600021f60bb25e19b7ed56fc332f93af6bf3b3cf2d4f6be28afc5fb9348ee475ec8069526cb97f064a72e96566e2ea6d3c82ae12
-EBUILD visp_hand2eye_calibration-0.13.1.ebuild 707 BLAKE2B 31878d909abafc0e40e31f7b7de2a1721b25afa43b3f56fdda47574ef4deb6ec0695bec203d6ac5f768a0b52f975c5a2da9800ad508ba9ffcb4fd6df6b166dc2 SHA512 b755f03f89d51f431fbeb7601581abcf8de9d5645d6eb502d25faaa248d948c8e5d77facaf57e4e88df90243109875c272e7bd63b1e884c2d95b23392c8d5e32
-EBUILD visp_hand2eye_calibration-9999.ebuild 707 BLAKE2B bd4e7297978f1004ee8ac249e18d3de727d4aa2ef54195b6200dd00e787da79b9927c4abb1ebf45fa726aee6525cb453a2a510b9ceadf8fe8aab7af4ef18a063 SHA512 bc3f3ec2ef481f6bcbc5bca8600021f60bb25e19b7ed56fc332f93af6bf3b3cf2d4f6be28afc5fb9348ee475ec8069526cb97f064a72e96566e2ea6d3c82ae12
-MISC metadata.xml 334 BLAKE2B e801c8eb4cd9e8e9a72038c502229181950691797bf3833e43e4d48c5674c2ec65effc7790de655a4d3ffe18837fda483ace821d9dd19057f8417c856267d638 SHA512 b15aadab13b3dcf6650802c5f2ae0d512fbb18add8c2c30b2dc3eba70f0ae3092d1311426607684223d35b4e46d34b1573e07eb6eeb02f19fc19a837e29bc965
diff --git a/dev-ros/visp_hand2eye_calibration/metadata.xml b/dev-ros/visp_hand2eye_calibration/metadata.xml
deleted file mode 100644
index 375352ceff95..000000000000
--- a/dev-ros/visp_hand2eye_calibration/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lagadic/vision_visp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild
deleted file mode 100644
index 4f14eac92f13..000000000000
--- a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimates the camera position with respect to its effector using ViSP"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_proc
-	dev-ros/roscpp
-	dev-ros/sensor_msgs
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.ebuild
deleted file mode 100644
index edbae8378ad0..000000000000
--- a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimates the camera position with respect to its effector using ViSP"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_proc
-	dev-ros/roscpp
-	dev-ros/sensor_msgs
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.13.1.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.13.1.ebuild
deleted file mode 100644
index b50f4bcfc817..000000000000
--- a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimates the camera position with respect to its effector using ViSP"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_proc
-	dev-ros/roscpp
-	dev-ros/sensor_msgs
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild
deleted file mode 100644
index edbae8378ad0..000000000000
--- a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimates the camera position with respect to its effector using ViSP"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_proc
-	dev-ros/roscpp
-	dev-ros/sensor_msgs
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_tracker/Manifest b/dev-ros/visp_tracker/Manifest
deleted file mode 100644
index 1460a919fb4e..000000000000
--- a/dev-ros/visp_tracker/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST vision_visp-0.13.1.tar.gz 1015139 BLAKE2B 8550c32b39cb94785221d924a97795d5b865327bbb8d570131fccf91c95eaee47f242eea5826efb04b083bf467ae8400729a40cb992fe5f1e689648718958d63 SHA512 bf40f4b81a56cec1031d1d2988f6fa41b542af07b63cdd6f3994d5000f7f3e5c721580cba206918d648db5c0cfb422d06829385da94dade4b31a5e8dcf916ddb
-EBUILD visp_tracker-0.13.1.ebuild 1103 BLAKE2B bb7ff9e484bb1040f4e290129da3268a6da4dfd70d404b3a2b6f396d24c1aa6b57860f51be093222f80502e09fb8fdd5eb3bb773faeefb642d34dfb81bf98b42 SHA512 2a1029485d3247df3918d2299cbea17909bbdc858115b4aaf972a35e2175b858309b7da669335874288762efe6582b5fa4b648b4e4715fb09fc821148252fb8a
-EBUILD visp_tracker-9999.ebuild 1103 BLAKE2B bb7ff9e484bb1040f4e290129da3268a6da4dfd70d404b3a2b6f396d24c1aa6b57860f51be093222f80502e09fb8fdd5eb3bb773faeefb642d34dfb81bf98b42 SHA512 2a1029485d3247df3918d2299cbea17909bbdc858115b4aaf972a35e2175b858309b7da669335874288762efe6582b5fa4b648b4e4715fb09fc821148252fb8a
-MISC metadata.xml 334 BLAKE2B e801c8eb4cd9e8e9a72038c502229181950691797bf3833e43e4d48c5674c2ec65effc7790de655a4d3ffe18837fda483ace821d9dd19057f8417c856267d638 SHA512 b15aadab13b3dcf6650802c5f2ae0d512fbb18add8c2c30b2dc3eba70f0ae3092d1311426607684223d35b4e46d34b1573e07eb6eeb02f19fc19a837e29bc965
diff --git a/dev-ros/visp_tracker/metadata.xml b/dev-ros/visp_tracker/metadata.xml
deleted file mode 100644
index 375352ceff95..000000000000
--- a/dev-ros/visp_tracker/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lagadic/vision_visp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/visp_tracker/visp_tracker-0.13.1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.13.1.ebuild
deleted file mode 100644
index b2059d29c349..000000000000
--- a/dev-ros/visp_tracker/visp_tracker-0.13.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP library"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/sensor_msgs
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	sci-libs/ViSP:=[opencv,X]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
-
-src_compile() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_compile
-}
diff --git a/dev-ros/visp_tracker/visp_tracker-9999.ebuild b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
deleted file mode 100644
index b2059d29c349..000000000000
--- a/dev-ros/visp_tracker/visp_tracker-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="noetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP library"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/sensor_msgs
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	sci-libs/ViSP:=[opencv,X]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
-fi
-
-src_compile() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	ros-catkin_src_compile
-}
diff --git a/dev-ros/visualization_marker_tutorials/Manifest b/dev-ros/visualization_marker_tutorials/Manifest
deleted file mode 100644
index 56a9ba2e55f6..000000000000
--- a/dev-ros/visualization_marker_tutorials/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD visualization_marker_tutorials-0.11.0.ebuild 429 BLAKE2B df650755ff86d5fb4edd7abed03e5be568cc7c39d1ed7451cb7ef60c360962c4736792649b1901687d0a709f53a27fc8ec44b5830d32f5cb7756223a51fc79f4 SHA512 a68a4f63c4d8f71014c8026c1f370dceee19d68480860cbe90fe622d41adf5da26d8289ecfb1ef691d382a00d61df2c41857d9d7bb9d0590a7038daa0e50ea50
-EBUILD visualization_marker_tutorials-9999.ebuild 429 BLAKE2B df650755ff86d5fb4edd7abed03e5be568cc7c39d1ed7451cb7ef60c360962c4736792649b1901687d0a709f53a27fc8ec44b5830d32f5cb7756223a51fc79f4 SHA512 a68a4f63c4d8f71014c8026c1f370dceee19d68480860cbe90fe622d41adf5da26d8289ecfb1ef691d382a00d61df2c41857d9d7bb9d0590a7038daa0e50ea50
-MISC metadata.xml 356 BLAKE2B 0e15a7c0c742df1f97b9674aaf9d0eb7c67544d269b644e0b19163a9a9bcaf8b0451f24ba2c2344acbbcd4856cf79f916e5d974bf5afde6f3c389b7ad7b8c45e SHA512 8e6b4b0942d77ede0e3e96b2f45a1dbddb293fe6235fb1a9e642dff5f483e5a272d18da8ad0d80e6bfa487eacff11d5a53089371a06c7d9c5fba56b3f3c147bb
diff --git a/dev-ros/visualization_marker_tutorials/metadata.xml b/dev-ros/visualization_marker_tutorials/metadata.xml
deleted file mode 100644
index ade798056081..000000000000
--- a/dev-ros/visualization_marker_tutorials/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.11.0.ebuild b/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.11.0.ebuild
deleted file mode 100644
index b8c35675e259..000000000000
--- a/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.11.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Visualization marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-9999.ebuild b/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-9999.ebuild
deleted file mode 100644
index b8c35675e259..000000000000
--- a/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Visualization marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/visualization_msgs/Manifest b/dev-ros/visualization_msgs/Manifest
deleted file mode 100644
index 4783885f9143..000000000000
--- a/dev-ros/visualization_msgs/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
-DIST common_msgs-1.13.1.tar.gz 68487 BLAKE2B ebb2f61efedd8e05ba0ced04ec0f94650f65837b4cdff466de2295d83906965b03a4f53e6641a119739fa110bbd17cd6a10c035805c88b3ea22c6db980298bac SHA512 1ede60c630e14fb4643b06e289bc954e16bdd90ab7910f9090dc794c73602d1a426da6e825f7bd5a755b04cffe4ec25ffd459dc211b0c508974007a710224d55
-EBUILD visualization_msgs-1.12.7.ebuild 477 BLAKE2B b021afd74ab2bbb28aff0da8c06fb11921723895636ec2828f02c9d5095d659a813c38f22b77276bb4dc537d93d3120360b4c1181ec12ba9697020ef1c225ae5 SHA512 ded6faf97cd011849e501073f75f83d17fe686f650ec931519f6a513f39746ebc0847b697b13aba85a7e6d48a321c8235c0bf1758336b565e641555f2bb2f920
-EBUILD visualization_msgs-1.13.0.ebuild 477 BLAKE2B b021afd74ab2bbb28aff0da8c06fb11921723895636ec2828f02c9d5095d659a813c38f22b77276bb4dc537d93d3120360b4c1181ec12ba9697020ef1c225ae5 SHA512 ded6faf97cd011849e501073f75f83d17fe686f650ec931519f6a513f39746ebc0847b697b13aba85a7e6d48a321c8235c0bf1758336b565e641555f2bb2f920
-EBUILD visualization_msgs-1.13.1.ebuild 477 BLAKE2B b021afd74ab2bbb28aff0da8c06fb11921723895636ec2828f02c9d5095d659a813c38f22b77276bb4dc537d93d3120360b4c1181ec12ba9697020ef1c225ae5 SHA512 ded6faf97cd011849e501073f75f83d17fe686f650ec931519f6a513f39746ebc0847b697b13aba85a7e6d48a321c8235c0bf1758336b565e641555f2bb2f920
-EBUILD visualization_msgs-9999.ebuild 477 BLAKE2B b021afd74ab2bbb28aff0da8c06fb11921723895636ec2828f02c9d5095d659a813c38f22b77276bb4dc537d93d3120360b4c1181ec12ba9697020ef1c225ae5 SHA512 ded6faf97cd011849e501073f75f83d17fe686f650ec931519f6a513f39746ebc0847b697b13aba85a7e6d48a321c8235c0bf1758336b565e641555f2bb2f920
-MISC metadata.xml 330 BLAKE2B bf532d1e45fe24e3a5c7541fcce2a98747f4062e86e61bd343a9e1c7f326901d1609a7bf91e4eed5f30853e597e3b94d9416a9ef7a1a3200d369d9a81d82f3c7 SHA512 c11d05a0984af1fee9c30454317e78455dbdcf34df7b7c3e76f9fc9447ab794b41e665850023c3a9c0591792dc4dd11c8645a5242b469a94d8887b3133bb3c6e
diff --git a/dev-ros/visualization_msgs/metadata.xml b/dev-ros/visualization_msgs/metadata.xml
deleted file mode 100644
index 2591a02e56dc..000000000000
--- a/dev-ros/visualization_msgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/common_msgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/visualization_msgs/visualization_msgs-1.12.7.ebuild b/dev-ros/visualization_msgs/visualization_msgs-1.12.7.ebuild
deleted file mode 100644
index fab4980360ea..000000000000
--- a/dev-ros/visualization_msgs/visualization_msgs-1.12.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages used by higher level packages that deal in visualization-specific data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild b/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild
deleted file mode 100644
index fab4980360ea..000000000000
--- a/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages used by higher level packages that deal in visualization-specific data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/visualization_msgs/visualization_msgs-1.13.1.ebuild b/dev-ros/visualization_msgs/visualization_msgs-1.13.1.ebuild
deleted file mode 100644
index fab4980360ea..000000000000
--- a/dev-ros/visualization_msgs/visualization_msgs-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages used by higher level packages that deal in visualization-specific data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/visualization_msgs/visualization_msgs-9999.ebuild b/dev-ros/visualization_msgs/visualization_msgs-9999.ebuild
deleted file mode 100644
index fab4980360ea..000000000000
--- a/dev-ros/visualization_msgs/visualization_msgs-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages used by higher level packages that deal in visualization-specific data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/voxel_grid/Manifest b/dev-ros/voxel_grid/Manifest
deleted file mode 100644
index 3b8c16399eac..000000000000
--- a/dev-ros/voxel_grid/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
-DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD voxel_grid-1.16.6.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
-EBUILD voxel_grid-1.17.0.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
-EBUILD voxel_grid-1.17.1.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
-EBUILD voxel_grid-9999.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
-MISC metadata.xml 338 BLAKE2B 665b2369369775a44e03820b1b8fcf88efe592d52da3cccb8c12ab55c82756e642d57a007978894fc07e694f75fc20c6e12d794d6c868a1f65615fe0fe7d134e SHA512 e12301e0204fef7fa9d428d04468a34dcd6af17e007e655d42c61ba6d5387b6e9720ca9cf4611392d111bbb420e6f7ea3a9f32f0eaef01a7001ed2fcd350949d
diff --git a/dev-ros/voxel_grid/metadata.xml b/dev-ros/voxel_grid/metadata.xml
deleted file mode 100644
index 878801a726f0..000000000000
--- a/dev-ros/voxel_grid/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/voxel_grid/voxel_grid-1.16.6.ebuild b/dev-ros/voxel_grid/voxel_grid-1.16.6.ebuild
deleted file mode 100644
index 2a7672352f28..000000000000
--- a/dev-ros/voxel_grid/voxel_grid-1.16.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Implementation of an efficient 3D voxel grid"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/voxel_grid/voxel_grid-1.17.0.ebuild b/dev-ros/voxel_grid/voxel_grid-1.17.0.ebuild
deleted file mode 100644
index 2a7672352f28..000000000000
--- a/dev-ros/voxel_grid/voxel_grid-1.17.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Implementation of an efficient 3D voxel grid"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/voxel_grid/voxel_grid-1.17.1.ebuild b/dev-ros/voxel_grid/voxel_grid-1.17.1.ebuild
deleted file mode 100644
index 2a7672352f28..000000000000
--- a/dev-ros/voxel_grid/voxel_grid-1.17.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Implementation of an efficient 3D voxel grid"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/voxel_grid/voxel_grid-9999.ebuild b/dev-ros/voxel_grid/voxel_grid-9999.ebuild
deleted file mode 100644
index 2a7672352f28..000000000000
--- a/dev-ros/voxel_grid/voxel_grid-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Implementation of an efficient 3D voxel grid"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
deleted file mode 100644
index c281e9678849..000000000000
--- a/dev-ros/xacro/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX tests.patch 625 BLAKE2B 5ec4d6bca2278f40a4886371abd75beb0ff933d3b7e6e9e4554e7f9d63b521d2ff9d2c91c530177c818de2006bbc7db77e86ce3f4323017f870cb6b2a186ba9c SHA512 10da25011dc5c63d282d45862c35d9f900a90bc61059d6e703e50e2a94bdd4ca9c0f20d3fe6e5b03b3f98059e1bcb74272adcbb7f72d5e5f1d3ad4ce5a5f6bca
-DIST xacro-1.14.6.tar.gz 81362 BLAKE2B b0ec80e8f224f1b31e9f21e1c11669a46da1b13cf82b5d82912196f9f647aa1c45a7084f4ea1e1690c0d969b5e126cd5b6069c9987034898b72d92310b7d565f SHA512 0796c07cbf4d51699ab07d656a42d13fc140406f6dbee3b94554f2aa91e68b64bd5d2c218930edb5b139ac41b5d5c6bffad505d220353d5748f371ec6bb196a3
-DIST xacro-1.14.8.tar.gz 81831 BLAKE2B 6ad5c8545f5b7167faea122834cb1226e2935f0e40dbd0da1a3e63dc5981adabf83b9d72bf0b51842e82bb31ed469c72a63d4dcbb3dd79b6c8f91fdfdf75b202 SHA512 a372dc3a9e62a9eb1a0cf6b2491c45685e8f5f7442da86f7767b47c8122ec67780aee4e76a4b9278046b85a16000b1ffe72e44a9ac04f39da21c5bc1cf788b0b
-EBUILD xacro-1.14.6.ebuild 773 BLAKE2B 2911b685e1a3992014b35541f7d261ea3b744716602211cbcc09df27a892fbd4dfa0576a8b70cebc5d6249fc4e70494be958c4a1cfa081b290b4232130c38cc6 SHA512 792e024feab8a468d906f332dab2806d05c0d4d643b6cbd9d995efede0dfd3a2e909110acd761af34753166a13ddf983793fdaa4bb510c583de3cd4a5ff96bc0
-EBUILD xacro-1.14.8.ebuild 773 BLAKE2B 2911b685e1a3992014b35541f7d261ea3b744716602211cbcc09df27a892fbd4dfa0576a8b70cebc5d6249fc4e70494be958c4a1cfa081b290b4232130c38cc6 SHA512 792e024feab8a468d906f332dab2806d05c0d4d643b6cbd9d995efede0dfd3a2e909110acd761af34753166a13ddf983793fdaa4bb510c583de3cd4a5ff96bc0
-EBUILD xacro-9999.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
-MISC metadata.xml 324 BLAKE2B 9a8261b44704f7d113b67f6150f290652920c37118f473066c8b91b3c12eb524c7c50cf341a87ed7cbde3aed44adb1c4bb741a71f8f6438511b9fe0bc58874d8 SHA512 adb6886865fc7bc53da85c92500acbc402820b69dc05f15dfce98f710f5e02efb17da404d05508f2b0d94c300e798f6a7be0ad8fbf2a96fc9fdd0ad900d130e6
diff --git a/dev-ros/xacro/files/tests.patch b/dev-ros/xacro/files/tests.patch
deleted file mode 100644
index 28d4b5768c35..000000000000
--- a/dev-ros/xacro/files/tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: xacro-1.14.1/test/test-cmake.sh
-===================================================================
---- xacro-1.14.1.orig/test/test-cmake.sh
-+++ xacro-1.14.1/test/test-cmake.sh
-@@ -15,6 +15,7 @@
- test -d $1 || exit 2
- test -r $1/CMakeLists.txt || exit 2
- 
-+basedir=`pwd`/../
- dir=`basename $1`
- 
- # redirect stdout and stderr to $dir.log
-@@ -26,7 +27,7 @@ mkdir $dir
- cd $dir
- 
- echo "*** running cmake ***"
--cmake -DCATKIN_DEVEL_PREFIX=devel -DCMAKE_INSTALL_PREFIX=install $1 || exit $?
-+cmake -DCATKIN_DEVEL_PREFIX="${basedir}/devel" -DCMAKE_INSTALL_PREFIX=install $1 || exit $?
- 
- echo
- echo "*** running make ***"
diff --git a/dev-ros/xacro/metadata.xml b/dev-ros/xacro/metadata.xml
deleted file mode 100644
index ea8d2a4dcf49..000000000000
--- a/dev-ros/xacro/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/xacro</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/xacro/xacro-1.14.6.ebuild b/dev-ros/xacro/xacro-1.14.6.ebuild
deleted file mode 100644
index 5c1e6682dc01..000000000000
--- a/dev-ros/xacro/xacro-1.14.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/xacro"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="XML macro language"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-RDEPEND="${RDEPEND}
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	local sd="$(python_get_sitedir)"
-	local local_sd="${BUILD_DIR}/devel/${sd#${EPREFIX}/usr}"
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	PYTHONPATH="${local_sd}:${PYTHONPATH}" ros-catkin_src_test
-}
diff --git a/dev-ros/xacro/xacro-1.14.8.ebuild b/dev-ros/xacro/xacro-1.14.8.ebuild
deleted file mode 100644
index 5c1e6682dc01..000000000000
--- a/dev-ros/xacro/xacro-1.14.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/xacro"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="XML macro language"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-RDEPEND="${RDEPEND}
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	local sd="$(python_get_sitedir)"
-	local local_sd="${BUILD_DIR}/devel/${sd#${EPREFIX}/usr}"
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	PYTHONPATH="${local_sd}:${PYTHONPATH}" ros-catkin_src_test
-}
diff --git a/dev-ros/xacro/xacro-9999.ebuild b/dev-ros/xacro/xacro-9999.ebuild
deleted file mode 100644
index 8383de0334c5..000000000000
--- a/dev-ros/xacro/xacro-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/xacro"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="XML macro language"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-RDEPEND="${RDEPEND}
-	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]"
-PATCHES=( "${FILESDIR}/tests.patch" )
-
-src_test() {
-	local sd="$(python_get_sitedir)"
-	local local_sd="${BUILD_DIR}/devel/${sd#${EPREFIX}/usr}"
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	PYTHONPATH="${local_sd}:${PYTHONPATH}" ros-catkin_src_test
-}
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
deleted file mode 100644
index 17909daee055..000000000000
--- a/dev-ros/xmlrpcpp/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
-DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
-DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
-DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD xmlrpcpp-1.15.10-r1.ebuild 435 BLAKE2B 8bd112b6589bd84d4bb74edb0ca0aff1a0aecd7c34a9ec157325207f92203c466c0769bb441ec6092b4b4005dd0b83d600df1911ef8f3c389d5a69ba434c0e35 SHA512 3a1e3225f9db1fbc11d9c90387c8f667c477a970ac6d15d580f1eb8b3ad7ffd423a20a81d8aa530147c9dbeef9b709ed3fd56974466731a63eece27ed3d11908
-EBUILD xmlrpcpp-1.15.11.ebuild 435 BLAKE2B 8bd112b6589bd84d4bb74edb0ca0aff1a0aecd7c34a9ec157325207f92203c466c0769bb441ec6092b4b4005dd0b83d600df1911ef8f3c389d5a69ba434c0e35 SHA512 3a1e3225f9db1fbc11d9c90387c8f667c477a970ac6d15d580f1eb8b3ad7ffd423a20a81d8aa530147c9dbeef9b709ed3fd56974466731a63eece27ed3d11908
-EBUILD xmlrpcpp-1.15.13.ebuild 435 BLAKE2B 8bd112b6589bd84d4bb74edb0ca0aff1a0aecd7c34a9ec157325207f92203c466c0769bb441ec6092b4b4005dd0b83d600df1911ef8f3c389d5a69ba434c0e35 SHA512 3a1e3225f9db1fbc11d9c90387c8f667c477a970ac6d15d580f1eb8b3ad7ffd423a20a81d8aa530147c9dbeef9b709ed3fd56974466731a63eece27ed3d11908
-EBUILD xmlrpcpp-1.15.14.ebuild 435 BLAKE2B 8bd112b6589bd84d4bb74edb0ca0aff1a0aecd7c34a9ec157325207f92203c466c0769bb441ec6092b4b4005dd0b83d600df1911ef8f3c389d5a69ba434c0e35 SHA512 3a1e3225f9db1fbc11d9c90387c8f667c477a970ac6d15d580f1eb8b3ad7ffd423a20a81d8aa530147c9dbeef9b709ed3fd56974466731a63eece27ed3d11908
-EBUILD xmlrpcpp-1.15.8-r1.ebuild 435 BLAKE2B 8bd112b6589bd84d4bb74edb0ca0aff1a0aecd7c34a9ec157325207f92203c466c0769bb441ec6092b4b4005dd0b83d600df1911ef8f3c389d5a69ba434c0e35 SHA512 3a1e3225f9db1fbc11d9c90387c8f667c477a970ac6d15d580f1eb8b3ad7ffd423a20a81d8aa530147c9dbeef9b709ed3fd56974466731a63eece27ed3d11908
-EBUILD xmlrpcpp-1.15.9-r1.ebuild 435 BLAKE2B 8bd112b6589bd84d4bb74edb0ca0aff1a0aecd7c34a9ec157325207f92203c466c0769bb441ec6092b4b4005dd0b83d600df1911ef8f3c389d5a69ba434c0e35 SHA512 3a1e3225f9db1fbc11d9c90387c8f667c477a970ac6d15d580f1eb8b3ad7ffd423a20a81d8aa530147c9dbeef9b709ed3fd56974466731a63eece27ed3d11908
-EBUILD xmlrpcpp-9999.ebuild 435 BLAKE2B 8bd112b6589bd84d4bb74edb0ca0aff1a0aecd7c34a9ec157325207f92203c466c0769bb441ec6092b4b4005dd0b83d600df1911ef8f3c389d5a69ba434c0e35 SHA512 3a1e3225f9db1fbc11d9c90387c8f667c477a970ac6d15d580f1eb8b3ad7ffd423a20a81d8aa530147c9dbeef9b709ed3fd56974466731a63eece27ed3d11908
-MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/xmlrpcpp/metadata.xml b/dev-ros/xmlrpcpp/metadata.xml
deleted file mode 100644
index 90098219374c..000000000000
--- a/dev-ros/xmlrpcpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/ros_comm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.10-r1.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.10-r1.ebuild
deleted file mode 100644
index 6d4d57e2649a..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.10-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.ebuild
deleted file mode 100644
index 6d4d57e2649a..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.13.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.13.ebuild
deleted file mode 100644
index 6d4d57e2649a..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.14.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.14.ebuild
deleted file mode 100644
index 6d4d57e2649a..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.14.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8-r1.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8-r1.ebuild
deleted file mode 100644
index 6d4d57e2649a..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.9-r1.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.9-r1.ebuild
deleted file mode 100644
index 6d4d57e2649a..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.9-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
deleted file mode 100644
index 6d4d57e2649a..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)
-"