gentoo resync : 25.08.2020

2186 files changed, 16806 insertions, 31377 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 0d7d9a4505cb..51725b7930d6 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/actionlib/Manifest b/dev-ros/actionlib/Manifest
index 30904afa70da..76e8eddb7c7b 100644
--- a/dev-ros/actionlib/Manifest
+++ b/dev-ros/actionlib/Manifest
@@ -1,8 +1,4 @@
-DIST actionlib-1.11.13.tar.gz 98518 BLAKE2B 918c541f3a6192ee9b89e4b2759651e027d447acc305aaf9bdeabb9587a527b6bd924eb812314c8c83baec3b6829ca0b5d126550ea70acc5d2739f7cd83e065d SHA512 273499a0a5b1c9b40147ba0bba61b44a2530c0a16d757a51f6b6211c95790e18ffe2c397582a429de84a639209779c2641a3013f71f75a2fd76d422115033601
-DIST actionlib-1.11.14.tar.gz 98789 BLAKE2B fb4f7afbc2836f43ccfbb5d477a7e54ec4feb13244a797a057922b02cb97886052b2b6b2f2cb3cdf0ecb1b0c7dd09a24768ad9bc459498e0606ba534a82598c7 SHA512 147fc8642e8d46cf6dc353b4f8850c2682204a6f256a7e0a065db5adb67b72c54e2f40ff4cabbec2fab6d1a1b0c82ff0abbea571ae4202774892c3dae01ad8bd
-DIST actionlib-1.11.15.tar.gz 99063 BLAKE2B 23cce02de41b7705645cd1bae35f90d8c89171f809c689323683bf4f644b7df8c46dc4c5cffa2de6a2791c3a77957964785fe6d99a77ccea25eee43fb88e4325 SHA512 3f6deb469b284ca7809a20779f8362cb48d2bf12d8fc4a546fb1fe28fc06baa9693f9efb576f27f1cac976051bcb966a2c47df1185847bea040c0ac0a915b6d9
-EBUILD actionlib-1.11.13.ebuild 740 BLAKE2B df2e5f48b95d5b7dff2992dc5cc128fa6f52d9c71150d75cbc9db8f8078e899c9562533133bcb0f08e951de7840c7b5eaadf7bbca09856cb4d8c5b942c034861 SHA512 e7a774d8f3167ff7862e33f7c9ddd4ec82ab2ee6ced7939747d90cfdc58f86f9bf4c84f9c0157b9a0b13a6566c3a37257707e6ddc48d03629d0d8ee0a45b2abf
-EBUILD actionlib-1.11.14.ebuild 740 BLAKE2B df2e5f48b95d5b7dff2992dc5cc128fa6f52d9c71150d75cbc9db8f8078e899c9562533133bcb0f08e951de7840c7b5eaadf7bbca09856cb4d8c5b942c034861 SHA512 e7a774d8f3167ff7862e33f7c9ddd4ec82ab2ee6ced7939747d90cfdc58f86f9bf4c84f9c0157b9a0b13a6566c3a37257707e6ddc48d03629d0d8ee0a45b2abf
-EBUILD actionlib-1.11.15.ebuild 740 BLAKE2B df2e5f48b95d5b7dff2992dc5cc128fa6f52d9c71150d75cbc9db8f8078e899c9562533133bcb0f08e951de7840c7b5eaadf7bbca09856cb4d8c5b942c034861 SHA512 e7a774d8f3167ff7862e33f7c9ddd4ec82ab2ee6ced7939747d90cfdc58f86f9bf4c84f9c0157b9a0b13a6566c3a37257707e6ddc48d03629d0d8ee0a45b2abf
-EBUILD actionlib-9999.ebuild 740 BLAKE2B df2e5f48b95d5b7dff2992dc5cc128fa6f52d9c71150d75cbc9db8f8078e899c9562533133bcb0f08e951de7840c7b5eaadf7bbca09856cb4d8c5b942c034861 SHA512 e7a774d8f3167ff7862e33f7c9ddd4ec82ab2ee6ced7939747d90cfdc58f86f9bf4c84f9c0157b9a0b13a6566c3a37257707e6ddc48d03629d0d8ee0a45b2abf
+DIST actionlib-1.13.1.tar.gz 100763 BLAKE2B d1c9bac94ed5928409e831087893cdc4921163592b5c141deb6c888eaee5bd581141ef84e95735b67f18e0dcf7c24d3486c6d6f0a36018a0e24dad91427956b3 SHA512 1b2cf48c0d3d635d4a37f177f7c05dbb21ed027dbddb4ea713f765fea0db3fee00ae242b8d51907d4841544a9ed231785959241947126dfb857daee0ff7e4cb2
+EBUILD actionlib-1.13.1.ebuild 860 BLAKE2B fa3dd4778939e4bc3745416ef13c74b5967acd6e76c334d78c708abd48fba3e5f6a9fd9d9bf05c1e0d8358e12e493614e9829185f5d1e5514e7f5f9604dd54be SHA512 c0021cb26e23ad083ec12cf0449fbf444e1f4af7266355c0b44962fdba316fe45bf0eed6c85f1787259e6926de548b34e2ec1063881e5da18513a607d0e66729
+EBUILD actionlib-9999.ebuild 860 BLAKE2B fa3dd4778939e4bc3745416ef13c74b5967acd6e76c334d78c708abd48fba3e5f6a9fd9d9bf05c1e0d8358e12e493614e9829185f5d1e5514e7f5f9604dd54be SHA512 c0021cb26e23ad083ec12cf0449fbf444e1f4af7266355c0b44962fdba316fe45bf0eed6c85f1787259e6926de548b34e2ec1063881e5da18513a607d0e66729
 MISC metadata.xml 327 BLAKE2B 007cbc7d1abad4e0f3aaf4509c5c3856044c3ac530924921d0f21d795123c8651001b05d7ec26d9ff22304784bdd5bca25a2fae2474f3c5b5f031b9518a59f3a SHA512 f76c38a1b5699078331b74d7ed7cf40de05e2d24b398589b6dc9fdd03a486c438f2109ddab42de0ad41fb72b8eff87e69cdd7f21e79cabd03a8bbb8a8d3ce7b8
diff --git a/dev-ros/actionlib/actionlib-1.11.13.ebuild b/dev-ros/actionlib/actionlib-1.11.13.ebuild
deleted file mode 100644
index 78149321f929..000000000000
--- a/dev-ros/actionlib/actionlib-1.11.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/actionlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-"
diff --git a/dev-ros/actionlib/actionlib-1.11.14.ebuild b/dev-ros/actionlib/actionlib-1.11.14.ebuild
deleted file mode 100644
index 78149321f929..000000000000
--- a/dev-ros/actionlib/actionlib-1.11.14.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/actionlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-"
diff --git a/dev-ros/actionlib/actionlib-1.11.15.ebuild b/dev-ros/actionlib/actionlib-1.11.15.ebuild
deleted file mode 100644
index 78149321f929..000000000000
--- a/dev-ros/actionlib/actionlib-1.11.15.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/actionlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-"
diff --git a/dev-ros/actionlib/actionlib-1.13.1.ebuild b/dev-ros/actionlib/actionlib-1.13.1.ebuild
new file mode 100644
index 000000000000..bfe083e9ecd0
--- /dev/null
+++ b/dev-ros/actionlib/actionlib-1.13.1.ebuild
@@ -0,0 +1,36 @@
+# 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="Provides a standardized interface for interfacing with preemptable tasks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/boost:=[threads]
+	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-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
index 78149321f929..bfe083e9ecd0 100644
--- a/dev-ros/actionlib/actionlib-9999.ebuild
+++ b/dev-ros/actionlib/actionlib-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/actionlib"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
@@ -17,12 +17,20 @@ IUSE=""
 
 RDEPEND="dev-libs/boost:=[threads]
 	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	"
 DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
 RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
+	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_msgs/Manifest b/dev-ros/actionlib_msgs/Manifest
index 2edd1e5e3c08..b84f9e4297c2 100644
--- a/dev-ros/actionlib_msgs/Manifest
+++ b/dev-ros/actionlib_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD actionlib_msgs-1.12.5.ebuild 486 BLAKE2B 6970b1a3cdebd529ddb3d70240ad7e1a9ef668fef6c1ba02017748b7d7bece14e092f6625c65b4cf76d1db3dbab34de465cf58506b29e383467a886e9b0b12f5 SHA512 ca009508164f25b6b92f6ade55713ebe8c9754af5cc384ea062f4e22df6c31cec6a3bd5ef0347a432499f1f2e416063381da135d2ad7fbcb7f6cf3942d4caeef
-EBUILD actionlib_msgs-1.12.6.ebuild 486 BLAKE2B 6970b1a3cdebd529ddb3d70240ad7e1a9ef668fef6c1ba02017748b7d7bece14e092f6625c65b4cf76d1db3dbab34de465cf58506b29e383467a886e9b0b12f5 SHA512 ca009508164f25b6b92f6ade55713ebe8c9754af5cc384ea062f4e22df6c31cec6a3bd5ef0347a432499f1f2e416063381da135d2ad7fbcb7f6cf3942d4caeef
-EBUILD actionlib_msgs-1.12.7.ebuild 486 BLAKE2B 6970b1a3cdebd529ddb3d70240ad7e1a9ef668fef6c1ba02017748b7d7bece14e092f6625c65b4cf76d1db3dbab34de465cf58506b29e383467a886e9b0b12f5 SHA512 ca009508164f25b6b92f6ade55713ebe8c9754af5cc384ea062f4e22df6c31cec6a3bd5ef0347a432499f1f2e416063381da135d2ad7fbcb7f6cf3942d4caeef
-EBUILD actionlib_msgs-9999.ebuild 486 BLAKE2B 6970b1a3cdebd529ddb3d70240ad7e1a9ef668fef6c1ba02017748b7d7bece14e092f6625c65b4cf76d1db3dbab34de465cf58506b29e383467a886e9b0b12f5 SHA512 ca009508164f25b6b92f6ade55713ebe8c9754af5cc384ea062f4e22df6c31cec6a3bd5ef0347a432499f1f2e416063381da135d2ad7fbcb7f6cf3942d4caeef
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD actionlib_msgs-1.13.0.ebuild 446 BLAKE2B 83a38172da3b6eebc908c1d776b2155cb88a2f22a0d31c7d97cb2e6c9cbb4dac96eee76dd0189bff1dfe3003482e8978c32f4fb478568bad8fb6967fc63dc0d8 SHA512 c5ac8309bf3f715e44820a0ec0ee604688e4657324238d88537aee5172598592afe75ff2c93364ef7e6f44a6c0c6fff828f6ed5879585723c80c0a4c68be2124
+EBUILD actionlib_msgs-9999.ebuild 446 BLAKE2B 83a38172da3b6eebc908c1d776b2155cb88a2f22a0d31c7d97cb2e6c9cbb4dac96eee76dd0189bff1dfe3003482e8978c32f4fb478568bad8fb6967fc63dc0d8 SHA512 c5ac8309bf3f715e44820a0ec0ee604688e4657324238d88537aee5172598592afe75ff2c93364ef7e6f44a6c0c6fff828f6ed5879585723c80c0a4c68be2124
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.5.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.5.ebuild
deleted file mode 100644
index d658f6173f57..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.6.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.6.ebuild
deleted file mode 100644
index d658f6173f57..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.7.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.7.ebuild
deleted file mode 100644
index d658f6173f57..000000000000
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.0.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..727f06efdf91
--- /dev/null
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
index d658f6173f57..727f06efdf91 100644
--- a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/actionlib_tools/Manifest b/dev-ros/actionlib_tools/Manifest
new file mode 100644
index 000000000000..b6f458cdd763
--- /dev/null
+++ b/dev-ros/actionlib_tools/Manifest
@@ -0,0 +1,4 @@
+DIST actionlib-1.13.1.tar.gz 100763 BLAKE2B d1c9bac94ed5928409e831087893cdc4921163592b5c141deb6c888eaee5bd581141ef84e95735b67f18e0dcf7c24d3486c6d6f0a36018a0e24dad91427956b3 SHA512 1b2cf48c0d3d635d4a37f177f7c05dbb21ed027dbddb4ea713f765fea0db3fee00ae242b8d51907d4841544a9ed231785959241947126dfb857daee0ff7e4cb2
+EBUILD actionlib_tools-1.13.1.ebuild 677 BLAKE2B f439ab8829e7b57388f65a3726907b558328008da72836224856d84496335f45ac88f7dc738df2e67bf2fed8dbc872a26d2ddf847f4b70397ab81df5abbdd88d SHA512 11d358644dd25cc66580cf5a15dd48abc3c36a978c943a5cc377274a8b713f02da30818e81f0e5b6a0c49bd1dbd7e732eb9bae1ce643a702e01bb0ecada8bd40
+EBUILD actionlib_tools-9999.ebuild 677 BLAKE2B f439ab8829e7b57388f65a3726907b558328008da72836224856d84496335f45ac88f7dc738df2e67bf2fed8dbc872a26d2ddf847f4b70397ab81df5abbdd88d SHA512 11d358644dd25cc66580cf5a15dd48abc3c36a978c943a5cc377274a8b713f02da30818e81f0e5b6a0c49bd1dbd7e732eb9bae1ce643a702e01bb0ecada8bd40
+MISC metadata.xml 327 BLAKE2B 007cbc7d1abad4e0f3aaf4509c5c3856044c3ac530924921d0f21d795123c8651001b05d7ec26d9ff22304784bdd5bca25a2fae2474f3c5b5f031b9518a59f3a SHA512 f76c38a1b5699078331b74d7ed7cf40de05e2d24b398589b6dc9fdd03a486c438f2109ddab42de0ad41fb72b8eff87e69cdd7f21e79cabd03a8bbb8a8d3ce7b8
diff --git a/dev-ros/actionlib_tools/actionlib_tools-1.13.1.ebuild b/dev-ros/actionlib_tools/actionlib_tools-1.13.1.ebuild
new file mode 100644
index 000000000000..6b5f4f44952f
--- /dev/null
+++ b/dev-ros/actionlib_tools/actionlib_tools-1.13.1.ebuild
@@ -0,0 +1,26 @@
+# 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
new file mode 100644
index 000000000000..6b5f4f44952f
--- /dev/null
+++ b/dev-ros/actionlib_tools/actionlib_tools-9999.ebuild
@@ -0,0 +1,26 @@
+# 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
new file mode 100644
index 000000000000..d032087311c0
--- /dev/null
+++ b/dev-ros/actionlib_tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros/actionlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/actionlib_tutorials/Manifest b/dev-ros/actionlib_tutorials/Manifest
index 21c9795fdb9e..5089dd0ab07b 100644
--- a/dev-ros/actionlib_tutorials/Manifest
+++ b/dev-ros/actionlib_tutorials/Manifest
@@ -1,8 +1,6 @@
-DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
-DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
-DIST common_tutorials-0.1.8.tar.gz 10591 BLAKE2B 7bf99e6a46ff52904f34f0b8e226dab10634325531ac736e530499af43ad1f1ca62168e476ef6ea9e33007c883804220b512e7683fed36e6940017624031f0ac SHA512 a0a2e8a7aba3415bf133e95e7d1b72cf5ee81efa962003ccaa2108fdfebd2a03044c60fd4daf73ca69f3a2975bd7fa9c60adfefc32d1b048da11e65aa613607c
-EBUILD actionlib_tutorials-0.1.10.ebuild 512 BLAKE2B 7e2a0e2ed6aa9adf69a5849c508a2da2a4944a2d5b09eede252671bd63f33a2f9af594783f852e4ebd2fe07537ffd378503fc1572df9b4d0a56386dcb1bac7be SHA512 80a38d4b14640d3b58c5ef893fe7627f4846a6d764fb4764c70ee7f92ece5d81e1f896f627f31e73a06d3ee393346911c9a6965e4b8bfc10cb166422f2bd5ecd
-EBUILD actionlib_tutorials-0.1.11.ebuild 512 BLAKE2B 92df94566b70d1f99559947535f819591265b978362df63c059fd16e2eda367e48a375e6251cbedc5319488e750c893c38373f27ae333be9b280fae4bac969cc SHA512 886a1c079e23326fd10bc0c11eccde179f01ac32d8862804d0bb4212442c581c51149338b7319b924bb7589fa14e88cb3ff381321fdba268d073b7d5c6eb0bf3
-EBUILD actionlib_tutorials-0.1.8.ebuild 512 BLAKE2B ff7e8318b4c18367c57cfa021b3eea87048ba13f4086bd62d3b43e21eda3f269c713f2d227111ae7729eb955878ca74c7e8b6b2eac51c68afba60e6c9083813b SHA512 a64362ce1310e632f5ccd88cde6c53a3aadc4df802102680e37236191a7e514b2f3b00c5a326a17102a37ecd9732ad5830afe2079e3a41262b684233e7be241a
-EBUILD actionlib_tutorials-9999.ebuild 512 BLAKE2B ff7e8318b4c18367c57cfa021b3eea87048ba13f4086bd62d3b43e21eda3f269c713f2d227111ae7729eb955878ca74c7e8b6b2eac51c68afba60e6c9083813b SHA512 a64362ce1310e632f5ccd88cde6c53a3aadc4df802102680e37236191a7e514b2f3b00c5a326a17102a37ecd9732ad5830afe2079e3a41262b684233e7be241a
+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.ebuild 481 BLAKE2B b97dca180f6681633671f90d0ff3b0f70c2157f3bfd1df8db65327d33a8968ad44e75b6d6963a20192ed6534a4211b9a9e5d0fec2972c5e5665f600ec6e1a588 SHA512 a2980f7033949d2cdf838dc35178cb6507b02140ad80ae3ddaeb7c50375140ff6833253a1f546accaaa4c358bc47cd708ffbecde18f98d42cfd868b8ac9b8fb3
+EBUILD actionlib_tutorials-0.2.0.ebuild 481 BLAKE2B b97dca180f6681633671f90d0ff3b0f70c2157f3bfd1df8db65327d33a8968ad44e75b6d6963a20192ed6534a4211b9a9e5d0fec2972c5e5665f600ec6e1a588 SHA512 a2980f7033949d2cdf838dc35178cb6507b02140ad80ae3ddaeb7c50375140ff6833253a1f546accaaa4c358bc47cd708ffbecde18f98d42cfd868b8ac9b8fb3
+EBUILD actionlib_tutorials-9999.ebuild 481 BLAKE2B b97dca180f6681633671f90d0ff3b0f70c2157f3bfd1df8db65327d33a8968ad44e75b6d6963a20192ed6534a4211b9a9e5d0fec2972c5e5665f600ec6e1a588 SHA512 a2980f7033949d2cdf838dc35178cb6507b02140ad80ae3ddaeb7c50375140ff6833253a1f546accaaa4c358bc47cd708ffbecde18f98d42cfd868b8ac9b8fb3
 MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.10.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.10.ebuild
deleted file mode 100644
index e841322f5bd6..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-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:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild
deleted file mode 100644
index a2c7c31051fe..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-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:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12.ebuild
new file mode 100644
index 000000000000..06dbfac86d9b
--- /dev/null
+++ b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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}
+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:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.8.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.8.ebuild
deleted file mode 100644
index 4c7a233988b2..000000000000
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-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:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.2.0.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.2.0.ebuild
new file mode 100644
index 000000000000..06dbfac86d9b
--- /dev/null
+++ b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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}
+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:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
index 4c7a233988b2..06dbfac86d9b 100644
--- a/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
+++ b/dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/common_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest
index 7fb7f28818a0..b2ad13a3d541 100644
--- a/dev-ros/amcl/Manifest
+++ b/dev-ros/amcl/Manifest
@@ -1,7 +1,23 @@
 AUX cmake.patch 331 BLAKE2B 473d4915af835a5f374eddf6d24d8bb003b02aaabc43119fa1d4eb53ecc640ca0225d0be0a03f811414b729344d1218b264231b27cb77480ec613283b03db6b8 SHA512 c2bd6bf44eedf69c03de172b88d9b9471a78b7176d6a5d4db18564986780c9c05ce9d74a65ded689fe1480d2094a2c16feffe27f7797224f6f43d019a806c327
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD amcl-1.16.3-r1.ebuild 1079 BLAKE2B c11f6555c3626edd0584b6612a8eb7e4e4cdfc5dc5f963bc5c65ca9a6affb07ffaa88025aab922de9e39859e5a98039021a63db95b8887a602680e3b5c002872 SHA512 a415f9623f0de95f4d84709fefd0513cbb16ae6c66fdd324d5eade232393afde69c1b5a51eac6ef9abde75323847d79b40d1426a9a99c7c0c4ce8fd8d6c2d28b
-EBUILD amcl-1.16.6.ebuild 1079 BLAKE2B c11f6555c3626edd0584b6612a8eb7e4e4cdfc5dc5f963bc5c65ca9a6affb07ffaa88025aab922de9e39859e5a98039021a63db95b8887a602680e3b5c002872 SHA512 a415f9623f0de95f4d84709fefd0513cbb16ae6c66fdd324d5eade232393afde69c1b5a51eac6ef9abde75323847d79b40d1426a9a99c7c0c4ce8fd8d6c2d28b
-EBUILD amcl-9999.ebuild 1079 BLAKE2B c11f6555c3626edd0584b6612a8eb7e4e4cdfc5dc5f963bc5c65ca9a6affb07ffaa88025aab922de9e39859e5a98039021a63db95b8887a602680e3b5c002872 SHA512 a415f9623f0de95f4d84709fefd0513cbb16ae6c66fdd324d5eade232393afde69c1b5a51eac6ef9abde75323847d79b40d1426a9a99c7c0c4ce8fd8d6c2d28b
+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-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
+EBUILD amcl-1.17.0.ebuild 1811 BLAKE2B 90e0627d3836a5a6049744084dfc59ea5176fd1ccbb5888d1c35665f9b8b7ab7054034dfbd2b2ea3209524973be65483cefca3cca77082f52838c2413cd8e714 SHA512 36db15257621e9700a745ac15d816d8b798e6d751d506e1f093cd3047a56d77f2cafc0acf2999da22d3534a790c4a642ca06be0935b81b00c8d493f9be775249
+EBUILD amcl-9999.ebuild 1811 BLAKE2B 90e0627d3836a5a6049744084dfc59ea5176fd1ccbb5888d1c35665f9b8b7ab7054034dfbd2b2ea3209524973be65483cefca3cca77082f52838c2413cd8e714 SHA512 36db15257621e9700a745ac15d816d8b798e6d751d506e1f093cd3047a56d77f2cafc0acf2999da22d3534a790c4a642ca06be0935b81b00c8d493f9be775249
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/amcl/amcl-1.16.3-r1.ebuild b/dev-ros/amcl/amcl-1.16.3-r1.ebuild
deleted file mode 100644
index 130de3bbef70..000000000000
--- a/dev-ros/amcl/amcl-1.16.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosbag
-		dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
-"
-PATCHES=( "${FILESDIR}/cmake.patch" )
diff --git a/dev-ros/amcl/amcl-1.16.6.ebuild b/dev-ros/amcl/amcl-1.16.6.ebuild
deleted file mode 100644
index 130de3bbef70..000000000000
--- a/dev-ros/amcl/amcl-1.16.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosbag
-		dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
-"
-PATCHES=( "${FILESDIR}/cmake.patch" )
diff --git a/dev-ros/amcl/amcl-1.17.0.ebuild b/dev-ros/amcl/amcl-1.17.0.ebuild
new file mode 100644
index 000000000000..a871a83d6448
--- /dev/null
+++ b/dev-ros/amcl/amcl-1.17.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 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
index 130de3bbef70..a871a83d6448 100644
--- a/dev-ros/amcl/amcl-9999.ebuild
+++ b/dev-ros/amcl/amcl-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,23 +13,57 @@ 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_USEDEP}]
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rosbag
 		dev-libs/boost:=
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2_ros
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_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_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/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
new file mode 100644
index 000000000000..a222024422f5
--- /dev/null
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_copyright-0.9.5.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
+EBUILD ament_cmake_copyright-9999.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.9.5.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.9.5.ebuild
new file mode 100644
index 000000000000..29ed35a1afd5
--- /dev/null
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.9.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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 auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_copyright
+	dev-ros/ament_cmake_test
+"
+DEPEND=""
+# 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() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || 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
new file mode 100644
index 000000000000..29ed35a1afd5
--- /dev/null
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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 auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_copyright
+	dev-ros/ament_cmake_test
+"
+DEPEND=""
+# 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() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || 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
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_cmake_copyright/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index b301d7fe37cc..ff3ec42f545b 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_core-0.8.1.ebuild 926 BLAKE2B b712ca27c217324c2c5668b1288fed950f0a9cf30bf1ba558db1cb90607572a3c0b5c8adbfad0b417bbe1484719916f0d980cbf5b8c5fe3656ec6bd6d32fc406 SHA512 79c17fd87f232478772b66dee2f0284e18e8cf55a1268b1142ed20fa27a14913fb298541908e654c76d5241a10813f5a4cb27368786384178a9764e1c3d7cc51
-EBUILD ament_cmake_core-9999.ebuild 926 BLAKE2B b712ca27c217324c2c5668b1288fed950f0a9cf30bf1ba558db1cb90607572a3c0b5c8adbfad0b417bbe1484719916f0d980cbf5b8c5fe3656ec6bd6d32fc406 SHA512 79c17fd87f232478772b66dee2f0284e18e8cf55a1268b1142ed20fa27a14913fb298541908e654c76d5241a10813f5a4cb27368786384178a9764e1c3d7cc51
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_core-0.9.6.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
+EBUILD ament_cmake_core-1.0.0.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
+EBUILD ament_cmake_core-9999.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-0.8.1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-0.8.1.ebuild
deleted file mode 100644
index 6e3eac947c36..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The core of the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-python/ament_package
-	dev-python/catkin_pkg
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-0.9.6.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-0.9.6.ebuild
new file mode 100644
index 000000000000..91e4b417df78
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-python/ament_package
+	dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.0.0.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.0.ebuild
new file mode 100644
index 000000000000..91e4b417df78
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-python/ament_package
+	dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 6e3eac947c36..91e4b417df78 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -39,3 +39,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
new file mode 100644
index 000000000000..6c220bf6bc38
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_cppcheck-0.9.5.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
+EBUILD ament_cmake_cppcheck-9999.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.9.5.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.9.5.ebuild
new file mode 100644
index 000000000000..9318e3a9e9c2
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.9.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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="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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cppcheck
+"
+DEPEND=""
+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 || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "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
new file mode 100644
index 000000000000..9318e3a9e9c2
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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="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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cppcheck
+"
+DEPEND=""
+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 || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "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
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
new file mode 100644
index 000000000000..606112f459c5
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_cpplint-0.9.5.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
+EBUILD ament_cmake_cpplint-9999.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.9.5.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.9.5.ebuild
new file mode 100644
index 000000000000..f60a48951cc2
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.9.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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="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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cpplint
+"
+DEPEND=""
+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 || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "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
new file mode 100644
index 000000000000..f60a48951cc2
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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="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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cpplint
+"
+DEPEND=""
+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 || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "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
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index ea98d6478e1e..89a0178fe883 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_export_definitions-0.8.1.ebuild 1008 BLAKE2B 0a53e92aae2655d69581f5b6c5ab155555ddaffe5cdf251135961ba77fd5c7d21dca772c8d9f81bc4ef2ebf7b54f1d2edd12df78d84928db1ce05f9fff25a270 SHA512 c4ec21cb34fbcef2163da52b23fcbf645be77034abba029b5162c4a2390ec9040fca7ca452a7a217b929937745f48089ff45c08afd5767f7159154d3dc85df29
-EBUILD ament_cmake_export_definitions-9999.ebuild 1008 BLAKE2B 0a53e92aae2655d69581f5b6c5ab155555ddaffe5cdf251135961ba77fd5c7d21dca772c8d9f81bc4ef2ebf7b54f1d2edd12df78d84928db1ce05f9fff25a270 SHA512 c4ec21cb34fbcef2163da52b23fcbf645be77034abba029b5162c4a2390ec9040fca7ca452a7a217b929937745f48089ff45c08afd5767f7159154d3dc85df29
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_export_definitions-0.9.6.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
+EBUILD ament_cmake_export_definitions-1.0.0.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
+EBUILD ament_cmake_export_definitions-9999.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild
deleted file mode 100644
index 7174878a8530..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.9.6.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.9.6.ebuild
new file mode 100644
index 000000000000..63b8542747c6
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.0.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.0.ebuild
new file mode 100644
index 000000000000..63b8542747c6
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 7174878a8530..63b8542747c6 100644
--- 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
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -39,3 +39,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index e1a0435ec672..a1f91bd63d22 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_export_dependencies-0.8.1.ebuild 1049 BLAKE2B ffdb8d5b6bf64e55a54b3eca6ff87279f10a84503a738eb22d477c741d68030b242f30587b11011a34f668077ee97c643299493f2716eb15ee9879e475554d10 SHA512 746e41db31511e1a307ea7974595da0d6c08d1af5f238ee4fba3b5da3d5490a1066414f64ff97ca6f73eef9c49d08759a03545c59a374f3c349cfcf63ef00d2a
-EBUILD ament_cmake_export_dependencies-9999.ebuild 1049 BLAKE2B ffdb8d5b6bf64e55a54b3eca6ff87279f10a84503a738eb22d477c741d68030b242f30587b11011a34f668077ee97c643299493f2716eb15ee9879e475554d10 SHA512 746e41db31511e1a307ea7974595da0d6c08d1af5f238ee4fba3b5da3d5490a1066414f64ff97ca6f73eef9c49d08759a03545c59a374f3c349cfcf63ef00d2a
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_export_dependencies-0.9.6.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
+EBUILD ament_cmake_export_dependencies-1.0.0.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
+EBUILD ament_cmake_export_dependencies-9999.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild
deleted file mode 100644
index a8243ae65981..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.9.6.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.9.6.ebuild
new file mode 100644
index 000000000000..6dcea483b58f
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.9.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.0.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.0.ebuild
new file mode 100644
index 000000000000..6dcea483b58f
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index a8243ae65981..6dcea483b58f 100644
--- 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
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -40,3 +40,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index 186c7fa47fbf..0b983549deb0 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_export_include_directories-0.8.1.ebuild 1016 BLAKE2B f99154bd0ad55d9209e173d185ad14bedf0d6b835c34c1e6de9d90713190c482532692bb6d3a3eecbd3ffefb27685016175b4ca353919d8dbea65f8d164c5a7f SHA512 8628400c047fc898c3aaeee3258b0dc4904e14ed8c083e9b91d90c1d00965a31e2cbbd71565c3140c9b3453dee3a10d50a9141d67a0352c61efd6e2c1e2db55f
-EBUILD ament_cmake_export_include_directories-9999.ebuild 1016 BLAKE2B f99154bd0ad55d9209e173d185ad14bedf0d6b835c34c1e6de9d90713190c482532692bb6d3a3eecbd3ffefb27685016175b4ca353919d8dbea65f8d164c5a7f SHA512 8628400c047fc898c3aaeee3258b0dc4904e14ed8c083e9b91d90c1d00965a31e2cbbd71565c3140c9b3453dee3a10d50a9141d67a0352c61efd6e2c1e2db55f
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_export_include_directories-0.9.6.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
+EBUILD ament_cmake_export_include_directories-1.0.0.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
+EBUILD ament_cmake_export_include_directories-9999.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.8.1.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.8.1.ebuild
deleted file mode 100644
index 3ec728675bae..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.9.6.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.9.6.ebuild
new file mode 100644
index 000000000000..64cff4ebe537
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.0.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.0.ebuild
new file mode 100644
index 000000000000..64cff4ebe537
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 3ec728675bae..64cff4ebe537 100644
--- 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
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -39,3 +39,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index 04a4283ea819..2b04e9b2044f 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_export_interfaces-0.8.1.ebuild 1045 BLAKE2B dcb61e865cdb17c4ebd3edb66ba40eb4f7947e88cf9a09a1471074d7a27d8b592794f7914a739e77847b648a2815ac967c46811bb9dfd0943cb855af2177d454 SHA512 8096978f17a317c88431b577d694cbca9933ae0a508756db1674c87551af0d1f9688d91298f03ff65237dde9fffc945d06c4d84830701d08a5c95a4c612fa9dc
-EBUILD ament_cmake_export_interfaces-9999.ebuild 1045 BLAKE2B dcb61e865cdb17c4ebd3edb66ba40eb4f7947e88cf9a09a1471074d7a27d8b592794f7914a739e77847b648a2815ac967c46811bb9dfd0943cb855af2177d454 SHA512 8096978f17a317c88431b577d694cbca9933ae0a508756db1674c87551af0d1f9688d91298f03ff65237dde9fffc945d06c4d84830701d08a5c95a4c612fa9dc
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_export_interfaces-0.9.6.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
+EBUILD ament_cmake_export_interfaces-1.0.0.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
+EBUILD ament_cmake_export_interfaces-9999.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.8.1.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.8.1.ebuild
deleted file mode 100644
index ecee8305483e..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.8.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_export_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.9.6.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.9.6.ebuild
new file mode 100644
index 000000000000..d8a437ccd5be
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.9.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.0.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.0.ebuild
new file mode 100644
index 000000000000..d8a437ccd5be
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index ecee8305483e..d8a437ccd5be 100644
--- 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
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -40,3 +40,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index 45ac90c7bb2d..323a892b40f6 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_export_libraries-0.8.1.ebuild 1150 BLAKE2B 77c6db5fe7af6b8f906c4bae8f5c6bff8449d7178a4544759bbc4e645e4ca48bd8b866ebab946afb6102bee7f0b0290c851c17b1e3da71c0b7d9cffc1bd62d12 SHA512 1256c8cc89cb2656ac123caa94465de37055faad2e0f5cbc030d906313dffd7bb43ce269e85a2a4bf0c39acfe04d27ce330ebd070399abd1b58e7e679f87fe7e
-EBUILD ament_cmake_export_libraries-9999.ebuild 1150 BLAKE2B 77c6db5fe7af6b8f906c4bae8f5c6bff8449d7178a4544759bbc4e645e4ca48bd8b866ebab946afb6102bee7f0b0290c851c17b1e3da71c0b7d9cffc1bd62d12 SHA512 1256c8cc89cb2656ac123caa94465de37055faad2e0f5cbc030d906313dffd7bb43ce269e85a2a4bf0c39acfe04d27ce330ebd070399abd1b58e7e679f87fe7e
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_export_libraries-0.9.6.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
+EBUILD ament_cmake_export_libraries-1.0.0.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
+EBUILD ament_cmake_export_libraries-9999.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.8.1.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.8.1.ebuild
deleted file mode 100644
index 3a206672bb44..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.8.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.9.6.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.9.6.ebuild
new file mode 100644
index 000000000000..448a058815a4
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.0.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.0.ebuild
new file mode 100644
index 000000000000..448a058815a4
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 3a206672bb44..448a058815a4 100644
--- 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
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
index a1a5713f3a05..06b57bd54740 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_export_link_flags-0.8.1.ebuild 1007 BLAKE2B c7c2570116a159a3d723204e6a54f32bbc7bcc8c16566c2e9509b5819793458c9e7fc8125f536a1a8b97e1803ab91cd4cb2212584b31362af51c860f8da4d852 SHA512 ff033ae591eb5e45b1eaf12e0db50d1c859b5c0ceed51daec53ce3474b7202084629c66c5997178d46a15d4211b94b9e3876caac5b825ccd142c682278faf176
-EBUILD ament_cmake_export_link_flags-9999.ebuild 1007 BLAKE2B c7c2570116a159a3d723204e6a54f32bbc7bcc8c16566c2e9509b5819793458c9e7fc8125f536a1a8b97e1803ab91cd4cb2212584b31362af51c860f8da4d852 SHA512 ff033ae591eb5e45b1eaf12e0db50d1c859b5c0ceed51daec53ce3474b7202084629c66c5997178d46a15d4211b94b9e3876caac5b825ccd142c682278faf176
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_export_link_flags-0.9.6.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
+EBUILD ament_cmake_export_link_flags-1.0.0.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
+EBUILD ament_cmake_export_link_flags-9999.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.8.1.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.8.1.ebuild
deleted file mode 100644
index 6f08b075e590..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.9.6.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.9.6.ebuild
new file mode 100644
index 000000000000..a009e37c439b
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.0.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.0.ebuild
new file mode 100644
index 000000000000..a009e37c439b
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 6f08b075e590..a009e37c439b 100644
--- 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
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -39,3 +39,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
new file mode 100644
index 000000000000..bdf3854cf4a3
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -0,0 +1,6 @@
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_export_targets-0.9.6.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
+EBUILD ament_cmake_export_targets-1.0.0.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
+EBUILD ament_cmake_export_targets-9999.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-0.9.6.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-0.9.6.ebuild
new file mode 100644
index 000000000000..16d96ae3af52
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-0.9.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export 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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.0.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.0.ebuild
new file mode 100644
index 000000000000..16d96ae3af52
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export 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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..16d96ae3af52
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export 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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_cmake</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
new file mode 100644
index 000000000000..6ae0dd448383
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_gmock-1.0.0.ebuild 1156 BLAKE2B c87d1774065994503291eca280dd6bb3e11ac3df3216e040990110d684824877c0bbb4a478e1c34d622f9e7ea14ae3e33ac8a5b93a9373abe389b6992aaaf7c3 SHA512 215bf70e9ceb21398d648b8d97472b83184359a2508f1f98c87f4a393beb453f62b243951b278b9540712a0468f7b97f9cb19dd4d331e1eba137e94b10d09ba7
+EBUILD ament_cmake_gmock-9999.ebuild 1156 BLAKE2B c87d1774065994503291eca280dd6bb3e11ac3df3216e040990110d684824877c0bbb4a478e1c34d622f9e7ea14ae3e33ac8a5b93a9373abe389b6992aaaf7c3 SHA512 215bf70e9ceb21398d648b8d97472b83184359a2508f1f98c87f4a393beb453f62b243951b278b9540712a0468f7b97f9cb19dd4d331e1eba137e94b10d09ba7
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.0.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.0.ebuild
new file mode 100644
index 000000000000..f63ad218898c
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	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 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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..f63ad218898c
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	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 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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gmock/metadata.xml b/dev-ros/ament_cmake_gmock/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_cmake</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
index 7fa12ad3b2b4..f8f1aab49821 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_gtest-0.8.1.ebuild 1147 BLAKE2B f88a7d3f9ce313a92c3f36ad63f808f32134a999ae8d04b86e83007dcafe24c93e7078f3da1e33693532208d4770b5accd066471ee152d4e79c9bb24fbc5722d SHA512 9b97301167ee0a9b620275ada2699d2ae0f00f5e771b5f71c746b70e1b4a402879ff112fa3aad0f119d931805b76cb9b380ee8a7bc45b9a8cb3e74b3b687ebca
-EBUILD ament_cmake_gtest-9999.ebuild 1147 BLAKE2B f88a7d3f9ce313a92c3f36ad63f808f32134a999ae8d04b86e83007dcafe24c93e7078f3da1e33693532208d4770b5accd066471ee152d4e79c9bb24fbc5722d SHA512 9b97301167ee0a9b620275ada2699d2ae0f00f5e771b5f71c746b70e1b4a402879ff112fa3aad0f119d931805b76cb9b380ee8a7bc45b9a8cb3e74b3b687ebca
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_gtest-0.9.6.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
+EBUILD ament_cmake_gtest-1.0.0.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
+EBUILD ament_cmake_gtest-9999.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.8.1.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.8.1.ebuild
deleted file mode 100644
index 55a2af945684..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.8.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.9.6.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.9.6.ebuild
new file mode 100644
index 000000000000..2f25c5bddffb
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.0.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.0.ebuild
new file mode 100644
index 000000000000..2f25c5bddffb
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 55a2af945684..2f25c5bddffb 100644
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
index 520ca86e115b..dfadfa2571cd 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_include_directories-0.8.1.ebuild 1016 BLAKE2B f99154bd0ad55d9209e173d185ad14bedf0d6b835c34c1e6de9d90713190c482532692bb6d3a3eecbd3ffefb27685016175b4ca353919d8dbea65f8d164c5a7f SHA512 8628400c047fc898c3aaeee3258b0dc4904e14ed8c083e9b91d90c1d00965a31e2cbbd71565c3140c9b3453dee3a10d50a9141d67a0352c61efd6e2c1e2db55f
-EBUILD ament_cmake_include_directories-9999.ebuild 1016 BLAKE2B f99154bd0ad55d9209e173d185ad14bedf0d6b835c34c1e6de9d90713190c482532692bb6d3a3eecbd3ffefb27685016175b4ca353919d8dbea65f8d164c5a7f SHA512 8628400c047fc898c3aaeee3258b0dc4904e14ed8c083e9b91d90c1d00965a31e2cbbd71565c3140c9b3453dee3a10d50a9141d67a0352c61efd6e2c1e2db55f
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_include_directories-0.9.6.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
+EBUILD ament_cmake_include_directories-1.0.0.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
+EBUILD ament_cmake_include_directories-9999.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.8.1.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.8.1.ebuild
deleted file mode 100644
index 3ec728675bae..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.9.6.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.9.6.ebuild
new file mode 100644
index 000000000000..64cff4ebe537
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.0.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.0.ebuild
new file mode 100644
index 000000000000..64cff4ebe537
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 3ec728675bae..64cff4ebe537 100644
--- 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
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -39,3 +39,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index 87567b9cb1bd..380eb0cded4f 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_libraries-0.8.1.ebuild 1153 BLAKE2B 742d43baa3796a5dd5067256bad9ae0cf7ce11e7f7d59e043530038d129a7ac866dfcd4ca48085ecb8f2e225e4df03553a2272511c5c062b3e38e2a6a472170f SHA512 a210c241e8b2f0eeae4e787abf1facff78118ae6b05c11c89c6ba7e6b55c50665a6629f815c0817fc7ccb0ed68a47776305c858c3529a8549c6b9a1d706fb27d
-EBUILD ament_cmake_libraries-9999.ebuild 1153 BLAKE2B 742d43baa3796a5dd5067256bad9ae0cf7ce11e7f7d59e043530038d129a7ac866dfcd4ca48085ecb8f2e225e4df03553a2272511c5c062b3e38e2a6a472170f SHA512 a210c241e8b2f0eeae4e787abf1facff78118ae6b05c11c89c6ba7e6b55c50665a6629f815c0817fc7ccb0ed68a47776305c858c3529a8549c6b9a1d706fb27d
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_libraries-0.9.6.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
+EBUILD ament_cmake_libraries-1.0.0.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
+EBUILD ament_cmake_libraries-9999.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.8.1.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.8.1.ebuild
deleted file mode 100644
index 9e26d92976cd..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.8.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
-}
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.9.6.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.9.6.ebuild
new file mode 100644
index 000000000000..b578744e5fc1
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.ebuild
new file mode 100644
index 000000000000..b578744e5fc1
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 9e26d92976cd..b578744e5fc1 100644
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-ros/ament_cmake_lint_cmake/Manifest b/dev-ros/ament_cmake_lint_cmake/Manifest
new file mode 100644
index 000000000000..a8f4f8a4911c
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_lint_cmake-0.9.5.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
+EBUILD ament_cmake_lint_cmake-9999.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.9.5.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.9.5.ebuild
new file mode 100644
index 000000000000..9b291e4d7356
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.9.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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 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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_lint_cmake
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(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_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..9b291e4d7356
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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 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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_lint_cmake
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(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_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
new file mode 100644
index 000000000000..899dd9246716
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_pytest-1.0.0.ebuild 1158 BLAKE2B ee413315205e26fd9606f578f147db7f9dfd14d66b86ca29114555b9bd34c6347cb6681fecca18e60aa0e966139a06c922d0c6d848e8409e48181257b8307b52 SHA512 20920da8d699f6675887da88dff9fdb279eb2ac1da3d2436b7b970b07128aafc2f07dc747f30174f6441546152fb3c02b670abab8d7a60502c78079acff2fa8d
+EBUILD ament_cmake_pytest-9999.ebuild 1158 BLAKE2B ee413315205e26fd9606f578f147db7f9dfd14d66b86ca29114555b9bd34c6347cb6681fecca18e60aa0e966139a06c922d0c6d848e8409e48181257b8307b52 SHA512 20920da8d699f6675887da88dff9fdb279eb2ac1da3d2436b7b970b07128aafc2f07dc747f30174f6441546152fb3c02b670abab8d7a60502c78079acff2fa8d
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.0.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.0.ebuild
new file mode 100644
index 000000000000..f0104eb06e84
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	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 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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..f0104eb06e84
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	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 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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_pytest/metadata.xml b/dev-ros/ament_cmake_pytest/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_cmake</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index 060074eec0b6..e3b7c53500d6 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -1,5 +1,7 @@
 AUX destdir.patch 1203 BLAKE2B fe4e783ea9d4802752d79d489e5b05d0ca9688a76d678521af41f232005da611c0286f594d15045dcae5610362ccc1bb878d29bddbeb86a9452b0289af347d67 SHA512 85e196c9777a6cc8b8b693e3825d5027c7a5db0a74008ad34d9be3714a088a9e651bb99ce53ee2bd95c47b2c1f8c2c657fa18cce0f13b11e4ea437cdd03ef0b3
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_python-0.8.1-r1.ebuild 1032 BLAKE2B 8113b0daaed54dba1b76fcf18ee95f335591037d6ad83a5b0f9e7c6665c270a6fcbc8b27bbe28e63957c93d53b49d9fcbcebabc7db7ede8ce2358c85e12308dc SHA512 ebb58bf8f4b1e7f7afbad4f5d9bd5ae56dab68307e6c58361ecce66dbc98b70bb959e9d3db97aa83bcd11184be3cf0551c4477233417be7a646b4e22dfe163c1
-EBUILD ament_cmake_python-9999.ebuild 1032 BLAKE2B 8113b0daaed54dba1b76fcf18ee95f335591037d6ad83a5b0f9e7c6665c270a6fcbc8b27bbe28e63957c93d53b49d9fcbcebabc7db7ede8ce2358c85e12308dc SHA512 ebb58bf8f4b1e7f7afbad4f5d9bd5ae56dab68307e6c58361ecce66dbc98b70bb959e9d3db97aa83bcd11184be3cf0551c4477233417be7a646b4e22dfe163c1
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_python-0.9.6.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
+EBUILD ament_cmake_python-1.0.0.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
+EBUILD ament_cmake_python-9999.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild
deleted file mode 100644
index fba573262bf6..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to use Python in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
-PATCHES=( "${FILESDIR}/destdir.patch" )
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-0.9.6.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-0.9.6.ebuild
new file mode 100644
index 000000000000..866ed8213865
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-0.9.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.0.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.0.ebuild
new file mode 100644
index 000000000000..866ed8213865
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index fba573262bf6..866ed8213865 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -40,3 +40,8 @@ BDEPEND="
 	${PYTHON_DEPS}
 "
 PATCHES=( "${FILESDIR}/destdir.patch" )
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_ros/Manifest b/dev-ros/ament_cmake_ros/Manifest
new file mode 100644
index 000000000000..08cf4e40249b
--- /dev/null
+++ b/dev-ros/ament_cmake_ros/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake_ros-0.9.0.tar.gz 10247 BLAKE2B 7492dae5b9925c2de5c6d775bec40a00c82eddd4f62ce9bfe51d745eebcc453646088b448b2e26a6d92a38ccc343e36c0ab9bcb7ec307265c1467c9129cd9aad SHA512 3c18cb88b943f06edcf3b83ba18b958997583ee733545faf8e8a9f2008a7d5da47f0479ddce6f32afefcc1a316304e78b1d36566ea6de77a89b3c64871bea766
+EBUILD ament_cmake_ros-0.9.0.ebuild 1107 BLAKE2B fe46df60d93e9f7bdb7435b031d6f637df4268d313d02f1df0fec93f03fa90a0aed51fa81d91a995507becbfa54f281ee1540850a94567eb9df69742ae5494c1 SHA512 48175c16d15da9e7ff292d573ffc65837e87cb6d7496958141785541064a7f6e6ef90f70eac6c64d87447dfcfdc4833229e0ab4ce35410a98e2db35dda554167
+EBUILD ament_cmake_ros-9999.ebuild 1107 BLAKE2B fe46df60d93e9f7bdb7435b031d6f637df4268d313d02f1df0fec93f03fa90a0aed51fa81d91a995507becbfa54f281ee1540850a94567eb9df69742ae5494c1 SHA512 48175c16d15da9e7ff292d573ffc65837e87cb6d7496958141785541064a7f6e6ef90f70eac6c64d87447dfcfdc4833229e0ab4ce35410a98e2db35dda554167
+MISC metadata.xml 334 BLAKE2B 31ad71fc081aaff06e8df868becdce6a5534f0c87ade8bc8525b1b2f9c9ba2fd750707cfbc2bc49fad70f5c353c25b07c81ac15fbf75bcdc33f307790f524a06 SHA512 e9725870b6ea4b7da5fd243399548a74dcff4c0cd6acb0b1ff3d72f35710cb1d70ec7bc0d6082e468599294f44308476ed9e2194785712b40bbb9a4d9a3a15a6
diff --git a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.0.ebuild b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.0.ebuild
new file mode 100644
index 000000000000..d0cf50beea1c
--- /dev/null
+++ b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	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}"
+fi
+
+DESCRIPTION="ROS specific CMake bits in the ament buildsystem"
+HOMEPAGE="https://github.com/ros2/ament_cmake_ros"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
+	test? (
+		dev-ros/ament_lint_auto
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	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
new file mode 100644
index 000000000000..d0cf50beea1c
--- /dev/null
+++ b/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	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}"
+fi
+
+DESCRIPTION="ROS specific CMake bits in the ament buildsystem"
+HOMEPAGE="https://github.com/ros2/ament_cmake_ros"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
+	test? (
+		dev-ros/ament_lint_auto
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	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
new file mode 100644
index 000000000000..c4507367383c
--- /dev/null
+++ b/dev-ros/ament_cmake_ros/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros2/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
index 6a13a5a293df..a0312c22c8da 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_target_dependencies-0.8.1.ebuild 1082 BLAKE2B 2564d6711bb8446b10231990580cf45774ea5e4dbbf1f01d0a3e43c31f2f09d91eaa6495dd95d0cd5a21ac7a291740c47ca8659eaa66d038830d14c8a7f80dc4 SHA512 c4fcfe25aafdceda2b8e5cf9fea02c6a67ca739b526c93b6c431ce22ac27c5a40aaafb10393113303f56e8340f2eb8690003c8c10e0071de680e15c98c8c02eb
-EBUILD ament_cmake_target_dependencies-9999.ebuild 1082 BLAKE2B 2564d6711bb8446b10231990580cf45774ea5e4dbbf1f01d0a3e43c31f2f09d91eaa6495dd95d0cd5a21ac7a291740c47ca8659eaa66d038830d14c8a7f80dc4 SHA512 c4fcfe25aafdceda2b8e5cf9fea02c6a67ca739b526c93b6c431ce22ac27c5a40aaafb10393113303f56e8340f2eb8690003c8c10e0071de680e15c98c8c02eb
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_target_dependencies-0.9.6.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
+EBUILD ament_cmake_target_dependencies-1.0.0.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
+EBUILD ament_cmake_target_dependencies-9999.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild
deleted file mode 100644
index c48f31a5cc7f..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_include_directories
-	dev-ros/ament_cmake_libraries
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.9.6.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.9.6.ebuild
new file mode 100644
index 000000000000..16ca90c0c124
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.9.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_include_directories
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.0.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.0.ebuild
new file mode 100644
index 000000000000..16ca90c0c124
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_include_directories
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index c48f31a5cc7f..16ca90c0c124 100644
--- 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
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -41,3 +41,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
index 525a99246446..bb268be1bc91 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_test-0.8.1.ebuild 1249 BLAKE2B 9de5cd84858828b42234a80abdb7c6fb709a853fb590d36b61aea4a2125356375d99a9dde55e7f5a7c6478c7cff34536a3528a9e39b8c668edad01091546365a SHA512 1c105fe065b6265f165be147a2e8b936b7a1a5de5ae55e2c4a2c826bd35657faf382a975db4b03621f8cf646d3e84e92a12e9b69c555a8f099cbce995715098c
-EBUILD ament_cmake_test-9999.ebuild 1249 BLAKE2B 9de5cd84858828b42234a80abdb7c6fb709a853fb590d36b61aea4a2125356375d99a9dde55e7f5a7c6478c7cff34536a3528a9e39b8c668edad01091546365a SHA512 1c105fe065b6265f165be147a2e8b936b7a1a5de5ae55e2c4a2c826bd35657faf382a975db4b03621f8cf646d3e84e92a12e9b69c555a8f099cbce995715098c
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_test-0.9.6.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
+EBUILD ament_cmake_test-1.0.0.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
+EBUILD ament_cmake_test-9999.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild
deleted file mode 100644
index 938e0193c306..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to add tests in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-DEPEND="
-	dev-ros/ament_cmake_core
-		dev-python/ament_package[${PYTHON_USEDEP}]
-		dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-ros/ament_cmake_python
-	${PYTHON_DEPS}
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	python_foreach_impl cmake-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake-utils_src_install
-	python_foreach_impl python_optimize
-}
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-0.9.6.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-0.9.6.ebuild
new file mode 100644
index 000000000000..00d8aa0613ba
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-0.9.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_python
+	${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_foreach_impl cmake_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.0.0.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.0.ebuild
new file mode 100644
index 000000000000..00d8aa0613ba
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_python
+	${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_foreach_impl cmake_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
index 938e0193c306..00d8aa0613ba 100644
--- a/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-r1
+inherit cmake python-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -42,18 +42,18 @@ BDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_configure() {
-	python_foreach_impl cmake-utils_src_configure
+	python_foreach_impl cmake_src_configure
 }
 
 src_compile() {
-	python_foreach_impl cmake-utils_src_compile
+	python_foreach_impl cmake_src_compile
 }
 
 src_test() {
-	python_foreach_impl cmake-utils_src_test
+	python_foreach_impl cmake_src_test
 }
 
 src_install() {
-	python_foreach_impl cmake-utils_src_install
+	python_foreach_impl cmake_src_install
 	python_foreach_impl python_optimize
 }
diff --git a/dev-ros/ament_cmake_uncrustify/Manifest b/dev-ros/ament_cmake_uncrustify/Manifest
new file mode 100644
index 000000000000..52bed5a3bf96
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_uncrustify-0.9.5.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
+EBUILD ament_cmake_uncrustify-9999.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.9.5.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.9.5.ebuild
new file mode 100644
index 000000000000..347b57dc9dc5
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.9.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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 CMake API for ament_uncrustify to check code against styleconventions"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_uncrustify
+"
+DEPEND=""
+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 || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "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
new file mode 100644
index 000000000000..347b57dc9dc5
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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 CMake API for ament_uncrustify to check code against styleconventions"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_uncrustify
+"
+DEPEND=""
+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 || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "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
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_version/Manifest b/dev-ros/ament_cmake_version/Manifest
index e2032dec4bb4..31f0b01a7017 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_version-0.8.1.ebuild 1004 BLAKE2B 243809015094231706345385f6556047a85bffd599e2ef5057d43bfada09deabdb4ebce24a739ec25b81e8817db462fb2acec5612cba43a7176518bbe99f0804 SHA512 63acd3647c4deb87a1a2b913964e5233672b58450e9807c8e08521d5d9df14951d3034af78f12ac0c05ca4470e457815d1b9718159a358becd9ee5b02ef6c451
-EBUILD ament_cmake_version-9999.ebuild 1004 BLAKE2B 243809015094231706345385f6556047a85bffd599e2ef5057d43bfada09deabdb4ebce24a739ec25b81e8817db462fb2acec5612cba43a7176518bbe99f0804 SHA512 63acd3647c4deb87a1a2b913964e5233672b58450e9807c8e08521d5d9df14951d3034af78f12ac0c05ca4470e457815d1b9718159a358becd9ee5b02ef6c451
+DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
+DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+EBUILD ament_cmake_version-0.9.6.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
+EBUILD ament_cmake_version-1.0.0.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
+EBUILD ament_cmake_version-9999.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-0.8.1.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-0.8.1.ebuild
deleted file mode 100644
index 0de78e13568c..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-ROS_PN="ament_cmake"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Override the exported package version in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_cmake"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-ros/ament_cmake_core
-"
-DEPEND="${RDEPEND}"
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-0.9.6.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-0.9.6.ebuild
new file mode 100644
index 000000000000..59400b11d05b
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.0.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.0.ebuild
new file mode 100644
index 000000000000..59400b11d05b
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
index 0de78e13568c..59400b11d05b 100644
--- a/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -39,3 +39,8 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_xmllint/Manifest b/dev-ros/ament_cmake_xmllint/Manifest
new file mode 100644
index 000000000000..8eb07f87fedb
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_xmllint-0.9.5.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
+EBUILD ament_cmake_xmllint-9999.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.9.5.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.9.5.ebuild
new file mode 100644
index 000000000000..065d1257e262
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.9.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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="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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_copyright
+"
+DEPEND=""
+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() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..065d1257e262
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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"
+	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="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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_copyright
+"
+DEPEND=""
+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() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_copyright/Manifest b/dev-ros/ament_copyright/Manifest
new file mode 100644
index 000000000000..a73f144a5f8a
--- /dev/null
+++ b/dev-ros/ament_copyright/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_copyright-0.9.5.ebuild 1007 BLAKE2B 57e2ccaf534c7f99c59e4960d78b823e33cc23546599abdc6ab1a8350f940dd675bf629851d152fd8d7e941447a16ab88ed85f1ccbddf43dce3ba085e2109740 SHA512 edc07a751bd68ce01a6f882963552861b8199510eda6e782f34a0733fb282123c009f186743af088042a6fe98bba42f9926d7e994ac07cb554be67b9bbb2eb7f
+EBUILD ament_copyright-9999.ebuild 1007 BLAKE2B 57e2ccaf534c7f99c59e4960d78b823e33cc23546599abdc6ab1a8350f940dd675bf629851d152fd8d7e941447a16ab88ed85f1ccbddf43dce3ba085e2109740 SHA512 edc07a751bd68ce01a6f882963552861b8199510eda6e782f34a0733fb282123c009f186743af088042a6fe98bba42f9926d7e994ac07cb554be67b9bbb2eb7f
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_copyright/ament_copyright-0.9.5.ebuild b/dev-ros/ament_copyright/ament_copyright-0.9.5.ebuild
new file mode 100644
index 000000000000..42c7cdda03b1
--- /dev/null
+++ b/dev-ros/ament_copyright/ament_copyright-0.9.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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 source files for copyright and license information."
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_copyright/ament_copyright-9999.ebuild b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
new file mode 100644
index 000000000000..42c7cdda03b1
--- /dev/null
+++ b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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 source files for copyright and license information."
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_copyright/metadata.xml b/dev-ros/ament_copyright/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_copyright/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
new file mode 100644
index 000000000000..3bd21e14e20e
--- /dev/null
+++ b/dev-ros/ament_cppcheck/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cppcheck-0.9.5.ebuild 779 BLAKE2B 73abfee136357c8313b74ab0551e101f8b0760bdf7a5c159aa033e157b018e490d9ba6938c476f91bc341d1b6230c4d881a8160d4008008c6e80593434d50a0f SHA512 52522b7326d8a241755a18f79214ca6930801ecc60911a60f80fb30c2ff6d58f8863bb0588dc2af69b2fde4ce76d6d0894506ee84399c50e4c8759ee4975887b
+EBUILD ament_cppcheck-9999.ebuild 779 BLAKE2B 73abfee136357c8313b74ab0551e101f8b0760bdf7a5c159aa033e157b018e490d9ba6938c476f91bc341d1b6230c4d881a8160d4008008c6e80593434d50a0f SHA512 52522b7326d8a241755a18f79214ca6930801ecc60911a60f80fb30c2ff6d58f8863bb0588dc2af69b2fde4ce76d6d0894506ee84399c50e4c8759ee4975887b
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.9.5.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.9.5.ebuild
new file mode 100644
index 000000000000..6a0744a992d3
--- /dev/null
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.9.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/cppcheck
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
new file mode 100644
index 000000000000..6a0744a992d3
--- /dev/null
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/cppcheck
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_cppcheck/metadata.xml b/dev-ros/ament_cppcheck/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_cppcheck/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
new file mode 100644
index 000000000000..04779351cabc
--- /dev/null
+++ b/dev-ros/ament_cpplint/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cpplint-0.9.5.ebuild 986 BLAKE2B 9905865e8c4138fd906c704461de13087fb8f211d0e8969e63014344f750003d3225339affa9767d25c8b3ce933728323d964997a9f8992eef24d3cd9f61456a SHA512 d2c675161d3b76deee6286b32fd5ecc6e2b521f21a893c0f611b55472548a30c26f64912fa63094bf875fde8406d484ff143e4991a7627f2abc5345abc9138de
+EBUILD ament_cpplint-9999.ebuild 986 BLAKE2B 9905865e8c4138fd906c704461de13087fb8f211d0e8969e63014344f750003d3225339affa9767d25c8b3ce933728323d964997a9f8992eef24d3cd9f61456a SHA512 d2c675161d3b76deee6286b32fd5ecc6e2b521f21a893c0f611b55472548a30c26f64912fa63094bf875fde8406d484ff143e4991a7627f2abc5345abc9138de
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.9.5.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.9.5.ebuild
new file mode 100644
index 000000000000..429c4f07a46d
--- /dev/null
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.9.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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 the Google style conventions using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
new file mode 100644
index 000000000000..429c4f07a46d
--- /dev/null
+++ b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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 the Google style conventions using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/metadata.xml b/dev-ros/ament_cpplint/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_cpplint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
new file mode 100644
index 000000000000..5cda0b532524
--- /dev/null
+++ b/dev-ros/ament_flake8/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_flake8-0.9.5.ebuild 933 BLAKE2B 9d3adc524e34363cf1ec0ad87dbd63703081f6553058b5f1f7f7462a106ff6612701a3fcef44b72aa9ac53ff7fca0ccd239548ff2a8500dc7309aec4203ea836 SHA512 f7635c4e1feff8c29b5279b6034a8f0c5acb7dfb286780567b43306127e15b2e70449cff37490f1cee6edf86f5d07734473d8b084a514b0a0d367ba3d8a7cf07
+EBUILD ament_flake8-9999.ebuild 933 BLAKE2B 9d3adc524e34363cf1ec0ad87dbd63703081f6553058b5f1f7f7462a106ff6612701a3fcef44b72aa9ac53ff7fca0ccd239548ff2a8500dc7309aec4203ea836 SHA512 f7635c4e1feff8c29b5279b6034a8f0c5acb7dfb286780567b43306127e15b2e70449cff37490f1cee6edf86f5d07734473d8b084a514b0a0d367ba3d8a7cf07
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_flake8/ament_flake8-0.9.5.ebuild b/dev-ros/ament_flake8/ament_flake8-0.9.5.ebuild
new file mode 100644
index 000000000000..91b3d21e5ffc
--- /dev/null
+++ b/dev-ros/ament_flake8/ament_flake8-0.9.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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 for style and syntax conventions with flake8"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/ament_flake8-9999.ebuild b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
new file mode 100644
index 000000000000..91b3d21e5ffc
--- /dev/null
+++ b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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 for style and syntax conventions with flake8"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/metadata.xml b/dev-ros/ament_flake8/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_flake8/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
new file mode 100644
index 000000000000..9728f57976d6
--- /dev/null
+++ b/dev-ros/ament_lint/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_lint-0.9.5.ebuild 737 BLAKE2B b3a0d3593189f905166edd4123aeffe2dc09fb018fc03993c440112de49ffb73084c14f3a3c3fd7cd01166b30d704b81e0920c16b3b8951bfa45accfb314b6af SHA512 fce25c1e73eb20ecd99ec8ed09dd4eac16f97becfee54c4f765ab42cac960b7e3f5662e41abaa0dc014eeb9cfdfa079f41c51182c95fbe9cdb3569de6564e2d4
+EBUILD ament_lint-9999.ebuild 737 BLAKE2B b3a0d3593189f905166edd4123aeffe2dc09fb018fc03993c440112de49ffb73084c14f3a3c3fd7cd01166b30d704b81e0920c16b3b8951bfa45accfb314b6af SHA512 fce25c1e73eb20ecd99ec8ed09dd4eac16f97becfee54c4f765ab42cac960b7e3f5662e41abaa0dc014eeb9cfdfa079f41c51182c95fbe9cdb3569de6564e2d4
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint/ament_lint-0.9.5.ebuild b/dev-ros/ament_lint/ament_lint-0.9.5.ebuild
new file mode 100644
index 000000000000..20530ba2bd7e
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-0.9.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/dev-ros/ament_lint/ament_lint-9999.ebuild b/dev-ros/ament_lint/ament_lint-9999.ebuild
new file mode 100644
index 000000000000..20530ba2bd7e
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/dev-ros/ament_lint/metadata.xml b/dev-ros/ament_lint/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_lint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
new file mode 100644
index 000000000000..dcb0095131ec
--- /dev/null
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_lint_auto-0.9.5.ebuild 1172 BLAKE2B ac440b1fb55484c7d9f85dfe512af394474333ec6233ebc0cf54dc2383b5a14285693f6db4ffc1bd1f6631b6c4e7dc48b569e5e79e86dca6dab412e01e1af744 SHA512 aaa135a58122470a3ff8e86c2aecc3e5f09af378abf3bf85af575b692f79ad96ad7fad7b038289319c756bd8f0d179a0e6135aa6ccafaaeb595e22c1430162f1
+EBUILD ament_lint_auto-9999.ebuild 1172 BLAKE2B ac440b1fb55484c7d9f85dfe512af394474333ec6233ebc0cf54dc2383b5a14285693f6db4ffc1bd1f6631b6c4e7dc48b569e5e79e86dca6dab412e01e1af744 SHA512 aaa135a58122470a3ff8e86c2aecc3e5f09af378abf3bf85af575b692f79ad96ad7fad7b038289319c756bd8f0d179a0e6135aa6ccafaaeb595e22c1430162f1
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.9.5.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.9.5.ebuild
new file mode 100644
index 000000000000..120c90db0dd4
--- /dev/null
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.9.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	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 auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "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
new file mode 100644
index 000000000000..120c90db0dd4
--- /dev/null
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	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 auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_lint_auto/metadata.xml b/dev-ros/ament_lint_auto/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_lint_auto/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_lint_cmake/Manifest b/dev-ros/ament_lint_cmake/Manifest
new file mode 100644
index 000000000000..f42a6470b9e7
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_lint_cmake-0.9.5.ebuild 978 BLAKE2B 5ad587b24be0ed037c2b8548afd9c547355e680b8a970eebf877b3226d12901ff6164b283c4db1ab70494a866c54d094a8f98d30a8e054fbfc02275b35a0a9c5 SHA512 e1cadb43205d6932d795327dd8435da5cdf06a3ed64229c354802ce7ec43be94a812b9a411274c7158e9a1c8eb61e45cd6e315b08c4efecb6b19c1080d19a209
+EBUILD ament_lint_cmake-9999.ebuild 978 BLAKE2B 5ad587b24be0ed037c2b8548afd9c547355e680b8a970eebf877b3226d12901ff6164b283c4db1ab70494a866c54d094a8f98d30a8e054fbfc02275b35a0a9c5 SHA512 e1cadb43205d6932d795327dd8435da5cdf06a3ed64229c354802ce7ec43be94a812b9a411274c7158e9a1c8eb61e45cd6e315b08c4efecb6b19c1080d19a209
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.9.5.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.9.5.ebuild
new file mode 100644
index 000000000000..e45310e62d25
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.9.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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="Lint CMake code using cmakelint and generate xUnit test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+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
new file mode 100644
index 000000000000..e45310e62d25
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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="Lint CMake code using cmakelint and generate xUnit test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint_cmake/metadata.xml b/dev-ros/ament_lint_cmake/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_pep257/Manifest b/dev-ros/ament_pep257/Manifest
new file mode 100644
index 000000000000..656e4646e94b
--- /dev/null
+++ b/dev-ros/ament_pep257/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_pep257-0.9.5.ebuild 981 BLAKE2B a451962b7f69f4579458efcdecfdf818cb97665fde6e6b942fa66dbc6c77737afabc29bae35d1bcdb9d500583ead032b987418d74a3dda906bfc8ad7fab3c996 SHA512 5628c2bd6b5e935f99ace1d4e7c4cea19fced6840e0f2616e1bf4ad7421b60be5c7dabcaad23a161fe3780ede977a2d79db5218ca65128b05de4c1199131a331
+EBUILD ament_pep257-9999.ebuild 981 BLAKE2B a451962b7f69f4579458efcdecfdf818cb97665fde6e6b942fa66dbc6c77737afabc29bae35d1bcdb9d500583ead032b987418d74a3dda906bfc8ad7fab3c996 SHA512 5628c2bd6b5e935f99ace1d4e7c4cea19fced6840e0f2616e1bf4ad7421b60be5c7dabcaad23a161fe3780ede977a2d79db5218ca65128b05de4c1199131a331
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_pep257/ament_pep257-0.9.5.ebuild b/dev-ros/ament_pep257/ament_pep257-0.9.5.ebuild
new file mode 100644
index 000000000000..30e3a98b66d7
--- /dev/null
+++ b/dev-ros/ament_pep257/ament_pep257-0.9.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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="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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/pydocstyle[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/ament_pep257-9999.ebuild b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
new file mode 100644
index 000000000000..30e3a98b66d7
--- /dev/null
+++ b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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="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"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/pydocstyle[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/metadata.xml b/dev-ros/ament_pep257/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_pep257/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_uncrustify/Manifest b/dev-ros/ament_uncrustify/Manifest
new file mode 100644
index 000000000000..27786584e2cc
--- /dev/null
+++ b/dev-ros/ament_uncrustify/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_uncrustify-0.9.5.ebuild 777 BLAKE2B aa07cfce12f28ae5f06d91195986cc2aeea829b035ccf427e1c566eeca297387d70146884fddcd6187fe0e689509b8715ea0a6cedb7a4e3fe5ec694690c14165 SHA512 7bdf67b0dfe60c106e6598ddd366bd8990813a42c3f992c9f74b7291c0b35b8345e8164a17783befb3fc0e3e2c8732dde5bffc44eb11e577a78265fc2e2454e0
+EBUILD ament_uncrustify-9999.ebuild 777 BLAKE2B aa07cfce12f28ae5f06d91195986cc2aeea829b035ccf427e1c566eeca297387d70146884fddcd6187fe0e689509b8715ea0a6cedb7a4e3fe5ec694690c14165 SHA512 7bdf67b0dfe60c106e6598ddd366bd8990813a42c3f992c9f74b7291c0b35b8345e8164a17783befb3fc0e3e2c8732dde5bffc44eb11e577a78265fc2e2454e0
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild
new file mode 100644
index 000000000000..fa3b285d2836
--- /dev/null
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/uncrustify
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
new file mode 100644
index 000000000000..fa3b285d2836
--- /dev/null
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/uncrustify
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_uncrustify/metadata.xml b/dev-ros/ament_uncrustify/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_uncrustify/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
new file mode 100644
index 000000000000..e2c1a0231cba
--- /dev/null
+++ b/dev-ros/ament_xmllint/Manifest
@@ -0,0 +1,4 @@
+DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_xmllint-0.9.5.ebuild 1047 BLAKE2B 4becfad9cf69de54c705e4ab87d16167e89c6fbea628db129aeb0b8318d251046fdcad5e8db1c8d6fadf084129b24a5a15e01c5409272ec8c8206b47c2327f1b SHA512 7f0161cc73cbb48c6567bdb980401684944cb1daeb4662a717b2329f4bc1efebc84632006ce8832ffbbd70dedf02a67902e9b0843522f00a04c7308748bf3d22
+EBUILD ament_xmllint-9999.ebuild 1047 BLAKE2B 4becfad9cf69de54c705e4ab87d16167e89c6fbea628db129aeb0b8318d251046fdcad5e8db1c8d6fadf084129b24a5a15e01c5409272ec8c8206b47c2327f1b SHA512 7f0161cc73cbb48c6567bdb980401684944cb1daeb4662a717b2329f4bc1efebc84632006ce8832ffbbd70dedf02a67902e9b0843522f00a04c7308748bf3d22
+MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild
new file mode 100644
index 000000000000..d9b72688ca3b
--- /dev/null
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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="Checks XML files like the package manifest using xmllint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
new file mode 100644
index 000000000000..d9b72688ca3b
--- /dev/null
+++ b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+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="Checks XML files like the package manifest using xmllint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/metadata.xml b/dev-ros/ament_xmllint/metadata.xml
new file mode 100644
index 000000000000..d5919f1304a0
--- /dev/null
+++ b/dev-ros/ament_xmllint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ament/ament_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/angles/Manifest b/dev-ros/angles/Manifest
index db1938a6ea12..e011767005a8 100644
--- a/dev-ros/angles/Manifest
+++ b/dev-ros/angles/Manifest
@@ -1,4 +1,4 @@
-DIST angles-1.9.11.tar.gz 8317 BLAKE2B 12fcae35abb3f1b013e2830d330f0f0f1d6bf7d0b245e37f853bf9cfc4584e291ac8253f15c921ea4f7b3176fd98d6c0b7c0bf98ad2e6f85b55e086e0be17be0 SHA512 e9b3a13ffeae1909e6306df9d2996d684decb6da82c836742f77c7c609b5de6eb75227ab83c4670359a58f32aa71ad7910ffd3e65af7354d5ab14d0ffaf36c58
-EBUILD angles-1.9.11.ebuild 410 BLAKE2B 25b3901a719c46a843bc93cdf219ad1b857035ebad4836ab0b1704f303b9476416815cb29bf3be0a21c52aa19ed8799528f58e60331923c9e1a9ee20a779ae7a SHA512 bb7454e9ae16ccc701c11caffaf72414cf018c2f27480bf1238082480725926a789585aac5449b884b139547ef6c79dc4ab66f1c9a068319af0f45e885bbd7a8
-EBUILD angles-9999.ebuild 410 BLAKE2B 25b3901a719c46a843bc93cdf219ad1b857035ebad4836ab0b1704f303b9476416815cb29bf3be0a21c52aa19ed8799528f58e60331923c9e1a9ee20a779ae7a SHA512 bb7454e9ae16ccc701c11caffaf72414cf018c2f27480bf1238082480725926a789585aac5449b884b139547ef6c79dc4ab66f1c9a068319af0f45e885bbd7a8
+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 324 BLAKE2B 9c2342e7eff009e1e0172fd743d80eada80e85d8d072ab90fccccc17630771fcf9b6ebf085c133b65157addcf26710cab59ea8e550f3fb40c37657e5ea966557 SHA512 e12a7fde24a91c6c84b0f44cf917534c3a323ff626daf176a0965095e9259d27d3def6dfa1e7715829e34fd04e4fcd29cb258e46ea8476566c264e2283bd7353
diff --git a/dev-ros/angles/angles-1.9.11.ebuild b/dev-ros/angles/angles-1.9.11.ebuild
deleted file mode 100644
index a2832af02cbb..000000000000
--- a/dev-ros/angles/angles-1.9.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/angles"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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-1.9.13.ebuild b/dev-ros/angles/angles-1.9.13.ebuild
new file mode 100644
index 000000000000..5c99989816b3
--- /dev/null
+++ b/dev-ros/angles/angles-1.9.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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
index a2832af02cbb..5c99989816b3 100644
--- a/dev-ros/angles/angles-9999.ebuild
+++ b/dev-ros/angles/angles-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/angles"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index 43f3a0e5ec79..5816797de49e 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,8 +1,6 @@
-DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
-DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
-EBUILD audio_capture-0.3.1.ebuild 631 BLAKE2B dae17522efbd9720eafcdd88995639cb6f16dbde9153952982b8d5c84fcedade72c0298798c5e62aac07866b8b33cba0e92d4aa89608c152a4867984bcf663c9 SHA512 c6e306409c32142860c2159e41bc79d9102ae3d47e66e27fefb1b1f77c9c14a700206b6c5dbc45ab18e0aeecfc1260ccd4478e3487fbe5a9c2ab4095008f5a99
-EBUILD audio_capture-0.3.2.ebuild 631 BLAKE2B 2fe8f579ba0bfa753812e437a3b03ad3a83db53514b78325876375021bf13912269fb5993b255a8720eda4ea33c2aca9d708a25ba9672f84eff5e4545176e83d SHA512 adfff3b15e61af59ec0b76b096bc40cdb2d948f7ba5d0e3fd0169295ce114cae74ce22a45a41d2a6fca3a0e41507d3a9175bbe91fd1d5f0a536290316decbbac
-EBUILD audio_capture-0.3.3.ebuild 631 BLAKE2B 2fe8f579ba0bfa753812e437a3b03ad3a83db53514b78325876375021bf13912269fb5993b255a8720eda4ea33c2aca9d708a25ba9672f84eff5e4545176e83d SHA512 adfff3b15e61af59ec0b76b096bc40cdb2d948f7ba5d0e3fd0169295ce114cae74ce22a45a41d2a6fca3a0e41507d3a9175bbe91fd1d5f0a536290316decbbac
-EBUILD audio_capture-9999.ebuild 631 BLAKE2B dae17522efbd9720eafcdd88995639cb6f16dbde9153952982b8d5c84fcedade72c0298798c5e62aac07866b8b33cba0e92d4aa89608c152a4867984bcf663c9 SHA512 c6e306409c32142860c2159e41bc79d9102ae3d47e66e27fefb1b1f77c9c14a700206b6c5dbc45ab18e0aeecfc1260ccd4478e3487fbe5a9c2ab4095008f5a99
+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
+EBUILD audio_capture-0.3.6.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
+EBUILD audio_capture-0.3.7.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
+EBUILD audio_capture-9999.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_capture/audio_capture-0.3.1.ebuild b/dev-ros/audio_capture/audio_capture-0.3.1.ebuild
deleted file mode 100644
index 76c8baa40806..000000000000
--- a/dev-ros/audio_capture/audio_capture-0.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-plugins/gst-plugins-lame:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_capture/audio_capture-0.3.2.ebuild b/dev-ros/audio_capture/audio_capture-0.3.2.ebuild
deleted file mode 100644
index d38f48f10b16..000000000000
--- a/dev-ros/audio_capture/audio_capture-0.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-plugins/gst-plugins-lame:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_capture/audio_capture-0.3.3.ebuild b/dev-ros/audio_capture/audio_capture-0.3.3.ebuild
deleted file mode 100644
index d38f48f10b16..000000000000
--- a/dev-ros/audio_capture/audio_capture-0.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-plugins/gst-plugins-lame:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_capture/audio_capture-0.3.6.ebuild b/dev-ros/audio_capture/audio_capture-0.3.6.ebuild
new file mode 100644
index 000000000000..ef0806b5c857
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.3.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	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-0.3.7.ebuild b/dev-ros/audio_capture/audio_capture-0.3.7.ebuild
new file mode 100644
index 000000000000..ef0806b5c857
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.3.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	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
index 76c8baa40806..ef0806b5c857 100644
--- a/dev-ros/audio_capture/audio_capture-9999.ebuild
+++ b/dev-ros/audio_capture/audio_capture-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,15 +14,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-libs/boost:=[threads]
 	media-libs/gstreamer:1.0
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	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_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index 3f11990d0272..fcf7c1a65d13 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,8 +1,6 @@
-DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
-DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
-EBUILD audio_common_msgs-0.3.1.ebuild 413 BLAKE2B 66051e11fe77f212f4ecfac346c4e1d2ce689094b174752e424fc5dff88268c6880ad8884685f34a3115b613a66021e34fd6edc383a6bd8280e48d9b90b17f30 SHA512 b4c3b7e17544f3d4704c7c60726c65840661e53caf0199912eb79849d28ed48c5112893e79ab130e5a2a097580d50ce87e205af5753a695f9af9e7963a649c62
-EBUILD audio_common_msgs-0.3.2.ebuild 413 BLAKE2B 66051e11fe77f212f4ecfac346c4e1d2ce689094b174752e424fc5dff88268c6880ad8884685f34a3115b613a66021e34fd6edc383a6bd8280e48d9b90b17f30 SHA512 b4c3b7e17544f3d4704c7c60726c65840661e53caf0199912eb79849d28ed48c5112893e79ab130e5a2a097580d50ce87e205af5753a695f9af9e7963a649c62
-EBUILD audio_common_msgs-0.3.3.ebuild 413 BLAKE2B 66051e11fe77f212f4ecfac346c4e1d2ce689094b174752e424fc5dff88268c6880ad8884685f34a3115b613a66021e34fd6edc383a6bd8280e48d9b90b17f30 SHA512 b4c3b7e17544f3d4704c7c60726c65840661e53caf0199912eb79849d28ed48c5112893e79ab130e5a2a097580d50ce87e205af5753a695f9af9e7963a649c62
-EBUILD audio_common_msgs-9999.ebuild 413 BLAKE2B 66051e11fe77f212f4ecfac346c4e1d2ce689094b174752e424fc5dff88268c6880ad8884685f34a3115b613a66021e34fd6edc383a6bd8280e48d9b90b17f30 SHA512 b4c3b7e17544f3d4704c7c60726c65840661e53caf0199912eb79849d28ed48c5112893e79ab130e5a2a097580d50ce87e205af5753a695f9af9e7963a649c62
+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
+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-9999.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.1.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.1.ebuild
deleted file mode 100644
index 55090b9ba792..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.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=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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.2.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.2.ebuild
deleted file mode 100644
index 55090b9ba792..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.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=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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.3.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.3.ebuild
deleted file mode 100644
index 55090b9ba792..000000000000
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.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=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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
new file mode 100644
index 000000000000..468a27192cda
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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
new file mode 100644
index 000000000000..468a27192cda
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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
index 55090b9ba792..468a27192cda 100644
--- a/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index 71cf4f1e844d..20bda4332d30 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,8 +1,6 @@
-DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
-DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
-EBUILD audio_play-0.3.1.ebuild 593 BLAKE2B 7724b7d05d38e78e412ea54e6c964975c48516060319007608686fad022b693d6cd4cb154b688ac77a7164d785871d493059e21e7cc5f82b73bbf46185360bba SHA512 a48ecc62f22dfb8c187e4f62666038f13bfa4804db30e1e72a3bf04912ab2af77bd3edb0ad3a441c9985f48b18c4c33e9b7b385b6b89d9e9166df157287c36e6
-EBUILD audio_play-0.3.2.ebuild 593 BLAKE2B 2a130ff1c86ca05a643b5ae082bdbb2e0c091fc66295b08431dd67e3a78c3976278b52549c126b4a2f2693f02997df42a2a7476d6c30942c8ac8274c4d766830 SHA512 cb93e0860f3bd966d7d78daebee5e9a1c27bd4c7611cb54f6b6bf5905e4f977be414dd611e5e3731be59af3ed89a286da6ea98a2a81904b94a709f3fe52c8193
-EBUILD audio_play-0.3.3.ebuild 593 BLAKE2B 2a130ff1c86ca05a643b5ae082bdbb2e0c091fc66295b08431dd67e3a78c3976278b52549c126b4a2f2693f02997df42a2a7476d6c30942c8ac8274c4d766830 SHA512 cb93e0860f3bd966d7d78daebee5e9a1c27bd4c7611cb54f6b6bf5905e4f977be414dd611e5e3731be59af3ed89a286da6ea98a2a81904b94a709f3fe52c8193
-EBUILD audio_play-9999.ebuild 593 BLAKE2B 7724b7d05d38e78e412ea54e6c964975c48516060319007608686fad022b693d6cd4cb154b688ac77a7164d785871d493059e21e7cc5f82b73bbf46185360bba SHA512 a48ecc62f22dfb8c187e4f62666038f13bfa4804db30e1e72a3bf04912ab2af77bd3edb0ad3a441c9985f48b18c4c33e9b7b385b6b89d9e9166df157287c36e6
+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
+EBUILD audio_play-0.3.6.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
+EBUILD audio_play-0.3.7.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
+EBUILD audio_play-9999.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_play/audio_play-0.3.1.ebuild b/dev-ros/audio_play/audio_play-0.3.1.ebuild
deleted file mode 100644
index bdcbd57e2876..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.2.ebuild b/dev-ros/audio_play/audio_play-0.3.2.ebuild
deleted file mode 100644
index 8f6095935773..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.3.ebuild b/dev-ros/audio_play/audio_play-0.3.3.ebuild
deleted file mode 100644
index 8f6095935773..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.6.ebuild b/dev-ros/audio_play/audio_play-0.3.6.ebuild
new file mode 100644
index 000000000000..b54dfb9a1e95
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.3.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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}
+
+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:=[threads]
+	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.ebuild b/dev-ros/audio_play/audio_play-0.3.7.ebuild
new file mode 100644
index 000000000000..b54dfb9a1e95
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.3.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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}
+
+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:=[threads]
+	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
index bdcbd57e2876..b54dfb9a1e95 100644
--- a/dev-ros/audio_play/audio_play-9999.ebuild
+++ b/dev-ros/audio_play/audio_play-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,14 +14,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-libs/boost:=[threads]
 	media-libs/gstreamer:1.0
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	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/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest
index ec095d87dc82..89d6070a28ad 100644
--- a/dev-ros/base_local_planner/Manifest
+++ b/dev-ros/base_local_planner/Manifest
@@ -1,10 +1,4 @@
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD base_local_planner-1.16.1.ebuild 1088 BLAKE2B 07d1c699b36f6288a8c464d22428b45032b14e0139a3615f6b0ce2b0d772a33fc9894271c754f4c06a9f917e11b0b078a057f32c02e8e7d9872fdbfebc7ee65b SHA512 7c0a4f6750e3be9f4a480791a44d19fddc588061fb6f8dbeb0641b7b64e7a3f3204b0a21446a568f81391fd266004ec0aed55ac9e655252be87af0e4d20619b5
-EBUILD base_local_planner-1.16.2.ebuild 1153 BLAKE2B 45ba326dfafd52147da17c0b34840c05fe438d1fa0d8bf990698e2c3986c691ae27d5299a42b43bb8e8ab3d5722bea2eedb7be20875aa6531f14c597df26f030 SHA512 eaf64d349960c06921abdd307da4c9689a1120b96c82176b7d78fd83d43d958658866e69aefe83b0d0a55ec31f57924a1fc77b817fe64985115e363514cf501f
-EBUILD base_local_planner-1.16.3.ebuild 1150 BLAKE2B bcf53fe75db20429ea4db153dda57f6d010441cdb78d7fe40d2af649d56c971f21ab049a78732f31d7264119fcdb1a6105e3e4392f0e92f0e080f6a0d50b6670 SHA512 ec286c6760d739e8e1db6d752585f4e080b040fdc154efbb4d1ceaad87d1941462205e9b3d2d4c8178ac23de2fc9223a6dfe642f506c5978cd0eebe5d7e789a2
-EBUILD base_local_planner-1.16.6.ebuild 1150 BLAKE2B d93b4427c41e8708588339ea50dfbb54db0f17c587e5c955a0472da8fbb043bc21d1bc39468c1e718fd01efb9070c9cb6b244cbe6a7813a57fa35a1705f577d9 SHA512 b12c80599ce3d215c93844b3e7675997c4b068f092062e815f922d154e249b8018ca3ce0080957fc787a0b45f15a4d2b9492b8923174a7533641b31e56247f1a
-EBUILD base_local_planner-9999.ebuild 1153 BLAKE2B 45ba326dfafd52147da17c0b34840c05fe438d1fa0d8bf990698e2c3986c691ae27d5299a42b43bb8e8ab3d5722bea2eedb7be20875aa6531f14c597df26f030 SHA512 eaf64d349960c06921abdd307da4c9689a1120b96c82176b7d78fd83d43d958658866e69aefe83b0d0a55ec31f57924a1fc77b817fe64985115e363514cf501f
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD base_local_planner-1.17.0.ebuild 1149 BLAKE2B 3e5d2a6fd2f465cd627f6094bc781fecdccea6fa9a24ff3b345074fde990ea003d0220e618d71a143b147fca2cadbb44a9854639ae407b7c459608711c5a2616 SHA512 6cbeb63500ab128e544c3635ba48cdf57709c222ff91d226e317bd9985d7f5ca1cb7c5441985625511ea170415b994bb6cd0f129afc44fcc3c18b55793b47224
+EBUILD base_local_planner-9999.ebuild 1149 BLAKE2B 3e5d2a6fd2f465cd627f6094bc781fecdccea6fa9a24ff3b345074fde990ea003d0220e618d71a143b147fca2cadbb44a9854639ae407b7c459608711c5a2616 SHA512 6cbeb63500ab128e544c3635ba48cdf57709c222ff91d226e317bd9985d7f5ca1cb7c5441985625511ea170415b994bb6cd0f129afc44fcc3c18b55793b47224
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/base_local_planner/base_local_planner-1.16.1.ebuild b/dev-ros/base_local_planner/base_local_planner-1.16.1.ebuild
deleted file mode 100644
index 459e749a5fbb..000000000000
--- a/dev-ros/base_local_planner/base_local_planner-1.16.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-	dev-libs/boost:=[threads]
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/base_local_planner/base_local_planner-1.16.2.ebuild b/dev-ros/base_local_planner/base_local_planner-1.16.2.ebuild
deleted file mode 100644
index b9d3cfb7e498..000000000000
--- a/dev-ros/base_local_planner/base_local_planner-1.16.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/base_local_planner/base_local_planner-1.16.3.ebuild b/dev-ros/base_local_planner/base_local_planner-1.16.3.ebuild
deleted file mode 100644
index 7e87eb46a5ae..000000000000
--- a/dev-ros/base_local_planner/base_local_planner-1.16.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/base_local_planner/base_local_planner-1.16.6.ebuild b/dev-ros/base_local_planner/base_local_planner-1.16.6.ebuild
deleted file mode 100644
index 2b56b9d24ec5..000000000000
--- a/dev-ros/base_local_planner/base_local_planner-1.16.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/base_local_planner/base_local_planner-1.17.0.ebuild b/dev-ros/base_local_planner/base_local_planner-1.17.0.ebuild
new file mode 100644
index 000000000000..b332fc26a742
--- /dev/null
+++ b/dev-ros/base_local_planner/base_local_planner-1.17.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 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"
+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
+	>=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:=[threads]
+"
+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
index b9d3cfb7e498..b332fc26a742 100644
--- a/dev-ros/base_local_planner/base_local_planner-9999.ebuild
+++ b/dev-ros/base_local_planner/base_local_planner-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
+DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -19,24 +18,26 @@ IUSE=""
 RDEPEND="
 	dev-ros/angles
 	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	>=dev-ros/nav_core-1.16
 	dev-ros/pluginlib
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/voxel_grid
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
+	dev-ros/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
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
 "
diff --git a/dev-ros/bond/Manifest b/dev-ros/bond/Manifest
index 47e26b804c48..24d06426d2f6 100644
--- a/dev-ros/bond/Manifest
+++ b/dev-ros/bond/Manifest
@@ -1,12 +1,4 @@
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD bond-1.7.19.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-1.8.0.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-1.8.1.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-1.8.2.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-1.8.3.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
-EBUILD bond-9999.ebuild 489 BLAKE2B f10c4609a94d07b9931f106386cce833450c0feb0511414959fa89d137498dd4fd06b82b66a4e3db9b3cf1298bc17362ff4de0dff76253c53d9a47ccf941cd07 SHA512 1d68b3c1e97eb34c1c2f6c2e7263d07445860bcb3c4d0539e48d24e7651e4cdaa23f1e9eb314cf5c789c91bc754fefcb41d0d27e0d1ab577aae9817d65ff0cbc
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD bond-1.8.5.ebuild 449 BLAKE2B d3c80d012695869c859fbebe7408949776e4bfd58212db5558e74f7a51babd26d98aaf08a6d3f7eb106001f484a50a1e7772a4320590db3996ec30837678101a SHA512 9ed5d1522408a2ac0d2595931f4a4dee07667bfd637ebfc7c33a61da826ee882ecc2d5d493669780718b52f19004930aac09abb28699c548d3bfbbada65e82f5
+EBUILD bond-9999.ebuild 449 BLAKE2B d3c80d012695869c859fbebe7408949776e4bfd58212db5558e74f7a51babd26d98aaf08a6d3f7eb106001f484a50a1e7772a4320590db3996ec30837678101a SHA512 9ed5d1522408a2ac0d2595931f4a4dee07667bfd637ebfc7c33a61da826ee882ecc2d5d493669780718b52f19004930aac09abb28699c548d3bfbbada65e82f5
 MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/bond/bond-1.7.19.ebuild b/dev-ros/bond/bond-1.7.19.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.7.19.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.0.ebuild b/dev-ros/bond/bond-1.8.0.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.8.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.1.ebuild b/dev-ros/bond/bond-1.8.1.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.8.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.2.ebuild b/dev-ros/bond/bond-1.8.2.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.8.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.3.ebuild b/dev-ros/bond/bond-1.8.3.ebuild
deleted file mode 100644
index 82922d265f43..000000000000
--- a/dev-ros/bond/bond-1.8.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.5.ebuild b/dev-ros/bond/bond-1.8.5.ebuild
new file mode 100644
index 000000000000..16f4aac71766
--- /dev/null
+++ b/dev-ros/bond/bond-1.8.5.ebuild
@@ -0,0 +1,19 @@
+# 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
index 82922d265f43..16f4aac71766 100644
--- a/dev-ros/bond/bond-9999.ebuild
+++ b/dev-ros/bond/bond-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/bond_core"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/bondcpp/Manifest b/dev-ros/bondcpp/Manifest
index ec67fbb178a8..ee56a0e301cf 100644
--- a/dev-ros/bondcpp/Manifest
+++ b/dev-ros/bondcpp/Manifest
@@ -1,8 +1,4 @@
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD bondcpp-1.8.1.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
-EBUILD bondcpp-1.8.2.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
-EBUILD bondcpp-1.8.3.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
-EBUILD bondcpp-9999.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD bondcpp-1.8.5.ebuild 493 BLAKE2B f723924109ba22387ae651b4115c07ddd4591241ae2f846512539754c24947fab4390bb9a269eb4d612725a23d23199b389a98f963a69cc1f129b377788e5e26 SHA512 c6bf1ed01b3e3eae3b078071ad1919013da0ceea4045b8a6cb38f39fc874b060c002bd9bd4d7e56bb74103524362d3d2228a90986757004df12d3d2fcb1b17ce
+EBUILD bondcpp-9999.ebuild 493 BLAKE2B f723924109ba22387ae651b4115c07ddd4591241ae2f846512539754c24947fab4390bb9a269eb4d612725a23d23199b389a98f963a69cc1f129b377788e5e26 SHA512 c6bf1ed01b3e3eae3b078071ad1919013da0ceea4045b8a6cb38f39fc874b060c002bd9bd4d7e56bb74103524362d3d2228a90986757004df12d3d2fcb1b17ce
 MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/bondcpp/bondcpp-1.8.1.ebuild b/dev-ros/bondcpp/bondcpp-1.8.1.ebuild
deleted file mode 100644
index 5516dd68b9ff..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism 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.2.ebuild b/dev-ros/bondcpp/bondcpp-1.8.2.ebuild
deleted file mode 100644
index 5516dd68b9ff..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism 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.3.ebuild b/dev-ros/bondcpp/bondcpp-1.8.3.ebuild
deleted file mode 100644
index 5516dd68b9ff..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism 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.5.ebuild b/dev-ros/bondcpp/bondcpp-1.8.5.ebuild
new file mode 100644
index 000000000000..dc38b47180d5
--- /dev/null
+++ b/dev-ros/bondcpp/bondcpp-1.8.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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
index 5516dd68b9ff..dc38b47180d5 100644
--- a/dev-ros/bondcpp/bondcpp-9999.ebuild
+++ b/dev-ros/bondcpp/bondcpp-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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, a mechanism for checking when another process has terminated"
+DESCRIPTION="C++ implementation of bond, for checking when another process has terminated"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/bondpy/Manifest b/dev-ros/bondpy/Manifest
index f63bc9da3b1a..e87792f89a57 100644
--- a/dev-ros/bondpy/Manifest
+++ b/dev-ros/bondpy/Manifest
@@ -1,18 +1,4 @@
-DIST bond_core-1.7.16.tar.gz 25327 BLAKE2B 1be27c56d656b85da87a59451df82355d80178efbb5a201d9891d59491f6cdf13147ba88a2a1ee8071b167f3f0b60e2e7f93d767bbc53bfa36af712a75d0b751 SHA512 1c35776782edfb7397845fde0ef3fcaac6179f1c55637fd5209303feb1755f13bff85e6cf36a2dd2671c18d5b433cb8e9ede04df923f742e22934b19d044e06e
-DIST bond_core-1.7.17.tar.gz 31334 BLAKE2B 1b807b321231647d6d88de17bd76e00121a18749b52ccd091902761c792453be85aa342231fb7e25a8a5ff9ea23530449bc58a20c6d2522d7afe231a94b5e994 SHA512 248146e6704c36f014e0f4c5178e566b6c4e344f46b39d4ac9a6cf6b152d1c163b5881921168b8898ec44da9d9b5bc69dc3a66ae26be61007c109aed1990ee73
-DIST bond_core-1.7.18.tar.gz 31402 BLAKE2B 7c87354c1e92f5be29e751029d229859658d1841830b0d66d3a635f7073e7da86e26554e99d3d2dc00ea5586313350d0c094114ca2fab492aae7e4844e2bbbfd SHA512 d943ea3ad4de6cbf8f703161a511d235229369ec593ff6532180cf7a0114ba51d20b736491d4c4415b642c1994901ba51983580cd02aa69d64c4e0a318e00a75
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD bondpy-1.7.16.ebuild 524 BLAKE2B 9f75cc74635cfbc54835c7904299ced1d063ebcd3f9635c61732464da7985451621e464bf0b37ca6380094a265c69a4b7513a5305a5e91809302430aa98df8f6 SHA512 5b04401038e8e45910ec8b94da0894eceed3c54b1021d39b3891239a5b801a956a4b8cc65315083cf44aee5d5998b77c6582861d224a27f6c8fa4b33556d3f5a
-EBUILD bondpy-1.7.17.ebuild 524 BLAKE2B 9f75cc74635cfbc54835c7904299ced1d063ebcd3f9635c61732464da7985451621e464bf0b37ca6380094a265c69a4b7513a5305a5e91809302430aa98df8f6 SHA512 5b04401038e8e45910ec8b94da0894eceed3c54b1021d39b3891239a5b801a956a4b8cc65315083cf44aee5d5998b77c6582861d224a27f6c8fa4b33556d3f5a
-EBUILD bondpy-1.7.18.ebuild 524 BLAKE2B a8c12d70118fb84cffc0babf118a487c1dd7b7474afeae735f0802a3c1f49ff0a9d3f46330dc6679a8a47303bb14e5d07842ab5da27c471f6abf622bd935998c SHA512 cc39348c27be295af7ea3d946f85278b2f4804769d6ca2bff9d7751802f44187d024311db6a38060135378ef575617000404911fafa70d464fb0c09a36240d17
-EBUILD bondpy-1.7.19.ebuild 524 BLAKE2B 4baf66fb09172fa53aa92f0490458d68bcadd5f801e7fa944281af24c6eb492685e2d2a75e97b6549b1e8e7133cef549dc680636431c2b34f845dbafc42101d7 SHA512 5080f86ba24532071160bb1f8705f0d131eb9f77cee14bb7a4ba74fe359192a4cc3042ede6184b2fd71cfe976bf25d56c5e775a34fa7356a2e06b33cf1a0df43
-EBUILD bondpy-1.8.0.ebuild 524 BLAKE2B 4baf66fb09172fa53aa92f0490458d68bcadd5f801e7fa944281af24c6eb492685e2d2a75e97b6549b1e8e7133cef549dc680636431c2b34f845dbafc42101d7 SHA512 5080f86ba24532071160bb1f8705f0d131eb9f77cee14bb7a4ba74fe359192a4cc3042ede6184b2fd71cfe976bf25d56c5e775a34fa7356a2e06b33cf1a0df43
-EBUILD bondpy-1.8.1.ebuild 524 BLAKE2B 4baf66fb09172fa53aa92f0490458d68bcadd5f801e7fa944281af24c6eb492685e2d2a75e97b6549b1e8e7133cef549dc680636431c2b34f845dbafc42101d7 SHA512 5080f86ba24532071160bb1f8705f0d131eb9f77cee14bb7a4ba74fe359192a4cc3042ede6184b2fd71cfe976bf25d56c5e775a34fa7356a2e06b33cf1a0df43
-EBUILD bondpy-1.8.2.ebuild 524 BLAKE2B 61386d97f5a62bce5c46d38b89324e7196e97260fa255894516f4043283b279df186a3d3b2778a09b477e48cfaa763ad877bdd57c9e41c249e00e9ceb4f77e47 SHA512 c115d9fb24d0b690c910a32e3643f402a587b4d57d0af73e75c5420e03df456f33918c965e6cf6efa6c8927990b05e745f76cae69b089d605d554267a3add93d
-EBUILD bondpy-1.8.3.ebuild 524 BLAKE2B 61386d97f5a62bce5c46d38b89324e7196e97260fa255894516f4043283b279df186a3d3b2778a09b477e48cfaa763ad877bdd57c9e41c249e00e9ceb4f77e47 SHA512 c115d9fb24d0b690c910a32e3643f402a587b4d57d0af73e75c5420e03df456f33918c965e6cf6efa6c8927990b05e745f76cae69b089d605d554267a3add93d
-EBUILD bondpy-9999.ebuild 524 BLAKE2B 9f75cc74635cfbc54835c7904299ced1d063ebcd3f9635c61732464da7985451621e464bf0b37ca6380094a265c69a4b7513a5305a5e91809302430aa98df8f6 SHA512 5b04401038e8e45910ec8b94da0894eceed3c54b1021d39b3891239a5b801a956a4b8cc65315083cf44aee5d5998b77c6582861d224a27f6c8fa4b33556d3f5a
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD bondpy-1.8.5.ebuild 495 BLAKE2B 89873364ce6f188e4db0249cbd9c9e4225089d439975a165549fc87f1bc9c16847dd3d37e388152d09c2a83b9d45003820c7755f5114899885f0633649c28eae SHA512 489d9df5471298df2a01ae9805acfc4e27df6be25a0dc990cbdf268424a231997fac1757f74f25ba1d70df068aa85524aad3316466a2d80f9c7cdf9fe5c0ea65
+EBUILD bondpy-9999.ebuild 495 BLAKE2B 89873364ce6f188e4db0249cbd9c9e4225089d439975a165549fc87f1bc9c16847dd3d37e388152d09c2a83b9d45003820c7755f5114899885f0633649c28eae SHA512 489d9df5471298df2a01ae9805acfc4e27df6be25a0dc990cbdf268424a231997fac1757f74f25ba1d70df068aa85524aad3316466a2d80f9c7cdf9fe5c0ea65
 MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/bondpy/bondpy-1.7.16.ebuild b/dev-ros/bondpy/bondpy-1.7.16.ebuild
deleted file mode 100644
index f686d8463127..000000000000
--- a/dev-ros/bondpy/bondpy-1.7.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.7.17.ebuild b/dev-ros/bondpy/bondpy-1.7.17.ebuild
deleted file mode 100644
index f686d8463127..000000000000
--- a/dev-ros/bondpy/bondpy-1.7.17.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.7.18.ebuild b/dev-ros/bondpy/bondpy-1.7.18.ebuild
deleted file mode 100644
index 0f6b315b2ff6..000000000000
--- a/dev-ros/bondpy/bondpy-1.7.18.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.7.19.ebuild b/dev-ros/bondpy/bondpy-1.7.19.ebuild
deleted file mode 100644
index 1944a1c798b6..000000000000
--- a/dev-ros/bondpy/bondpy-1.7.19.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.0.ebuild b/dev-ros/bondpy/bondpy-1.8.0.ebuild
deleted file mode 100644
index 1944a1c798b6..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.1.ebuild b/dev-ros/bondpy/bondpy-1.8.1.ebuild
deleted file mode 100644
index 1944a1c798b6..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.2.ebuild b/dev-ros/bondpy/bondpy-1.8.2.ebuild
deleted file mode 100644
index 4440f46b7719..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.3.ebuild b/dev-ros/bondpy/bondpy-1.8.3.ebuild
deleted file mode 100644
index 4440f46b7719..000000000000
--- a/dev-ros/bondpy/bondpy-1.8.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/smclib
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondpy/bondpy-1.8.5.ebuild b/dev-ros/bondpy/bondpy-1.8.5.ebuild
new file mode 100644
index 000000000000..5e193376f61a
--- /dev/null
+++ b/dev-ros/bondpy/bondpy-1.8.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
index f686d8463127..5e193376f61a 100644
--- a/dev-ros/bondpy/bondpy-9999.ebuild
+++ b/dev-ros/bondpy/bondpy-9999.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/bond_core"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated"
+DESCRIPTION="Python implementation of bond, for checking when another process has terminated"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/bond[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/bond[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/smclib
 	sys-apps/util-linux
 "
diff --git a/dev-ros/calibration_estimation/Manifest b/dev-ros/calibration_estimation/Manifest
index d37ab1fc427e..1d68b1095107 100644
--- a/dev-ros/calibration_estimation/Manifest
+++ b/dev-ros/calibration_estimation/Manifest
@@ -1,6 +1,5 @@
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
+AUX py3.patch 3416 BLAKE2B 7f879cee3a10359d5988fe8ee04ccfb9c2d30fff7609e52950c7a61c3f02ad571363094f47e841ef9796c49c0d14f75c275cf3ba7534a5a0c1c0680ec48a2c70 SHA512 6200c57aa4f6f95338eba80342efcdd026b971d3b373a946fd45ce92bddc67f329c1fcafcedc74f2169ce871565a91b1d442a862cd5f87cd99f9aa225304b15f
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_estimation-0.10.13.ebuild 894 BLAKE2B 5ce9e71bfe04e4ddf1543698bb03f2e3a172e7d8cfd27a2ad71c77f31b233f1e6e94ae5823ec0f230a80c2fe37488fdd1ace2d7ca4bd8504267a8802a646219b SHA512 44640c1e0eef9d9b90e601e343dd84cc82af314cfc5399173b35f4abd66d889cafa7a09ce16a59c9e8d34a323e00205b587e621fcac3ce51dde55fe054acf491
-EBUILD calibration_estimation-0.10.14.ebuild 894 BLAKE2B 5ce9e71bfe04e4ddf1543698bb03f2e3a172e7d8cfd27a2ad71c77f31b233f1e6e94ae5823ec0f230a80c2fe37488fdd1ace2d7ca4bd8504267a8802a646219b SHA512 44640c1e0eef9d9b90e601e343dd84cc82af314cfc5399173b35f4abd66d889cafa7a09ce16a59c9e8d34a323e00205b587e621fcac3ce51dde55fe054acf491
-EBUILD calibration_estimation-9999.ebuild 894 BLAKE2B 5ce9e71bfe04e4ddf1543698bb03f2e3a172e7d8cfd27a2ad71c77f31b233f1e6e94ae5823ec0f230a80c2fe37488fdd1ace2d7ca4bd8504267a8802a646219b SHA512 44640c1e0eef9d9b90e601e343dd84cc82af314cfc5399173b35f4abd66d889cafa7a09ce16a59c9e8d34a323e00205b587e621fcac3ce51dde55fe054acf491
+EBUILD calibration_estimation-0.10.14.ebuild 1280 BLAKE2B 49120c98ab855cf32bd412b264684a95901603fca9ac078f3a02158012fd175f768db4bc28e58b6410b1d7344c5dabb9557b3d41c8d878a674c9acf5f3abdd99 SHA512 b9e7b901eb6ce7c4099de1de63f83e3c19dbfe99d0f601b52bc5a75b3fd273a0bb04150aff5e9439a3354f1182bdca96d8584a5c2afc3dbb4b785c13e7f6b2ec
+EBUILD calibration_estimation-9999.ebuild 1280 BLAKE2B 49120c98ab855cf32bd412b264684a95901603fca9ac078f3a02158012fd175f768db4bc28e58b6410b1d7344c5dabb9557b3d41c8d878a674c9acf5f3abdd99 SHA512 b9e7b901eb6ce7c4099de1de63f83e3c19dbfe99d0f601b52bc5a75b3fd273a0bb04150aff5e9439a3354f1182bdca96d8584a5c2afc3dbb4b785c13e7f6b2ec
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
deleted file mode 100644
index bbce471d0c6c..000000000000
--- a/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/urdf_parser_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
index bbce471d0c6c..c83819a9fef4 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,16 +14,26 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	$(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}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/urdf_parser_py[${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 "sci-libs/scipy[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
+	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
+}
diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
index bbce471d0c6c..c83819a9fef4 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,16 +14,26 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	$(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}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/urdf_parser_py[${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 "sci-libs/scipy[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
+	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
+}
diff --git a/dev-ros/calibration_estimation/files/py3.patch b/dev-ros/calibration_estimation/files/py3.patch
new file mode 100644
index 000000000000..ad680c7a7c60
--- /dev/null
+++ b/dev-ros/calibration_estimation/files/py3.patch
@@ -0,0 +1,78 @@
+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_launch/Manifest b/dev-ros/calibration_launch/Manifest
index 84380a35face..a366ca68a574 100644
--- a/dev-ros/calibration_launch/Manifest
+++ b/dev-ros/calibration_launch/Manifest
@@ -1,6 +1,4 @@
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_launch-0.10.13.ebuild 546 BLAKE2B e36018028e59c08a3ab8c025fb3b226ea17fa074968b0fd054425dd9ecbc5bf583d6e454bb6e448e5fe38657e733984f30e8d07ed8279b8a5c3fd358e57f8989 SHA512 18b7f9f68d3382d5e55cefcde9ddfc709881fe54c3af42345b69c69202fb1b13f86e168ba65c8fc009ac388da14ba2663cfcce26ef79f85044e8b154c2176bdd
-EBUILD calibration_launch-0.10.14.ebuild 546 BLAKE2B e36018028e59c08a3ab8c025fb3b226ea17fa074968b0fd054425dd9ecbc5bf583d6e454bb6e448e5fe38657e733984f30e8d07ed8279b8a5c3fd358e57f8989 SHA512 18b7f9f68d3382d5e55cefcde9ddfc709881fe54c3af42345b69c69202fb1b13f86e168ba65c8fc009ac388da14ba2663cfcce26ef79f85044e8b154c2176bdd
-EBUILD calibration_launch-9999.ebuild 546 BLAKE2B e36018028e59c08a3ab8c025fb3b226ea17fa074968b0fd054425dd9ecbc5bf583d6e454bb6e448e5fe38657e733984f30e8d07ed8279b8a5c3fd358e57f8989 SHA512 18b7f9f68d3382d5e55cefcde9ddfc709881fe54c3af42345b69c69202fb1b13f86e168ba65c8fc009ac388da14ba2663cfcce26ef79f85044e8b154c2176bdd
+EBUILD calibration_launch-0.10.14.ebuild 524 BLAKE2B aed2d59c7dd17a1fa59b3e85482c561ccd420eb4a5c4b251a9533befeb3cfb45892107b4c4f16b8bd96c52da516c26e51644e5f491d9cbc9523646d4895d3b12 SHA512 b4867dba2dbc1d9b66a4a6c3f9ad5ce64ff2e81b35988c8fe2b01718ee534c96d80c1325c2eceab3dda7e66f13defe2d62947e9564fff1be8908ff335c356daa
+EBUILD calibration_launch-9999.ebuild 524 BLAKE2B aed2d59c7dd17a1fa59b3e85482c561ccd420eb4a5c4b251a9533befeb3cfb45892107b4c4f16b8bd96c52da516c26e51644e5f491d9cbc9523646d4895d3b12 SHA512 b4867dba2dbc1d9b66a4a6c3f9ad5ce64ff2e81b35988c8fe2b01718ee534c96d80c1325c2eceab3dda7e66f13defe2d62947e9564fff1be8908ff335c356daa
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild
deleted file mode 100644
index af3023c2b45d..000000000000
--- a/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files that can be helpful in 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
-"
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild
index af3023c2b45d..b3b796757277 100644
--- a/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild
+++ b/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
+DESCRIPTION="Launch files for configuring the calibration stack to run on your robot"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/calibration_launch/calibration_launch-9999.ebuild b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
index af3023c2b45d..b3b796757277 100644
--- a/dev-ros/calibration_launch/calibration_launch-9999.ebuild
+++ b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
+DESCRIPTION="Launch files for configuring the calibration stack to run on your robot"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/calibration_msgs/Manifest b/dev-ros/calibration_msgs/Manifest
index 6379b5428fc2..123720a3fa5f 100644
--- a/dev-ros/calibration_msgs/Manifest
+++ b/dev-ros/calibration_msgs/Manifest
@@ -1,4 +1,4 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_msgs-0.10.14.ebuild 557 BLAKE2B 2f13084bc1829032643eee0d6f13aa18d7fb06d2b22c733912f69d91c84d5b3f6c831a86f1b4253a58ce187d24e27aeae57dd791f9c519bc1ddfbafb52185382 SHA512 95da344a579e04d1c11e1b69a25deabe2db966bdbb9783b087538ddcd1014fb82d6e62b3b4a19ce3866d664dc0274b4b5d3ce974ca3c92b967f3272be1073da9
-EBUILD calibration_msgs-9999.ebuild 557 BLAKE2B 2f13084bc1829032643eee0d6f13aa18d7fb06d2b22c733912f69d91c84d5b3f6c831a86f1b4253a58ce187d24e27aeae57dd791f9c519bc1ddfbafb52185382 SHA512 95da344a579e04d1c11e1b69a25deabe2db966bdbb9783b087538ddcd1014fb82d6e62b3b4a19ce3866d664dc0274b4b5d3ce974ca3c92b967f3272be1073da9
+EBUILD calibration_msgs-0.10.14.ebuild 506 BLAKE2B 286bea7d10840fe5bcf037a516d1449b8a89af9df43d50a5fb68506b4866751a6ee924f1bb80ca2ae8ec6d6276e93b37396168f6b79ee218ac8ac057d7432be5 SHA512 18c8009c537a446fc318b9120a4fe8c34ab116ad4f3b0fa988399b2cc6c8fae24a3d6b187eb336866b24097ab87485d3cda04635df07ac39193350beb4949ec2
+EBUILD calibration_msgs-9999.ebuild 506 BLAKE2B 286bea7d10840fe5bcf037a516d1449b8a89af9df43d50a5fb68506b4866751a6ee924f1bb80ca2ae8ec6d6276e93b37396168f6b79ee218ac8ac057d7432be5 SHA512 18c8009c537a446fc318b9120a4fe8c34ab116ad4f3b0fa988399b2cc6c8fae24a3d6b187eb336866b24097ab87485d3cda04635df07ac39193350beb4949ec2
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild b/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild
index f4f4afa47c8a..ad6751d37f33 100644
--- a/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild
+++ b/dev-ros/calibration_msgs/calibration_msgs-0.10.14.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 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 full robot calibration procedures"
+DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
index f4f4afa47c8a..ad6751d37f33 100644
--- a/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
+++ b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 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 full robot calibration procedures"
+DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/calibration_setup_helper/Manifest b/dev-ros/calibration_setup_helper/Manifest
index 657d026607d7..260e29b51570 100644
--- a/dev-ros/calibration_setup_helper/Manifest
+++ b/dev-ros/calibration_setup_helper/Manifest
@@ -1,6 +1,4 @@
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_setup_helper-0.10.13.ebuild 434 BLAKE2B e7e8084ed5d221d59850d663d5c1ede8f3ecc9970a7efe2e05113893125768d3f885c3c0e11f9283ef0ca71c6338685a07dd8de65071e539a801e9c142827edf SHA512 2d74b50c5730850fcc758e8ce2949c4092cb77520fa03c27cad5d664a09ef4d3ad88c984b4bba48bd946b2d91f5b3332e99aced0b81b8aeb64b5875905bc94bd
-EBUILD calibration_setup_helper-0.10.14.ebuild 434 BLAKE2B e7e8084ed5d221d59850d663d5c1ede8f3ecc9970a7efe2e05113893125768d3f885c3c0e11f9283ef0ca71c6338685a07dd8de65071e539a801e9c142827edf SHA512 2d74b50c5730850fcc758e8ce2949c4092cb77520fa03c27cad5d664a09ef4d3ad88c984b4bba48bd946b2d91f5b3332e99aced0b81b8aeb64b5875905bc94bd
-EBUILD calibration_setup_helper-9999.ebuild 434 BLAKE2B e7e8084ed5d221d59850d663d5c1ede8f3ecc9970a7efe2e05113893125768d3f885c3c0e11f9283ef0ca71c6338685a07dd8de65071e539a801e9c142827edf SHA512 2d74b50c5730850fcc758e8ce2949c4092cb77520fa03c27cad5d664a09ef4d3ad88c984b4bba48bd946b2d91f5b3332e99aced0b81b8aeb64b5875905bc94bd
+EBUILD calibration_setup_helper-0.10.14.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
+EBUILD calibration_setup_helper-9999.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild
deleted file mode 100644
index bb46fd420687..000000000000
--- a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.14.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.14.ebuild
index bb46fd420687..58b1a15eaf9d 100644
--- 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
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
index bb46fd420687..58b1a15eaf9d 100644
--- a/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/camera_calibration/Manifest b/dev-ros/camera_calibration/Manifest
index 7cf1c5d6fed8..381149ea0f41 100644
--- a/dev-ros/camera_calibration/Manifest
+++ b/dev-ros/camera_calibration/Manifest
@@ -1,22 +1,8 @@
-DIST image_pipeline-1.12.14.tar.gz 118296 BLAKE2B c9893473725d7c736888d3ce24b83a17afa9208afc325f9dcb6b24d464c26a8fdd88db8fd2e43c2251365366f321fe50d1e6f7bb62ca235e0c2f36f81dae605f SHA512 724b6d20edab1436c51a05f4399b852cabab74c5e04dea97f53a256fb512b4dbfc97fd6e7d74d41bfd7d92fe183aa86a993a39b8687c27dc7b7f85d1a1c81b94
-DIST image_pipeline-1.12.15.tar.gz 122012 BLAKE2B ba3595970b479e7708c533840c9cc24e9a793e8cc89ecee656028416dbff58487c5df994ab521852a6658dc01b7d70006f86f493b02c87a058cae1dd21f90a38 SHA512 184805f99020332ad74899ec47abc56144aceef8d4eabf877a4dc85f30befdc78b209407e1be624ba151be3a71be1fafdbd87c771137bee7c080c24935f6c6fa
-DIST image_pipeline-1.12.16.tar.gz 126407 BLAKE2B 7c05810453acd6e8a095a3d49763f315b674753db4e9e7c6714b5bd92f5bd1f01a3f4a257db0432daca347a9d531a797548f498dfbc132b5ad96d2e2e959a089 SHA512 2e1b77a6267fef2925396b36c8d3fdabcf8c0e61043bbeb066f0923bba867c3f63a9da4a9829d26c502af70ad7ab3dcda6cca14628accc472010af8df4b1153e
-DIST image_pipeline-1.12.18.tar.gz 127899 BLAKE2B 4ec0625c57da5348c9b276a8a457f60cecbf58774ba6ec7c51098837259ab0bc241815e313c458d93fa14a71b23b8768a9b4b12966f73893c88783f313e5e07e SHA512 9a9d671d31d3c6a9343836fa8c7a5566fb9e032330dbc57adeab35510263aca0482a8a8413716e79c49e2e187c3892ab200c92435e8797d4b69e3332771b64da
-DIST image_pipeline-1.12.19.tar.gz 130635 BLAKE2B 23709220248c86900c092a94a688cb428ceb58aba621e078cece903038345339e75706b0496aacd616e8a5e67522fff781d6a48022f8e6c231bb76eed9417b6e SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba
-DIST image_pipeline-1.12.20.tar.gz 137888 BLAKE2B 2fa362acf59e545c794136262bab98bd5bf5c9025306df5b3f46fd4f498a13c99ef902653f8725564e02f6d1178ba7b77f973d248e4229c80251ad8f5747fb56 SHA512 37a45cfcc8bdb8b40477860e29f72671d423d4531156f5901128c32a6c41d27f235cdac216502d614ab7ddab5e66c2f343baaa0fd22cf83cb38e667fbbc111c5
-DIST image_pipeline-1.12.21.tar.gz 139264 BLAKE2B 0b60057d35a250b0f4938ad79d893b922501d9416a6a7122c49023f632affd06c1c82bfddff0f10bbebe683d8dd50eb4d947d5086a8bb6935da98f8a2d146eed SHA512 76f06e7a1effb3098454496e01a8c14b34a37a3ea96ac51a0deb860b6891b37d354dcf7d9c06389476decaa90c3097c4495e34d04f70ad6a571fc5469eda2f6c
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD camera_calibration-1.12.14.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
-EBUILD camera_calibration-1.12.15.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
-EBUILD camera_calibration-1.12.16.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
-EBUILD camera_calibration-1.12.18.ebuild 828 BLAKE2B a6833c11c8dc7e6f45dae25ee287fb14393bc9ae8320a930aff053481f753ac9a36331ae65ce667a66e10145504370e374109767fd2e89f30e824e834c59b5bd SHA512 4902c3e58986332f4358f3d8d2f95ece4da4ec424eb7902e989bd7284228afe182c78641859db0bc5910002b53bd32297221233562b6aae102d880a45a8b88cb
-EBUILD camera_calibration-1.12.19.ebuild 828 BLAKE2B a6833c11c8dc7e6f45dae25ee287fb14393bc9ae8320a930aff053481f753ac9a36331ae65ce667a66e10145504370e374109767fd2e89f30e824e834c59b5bd SHA512 4902c3e58986332f4358f3d8d2f95ece4da4ec424eb7902e989bd7284228afe182c78641859db0bc5910002b53bd32297221233562b6aae102d880a45a8b88cb
-EBUILD camera_calibration-1.12.20.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
-EBUILD camera_calibration-1.12.21.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
-EBUILD camera_calibration-1.12.22.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
-EBUILD camera_calibration-1.12.23.ebuild 828 BLAKE2B 7584bc3eb7533127f2475f6a42ccde314f51cb64fcf14ca3e2e1e7ef3f8a3e83c606ce8cc00d0e329f359b46b4d5477d2e68f7a43c9b1b9dd61bbe6d3a8c32a7 SHA512 4fac89c8b30f0be4898a996cf1f2bc0af1643e2e2b0a9b3bfb72ddd50e9e235e623f5600a90f321030f75e1707e3fa200899e6e7e50ba5b81f736735f5227e53
-EBUILD camera_calibration-1.13.0.ebuild 825 BLAKE2B a9b21903a35b2eaa4e7a73b59abcfd6a0b59477cad33ff8a637153b9e0295998d1a377e1c5cf4c686a068c8cbdfdad82678f3550402581bacd27d2b816202615 SHA512 580a5ec88c72b7c699f00d9711593f84c7759c90eb58aa0fa85e094e4c9a30e10c02f5c743d6b6525f4648206bcf7a9e5268f1fb085be345f992ed09133ad1cb
-EBUILD camera_calibration-9999.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
+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-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
+EBUILD camera_calibration-1.15.2.ebuild 1403 BLAKE2B 049ba1a8a999e986a6a56a4d190044df6a0b84adf76a402bc3fd1894da3564b87492dcbd101776f2c8ca361bf33776ad88df98573c12b2d5da2bf520bc648f6d SHA512 ef449cb1f2d25a5e9434ca5d3f80c042183f6609a7014187d252a9ff9a3531375b19028070ed63bd6bec60cfbd9e4ea5df7fef4e4e280dd54456bab69f10e0cc
+EBUILD camera_calibration-9999.ebuild 1403 BLAKE2B 049ba1a8a999e986a6a56a4d190044df6a0b84adf76a402bc3fd1894da3564b87492dcbd101776f2c8ca361bf33776ad88df98573c12b2d5da2bf520bc648f6d SHA512 ef449cb1f2d25a5e9434ca5d3f80c042183f6609a7014187d252a9ff9a3531375b19028070ed63bd6bec60cfbd9e4ea5df7fef4e4e280dd54456bab69f10e0cc
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
deleted file mode 100644
index 3007515b82f3..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.15.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.15.ebuild
deleted file mode 100644
index 3007515b82f3..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.15.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.16.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.16.ebuild
deleted file mode 100644
index 3007515b82f3..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.18.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.18.ebuild
deleted file mode 100644
index 9c21e67f122f..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.18.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.19.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.19.ebuild
deleted file mode 100644
index 9c21e67f122f..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.20.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.20.ebuild
deleted file mode 100644
index f447ac323c69..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.20.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.21.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.21.ebuild
deleted file mode 100644
index f447ac323c69..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.22.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.22.ebuild
deleted file mode 100644
index f447ac323c69..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild
deleted file mode 100644
index c1bc117b7d18..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild b/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild
deleted file mode 100644
index dffb8eec336f..000000000000
--- a/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild b/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
new file mode 100644
index 000000000000..115ecc7444b3
--- /dev/null
+++ b/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 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}]")
+	)"
+
+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
+}
diff --git a/dev-ros/camera_calibration/camera_calibration-9999.ebuild b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
index 3007515b82f3..115ecc7444b3 100644
--- a/dev-ros/camera_calibration/camera_calibration-9999.ebuild
+++ b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
@@ -1,27 +1,40 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
+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_USEDEP}]
-	dev-ros/image_geometry[${PYTHON_USEDEP}]
-	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${PYTHON_USEDEP}]
+	dev-ros/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? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_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
+}
diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest
index 4783afebc92a..f07a0124535f 100644
--- a/dev-ros/camera_calibration_parsers/Manifest
+++ b/dev-ros/camera_calibration_parsers/Manifest
@@ -1,5 +1,5 @@
-AUX boostpython.patch 894 BLAKE2B b9dadc07ac55c68b15c2960ae545a0d7f2984da11d835f41707d6a1b54487650a4507c720e3c372eeb2aec9f8fc20edfb726a4df616349802aa484210ee8bf2e SHA512 222e4ae077e40af8cd2b913d71d43e06b5b798375ae0d8fd9cf6c9387d7ffb1acd2c44208713cdeb8ae24dce74eff426b4b9180d6e07a2041b5d0a6031ad756a
-DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD camera_calibration_parsers-1.11.13-r1.ebuild 721 BLAKE2B d2264d8bcc8bc472cdefc2436b32b020f9b926e36574dd50ed6390d02a043f269cd4b8e47874a225d30c2c2f25b17dfa7fc82bd051f719e3ba77761e8ba34495 SHA512 5567df0e7e2ac53ff82ea9c02835b7f961d103d8c73e2cda8c9656d40f0e2f5b6fe1eab28a1b2163a96d8463b30b89b6a45e9e363860d7b7f417e3cd72a383db
-EBUILD camera_calibration_parsers-9999.ebuild 721 BLAKE2B d2264d8bcc8bc472cdefc2436b32b020f9b926e36574dd50ed6390d02a043f269cd4b8e47874a225d30c2c2f25b17dfa7fc82bd051f719e3ba77761e8ba34495 SHA512 5567df0e7e2ac53ff82ea9c02835b7f961d103d8c73e2cda8c9656d40f0e2f5b6fe1eab28a1b2163a96d8463b30b89b6a45e9e363860d7b7f417e3cd72a383db
+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 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
deleted file mode 100644
index ff27b5050edc..000000000000
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-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=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit ros-catkin
-
-DESCRIPTION="Routines for reading and writing camera calibration parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	>=dev-cpp/yaml-cpp-0.5:=
-	dev-ros/roscpp
-	dev-ros/roscpp_serialization
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/nose )
-"
-PATCHES=( "${FILESDIR}/boostpython.patch" )
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
new file mode 100644
index 000000000000..9e586eb4d9df
--- /dev/null
+++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 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
index ff27b5050edc..9e586eb4d9df 100644
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
+++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit ros-catkin
 
@@ -15,15 +14,26 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	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
-	test? ( dev-python/nose )
 "
 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
index 02019d6458f7..30840401c0df 100644
--- a/dev-ros/camera_calibration_parsers/files/boostpython.patch
+++ b/dev-ros/camera_calibration_parsers/files/boostpython.patch
@@ -5,15 +5,11 @@ Index: camera_calibration_parsers/CMakeLists.txt
 ===================================================================
 --- camera_calibration_parsers.orig/CMakeLists.txt
 +++ camera_calibration_parsers/CMakeLists.txt
-@@ -4,11 +4,7 @@ project(camera_calibration_parsers)
+@@ -4,7 +4,7 @@ project(camera_calibration_parsers)
  find_package(catkin REQUIRED sensor_msgs rosconsole roscpp roscpp_serialization)
  
  find_package(PythonLibs REQUIRED)
--if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
--  find_package(Boost REQUIRED COMPONENTS filesystem python)
--else()
--  find_package(Boost REQUIRED COMPONENTS filesystem python3)
--endif()
+-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})
  
diff --git a/dev-ros/camera_info_manager/Manifest b/dev-ros/camera_info_manager/Manifest
index 67a0da59c33f..6eb7691c85c9 100644
--- a/dev-ros/camera_info_manager/Manifest
+++ b/dev-ros/camera_info_manager/Manifest
@@ -1,16 +1,4 @@
-DIST image_common-1.11.10.tar.gz 52212 BLAKE2B 70ad401de41fb7a54fb741168f368a0d3f9a220f15fe7b1064868e3f4d1b34b5f39a842f24e6e22a9ac74919f2377fab28d32fb91a546068244f436ab40ee044 SHA512 dac26cf9f3a7f0660f513fdcfbcf42ff2b772aaa03dd7422e5b7ede6f2f5724e7ba6c50bdddd2511168fbb7f576d05beda786eec1ac86b3b31b6429341dc1657
-DIST image_common-1.11.11.tar.gz 52591 BLAKE2B 21ae3e98e6b80ca8da5c7cb6055f37aca1ecd14950e2d40a936534ecf43df02002868de48bf2e3eff2e94ebc60e55849490885d456a037ab1456c972aeeb4f9b SHA512 3693647935620bc0b223b80c515e2d02718b96eb5d61f57c436098cc635764f359de0f762e5e5e3746b6fbd06e99a490d4cecc33ea38e760f1126e4b321f78f8
-DIST image_common-1.11.12.tar.gz 53920 BLAKE2B 296601a14b0e18e6685924ae4557ead446a95ac91ddffb791f9b0b4d643b8f9e40c17f8ace1a705bb5193647bb07444ac81513c888864b0cdd9b45464c14916c SHA512 cd64edd658092c88060a99bbf2cd501cd27441123c34914fc4c8d8c8a8a1fe6d4a929211e71d813b6eb72e1d844842ee3e12567bc40d32981db9ee430e61fb10
-DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-DIST image_common-1.11.7.tar.gz 49437 BLAKE2B eb0df420e7bb3a81b21d527347a3f546f680ef33c9e1be65a17a91abf20e5425b0f08b1d0f9dfe034813f9431cca391c1bf73f78801a3217fb24b21df781df63 SHA512 7408b641c75b6227130218862674609521d8465680ac15d45fc296de6ad3372ef1dde225a812740e0d5200f5923b52b4e9c2fca4dd4f96104f0bfe901400f456
-DIST image_common-1.11.8.tar.gz 49596 BLAKE2B 03806c9bd8c375c3611f29696ea523f1774e4d61ee13b8bde4ea1f5e11c175a02fa59c7b1af2056cafb81a641d1adc73ae0441625c5a0c4e43efd8d91e86e3e4 SHA512 448a10466c6ac04d2193ce87741658073c70f629b554df484decfba107c5bc67d9fcf660a12a1dc31ce2c570d69004207c47249e5523276a425e38f330d17f35
-DIST image_common-1.11.9.tar.gz 52035 BLAKE2B b717ef682f70d702f8ace2707a21bba8eada4ed65d8c2e733502b40b1497b9f520415bc012e41da744d19a5e21e360219a10d5928f060679c240fd8a0d7e2275 SHA512 465b66731197384105dff0c499b89ab48d68859aae95411cf7d675fcb911018c7f2d79d3825b17ebcba8297b244491ef848b1b0cf70e620b93b9d73dc9b5bd77
-EBUILD camera_info_manager-1.11.10.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
-EBUILD camera_info_manager-1.11.11.ebuild 554 BLAKE2B 6ed14f72504dcb4d2274a063c2725209686602d6b463ea4e34d05397da6f18e5767ecce523468bad4606f756657ac990623173c5b4ba3b43987930ac827821bd SHA512 cedf5f5253d977ba04c0a3a8bea09f6e055977d8756acad5026e811d30784019f6258d9dc90097fb9d75004a9b42a5a054c7cbd67da36a03680c7a4941406ca8
-EBUILD camera_info_manager-1.11.12.ebuild 554 BLAKE2B 6969a637ea8b429ec59cc3b47052c5f1da3ddd7b2a05c2953b1844cfd4c50bfcb360c1b58a9dffcf611f27123ec05f5a48eb407f69ab375bbdaaae35e6e0d0d4 SHA512 f606285ed43d507c690702ea18ad4ca2a6d4f017c85f2ebedf7e6fffe01099ee2225906ace25b03d82dce2ab9ffc57f17302c5d6344578f638f036b53b3a40c4
-EBUILD camera_info_manager-1.11.13.ebuild 554 BLAKE2B 6969a637ea8b429ec59cc3b47052c5f1da3ddd7b2a05c2953b1844cfd4c50bfcb360c1b58a9dffcf611f27123ec05f5a48eb407f69ab375bbdaaae35e6e0d0d4 SHA512 f606285ed43d507c690702ea18ad4ca2a6d4f017c85f2ebedf7e6fffe01099ee2225906ace25b03d82dce2ab9ffc57f17302c5d6344578f638f036b53b3a40c4
-EBUILD camera_info_manager-1.11.7.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
-EBUILD camera_info_manager-1.11.8.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
-EBUILD camera_info_manager-1.11.9.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
-EBUILD camera_info_manager-9999.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
+DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
+EBUILD camera_info_manager-1.12.0.ebuild 553 BLAKE2B eab470214252eb1998f0a655af65255f9fa8350e523229bc49a980d7b28d13c9b9ef502944029d4408461e707326333e6c6d5ba097ed5c61d2d06188c3d3f0a4 SHA512 b8d2887fa39f1ba8204f2bb1e2757f06f0d256f389fddcede65359f0974fea913883aecbb88ee303952620e5cd42e9463c3b7446119e84136c70c5fbe81316e9
+EBUILD camera_info_manager-9999.ebuild 553 BLAKE2B eab470214252eb1998f0a655af65255f9fa8350e523229bc49a980d7b28d13c9b9ef502944029d4408461e707326333e6c6d5ba097ed5c61d2d06188c3d3f0a4 SHA512 b8d2887fa39f1ba8204f2bb1e2757f06f0d256f389fddcede65359f0974fea913883aecbb88ee303952620e5cd42e9463c3b7446119e84136c70c5fbe81316e9
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild
deleted file mode 100644
index 01fd5f221156..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.11.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.11.ebuild
deleted file mode 100644
index 5aab9a74a94e..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.12.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.12.ebuild
deleted file mode 100644
index 16533def62e2..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.12.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.13.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.13.ebuild
deleted file mode 100644
index 16533def62e2..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.7.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.7.ebuild
deleted file mode 100644
index 01fd5f221156..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.8.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.8.ebuild
deleted file mode 100644
index 01fd5f221156..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.9.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.9.ebuild
deleted file mode 100644
index 01fd5f221156..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
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
new file mode 100644
index 000000000000..624e1b1e8291
--- /dev/null
+++ b/dev-ros/camera_info_manager/camera_info_manager-1.12.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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-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
index 01fd5f221156..624e1b1e8291 100644
--- a/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
+++ b/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -18,7 +18,9 @@ RDEPEND="
 	dev-ros/image_transport
 	dev-ros/roscpp
 	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest )
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/carrot_planner/Manifest b/dev-ros/carrot_planner/Manifest
index 15310bb980da..deeaa7de6a18 100644
--- a/dev-ros/carrot_planner/Manifest
+++ b/dev-ros/carrot_planner/Manifest
@@ -1,10 +1,4 @@
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD carrot_planner-1.16.1.ebuild 595 BLAKE2B c190b4df7617f2e600493e9841940b12b4841e17fea253cf59b20d86d2f701a80951f6b74b3074395967c7c22077f419efda210ee623427dc696dda11b45f833 SHA512 4457a05ddc7305f647c80a265b8ceb7e051452ade4e9f2ea316a53f389ed5e0685c186999de8d739f8a9a5c47c86fc5924bb46c4a2f16bb50286fe2954598f7b
-EBUILD carrot_planner-1.16.2.ebuild 608 BLAKE2B 167e6751811107cf47a1f8eb596faa5ebf44dd65681d1db9bee8e9b4c10671dc6ed5fa4f75686578886217f4e201033fde2f1c280c6520d2b316933074ed6f6b SHA512 96e0afa83da45c339680c20b28a45b3829892d74d77244a794ecb644e51e20e5d513a5dfe94bf65660d0ce26ef5414b1103e51bdc284dafde2dffa90132fbb77
-EBUILD carrot_planner-1.16.3.ebuild 605 BLAKE2B 10430a945a7dded75071129160f0ef7e24bfde4cedafa9dff0bbc7257769f0bf3ef1b5be020d247f45e924d950b71d2a1949e0da12458bd951ea6bfe09a77314 SHA512 b0d37147cb1d25dba11e47bae0ef4c5ee0dc9594a9437e5e00921e9e1b422850cbc526c26447990467c8d3b5ce0b117ad9e2c881e2298e83c8d29dadd8dd906a
-EBUILD carrot_planner-1.16.6.ebuild 605 BLAKE2B 211334c2c5080ac14471730bf767f80f174c27a1b138a6e2ce343c83f01e195cd761f74b65a880b0669de5370acb520a90594c5e356dd9a1917f6d43dda175d3 SHA512 7f7618f9dc9adaf013ee3c8fd562823d8135808f3f03060914f18806223739128308d51def8dbd387a204d2c3fc5d8538a4ee51be842398aebd456bb726a7d43
-EBUILD carrot_planner-9999.ebuild 608 BLAKE2B 167e6751811107cf47a1f8eb596faa5ebf44dd65681d1db9bee8e9b4c10671dc6ed5fa4f75686578886217f4e201033fde2f1c280c6520d2b316933074ed6f6b SHA512 96e0afa83da45c339680c20b28a45b3829892d74d77244a794ecb644e51e20e5d513a5dfe94bf65660d0ce26ef5414b1103e51bdc284dafde2dffa90132fbb77
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD carrot_planner-1.17.0-r1.ebuild 633 BLAKE2B d69298e2372b61114bd6315dda1f5f03380aaa4ff3732f67b26d42c904576ac32cea8f4b10ffbcc220f2714bd82913e5887fdc5c5cb09be8f922f491ac00ba54 SHA512 56bb321ff22818b6b1b85c942985d879cd7e66300c2f350d69094e9d08ba92471df2a2529635b4148182430a9b92ec2c26f25eccb3e27fcebdf255266cc3ccb7
+EBUILD carrot_planner-9999.ebuild 633 BLAKE2B d69298e2372b61114bd6315dda1f5f03380aaa4ff3732f67b26d42c904576ac32cea8f4b10ffbcc220f2714bd82913e5887fdc5c5cb09be8f922f491ac00ba54 SHA512 56bb321ff22818b6b1b85c942985d879cd7e66300c2f350d69094e9d08ba92471df2a2529635b4148182430a9b92ec2c26f25eccb3e27fcebdf255266cc3ccb7
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/carrot_planner/carrot_planner-1.16.1.ebuild b/dev-ros/carrot_planner/carrot_planner-1.16.1.ebuild
deleted file mode 100644
index 9b88284f1191..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.16.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="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_ros
-
-	dev-libs/boost:=
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/carrot_planner/carrot_planner-1.16.2.ebuild b/dev-ros/carrot_planner/carrot_planner-1.16.2.ebuild
deleted file mode 100644
index 86e76aa7b195..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.16.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="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/boost:=
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/carrot_planner/carrot_planner-1.16.3.ebuild b/dev-ros/carrot_planner/carrot_planner-1.16.3.ebuild
deleted file mode 100644
index a1772a73b786..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.16.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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/boost:=
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/carrot_planner/carrot_planner-1.16.6.ebuild b/dev-ros/carrot_planner/carrot_planner-1.16.6.ebuild
deleted file mode 100644
index 43b515deef9f..000000000000
--- a/dev-ros/carrot_planner/carrot_planner-1.16.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=5
-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/boost:=
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..988e46d33c04
--- /dev/null
+++ b/dev-ros/carrot_planner/carrot_planner-1.17.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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
index 86e76aa7b195..988e46d33c04 100644
--- a/dev-ros/carrot_planner/carrot_planner-9999.ebuild
+++ b/dev-ros/carrot_planner/carrot_planner-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
@@ -23,7 +23,9 @@ RDEPEND="
 	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}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/class_loader/Manifest b/dev-ros/class_loader/Manifest
index ceeffc5902ae..5a8b1c29d9f4 100644
--- a/dev-ros/class_loader/Manifest
+++ b/dev-ros/class_loader/Manifest
@@ -1,4 +1,4 @@
-DIST class_loader-0.4.1.tar.gz 33110 BLAKE2B 61a93af542124799ddc7341bdd330ca8cd13046fc6a0ce765818bfce09def49b93c351180278c80c32e9449ce46b520ab91153bb4d9630e809623106efdc1f76 SHA512 954ad1e76a8b2b679d4cdd46e4c29471dbdaae18be580bd5babe576c89265c473fb218253338667d51f68bf26780a48d934e476a30983cb986bec4ffadec28d1
-EBUILD class_loader-0.4.1-r1.ebuild 431 BLAKE2B 3397bc1ee2846c81d5032dbb3661b26b1e6438a7c9d28f196c5477a173902e87e7487b59b128f5ed55633349f665c284d184e7342d69a8e95723af254642c6aa SHA512 b0ce9dc25f5fa5c4b7feae5e5371ec39a50f7eb5f2908a8ee8eb129851677e638bcb1e8cabc49fc2ef2778d14fe4075bb1b9b9a91d86d905a724d85049f77d4a
-EBUILD class_loader-9999.ebuild 431 BLAKE2B 3397bc1ee2846c81d5032dbb3661b26b1e6438a7c9d28f196c5477a173902e87e7487b59b128f5ed55633349f665c284d184e7342d69a8e95723af254642c6aa SHA512 b0ce9dc25f5fa5c4b7feae5e5371ec39a50f7eb5f2908a8ee8eb129851677e638bcb1e8cabc49fc2ef2778d14fe4075bb1b9b9a91d86d905a724d85049f77d4a
+DIST class_loader-0.5.0.tar.gz 34165 BLAKE2B 117b93bf263ac616947386a43413682cd4bf1eb4e0150673fa8803ba2af17df3f5137d38f26774a51f1974bd12237f35c36d5824c0ddbe66062a608a0518dc08 SHA512 94070562f164c4532e0da5df245125eae8af0f1d33574f7692a608f3a7bcf5cbac147828600c51457f4f3585b723dd86c8c5cbeea22764c75e6f670383be5308
+EBUILD class_loader-0.5.0.ebuild 440 BLAKE2B 92fd35e808943c679677c5f49b09921782a2886a346f579f1825fba320b1d70ca87c510f52f6dfb3ef523e6b09c06b2b4fc1067712d501d17acc87bb3be5d288 SHA512 47dbbe0e08472a31d6434a31aed0cc27592b3263d6484e0c0b130ecd0d759988fc53651feb9771a1aa722ea35b5e3f2de7468f8b7ed94ec4acbad3fe80db0323
+EBUILD class_loader-9999.ebuild 440 BLAKE2B 92fd35e808943c679677c5f49b09921782a2886a346f579f1825fba320b1d70ca87c510f52f6dfb3ef523e6b09c06b2b4fc1067712d501d17acc87bb3be5d288 SHA512 47dbbe0e08472a31d6434a31aed0cc27592b3263d6484e0c0b130ecd0d759988fc53651feb9771a1aa722ea35b5e3f2de7468f8b7ed94ec4acbad3fe80db0323
 MISC metadata.xml 330 BLAKE2B ee09655fb1ba4eb6310f6ada92765e7a7aeab4cf9c9c3acfc29c54e6248543270aff3f089b13df31bb0b9f4e17c28f9dc82d469a481769989aa410fd392619e1 SHA512 9577bebad3f9dc042eb4d055bda37a837948682da8a73dee93d847b9224227edbb51ca6cdd4002ff0c076387d8aee43428e6c16cfb13fce6a0ee8502b3eab406
diff --git a/dev-ros/class_loader/class_loader-0.4.1-r1.ebuild b/dev-ros/class_loader/class_loader-0.4.1-r1.ebuild
deleted file mode 100644
index 16fdc81a521a..000000000000
--- a/dev-ros/class_loader/class_loader-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/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:=[threads]
-	dev-ros/cmake_modules
-	dev-libs/console_bridge:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/class_loader/class_loader-0.5.0.ebuild b/dev-ros/class_loader/class_loader-0.5.0.ebuild
new file mode 100644
index 000000000000..b832c7497614
--- /dev/null
+++ b/dev-ros/class_loader/class_loader-0.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 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:=[threads]
+	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
index 16fdc81a521a..b832c7497614 100644
--- a/dev-ros/class_loader/class_loader-9999.ebuild
+++ b/dev-ros/class_loader/class_loader-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/class_loader"
 KEYWORDS="~amd64 ~arm"
@@ -15,6 +15,8 @@ IUSE=""
 
 RDEPEND="dev-libs/poco
 	dev-libs/boost:=[threads]
-	dev-ros/cmake_modules
 	dev-libs/console_bridge:="
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index 0f25e7c82ec2..a9cff1182aeb 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -1,6 +1,4 @@
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD clear_costmap_recovery-1.16.3.ebuild 636 BLAKE2B 732722bb2f8ee5dcd044b921a07d7a6f7c9a5e621ca213f2c2175cc894fee867efbebb4fd28254c1578b25165afa76d5ea34ca919cc704b5a7fa54dbe750fcc9 SHA512 2296a68eaedc697745fa30356e9f277fff7d347818099a35f1553fdc2d0dbf6046a5d88fc37b17970175004f8787f552822447e6cccc38515be0ee25decc742b
-EBUILD clear_costmap_recovery-1.16.6.ebuild 636 BLAKE2B 4cb6ec727bf2877ca64defa6800be82d909df4664d9d333bee68f3bec3fe4c9bf2f69ca06d78a4caa6ecc4c14d571727df7720a3832fd98114742c05b525deda SHA512 dc586c0a5a42a3f3f031f5d8c333778ae2f2b73ed2cd64c4079ffb1f45c1fe02f8818892a32fd5a62c7f605221d87e8955aa16cb75ec246e5d0782529a00a5f3
-EBUILD clear_costmap_recovery-9999.ebuild 636 BLAKE2B 732722bb2f8ee5dcd044b921a07d7a6f7c9a5e621ca213f2c2175cc894fee867efbebb4fd28254c1578b25165afa76d5ea34ca919cc704b5a7fa54dbe750fcc9 SHA512 2296a68eaedc697745fa30356e9f277fff7d347818099a35f1553fdc2d0dbf6046a5d88fc37b17970175004f8787f552822447e6cccc38515be0ee25decc742b
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD clear_costmap_recovery-1.17.0.ebuild 618 BLAKE2B e94706667ceb0a304db3c41d67ff2eb8b6754c06cb53833d280af3b679274504ba1db6606d06b847401c91ec976aecf5c9f4f9a69f6e9f4b96bb877e552e09a1 SHA512 2cbe381fbaeed8e010630a4a41475d219c0a9adb7ffdd7d812250dfb337e087e161777454832b1bf5cc011f7e4e47d16489083f44294d1edce962bef2e643271
+EBUILD clear_costmap_recovery-9999.ebuild 618 BLAKE2B e94706667ceb0a304db3c41d67ff2eb8b6754c06cb53833d280af3b679274504ba1db6606d06b847401c91ec976aecf5c9f4f9a69f6e9f4b96bb877e552e09a1 SHA512 2cbe381fbaeed8e010630a4a41475d219c0a9adb7ffdd7d812250dfb337e087e161777454832b1bf5cc011f7e4e47d16489083f44294d1edce962bef2e643271
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.3.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.3.ebuild
deleted file mode 100644
index 577df1d17e47..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16.3
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )
-"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.6.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.6.ebuild
deleted file mode 100644
index 13b23257b73d..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.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=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16.3
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )
-"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0.ebuild
new file mode 100644
index 000000000000..5f505a6c1a2e
--- /dev/null
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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="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:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest dev-cpp/gtest )
+"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
index 577df1d17e47..5f505a6c1a2e 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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 to clear space by reverting the costmaps to the static map"
+DESCRIPTION="Recovery behavior that attempts reverting the costmaps to the static map"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/cmake_modules/Manifest b/dev-ros/cmake_modules/Manifest
index 6b71d7c4f2b2..c3e377e1ad42 100644
--- a/dev-ros/cmake_modules/Manifest
+++ b/dev-ros/cmake_modules/Manifest
@@ -1,6 +1,4 @@
-DIST cmake_modules-0.4.2.tar.gz 18541 BLAKE2B 448fa9f49c155e60f56094cadfd2f1d26bac426a18ce7355c92f227fb650f77affd49557c98fa4d0b26d4e21ed7b4d2a2e6deb6fdc25a3996705a2b9e3805f56 SHA512 1ab0f9d15296c024caf83f126db675894163ff6104c86e22f105e8027561b291e2a0178e39980439e66e4b691e6122830621fbb09f957eebe94ddd065c23f5e7
 DIST cmake_modules-0.5.0.tar.gz 18605 BLAKE2B 5be0a6f7e69806347eea03796b06679618c071dfdf72bce73d040c3788983f95c967586c800b4429df80ac6996439a0f59c2827dfb96aa50f5fe09169dc3d6e6 SHA512 a7920a094f3b3d8e480c16fd279d960e0c4d919bc4a337ba4f37ad82005805cac0e313a758e0b823986a280a8d3536a5dc36ac9603b7cd43bc0e965e9dfdd028
-EBUILD cmake_modules-0.4.2.ebuild 375 BLAKE2B 0e07ec88f48c4f823b5587eeb764a691265858f1d84386e55cee65f61a06d0cf4d1e5a11f2ff4ea78d04bbb7011e1138c9a21af71457c4ecca4775d710a4c386 SHA512 c3bd32b8ca16b4ed7274d0054fced3ca987854707dda2af695a77cb31d37bfcbfb17e04e52d729c708d4f2f929e1b9b02553bf36f122352b7b7d6128e26ddaa5
-EBUILD cmake_modules-0.5.0.ebuild 375 BLAKE2B d58eca570616a0078c64957f095d5cb737bf55ba2dcb06d54155a93033c8bde2421f2555e3b2938a1188292f690ad879ddc47ea90239fceca2442d0471343b48 SHA512 596c8d0dc809ca711a0ade9c9e7e9323f9dbe397e1486876c0b85a38cf5fcfc0e77064a48b0db87cdbe24e37f4b9f667a1a179b01b16cba65dec197839362d1b
-EBUILD cmake_modules-9999.ebuild 375 BLAKE2B d58eca570616a0078c64957f095d5cb737bf55ba2dcb06d54155a93033c8bde2421f2555e3b2938a1188292f690ad879ddc47ea90239fceca2442d0471343b48 SHA512 596c8d0dc809ca711a0ade9c9e7e9323f9dbe397e1486876c0b85a38cf5fcfc0e77064a48b0db87cdbe24e37f4b9f667a1a179b01b16cba65dec197839362d1b
+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 331 BLAKE2B 542842b17662d8d11d0e8c9bf8e964a0bb220e9fd9b377a5d85ae41760a836cc66d5f4325fd79644878c7514d5d6487b4231417249bad174e294961404f64919 SHA512 cd2600dbf2b4aa2203c0d84f35ee501e48d3e14d16bd66a66c135dc57dab76b5abd9a9888e62babce118f9fb7c80752be6d4a72b0c7a040f844cf37735a537d9
diff --git a/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild b/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
deleted file mode 100644
index a76cb730354e..000000000000
--- a/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/cmake_modules"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild b/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
index 4b3ea76798d0..fd800aebb7d3 100644
--- a/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
+++ b/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
 
-DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
+DESCRIPTION="CMake Modules which are commonly used by ROS packages"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/cmake_modules/cmake_modules-9999.ebuild b/dev-ros/cmake_modules/cmake_modules-9999.ebuild
index 4b3ea76798d0..fd800aebb7d3 100644
--- a/dev-ros/cmake_modules/cmake_modules-9999.ebuild
+++ b/dev-ros/cmake_modules/cmake_modules-9999.ebuild
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
 
-DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
+DESCRIPTION="CMake Modules which are commonly used by ROS packages"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index a11a867361b7..39ebff4a8267 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@@ -1,6 +1,4 @@
-DIST collada_urdf-1.12.10.tar.gz 73182 BLAKE2B 69f245e7962ad542a133ee71a7e9cbf7314ca7e754d95521dc802ef4296e957321897170444616bc2789626f19e7c368749f5644482dae04f28b864d08970de9 SHA512 78387ba78175099be0c48f966a185630598504f27d5baa76e9a9c088132b1368c698784c5367b376ac126e7c5a97a2117864561a073e6f9370a47fb86ad62ca4
-DIST collada_urdf-1.12.12.tar.gz 73361 BLAKE2B 7c23510d18080614e4f5666fa79d66b8378b6e524ac54249b8df03cefb3edfbcb7977690ca30917f8eab5ca56e689015f236cabff2aed402bd3a6b8d50f72cc6 SHA512 e0628daf905053bb6193cb3919b17b78f0697b1a530d589165f91343ac82a9fd08d86b9b24264e7f7750bef74d3a3b0db28bae63a31e8a484d8784db0a0ef6e5
-EBUILD collada_parser-1.12.10-r3.ebuild 552 BLAKE2B a56ae971ca688d0774f59b54004df43871e6a92ac8b55a1a2b48ba35c53fcaa35938bf968659943429ac7b62cccc95d5a182dd305428a0ddf48f672461134334 SHA512 8f462d2b74002b11b8fe7002d01767c1ad65650b395c142a69f901464e0a2f1566a2b068135c698134517b8927bf0bb199b84b8840920bafb7b97c2cc600bc95
-EBUILD collada_parser-1.12.12.ebuild 556 BLAKE2B b5131c89be3981d39d8d0bc0310a92007b9f2b0377b0096595230ce8b884e54a030bb5356531ab90f738e2d0820188651c935588e27b36fe7887763ee5fe2c7f SHA512 0dc225504afb546744f8fbfe7d5bf99a9f887f9e2cb27ca46784daac45d968c580af672f5c7bace1d5eb3bd9d2cb52b3ab95f486cb947517ce1dece4b4631b49
-EBUILD collada_parser-9999.ebuild 556 BLAKE2B b5131c89be3981d39d8d0bc0310a92007b9f2b0377b0096595230ce8b884e54a030bb5356531ab90f738e2d0820188651c935588e27b36fe7887763ee5fe2c7f SHA512 0dc225504afb546744f8fbfe7d5bf99a9f887f9e2cb27ca46784daac45d968c580af672f5c7bace1d5eb3bd9d2cb52b3ab95f486cb947517ce1dece4b4631b49
+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 330 BLAKE2B c2da1c8743674b266a5f2f5fcc19b62552a16668ddc3770bbb693942a52e2b089e80646cbfd971cc9d8a196d62cf5fa08fc9612c2b9f8e0fe4127af47de683ff SHA512 ee9d0c6d572e3e0027eac2efd899d9008549a7f45a7ca92356bc62c7f3f10fc6aa3a9bb5e4b926ee44bf106350769c9ddf7d351761457707fba21f6e1c9eb3bf
diff --git a/dev-ros/collada_parser/collada_parser-1.12.10-r3.ebuild b/dev-ros/collada_parser/collada_parser-1.12.10-r3.ebuild
deleted file mode 100644
index cd21973f675f..000000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.10-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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/roscpp
-	dev-ros/class_loader:=
-	dev-libs/urdfdom_headers
-	dev-libs/collada-dom:=
-	>=dev-ros/urdf-1.12.6
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_parser/collada_parser-1.12.12.ebuild b/dev-ros/collada_parser/collada_parser-1.12.12.ebuild
deleted file mode 100644
index 6358999ff08c..000000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-1.12.13.ebuild b/dev-ros/collada_parser/collada_parser-1.12.13.ebuild
new file mode 100644
index 000000000000..8cb7ca4bd889
--- /dev/null
+++ b/dev-ros/collada_parser/collada_parser-1.12.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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
index 6358999ff08c..8cb7ca4bd889 100644
--- a/dev-ros/collada_parser/collada_parser-9999.ebuild
+++ b/dev-ros/collada_parser/collada_parser-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/collada_urdf"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest
index f1a804639d5a..8f0de114643a 100644
--- a/dev-ros/collada_urdf/Manifest
+++ b/dev-ros/collada_urdf/Manifest
@@ -1,6 +1,4 @@
-DIST collada_urdf-1.12.10.tar.gz 73182 BLAKE2B 69f245e7962ad542a133ee71a7e9cbf7314ca7e754d95521dc802ef4296e957321897170444616bc2789626f19e7c368749f5644482dae04f28b864d08970de9 SHA512 78387ba78175099be0c48f966a185630598504f27d5baa76e9a9c088132b1368c698784c5367b376ac126e7c5a97a2117864561a073e6f9370a47fb86ad62ca4
-DIST collada_urdf-1.12.12.tar.gz 73361 BLAKE2B 7c23510d18080614e4f5666fa79d66b8378b6e524ac54249b8df03cefb3edfbcb7977690ca30917f8eab5ca56e689015f236cabff2aed402bd3a6b8d50f72cc6 SHA512 e0628daf905053bb6193cb3919b17b78f0697b1a530d589165f91343ac82a9fd08d86b9b24264e7f7750bef74d3a3b0db28bae63a31e8a484d8784db0a0ef6e5
-EBUILD collada_urdf-1.12.10-r1.ebuild 585 BLAKE2B 4ac88d382e17505599c338392d20bc7fe770728b06587e248a1c77a7550e2f1cf4775bad0713891eb25b969aecedc3b25e090f87430c19cfea6cdae357225f6b SHA512 72c1728b7ea621ee064611082ebc3b8fd2f7330891e79c34ac023def00a535fd749dc1a27ffb84beee12c715967b2f12aff66c0480226fe26fe582d835806475
-EBUILD collada_urdf-1.12.12.ebuild 616 BLAKE2B ad46888b5009f1e42e0c08a21e49c93b085be6c13842fbc42d4e20afe61dcffebb7e1fd9b6ae50f8660981ce4f37eff6e3cdf156cb94da29e360a16a1f55d7b2 SHA512 3256d6bcbc557b70a6e6db147859fa7906baab1f21d1a18702dd46c12d3e505e0dbf0462476ea425e427877ecf1b8d30fc62f8ccf4aa0241301734e7a111bb16
-EBUILD collada_urdf-9999.ebuild 616 BLAKE2B ad46888b5009f1e42e0c08a21e49c93b085be6c13842fbc42d4e20afe61dcffebb7e1fd9b6ae50f8660981ce4f37eff6e3cdf156cb94da29e360a16a1f55d7b2 SHA512 3256d6bcbc557b70a6e6db147859fa7906baab1f21d1a18702dd46c12d3e505e0dbf0462476ea425e427877ecf1b8d30fc62f8ccf4aa0241301734e7a111bb16
+DIST collada_urdf-1.12.13.tar.gz 73633 BLAKE2B 5c3458f9b245dc6b21dde8c78938712316dba25694847fa54e422cfc5b7802f4dd10a79f6fe62c7b9f553d215ddb0b9276e33651d7e75f3d11a78efa3f031a08 SHA512 ec1063b124727bb51d0ce6d19f5203ae8a1d368d3ab21b80fcb1f699022008a639638e9ebccf7d24587c7ff6b88c33e0c81cc9adc3e00334960f830248293e0b
+EBUILD collada_urdf-1.12.13.ebuild 653 BLAKE2B 96649371805ed8ddc581de7dd285aff9b03fbcfac6f72e8157cdc21f5ee6622165e5f47d9d5dc50117d24fc72da6b1edca92b5f1aa066bf4e68fb9008234b917 SHA512 f23817bdd5cfcc11fc0c5eb258db9f54e6d71863b6dccf2d957f78ad5fe44181857e349a3f967244b511f9a83496ada4ba5071f4359be0a05f87257272863c0b
+EBUILD collada_urdf-9999.ebuild 653 BLAKE2B 96649371805ed8ddc581de7dd285aff9b03fbcfac6f72e8157cdc21f5ee6622165e5f47d9d5dc50117d24fc72da6b1edca92b5f1aa066bf4e68fb9008234b917 SHA512 f23817bdd5cfcc11fc0c5eb258db9f54e6d71863b6dccf2d957f78ad5fe44181857e349a3f967244b511f9a83496ada4ba5071f4359be0a05f87257272863c0b
 MISC metadata.xml 330 BLAKE2B c2da1c8743674b266a5f2f5fcc19b62552a16668ddc3770bbb693942a52e2b089e80646cbfd971cc9d8a196d62cf5fa08fc9612c2b9f8e0fe4127af47de683ff SHA512 ee9d0c6d572e3e0027eac2efd899d9008549a7f45a7ca92356bc62c7f3f10fc6aa3a9bb5e4b926ee44bf106350769c9ddf7d351761457707fba21f6e1c9eb3bf
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild
deleted file mode 100644
index 1a3e4542f459..000000000000
--- a/dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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
-	dev-ros/collada_parser
-	dev-ros/resource_retriever
-	dev-ros/urdf
-	dev-ros/geometric_shapes
-	dev-ros/tf
-	media-libs/assimp
-	dev-libs/tinyxml
-	dev-libs/collada-dom:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild
deleted file mode 100644
index 4d2d43f8f971..000000000000
--- a/dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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
-	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:=
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.13.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.13.ebuild
new file mode 100644
index 000000000000..446859e234e0
--- /dev/null
+++ b/dev-ros/collada_urdf/collada_urdf-1.12.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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="Convert Unified Robot Description Format (URDF) documents into COLLADA documents"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/angles
+	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
index 4d2d43f8f971..446859e234e0 100644
--- a/dev-ros/collada_urdf/collada_urdf-9999.ebuild
+++ b/dev-ros/collada_urdf/collada_urdf-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/collada_urdf"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -23,8 +23,13 @@ RDEPEND="
 	dev-ros/geometric_shapes
 	media-libs/assimp
 	dev-libs/collada-dom:=
-	dev-cpp/eigen:3
 "
 DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	test? (
+		dev-cpp/gtest
+	)
+"
+BDEPEND="
 	dev-ros/cmake_modules
 "
diff --git a/dev-ros/combined_robot_hw/Manifest b/dev-ros/combined_robot_hw/Manifest
index 85aed79ac623..0e3fc500861a 100644
--- a/dev-ros/combined_robot_hw/Manifest
+++ b/dev-ros/combined_robot_hw/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD combined_robot_hw-0.14.2.ebuild 469 BLAKE2B e80681e6738a357fa581c2fd6e05f1063720760dd72a30353390a283c35b52cc458f77642375ebd5904d6c2e807b9db26d90ecd0e238923fea9153ca66f52d5d SHA512 7310b5b0cd485a9afd95ea427e3bade40e4aedfbbaf2ba1fce36bb36a832b3375a8efb5e49f5b5705a2d6b13e3009c63f3bf240b45a8021ef79552134db3efa0
-EBUILD combined_robot_hw-0.15.0.ebuild 469 BLAKE2B 044469c633f200170ddd3d070f98288bdb743e6ecb4c629a50d04a5bdd51508b9eddc1b192e9eb941400e62b6f307f838552c1d3598d292b12cff0eb9b34e0b9 SHA512 f3c945807062eac38f6e83fdcb1431d05f78d1cd88c1907754e205f56ca00a5f046377f747e19d4feb888e30df17675ed2cc3842dbc53ac46cdc61ff61bf8307
-EBUILD combined_robot_hw-0.15.1.ebuild 466 BLAKE2B 70b3d23b6b256ab8ebd4c24df2f77618211758b0df214fb731ed3877f352269d19c74961840996ba86708cb8ed772884dd9451654d7576b626d8884c77db3d4a SHA512 94b74ab03c6db3bd88d0fdc37b656e540075cb9c66604d1555faa2fe14d8ff70381802f0414cff60ac5a2476d852bb3a8a893cfaa398ec8d95300b7e17145a39
-EBUILD combined_robot_hw-9999.ebuild 469 BLAKE2B 044469c633f200170ddd3d070f98288bdb743e6ecb4c629a50d04a5bdd51508b9eddc1b192e9eb941400e62b6f307f838552c1d3598d292b12cff0eb9b34e0b9 SHA512 f3c945807062eac38f6e83fdcb1431d05f78d1cd88c1907754e205f56ca00a5f046377f747e19d4feb888e30df17675ed2cc3842dbc53ac46cdc61ff61bf8307
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD combined_robot_hw-0.19.1.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
+EBUILD combined_robot_hw-9999.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.14.2.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.14.2.ebuild
deleted file mode 100644
index 9bb0b92638d0..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.14.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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.11
-	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.15.0.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.15.0.ebuild
deleted file mode 100644
index 99715e8c95e0..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.15.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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.15.1.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild
deleted file mode 100644
index 3b7d67c426e0..000000000000
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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.1.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild
new file mode 100644
index 000000000000..321a5d7c964b
--- /dev/null
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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-9999.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
index 99715e8c95e0..321a5d7c964b 100644
--- a/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
index 25ad1668da61..2bea67513780 100644
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD combined_robot_hw_tests-0.14.2.ebuild 589 BLAKE2B 4a175543e9901120894ca1f361f683d5e54fd1a22422313e46acbef335b6e6367795ad8805f4ba0313a3febcbd303df21d1c61ed0e1698a5c85f4df6cbb60692 SHA512 b6d58964feaec3d7bc88230a61041362e43baea4de3e2684258a508940fd9473745890074c90de9d02ca8c9bbb06c802e3cf4c44980017f96644e47ef874b173
-EBUILD combined_robot_hw_tests-0.15.0.ebuild 589 BLAKE2B 4a175543e9901120894ca1f361f683d5e54fd1a22422313e46acbef335b6e6367795ad8805f4ba0313a3febcbd303df21d1c61ed0e1698a5c85f4df6cbb60692 SHA512 b6d58964feaec3d7bc88230a61041362e43baea4de3e2684258a508940fd9473745890074c90de9d02ca8c9bbb06c802e3cf4c44980017f96644e47ef874b173
-EBUILD combined_robot_hw_tests-0.15.1.ebuild 586 BLAKE2B db81f31c6d64cc9c70e986d840cb553d9020c769dee49f3739b3c3d24864970f57cb51f27abef12017395b4ba58068e10482a9b31433378bde8564710f4104e1 SHA512 9be8857413fb81279341f3a4c5f77c70b8a947b4b281404c0f639acf2dffddfffaa4178a691be50b4a34767227efddc759cc1b76fe8028a7b311feeca6077350
-EBUILD combined_robot_hw_tests-9999.ebuild 589 BLAKE2B bad2e5cab92497c62e4a0d68b3db266c0e0b943d38ef10061137a3a6dada62e7e900faa4b4668d5632ff560d8153f2ee6d1c6c6948bb6e4b97810903fafbfd58 SHA512 d712002b21634dad8314f7bceeead5210a093fc433aa03ebe22db5d0ccb94f09289b2c78c7c6df143f660ba89a6aafd61f5279bd1c7ba5ffe93034f9b897d3fe
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD combined_robot_hw_tests-0.19.1.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
+EBUILD combined_robot_hw_tests-9999.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.14.2.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.14.2.ebuild
deleted file mode 100644
index e23c205a4524..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.14.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_tests
-	dev-ros/hardware_interface
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.0.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.0.ebuild
deleted file mode 100644
index e23c205a4524..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_tests
-	dev-ros/hardware_interface
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild
deleted file mode 100644
index 9c9859bfbe6c..000000000000
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.15.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_tests
-	dev-ros/hardware_interface
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
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
new file mode 100644
index 000000000000..c38e64568c99
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 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-9999.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
index fca1073283bc..c38e64568c99 100644
--- 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
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,11 +16,22 @@ 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_USEDEP}] )"
+	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/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest
index b44237b93bb9..d8e657e8a1ef 100644
--- a/dev-ros/compressed_depth_image_transport/Manifest
+++ b/dev-ros/compressed_depth_image_transport/Manifest
@@ -1,5 +1,4 @@
-AUX ocv4.patch 534 BLAKE2B 344016d8bacd6f2ee93604a94fb82a2b548b584540d8d39a6910d6ba7ed9882667e8da47f6b2654a9cc89e0424944728e34bb97a02ddba23f8621bd26baf9e1d SHA512 890b27946567e9290250bb8af10821ba8519dead141c8ff22cb2be8a201ca6bf26955503edbd767dec878a77609c3d9d50adefb8f02b75ce1d4aee8a2998d5b9
-DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD compressed_depth_image_transport-1.9.5-r1.ebuild 637 BLAKE2B 1d292d3d1600dd00176be37b0855767ed69d37cb99a96b2cbdab227ae34331cf40e91cad68b0a4967de854b2e20f95598b1fdc44ed35951addb4d7274224d789 SHA512 2eb7fe38a27eb416b12d0de400cac49fd68e475264ef1f2be2fdc5a3051c8ff80626daba2141849d21104f6cf3eecf7e11ab3b2a690e74fdecc089d5d66e8bf0
-EBUILD compressed_depth_image_transport-9999.ebuild 599 BLAKE2B a522cfae31f5b06a5c71893ec4219a50f108f6cab778cf6af8f819c3bd9929fa4f12825eb9e4dccdaa2679975e4cd30e19ed9057875c9370e847c9761ca4d0bf SHA512 f7e0dbab6bf3f1bd59e90d5569b4df97ba210fafe2883f2125c98da1675b1203d84790ee1e10958f7912eef478d29235735b0d3e246006bc40aedbeaba14583d
+DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
+EBUILD compressed_depth_image_transport-1.14.0.ebuild 585 BLAKE2B 0b8b19deef36e366964662b6b0d7748cfb66f6e4bb4d4e5cca1b28f5c04dddf77fc296dc267d6d7ac2226f69850be63735f0dbe3a64dea0236181bdf504908dd SHA512 332f93b0ece052ab11ef4ef6cf532861e359675da30a74dd4d95427f4678c1dfadc30f48f78ecb2c833ce1bc0f8756eb6966bc0144a8f8a5b513eeea91df8e01
+EBUILD compressed_depth_image_transport-9999.ebuild 585 BLAKE2B 0b8b19deef36e366964662b6b0d7748cfb66f6e4bb4d4e5cca1b28f5c04dddf77fc296dc267d6d7ac2226f69850be63735f0dbe3a64dea0236181bdf504908dd SHA512 332f93b0ece052ab11ef4ef6cf532861e359675da30a74dd4d95427f4678c1dfadc30f48f78ecb2c833ce1bc0f8756eb6966bc0144a8f8a5b513eeea91df8e01
 MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
new file mode 100644
index 000000000000..97f465fd4872
--- /dev/null
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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
+	)
+"
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild
deleted file mode 100644
index d3bccdcdc1cc..000000000000
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin to image_transport for transparently sending depth images using PNG compression"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/image_transport
-	>=media-libs/opencv-4:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
index d4ef693e9dd2..97f465fd4872 100644
--- 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
@@ -1,25 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Plugin to image_transport for transparently sending depth images using PNG compression"
+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_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_transport
 	media-libs/opencv:=
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/compressed_depth_image_transport/files/ocv4.patch b/dev-ros/compressed_depth_image_transport/files/ocv4.patch
deleted file mode 100644
index 9d1c7d79ce62..000000000000
--- a/dev-ros/compressed_depth_image_transport/files/ocv4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: compressed_depth_image_transport/src/codec.cpp
-===================================================================
---- compressed_depth_image_transport.orig/src/codec.cpp
-+++ compressed_depth_image_transport/src/codec.cpp
-@@ -135,7 +135,7 @@ sensor_msgs::Image::Ptr decodeCompressed
-       // Decode raw image
-       try
-       {
--        cv_ptr->image = cv::imdecode(imageData, CV_LOAD_IMAGE_UNCHANGED);
-+        cv_ptr->image = cv::imdecode(imageData, cv::IMREAD_UNCHANGED);
-       }
-       catch (cv::Exception& e)
-       {
diff --git a/dev-ros/compressed_image_transport/Manifest b/dev-ros/compressed_image_transport/Manifest
index c31e789ccc48..5423f8cc5c3e 100644
--- a/dev-ros/compressed_image_transport/Manifest
+++ b/dev-ros/compressed_image_transport/Manifest
@@ -1,5 +1,4 @@
-AUX ocv4.patch 823 BLAKE2B e435db081e4fb82fb3ab6a0aa46dc157c06c5d4e89b8f93bca737300b4a34c63a77101907e0ccd4d11764a5aeba084cbba98fa25cd5eb0923217cb6961b207da SHA512 0372e0c4401424dccd6e5e20d9d9eae37a7d38801a2d73a93631545d347569a685d9540a9e73b65db83e8cb6499874e0675b1eed25d0b0a8c9ca5c6557609ccb
-DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD compressed_image_transport-1.9.5-r1.ebuild 632 BLAKE2B 5431debfeda9cf204fa8e3213d7524de051885ee2db0e2b5b96e11f1f34ea2a7cfb0b3c6e2d353b07b1539f43448df400374ecb5bf7ba6dbd112cd0b5fd9cc6f SHA512 33dc22784dcc6ab9fd4ce13c17e9cf42342cd2f60f2494b7c0ab1816495a615ada381ae94e12d4c12f05ebc60318ae00a30132693cf9a169d0ff14d18342612c
-EBUILD compressed_image_transport-9999.ebuild 594 BLAKE2B 0371f8f25fc02e5ce6dc843a2642c0bf9138f1696ec940bff8508a79bc66ccc193f317610a8587720f6c6daf0db53feec6b82bcd8d8d63815dd0b481fc8f82f1 SHA512 f5711ff9ac19b3f2d38627aee4c2e7ea88202d892eff1cd38ef6e256173a81e4e4245034f01cd0c80b4feb01e2a44ea3e8e1b97dfef18882465813ab529c2fc5
+DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
+EBUILD compressed_image_transport-1.14.0.ebuild 551 BLAKE2B 90730fdbf3d9d330a708ce8e5ec45a07bb34dbf698199b092707ac6d8d1868d3def90eba2b415280e730665dbbb0af1a860c1c93ab2cc4ce6b252fed5a29da87 SHA512 2e36d72c20c4f6edc0938ef8523dbb85875cb787440cba474872e5e9bde81c155bcdcb09c66ce739c6da29a2f284505da47ed8d52a0e38eb5010e54e5d585bec
+EBUILD compressed_image_transport-9999.ebuild 551 BLAKE2B 90730fdbf3d9d330a708ce8e5ec45a07bb34dbf698199b092707ac6d8d1868d3def90eba2b415280e730665dbbb0af1a860c1c93ab2cc4ce6b252fed5a29da87 SHA512 2e36d72c20c4f6edc0938ef8523dbb85875cb787440cba474872e5e9bde81c155bcdcb09c66ce739c6da29a2f284505da47ed8d52a0e38eb5010e54e5d585bec
 MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
new file mode 100644
index 000000000000..f2997bda2e2c
--- /dev/null
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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}"
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild
deleted file mode 100644
index 044d1c361210..000000000000
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin to image_transport for transparently sending images encoded as JPEG or PNG"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/image_transport
-	>=media-libs/opencv-4:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
index 46fc32014194..f2997bda2e2c 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Plugin to image_transport for transparently sending images encoded as JPEG or PNG"
+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_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_transport
 	media-libs/opencv:=
 	dev-libs/boost:=
diff --git a/dev-ros/compressed_image_transport/files/ocv4.patch b/dev-ros/compressed_image_transport/files/ocv4.patch
deleted file mode 100644
index 6b3406b5c006..000000000000
--- a/dev-ros/compressed_image_transport/files/ocv4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: compressed_image_transport/src/compressed_publisher.cpp
-===================================================================
---- compressed_image_transport.orig/src/compressed_publisher.cpp
-+++ compressed_image_transport/src/compressed_publisher.cpp
-@@ -97,7 +97,7 @@ void CompressedPublisher::publish(const
-     // JPEG Compression
-     case JPEG:
-     {
--      params[0] = CV_IMWRITE_JPEG_QUALITY;
-+      params[0] = cv::IMWRITE_JPEG_QUALITY;
-       params[1] = config_.jpeg_quality;
- 
-       // Update ros message format header
-@@ -154,7 +154,7 @@ void CompressedPublisher::publish(const
-       // PNG Compression
-     case PNG:
-     {
--      params[0] = CV_IMWRITE_PNG_COMPRESSION;
-+      params[0] = cv::IMWRITE_PNG_COMPRESSION;
-       params[1] = config_.png_level;
- 
-       // Update ros message format header
diff --git a/dev-ros/console_bridge_vendor/Manifest b/dev-ros/console_bridge_vendor/Manifest
index 6822f30b7065..954fac10a8c2 100644
--- a/dev-ros/console_bridge_vendor/Manifest
+++ b/dev-ros/console_bridge_vendor/Manifest
@@ -1,4 +1,4 @@
-DIST console_bridge_vendor-1.2.0.tar.gz 5640 BLAKE2B d0a2b18c8d4b9259e6c8ba2953a7650e9aaef348345c5651b5a769ec9c2d4346e404688d7e6c60c3c45186d0afa0e3d3a6d9e49baef2ef1da4e0679aa7d5ba06 SHA512 2b5c8ab47554d724665184ae4dfea32a6291d9d2578a489eb81e695cc513c723e934c1dca0e66eaf83b81d656fbc67a4c7e3b4d15eae5d8770ad6ebc700b6d6b
-EBUILD console_bridge_vendor-1.2.0.ebuild 788 BLAKE2B 6013837d97ed10221e6334427df52649d7059c307734beb33908faabe1a60d5670a2c8d6ab0fee665da16805feb5d3acf81b12c9211f76c53587fcd476b6229e SHA512 0e9b0d8620cc81a127af63b4a6536c60b52d6c1cfa3a44148430dabe25cfe4b621ace5360cd18a875dcf087eac51c8020d0d6edd09c389ae89567cde341c9517
-EBUILD console_bridge_vendor-9999.ebuild 788 BLAKE2B 6013837d97ed10221e6334427df52649d7059c307734beb33908faabe1a60d5670a2c8d6ab0fee665da16805feb5d3acf81b12c9211f76c53587fcd476b6229e SHA512 0e9b0d8620cc81a127af63b4a6536c60b52d6c1cfa3a44148430dabe25cfe4b621ace5360cd18a875dcf087eac51c8020d0d6edd09c389ae89567cde341c9517
+DIST console_bridge_vendor-1.2.1.tar.gz 7403 BLAKE2B d18f2ccb352c04b1c84a2c8ed5bb4fb790cddd3adf9667a6e9e99cdfb7da3f24931c653ffd0c8175131799d08086d110ad9ad33660ffc307a3a21a7dbf54ebef SHA512 12b611ff578b4a9e20fc894789985056b1b396f7085d4d6f0848fbe1a926ddc47ee6cc2c65bf3289041573b48bad75e2ce5a6d1b3f94aa8049429faece44d6a2
+EBUILD console_bridge_vendor-1.2.1.ebuild 1013 BLAKE2B 5d6509a1d9a5abef3cf1a9c96ae78b90eb354f8b258fe96fd17a9bc4def3f6315f33d6f04775d686b8a720c9275421edda7f5bcb6f46e4f00a1d7b80acd0a21b SHA512 48784e05c31d1cd840e244d608145215eb296f4a220978d96258ce92e9a4340f4dd12c1b13d1882245131f310b6a7dc9e436aef0e2af52e9b46d95d70677398d
+EBUILD console_bridge_vendor-9999.ebuild 1013 BLAKE2B 5d6509a1d9a5abef3cf1a9c96ae78b90eb354f8b258fe96fd17a9bc4def3f6315f33d6f04775d686b8a720c9275421edda7f5bcb6f46e4f00a1d7b80acd0a21b SHA512 48784e05c31d1cd840e244d608145215eb296f4a220978d96258ce92e9a4340f4dd12c1b13d1882245131f310b6a7dc9e436aef0e2af52e9b46d95d70677398d
 MISC metadata.xml 340 BLAKE2B 870056bcba705aba636b787bab5b7418c318794f542a5e9ee3f165dc569e6e69b0e41ea54899150184f4ec5810398f3d2ae9fe33ffac64ddacfcba9b3c9e583f SHA512 7e652e5616c60cf5b77bd6f7a4b120ce26c35885426c87f9d22cc2963c9975f9423f1e2e88c795c55457d386b608ce783cb606a5b02dad1fd92a467373c34169
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild
deleted file mode 100644
index 9d08355634bd..000000000000
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ros2/console_bridge_vendor"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/ros2/console_bridge_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Wrapper around console_bridge"
-HOMEPAGE="https://github.com/ros2/console_bridge_vendor"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-DEPEND="
-	>=dev-libs/console_bridge-0.4.1
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
-"
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild
new file mode 100644
index 000000000000..41ddf98ec4ba
--- /dev/null
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ros2/console_bridge_vendor"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/ros2/console_bridge_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Wrapper around console_bridge"
+HOMEPAGE="https://github.com/ros2/console_bridge_vendor"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="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() {
+	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
index 9d08355634bd..41ddf98ec4ba 100644
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
@@ -25,13 +25,25 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
+IUSE="test"
 
 DEPEND="
-	>=dev-libs/console_bridge-0.4.1
+	>=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() {
+	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/control_msgs/Manifest b/dev-ros/control_msgs/Manifest
index 47bb30569b9f..471084074097 100644
--- a/dev-ros/control_msgs/Manifest
+++ b/dev-ros/control_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST control_msgs-1.4.0.tar.gz 3636 BLAKE2B c82300bc17e04d4c061ec4907b9fe086d4d7768543cfa724b729e23b1b09a843c495002412bb9da48a1f7cd05cfc201b4d5da156135c104dd7ddb78193772556 SHA512 962e85661c39c3dbc91138ba4d98cfe9f846ee1e4a9b9eda1e4f76b9ef3aa4777a9faa7640e098e301601358a5e6edfe15ff585f3978fecb51b4966c6ec7fab3
-EBUILD control_msgs-1.4.0.ebuild 551 BLAKE2B d03205f52c9d24a95f557f5e219b8c9cfd77a45ad327c7b116d6cc8a447f1357addc0c9df80d4477a08d7fc13971bf8b49a4542557ad5edb523a5fef95eaf0d4 SHA512 8666dbe66c0106e48aee9f1c3495c04aa4fe828914e24657cd7cf1ee982bcba122203b895ef170ae7bbf9aabc72da3128749fb460d16738d1531733240db1a38
-EBUILD control_msgs-9999.ebuild 551 BLAKE2B d03205f52c9d24a95f557f5e219b8c9cfd77a45ad327c7b116d6cc8a447f1357addc0c9df80d4477a08d7fc13971bf8b49a4542557ad5edb523a5fef95eaf0d4 SHA512 8666dbe66c0106e48aee9f1c3495c04aa4fe828914e24657cd7cf1ee982bcba122203b895ef170ae7bbf9aabc72da3128749fb460d16738d1531733240db1a38
+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 339 BLAKE2B 4773797df970cc9ae9f344c1bcf979bd923e08f6f2420c045a088953edf3d7308bf0beb92984b6f5f44c2587b14b8df251f50d3fd6e61a5e8bf293a0c074d779 SHA512 e240b079a8f504ef8e31bffce71f126ce20ff7446d16b961b195fb2010db830ce8271e6ac9576e785ea6e796619f14317721a0fd50fd45512a23fa04261a40cb
diff --git a/dev-ros/control_msgs/control_msgs-1.4.0.ebuild b/dev-ros/control_msgs/control_msgs-1.4.0.ebuild
deleted file mode 100644
index 601f7602785c..000000000000
--- a/dev-ros/control_msgs/control_msgs-1.4.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=5
-
-ROS_REPO_URI="https://github.com/ros-controls/control_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-1.5.2.ebuild b/dev-ros/control_msgs/control_msgs-1.5.2.ebuild
new file mode 100644
index 000000000000..2b3e66de6c4e
--- /dev/null
+++ b/dev-ros/control_msgs/control_msgs-1.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
index 601f7602785c..2b3e66de6c4e 100644
--- a/dev-ros/control_msgs/control_msgs-9999.ebuild
+++ b/dev-ros/control_msgs/control_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-controls/control_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/trajectory_msgs"
 
diff --git a/dev-ros/control_toolbox/Manifest b/dev-ros/control_toolbox/Manifest
index 3da58c511243..f58390e82c9c 100644
--- a/dev-ros/control_toolbox/Manifest
+++ b/dev-ros/control_toolbox/Manifest
@@ -1,8 +1,4 @@
-DIST control_toolbox-1.14.0.tar.gz 24084 BLAKE2B c4ffd003060e57a6f08b2f064ada0c237eaea782aa719819fcd437868a440e68b278871cd82f6cfb7f877ca7b7f6da6aa17509198a550eb20c53bfbe095da75e SHA512 205d1e8421f3727532d14746f1898536a6bb6144071e8f5c8f5be17242462ed18512d7ede61ef686db46d6beea4b655c1ad22dec1e5940c99e2d52e0a88c1769
-DIST control_toolbox-1.15.0.tar.gz 24096 BLAKE2B fc2288f9b6493b4d3de9eabfa43313602702fcf66bf2cae5091866e9f4989126cfebe4efb73a12bbd67fee4dfb16de4847984f7da3636dd402b47658876686a2 SHA512 e2f1bae35d3c70fb15eff30fb7a3d380cd5857ffebb28cac2d48de7e0f12191a0c3a57ccc80978155f42e6ffc59af14c372ddec0532ecb2a7c2db720737c1a16
-DIST control_toolbox-1.16.0.tar.gz 23723 BLAKE2B 00de0c11804ce31d07877f480d62b7bfecae86ab8ce1a63107948f02449a05a355b75e4fc0f22dc95be5b9000adc133b2e731029d6143d2af8b425387806173d SHA512 942f63b95f4540dd634daf090389b4f839b59a73d85ad8d1636b7180e2cb3c66d75cf131216d53709bafec54543dab2034e6e88d38ab1045711eda095ea77dd7
-EBUILD control_toolbox-1.14.0.ebuild 612 BLAKE2B f0ae704eccaee7d7a5f52ec6013ec7719a846cf1657c51dade13fa5e9916469350502cf7ab0cce0ece8081fe755496bbf733cc93e998550902b6ffbb2a3b5cca SHA512 9073442c13842494217909825a4c914d6a0dc30a69b6ab624b1995b979e81855b6c9ff5cd84a6a72a7cd05a0833cb6ee68043d52824db97a31b5462bb734f41b
-EBUILD control_toolbox-1.15.0.ebuild 612 BLAKE2B 651a30f85c57dcad1307caf7718826bf94005b32a96e036ab3dc9d906ccd0d38d95314d09019a0d058faacc2fafbfc2e54afe065742018fd89faa6982d9cb8f6 SHA512 3a0728bfaaab6258ccbd20a97fad87f5c54ea12a6b2e5b35b7cb9dace982a4c23bf66f0e1b2d4c8a027506e322538c0b39e3dfb18bd860a87a1f7b4ae05d9367
-EBUILD control_toolbox-1.16.0.ebuild 612 BLAKE2B b9c7d3d7d55331055b1314d1d580dbe0d4049cc1a8d76be201d06580588f90f6cca1188a54edfba414d689f4ff30c56cbc5579679d55ffd54c977d9c319b6828 SHA512 8a7f46358516f2198f38512d688c3d8bab1ad25a43d33cff150a2d8d6b7c941d89d9402ceb3a93816fc32fc2b812fd560e0278cbc979598c6fe528b89a3f0dc0
-EBUILD control_toolbox-9999.ebuild 612 BLAKE2B f0ae704eccaee7d7a5f52ec6013ec7719a846cf1657c51dade13fa5e9916469350502cf7ab0cce0ece8081fe755496bbf733cc93e998550902b6ffbb2a3b5cca SHA512 9073442c13842494217909825a4c914d6a0dc30a69b6ab624b1995b979e81855b6c9ff5cd84a6a72a7cd05a0833cb6ee68043d52824db97a31b5462bb734f41b
+DIST control_toolbox-1.18.2.tar.gz 24244 BLAKE2B 13c4d4d6991db496ea6223c6cc33c9b0b7fa7b3e18c13cc330cf032ac67b185a596ca2eb118678faf6f0a3106458e3ce20635dfd99fbc1acf176ee2844e6ec99 SHA512 0b8bbd0fec88b1679260d9b5d5c5762f52fd14f4156be45ea07a410a7967571136a65115f530ae4f7a84e456e56c363616e23d0b54d8c092a38a80fad691c705
+EBUILD control_toolbox-1.18.2.ebuild 607 BLAKE2B c5b007986f5d9d52d2f2602b6e72269cbd828f3cbdd5b5b736b52d71401e34dee5ce9b5ffbe4f9f9227d8b79c105f3a1f8ae75c6e171d762e41dbcea155a3050 SHA512 df8cf33df250b0e291f7d95bb8c9d8dc4d28b76bb81c6f348a7350a50d0ce8ffd126def6cfd754da02928624e1d8356bef9bbd5446d42dd69f9d14ee1dd1e234
+EBUILD control_toolbox-9999.ebuild 607 BLAKE2B c5b007986f5d9d52d2f2602b6e72269cbd828f3cbdd5b5b736b52d71401e34dee5ce9b5ffbe4f9f9227d8b79c105f3a1f8ae75c6e171d762e41dbcea155a3050 SHA512 df8cf33df250b0e291f7d95bb8c9d8dc4d28b76bb81c6f348a7350a50d0ce8ffd126def6cfd754da02928624e1d8356bef9bbd5446d42dd69f9d14ee1dd1e234
 MISC metadata.xml 342 BLAKE2B fb0771fe1ae1d9988202a13aa319eca68cde1c129b68b74405ba854416522c81917bd7ecc26dd6ff0d9c32a02c5b089dbbaa4b13eb6ee3e65c050a09ec6731e8 SHA512 81835aefd67c55665a6f7d2a2cdbced84032d83ca35d6924410a62c00021cf7eb0e11e1094e0bb70becb635b480c8e527c7e9bdfaaa17149918552d440539e0c
diff --git a/dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild
deleted file mode 100644
index ac4eb7122b93..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
-	dev-ros/realtime_tools
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild
deleted file mode 100644
index 2c6a1e83f76d..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
-	dev-ros/realtime_tools
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild
deleted file mode 100644
index 91cec2668963..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
-	dev-ros/realtime_tools
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-1.18.2.ebuild b/dev-ros/control_toolbox/control_toolbox-1.18.2.ebuild
new file mode 100644
index 000000000000..46a22e5b1b70
--- /dev/null
+++ b/dev-ros/control_toolbox/control_toolbox-1.18.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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_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
+	dev-ros/realtime_tools
+	dev-libs/boost:=[threads]
+	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
index ac4eb7122b93..46a22e5b1b70 100644
--- a/dev-ros/control_toolbox/control_toolbox-9999.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -21,6 +20,8 @@ RDEPEND="
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads]
 	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
 	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_interface/Manifest b/dev-ros/controller_interface/Manifest
index 51b6686d2f70..c96654c6a78c 100644
--- a/dev-ros/controller_interface/Manifest
+++ b/dev-ros/controller_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD controller_interface-0.14.2.ebuild 408 BLAKE2B ee1309c20ed563389b1480dfac5f10297b1285690c000d83752682afb1c6a7cd448cc92dc799c67f0a1253315acf578d211b833d2438b12c6ccbdec1dab8ed8c SHA512 e629261c89a8acc3c83d7f955b5b93b3df0adc23de7a39023b6e9bce360a9464162873f348ce2f02386cf0a640ceb3daead3f12a040bf646d66d2179d167fdaa
-EBUILD controller_interface-0.15.0.ebuild 408 BLAKE2B ee1309c20ed563389b1480dfac5f10297b1285690c000d83752682afb1c6a7cd448cc92dc799c67f0a1253315acf578d211b833d2438b12c6ccbdec1dab8ed8c SHA512 e629261c89a8acc3c83d7f955b5b93b3df0adc23de7a39023b6e9bce360a9464162873f348ce2f02386cf0a640ceb3daead3f12a040bf646d66d2179d167fdaa
-EBUILD controller_interface-0.15.1.ebuild 405 BLAKE2B b1cba0340f1e729d15b15bfc65c3c37b66b28266390b73a4e2065caa7d0307de58ed815fbcf98ee22ad7f0175687f2eff83d344e8f2a2bd564a1feb2ccd51d5b SHA512 07e6a7656b2beb125db8771ee36fa387bb76bb935d4d8ce7e709a1e442492b9bfa1257ec35247e1119d5f31ced8b329875571740fdb777ba5c74590968ffa6db
-EBUILD controller_interface-9999.ebuild 408 BLAKE2B 97811b917ce93d4db53d5411bbbb03a8f02f07703c4cea04a796570d3308d3a5dda73a7948f1e173584d36c343d472a5c0147429ca975a733b5854983276ccff SHA512 778dbbec3af738e3cb52f818b7b1ff9a190b61f3fea575c2e2e3b0c7de92ae9011a1f8ddc6c7cb10e0f26f3d0e4100f0ba0e8d2b9cc01cf692951ba579fa7519
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD controller_interface-0.19.1-r1.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
+EBUILD controller_interface-9999.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_interface/controller_interface-0.14.2.ebuild b/dev-ros/controller_interface/controller_interface-0.14.2.ebuild
deleted file mode 100644
index e8684ba4ea1c..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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}"
diff --git a/dev-ros/controller_interface/controller_interface-0.15.0.ebuild b/dev-ros/controller_interface/controller_interface-0.15.0.ebuild
deleted file mode 100644
index e8684ba4ea1c..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.15.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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}"
diff --git a/dev-ros/controller_interface/controller_interface-0.15.1.ebuild b/dev-ros/controller_interface/controller_interface-0.15.1.ebuild
deleted file mode 100644
index d24990956627..000000000000
--- a/dev-ros/controller_interface/controller_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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}"
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
new file mode 100644
index 000000000000..f86635bda8b3
--- /dev/null
+++ b/dev-ros/controller_interface/controller_interface-0.19.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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-9999.ebuild b/dev-ros/controller_interface/controller_interface-9999.ebuild
index f3d2ab9e4d58..f86635bda8b3 100644
--- a/dev-ros/controller_interface/controller_interface-9999.ebuild
+++ b/dev-ros/controller_interface/controller_interface-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
@@ -16,6 +16,8 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hardware_interface
-	dev-ros/pluginlib
+	dev-ros/pluginlib:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
index 111c2ea97843..7aad238d435e 100644
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD controller_manager-0.14.2.ebuild 803 BLAKE2B 2f5f1b9769f8683e9e3a6f1cfef75de57a9e27597643c56195842292cec7f93aba06900784290ca57e8251f967bde5c87fa5aaa7c394eede04f05d64b96b68d5 SHA512 8d827c6174ade1dc685037ab86a3de54990a51efef3a6cb24359e9d5019f1acaec5ffe8c4057424553f4e7cf30f3ce298ccfb2f4f433c740416b9ff5b8c8463e
-EBUILD controller_manager-0.15.0.ebuild 810 BLAKE2B b38ba0db00655bd8a15c6da10ff3a6af83c210f4edbc70c0894912d5fb3aa662938282cf4c85e5518181babeea85452dfff40a7daef4df6d795729b80d5a9e2b SHA512 63943aa95b08f1c0eebe21496cd81028a84a0d4fbd353c4119daa92da0ef354306779da6814bfe1bd9ec8cddaa2f23a5980ffcbd7fbd9121d1693a28467b7fbd
-EBUILD controller_manager-0.15.1.ebuild 807 BLAKE2B 42bbac7dd17a30d80741b52178dc6ba14ea15d56b19b976129a199db25cd5f1d2f5dc1dc07c068b9c8a38766653d3ca3aeaf0d40a44001b241ad3ff451a7f7e6 SHA512 267c286781cec7b7039191bed1e8ffbaa95c2779295f66c405ddc3a5723403ba2ce1762be954febdaf09d2864eebc255f5052edb928d468a06c15d8db9269a21
-EBUILD controller_manager-9999.ebuild 810 BLAKE2B b38ba0db00655bd8a15c6da10ff3a6af83c210f4edbc70c0894912d5fb3aa662938282cf4c85e5518181babeea85452dfff40a7daef4df6d795729b80d5a9e2b SHA512 63943aa95b08f1c0eebe21496cd81028a84a0d4fbd353c4119daa92da0ef354306779da6814bfe1bd9ec8cddaa2f23a5980ffcbd7fbd9121d1693a28467b7fbd
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD controller_manager-0.19.1.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
+EBUILD controller_manager-9999.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager/controller_manager-0.14.2.ebuild b/dev-ros/controller_manager/controller_manager-0.14.2.ebuild
deleted file mode 100644
index c25eb8f6ab18..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.14.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_interface
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_manager/controller_manager-0.15.0.ebuild b/dev-ros/controller_manager/controller_manager-0.15.0.ebuild
deleted file mode 100644
index 53f3342904a0..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.15.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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},${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_manager/controller_manager-0.15.1.ebuild b/dev-ros/controller_manager/controller_manager-0.15.1.ebuild
deleted file mode 100644
index a6d49e76c54a..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.15.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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},${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/controller_manager/controller_manager-0.19.1.ebuild b/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
new file mode 100644
index 000000000000..56fe44573d05
--- /dev/null
+++ b/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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="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
+	)"
diff --git a/dev-ros/controller_manager/controller_manager-9999.ebuild b/dev-ros/controller_manager/controller_manager-9999.ebuild
index 53f3342904a0..56fe44573d05 100644
--- a/dev-ros/controller_manager/controller_manager-9999.ebuild
+++ b/dev-ros/controller_manager/controller_manager-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,16 +15,21 @@ IUSE=""
 
 RDEPEND="
 	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=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/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	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}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/controller_manager_msgs/Manifest b/dev-ros/controller_manager_msgs/Manifest
index ffc049c79cc8..f9306a0d5c32 100644
--- a/dev-ros/controller_manager_msgs/Manifest
+++ b/dev-ros/controller_manager_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD controller_manager_msgs-0.14.2.ebuild 464 BLAKE2B 4f8100aa36c9b5ed5450c51b40791032a1079d7370ca9ed19b84368e1debc3a3aa617e9669eec73c47cceaf32eed781034e17372f7a9fffe34819e609d1c5208 SHA512 7c65d5b107e50dcaae9994af726a343d89c0259ca6bff92e8d5cdefd6185728ba66d14e1e7a457c3643ce5e5650274d5c86c220fee2308cfcf3c85d5a7e89b98
-EBUILD controller_manager_msgs-0.15.0.ebuild 464 BLAKE2B 4f8100aa36c9b5ed5450c51b40791032a1079d7370ca9ed19b84368e1debc3a3aa617e9669eec73c47cceaf32eed781034e17372f7a9fffe34819e609d1c5208 SHA512 7c65d5b107e50dcaae9994af726a343d89c0259ca6bff92e8d5cdefd6185728ba66d14e1e7a457c3643ce5e5650274d5c86c220fee2308cfcf3c85d5a7e89b98
-EBUILD controller_manager_msgs-0.15.1.ebuild 461 BLAKE2B a2c8a19380acc283d95d721522d41d36bd032f84cd3e11bec420fdad9d9a843a0fc8482edf18613171dddfb251376b2a436a6d124e02927e1d50647090eb4399 SHA512 d066c6af5b3a769bd0f761ee7e2b834a6f06f58c47c688dd73b74e89513cd1c9883e8bd0e28ab0cfd4dc178d79ac35a21d0a3244a37b8f31f93db08d8b54f116
-EBUILD controller_manager_msgs-9999.ebuild 464 BLAKE2B db06a2ed1f6f299d1182d20fcff079a682a71cd048788b9a8eb2076211912d72443cd7aa3f6f0022b7432d6b058b231ab1490e29e7fc9bbe10c8744a930d07e4 SHA512 5c147fd4b7e6e64db8d0d804f8110825e41eb2c511da37b49117fb09a898fc271049b7c7d5565684493163dd0012c40442a7f637a39bb1d6e0785fd23b152998
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD controller_manager_msgs-0.19.1.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
+EBUILD controller_manager_msgs-9999.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.14.2.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.14.2.ebuild
deleted file mode 100644
index 6139986be33e..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.14.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.0.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.0.ebuild
deleted file mode 100644
index 6139986be33e..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild
deleted file mode 100644
index 70b132e01e6b..000000000000
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.15.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..96b14aee266a
--- /dev/null
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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-9999.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
index a1d99eb3980f..96b14aee266a 100644
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
@@ -16,5 +15,5 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rospy[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
index 4afe4dd2535f..b5545b2beb0a 100644
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD controller_manager_tests-0.14.2.ebuild 638 BLAKE2B 9862addeb71f04c83bf900382f2abdaa8dbd20f1d2c5d6cdcc04edfa6ae085b3a9d07459f50b36c29d71ff598e4f4af04ac50a0d958f2a8dc7b07d0b46965f35 SHA512 150ccf5b065c5fda48ccd1f045aa6d90408802fa1fdf24d3bb01141755454fa2a76df2542fb0cba9b0a46962f5ffc3861a66cb7adcf1cbe26ee8606c76d18e5d
-EBUILD controller_manager_tests-0.15.0.ebuild 638 BLAKE2B 9862addeb71f04c83bf900382f2abdaa8dbd20f1d2c5d6cdcc04edfa6ae085b3a9d07459f50b36c29d71ff598e4f4af04ac50a0d958f2a8dc7b07d0b46965f35 SHA512 150ccf5b065c5fda48ccd1f045aa6d90408802fa1fdf24d3bb01141755454fa2a76df2542fb0cba9b0a46962f5ffc3861a66cb7adcf1cbe26ee8606c76d18e5d
-EBUILD controller_manager_tests-0.15.1.ebuild 635 BLAKE2B 16e33d2420cfcfa944e9e17fcd4fd2eddb9b8992eb50d0d398c93fc7a23e102208348d24a205f470605f91dff8fecdff37088e84a0668523a0177a45c73f6e63 SHA512 ed3b16c14ff0dae401ae581fa17958f881cab60aef679fafd3fd4e96916760df35a3dae70cbb54f407931b6b08d798ebd16051a450c9defeb73a9cf5ca2138df
-EBUILD controller_manager_tests-9999.ebuild 638 BLAKE2B c29f7638adef4694e94db2d2b75ee1aae1bd7cbd7be614e506a5dd057645d9c08735d6a799c4aa65d3fa53ca320de05d21a0d4d7546a291b559266ce15592c9d SHA512 f2d2980f53c20872fa638ffa9000b26e98be51f705a81a4483482fc29d28ab4ebddd14ae524c40ac00ae746d9f106eda05821555abc2c5e1225c1c8a9f703d80
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD controller_manager_tests-0.19.1.ebuild 830 BLAKE2B 6a96185527ece16c20a2b083156ecb2500e2ccc59016436c7698814be3fc3108e6e7fd2935396280034c3dc32147ade91fc1ad8675360f3cb88a402d168e4bc2 SHA512 1fdf34ba0ef79acda78d5c2f4a2641037828991c5014a9221ce3dd45ebc8c4d32ccc36bd2c89aab1af0997344c1a00456ad5890f9308ddd31999eb88b09394cc
+EBUILD controller_manager_tests-9999.ebuild 830 BLAKE2B 6a96185527ece16c20a2b083156ecb2500e2ccc59016436c7698814be3fc3108e6e7fd2935396280034c3dc32147ade91fc1ad8675360f3cb88a402d168e4bc2 SHA512 1fdf34ba0ef79acda78d5c2f4a2641037828991c5014a9221ce3dd45ebc8c4d32ccc36bd2c89aab1af0997344c1a00456ad5890f9308ddd31999eb88b09394cc
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.14.2.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.14.2.ebuild
deleted file mode 100644
index e78a04991c3d..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.14.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosservice[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.0.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.15.0.ebuild
deleted file mode 100644
index e78a04991c3d..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosservice[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild
deleted file mode 100644
index 77cb39291f47..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.15.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosservice[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
new file mode 100644
index 000000000000..b3f59e8c48b5
--- /dev/null
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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="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:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rosservice[${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/controller_manager_tests/controller_manager_tests-9999.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
index 64df454d8fb0..b3f59e8c48b5 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/controller_manager[${PYTHON_USEDEP}]
+	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/controller_interface
 	dev-ros/control_toolbox
 	dev-libs/boost:=
@@ -23,7 +22,14 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosservice[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rosservice[${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/convex_decomposition/Manifest b/dev-ros/convex_decomposition/Manifest
index c26d278cc98a..ff4cc31758b8 100644
--- a/dev-ros/convex_decomposition/Manifest
+++ b/dev-ros/convex_decomposition/Manifest
@@ -1,8 +1,4 @@
-DIST convex_decomposition-0.1.10.tar.gz 75232 BLAKE2B 24e6460b127a6c6904c7d2db8bc7b84a56d6c32828f8b049df1f5fd0adb3a098d7759394785cfca09030734cc02cf0d512912d2da5aa41b8d8e070cb8f7d7dc2 SHA512 1e2bfd6a2596d3d06b99347f5200ae50b1d934109afc2fa4bda14747571ce8795ac798c5f11950b2cc962426ca4c97ae86e946583436785ef6b84b15eb122497
-DIST convex_decomposition-0.1.11.tar.gz 75259 BLAKE2B 8d0247971ad722fa8ea66501528055739a096d1c558c7542b3c6b3843ce705e54f8a4577963ef0ad77d40fb68701eb3098aa75e6541319f9ddb8221833e6bcef SHA512 b0d061144c3d4351e23f7cf8cc6c6b014b74ebecf32fc41347840e71b0616a95095f8d4ad126b6c2eba25db9129e976b79ffc61a1bd1c5606b2a18b75ee1b30e
 DIST convex_decomposition-0.1.12.tar.gz 76216 BLAKE2B fda1e88cb3efffe3ae7e384216b4f2af072ca25c407efc07eaa8cc7a84c64b723aeb729be05cedb5ef6f82f51292aef1ec6acd48282742a02e9ec6fb49d78e6f SHA512 c6c502e66259983e3462b27253ff8483d56baaa71b8c42037b43fd11aa0c226851d5c6dcf5745b814a3601083b5b85662268db2a1af99e1bdbc8f237c6ff2704
-EBUILD convex_decomposition-0.1.10.ebuild 346 BLAKE2B b2e979c3b3c9df075ed81d317413441822526193695fad834c643cdf88a846d2f41257802a9d8bbf65c2a2fafb4d49c31938bb94ba49c7a862ff9b94def205d5 SHA512 1c794efda5e67b77076aab708b88f52523bd727f39dba949dc04fea722e62962033f7bfbf86ae473250e02866a14b0760e1f383632e8211804dd6a8aeda3b4ef
-EBUILD convex_decomposition-0.1.11.ebuild 346 BLAKE2B b2e979c3b3c9df075ed81d317413441822526193695fad834c643cdf88a846d2f41257802a9d8bbf65c2a2fafb4d49c31938bb94ba49c7a862ff9b94def205d5 SHA512 1c794efda5e67b77076aab708b88f52523bd727f39dba949dc04fea722e62962033f7bfbf86ae473250e02866a14b0760e1f383632e8211804dd6a8aeda3b4ef
-EBUILD convex_decomposition-0.1.12.ebuild 343 BLAKE2B d05812fbee6521f1a40e3994382e55187d2918506636dc32b99cc6091ffcb8f51a6c35b33b669ad09aa57bc4bee4974c3cc8864644e563b2d857209d7394ea27 SHA512 0658888b9e0c6a0f51e761acf44c04c809e6bdc23d7dea3d49a887590914901a1c53f5e032caf813ffad34787776da8756640f594bfff3fb45c022247555598a
-EBUILD convex_decomposition-9999.ebuild 346 BLAKE2B b2e979c3b3c9df075ed81d317413441822526193695fad834c643cdf88a846d2f41257802a9d8bbf65c2a2fafb4d49c31938bb94ba49c7a862ff9b94def205d5 SHA512 1c794efda5e67b77076aab708b88f52523bd727f39dba949dc04fea722e62962033f7bfbf86ae473250e02866a14b0760e1f383632e8211804dd6a8aeda3b4ef
+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 338 BLAKE2B 9629aa5efb047198fd4701c0dbae8aee71b4ed57d113ba29364cc2aed29cf27a12479ce983212b864148297511b2ab825094a3d4b5daca3dd0f494ec1fed1667 SHA512 7e80090cf6f3f61e7d44024b25e40178b4e7434db9704418cfa397fad7da84b071afe88bbb261195c1d7e40ae328cdba28fb512885054b52c799d1d465504154
diff --git a/dev-ros/convex_decomposition/convex_decomposition-0.1.10.ebuild b/dev-ros/convex_decomposition/convex_decomposition-0.1.10.ebuild
deleted file mode 100644
index a4da6c88817e..000000000000
--- a/dev-ros/convex_decomposition/convex_decomposition-0.1.10.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-0.1.11.ebuild b/dev-ros/convex_decomposition/convex_decomposition-0.1.11.ebuild
deleted file mode 100644
index a4da6c88817e..000000000000
--- a/dev-ros/convex_decomposition/convex_decomposition-0.1.11.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-0.1.12.ebuild b/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
index 417a3b55f276..26c6262a0b60 100644
--- a/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
+++ b/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/convex_decomposition"
 KEYWORDS="~amd64"
 
diff --git a/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild b/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
index a4da6c88817e..26c6262a0b60 100644
--- a/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
+++ b/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/convex_decomposition"
 KEYWORDS="~amd64"
 
diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest
index e9ab634a35ce..04c98e5eb076 100644
--- a/dev-ros/costmap_2d/Manifest
+++ b/dev-ros/costmap_2d/Manifest
@@ -1,10 +1,8 @@
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD costmap_2d-1.16.1.ebuild 1129 BLAKE2B 9fef526a72f8c74a2f5416f6023b737a98c0c00accfa854dd45997d0f7fe60631a5c637decd882a931d67d1f62f14e6928fbd67e1c4f745c5c5a2e2b1a58f768 SHA512 289558f8f6435ea8dcce6007015d987dfe0ee43f58eb787794d771dc28a039692e1ee323641e53638c81c6d96e02c30f10116fa568ad57da6f7b8c3031b33ddb
-EBUILD costmap_2d-1.16.2.ebuild 1142 BLAKE2B f1c97efdafbf3bd401a2dbbe3b412f574ebf8eac3fe31881c4bb4be839ef565e768188395dbddd84c811689965fef423317a043226f6d2d356c74cab2fc04b7f SHA512 e384f914270afb78ff60d2963fa68e47f839970ea57131ec8a09318c530b8a7a544fbc34bfb230a045827128e1e5b91cc4324941249773b12abb9d81f40fab41
-EBUILD costmap_2d-1.16.3.ebuild 1139 BLAKE2B 6f8f93df8bf51709e4bbbe9444cd79d0d91bed2532016063d63d9d6c35e923169a9b752f1832de6ef01a24f3c207b79c5eb8f72d953fbbafcaa353eb330efd14 SHA512 6db86133f72cc7ee4c91b77b62a8ac31675ad5239de75d008d1cff937ef66288892254bf9b24ebf1bf3d31cfb1c13d45836eab50cbbf702e0c31a306242b6c6f
-EBUILD costmap_2d-1.16.6.ebuild 1139 BLAKE2B 13c3df2b0a5dd74d3618e8382497cabda65bf677091a86df9ab34ae28b356c7aa798750c31c82ef5664e793f88c972706fc8aa0652061b67903190369249bf71 SHA512 0b5899f6650272326d2e2767b06956d93ef1c5af695c1fc96baf58cacc3182e02f35c31cce73549a3ec874b7fa2ab80abe1f3882d933294130b1685d14a49658
-EBUILD costmap_2d-9999.ebuild 1142 BLAKE2B f1c97efdafbf3bd401a2dbbe3b412f574ebf8eac3fe31881c4bb4be839ef565e768188395dbddd84c811689965fef423317a043226f6d2d356c74cab2fc04b7f SHA512 e384f914270afb78ff60d2963fa68e47f839970ea57131ec8a09318c530b8a7a544fbc34bfb230a045827128e1e5b91cc4324941249773b12abb9d81f40fab41
+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-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
+EBUILD costmap_2d-1.17.0-r1.ebuild 1730 BLAKE2B d2186af9fd7d07e7618790fe2db06c8742ac814d19a18030f39ad883df355c164ed891dcf1fad56f90de591f753678bec692a79f58309587c9db1454091633d9 SHA512 1bb529f438e783810a9ce9ba99d2fab75230b9ea86c4b69979f97ec6a470d065d50e95d3ec473846284965b4d6bc29220d6d8790533c93d0327b4649e8e86f37
+EBUILD costmap_2d-9999.ebuild 1730 BLAKE2B d2186af9fd7d07e7618790fe2db06c8742ac814d19a18030f39ad883df355c164ed891dcf1fad56f90de591f753678bec692a79f58309587c9db1454091633d9 SHA512 1bb529f438e783810a9ce9ba99d2fab75230b9ea86c4b69979f97ec6a470d065d50e95d3ec473846284965b4d6bc29220d6d8790533c93d0327b4649e8e86f37
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/costmap_2d/costmap_2d-1.16.1.ebuild b/dev-ros/costmap_2d/costmap_2d-1.16.1.ebuild
deleted file mode 100644
index 8530f07a75db..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.16.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? (
-		dev-ros/map_server
-		dev-ros/rosbag
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit
-	)"
diff --git a/dev-ros/costmap_2d/costmap_2d-1.16.2.ebuild b/dev-ros/costmap_2d/costmap_2d-1.16.2.ebuild
deleted file mode 100644
index 4a554602785b..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.16.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? (
-		dev-ros/map_server
-		dev-ros/rosbag
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit
-	)"
diff --git a/dev-ros/costmap_2d/costmap_2d-1.16.3.ebuild b/dev-ros/costmap_2d/costmap_2d-1.16.3.ebuild
deleted file mode 100644
index e42f534ac4e7..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.16.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? (
-		dev-ros/map_server
-		dev-ros/rosbag
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit
-	)"
diff --git a/dev-ros/costmap_2d/costmap_2d-1.16.6.ebuild b/dev-ros/costmap_2d/costmap_2d-1.16.6.ebuild
deleted file mode 100644
index 87474f1cdd7c..000000000000
--- a/dev-ros/costmap_2d/costmap_2d-1.16.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Creates a 2D costmap from sensor data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="ros_messages_cxx"
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/voxel_grid
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? (
-		dev-ros/map_server
-		dev-ros/rosbag
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit
-	)"
diff --git a/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild b/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild
new file mode 100644
index 000000000000..f07bee5f0d3b
--- /dev/null
+++ b/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 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"
+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:=[threads]
+	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
index 4a554602785b..f07bee5f0d3b 100644
--- a/dev-ros/costmap_2d/costmap_2d-9999.ebuild
+++ b/dev-ros/costmap_2d/costmap_2d-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
 
 inherit ros-catkin
@@ -16,32 +15,54 @@ 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_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/laser_geometry
 	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
+	>=dev-ros/pluginlib-1.13.0-r1
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2
 	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/voxel_grid
 
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_sensor_msgs
-
-	dev-cpp/eigen:3
 	dev-libs/boost:=[threads]
 	dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
+	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_USEDEP}]
+		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/cpp_common/Manifest b/dev-ros/cpp_common/Manifest
index a02d845db71f..8f1da23a0b84 100644
--- a/dev-ros/cpp_common/Manifest
+++ b/dev-ros/cpp_common/Manifest
@@ -1,16 +1,4 @@
-DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
-DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
-DIST roscpp_core-0.6.12.tar.gz 35606 BLAKE2B 5f249ce576e046b487a12fc1d598429741329b57f4226a6a0fa7b62e0a5a6fa0716814e0c8cd8a4d4378f8994ca1534530d410a8865d666397328047f12f821d SHA512 a84799ee67cf205c9c304433f70aaf80c8f19eac86bc0c9c3207aa0ae255f33b302b4ad9e37feeb5d95d7e2db9210679871548313612f220e06fef3db2357f89
-DIST roscpp_core-0.6.13.tar.gz 35881 BLAKE2B f1eee242ecbda14de4d1b4f92c4552b249398eea0216300933e0ea73d86bce970e7db375b23d5ecb023e8a8a2e75baec8b7c0a935647143f1ff2a1eaf0bcbd5b SHA512 7d81371c383b8b2ae8d31731f21213ac2c5c4d47ed038890214c9da527f27149ce1deeda4a5e67adaabbfb7ff4a6edc53495cfa50625eeb94089eb7615850d2c
-DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
-DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
-DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
-EBUILD cpp_common-0.6.10.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
-EBUILD cpp_common-0.6.11.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
-EBUILD cpp_common-0.6.12.ebuild 417 BLAKE2B a5920f4e5818b7b24d7818db091c73447a3bc4a30f6fbe2393e000e0560ae3696f3bd6cc46343cdf52ab9d25921a789bb40a29db817b841ba2387692fa000eed SHA512 4a53fb67eafb11bfc1610896bee89668ca9237709e3dab4d920f7e249873db90a9e021f6800c4d2807900d7853d0f98d5890c52687959d74bd100846362f430e
-EBUILD cpp_common-0.6.13.ebuild 417 BLAKE2B a5920f4e5818b7b24d7818db091c73447a3bc4a30f6fbe2393e000e0560ae3696f3bd6cc46343cdf52ab9d25921a789bb40a29db817b841ba2387692fa000eed SHA512 4a53fb67eafb11bfc1610896bee89668ca9237709e3dab4d920f7e249873db90a9e021f6800c4d2807900d7853d0f98d5890c52687959d74bd100846362f430e
-EBUILD cpp_common-0.6.7-r1.ebuild 420 BLAKE2B b21ab6c6e875b3295217c3c735601d424d86bfca9479e7fc569c5b1c6e3d8b1c1646cb3ca8d41246a6298dc57436ede4efc03f47490367d203d041795e3bf67a SHA512 4f3e377d1cd041b0d7802a182a4182f461d23fcd989c1c89e111702c0679e64a47c48b398b4bf4605052048dae569627091bdf08c4754d95556810bc3ec9158a
-EBUILD cpp_common-0.6.8.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
-EBUILD cpp_common-0.6.9.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
-EBUILD cpp_common-9999.ebuild 420 BLAKE2B b21ab6c6e875b3295217c3c735601d424d86bfca9479e7fc569c5b1c6e3d8b1c1646cb3ca8d41246a6298dc57436ede4efc03f47490367d203d041795e3bf67a SHA512 4f3e377d1cd041b0d7802a182a4182f461d23fcd989c1c89e111702c0679e64a47c48b398b4bf4605052048dae569627091bdf08c4754d95556810bc3ec9158a
+DIST roscpp_core-0.7.2.tar.gz 35095 BLAKE2B 065f81f514becd2ea1586735c759be79765eeee1c8a9606261ebd2086cf406c87276b143ace4ac43eeb7f8ee6dccc07812c614e6e185f2354d64b1dfe401b849 SHA512 fb04ee37db14d31b7c06ae3484f5aa414563e96a90b820b7d6e23e921bcd831a8bf1d66c723aef65a617b2da92456345cb796271409c8dc155ef1084926659ef
+EBUILD cpp_common-0.7.2.ebuild 417 BLAKE2B 4f2117640caa5e218d2f75a82d51c39c6c9ec18d8564c2664a98da18d8f76ff588b4d2dc1e1667d3e85ac84f3fc025586d193f58edf290cc4915b4ac7e4c8e1a SHA512 b16ac4f81e301a975cae64de62a137937cad20e94b3fb81fad69435d62f1030deeaa92bd6bf81d4f55615a819851e75a00d0ed106b9a133cf1e626b5188b3a81
+EBUILD cpp_common-9999.ebuild 417 BLAKE2B 4f2117640caa5e218d2f75a82d51c39c6c9ec18d8564c2664a98da18d8f76ff588b4d2dc1e1667d3e85ac84f3fc025586d193f58edf290cc4915b4ac7e4c8e1a SHA512 b16ac4f81e301a975cae64de62a137937cad20e94b3fb81fad69435d62f1030deeaa92bd6bf81d4f55615a819851e75a00d0ed106b9a133cf1e626b5188b3a81
 MISC metadata.xml 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/cpp_common/cpp_common-0.6.10.ebuild b/dev-ros/cpp_common/cpp_common-0.6.10.ebuild
deleted file mode 100644
index 4b61973c2c53..000000000000
--- a/dev-ros/cpp_common/cpp_common-0.6.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-0.6.11.ebuild b/dev-ros/cpp_common/cpp_common-0.6.11.ebuild
deleted file mode 100644
index 4b61973c2c53..000000000000
--- a/dev-ros/cpp_common/cpp_common-0.6.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-0.6.12.ebuild b/dev-ros/cpp_common/cpp_common-0.6.12.ebuild
deleted file mode 100644
index 24512c4ae733..000000000000
--- a/dev-ros/cpp_common/cpp_common-0.6.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-0.6.13.ebuild b/dev-ros/cpp_common/cpp_common-0.6.13.ebuild
deleted file mode 100644
index 24512c4ae733..000000000000
--- a/dev-ros/cpp_common/cpp_common-0.6.13.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-0.6.7-r1.ebuild b/dev-ros/cpp_common/cpp_common-0.6.7-r1.ebuild
deleted file mode 100644
index 45cbd70c4812..000000000000
--- a/dev-ros/cpp_common/cpp_common-0.6.7-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-0.6.8.ebuild b/dev-ros/cpp_common/cpp_common-0.6.8.ebuild
deleted file mode 100644
index 4b61973c2c53..000000000000
--- a/dev-ros/cpp_common/cpp_common-0.6.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-0.6.9.ebuild b/dev-ros/cpp_common/cpp_common-0.6.9.ebuild
deleted file mode 100644
index 4b61973c2c53..000000000000
--- a/dev-ros/cpp_common/cpp_common-0.6.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge:=
-	dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-0.7.2.ebuild b/dev-ros/cpp_common/cpp_common-0.7.2.ebuild
new file mode 100644
index 000000000000..c422096a4959
--- /dev/null
+++ b/dev-ros/cpp_common/cpp_common-0.7.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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="C++ code for doing things that are not necessarily ROS related"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge:=
+	dev-libs/boost:=[threads]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/cpp_common/cpp_common-9999.ebuild b/dev-ros/cpp_common/cpp_common-9999.ebuild
index 45cbd70c4812..c422096a4959 100644
--- a/dev-ros/cpp_common/cpp_common-9999.ebuild
+++ b/dev-ros/cpp_common/cpp_common-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/roscpp_core"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index 36cc0262223f..0dc4f121dfa8 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,6 +1,5 @@
-AUX boostpython.patch 551 BLAKE2B f3cecec73fbc584f324da2c1438ca42e283031fdf6df3f8ac458da9f09c3344716e9ca901de9f35edceaf6cc0223f66a1cef2e77ee3106f7b39b8ab96b204ade SHA512 9b306662ccef96aa9eee0b5c244de4919a9f8614502e1d75e63e787b4a0408ca6363c67b4b6eb897ffd8ca90df856444c357acee5f23074e33f7afd985686f7f
-AUX ocv4.patch 12322 BLAKE2B a27a3c0b9303969c2984f283657b6dc9b0d1840183bf9fe875280db7ed9862d16fe44dc3e917d6620431a351cdcadb13000a152b1b49528d90733813ba859d05 SHA512 167a4a3f16e3560c23a354ad2e041e60b5318ee56e9af4d35e9255faa9449cd4d2af3dde9648d8f49fdf64c5d28a66959efd90fbecb5af5a262c3ec090bd7e7f
-DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD cv_bridge-1.13.0.ebuild 658 BLAKE2B eda35a1df52c2c743ef76904a92e74ed1fd711785c846f035657270f14ee21dcccff95a428c49c8c430fe9092cfcb820bd74833d5df126b141d487cbee26a6a2 SHA512 9f9dfd0e6af3a4d0ec5ce10ae41f1e4f14e7fde90fe597505e9120dd8f975deec20f5bae0d053e03dd999d46972f9f7ed19517b8c236c1ebada4d922d8201f25
-EBUILD cv_bridge-9999.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
+AUX boostpython.patch 599 BLAKE2B 5076c2efdfd06afa9dbc9e3ad344774c1fca54ef172a4808e4ba7b40f4770250d49b1e478abcee1ac973c3a1012579694499a1dd48fd84c19f996441920c329c SHA512 21c5a6589a1ee19d5f586b535807c35f5eef77da6dae614deb7542d8cb1cf850902b5d7de197d6060016f43dcbef8d6d69d104abc5f5fa0af6131a415a43ba64
+DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
+EBUILD cv_bridge-1.15.0.ebuild 801 BLAKE2B 92b9e314c3c22a21a6496ecb8c1e8c047dbf14993c30a453cd6f934a99602ea6c9bb8c5c1d9c1b86c28f51bfd6d8a137a24349343ec8ace88debadd6364bfbf8 SHA512 0871710d79cbd4fcce528d783fb6c52c2cf4d9a678ac69fa05ff1790788140c007355b5b38341c806999b6c3656f56e81d74822c4a4183bc36692dcdf00b6993
+EBUILD cv_bridge-9999.ebuild 801 BLAKE2B 92b9e314c3c22a21a6496ecb8c1e8c047dbf14993c30a453cd6f934a99602ea6c9bb8c5c1d9c1b86c28f51bfd6d8a137a24349343ec8ace88debadd6364bfbf8 SHA512 0871710d79cbd4fcce528d783fb6c52c2cf4d9a678ac69fa05ff1790788140c007355b5b38341c806999b6c3656f56e81d74822c4a4183bc36692dcdf00b6993
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
deleted file mode 100644
index a592d05deeb9..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild
new file mode 100644
index 000000000000..582de3e58f72
--- /dev/null
+++ b/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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="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:=[threads,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" )
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
index 422225d82b4f..582de3e58f72 100644
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,9 +15,16 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	>=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff]
+	$(python_gen_cond_dep "dev-libs/boost:=[threads,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}]
+	)
 "
-DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/files/boostpython.patch b/dev-ros/cv_bridge/files/boostpython.patch
index 72fac8087363..a6192f98be24 100644
--- a/dev-ros/cv_bridge/files/boostpython.patch
+++ b/dev-ros/cv_bridge/files/boostpython.patch
@@ -2,14 +2,17 @@ Index: cv_bridge/CMakeLists.txt
 ===================================================================
 --- cv_bridge.orig/CMakeLists.txt
 +++ cv_bridge/CMakeLists.txt
-@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+@@ -5,14 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
  
  if(NOT ANDROID)
    find_package(PythonLibs)
--  if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
--    find_package(Boost REQUIRED python)
+-
+-  if(PYTHONLIBS_VERSION_STRING VERSION_LESS "3.8")
+-    # Debian Buster
+-    find_package(Boost REQUIRED python37)
 -  else()
--    find_package(Boost REQUIRED python3)
+-    # Ubuntu Focal
+-    find_package(Boost REQUIRED python)
 -  endif()
 +  find_package(Boost REQUIRED python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
  else()
diff --git a/dev-ros/cv_bridge/files/ocv4.patch b/dev-ros/cv_bridge/files/ocv4.patch
deleted file mode 100644
index 8a58408c9e8e..000000000000
--- a/dev-ros/cv_bridge/files/ocv4.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-From b0281a5c844ea0b0d9e0104674474adf50810f49 Mon Sep 17 00:00:00 2001
-From: BrutusTT <brutusthetschiepel@gmail.com>
-Date: Wed, 4 Sep 2019 11:39:30 +0100
-Subject: [PATCH 1/2] add OpenCV4 support addresses
- ros-perception/vision_opencv#272
-
----
- cv_bridge/CMakeLists.txt     | 2 +-
- cv_bridge/src/CMakeLists.txt | 8 +++++---
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/cv_bridge/CMakeLists.txt b/cv_bridge/CMakeLists.txt
-index 997bef3e..c203aad1 100644
---- a/cv_bridge/CMakeLists.txt
-+++ b/cv_bridge/CMakeLists.txt
-@@ -13,7 +13,7 @@ if(NOT ANDROID)
- else()
- find_package(Boost REQUIRED)
- endif()
--find_package(OpenCV 3 REQUIRED
-+find_package(OpenCV REQUIRED
-   COMPONENTS
-     opencv_core
-     opencv_imgproc
-diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt
-index 37ba30ee..6d91003b 100644
---- a/cv_bridge/src/CMakeLists.txt
-+++ b/cv_bridge/src/CMakeLists.txt
-@@ -32,10 +32,12 @@ if (PYTHON_VERSION_MAJOR VERSION_EQUAL 3)
-   add_definitions(-DPYTHON3)
- endif()
- 
--if (OpenCV_VERSION_MAJOR VERSION_EQUAL 3)
--add_library(${PROJECT_NAME}_boost module.cpp module_opencv3.cpp)
-+if (OpenCV_VERSION_MAJOR VERSION_EQUAL 4)
-+  add_library(${PROJECT_NAME}_boost module.cpp module_opencv4.cpp)
-+elseif(OpenCV_VERSION_MAJOR VERSION_EQUAL 3)
-+  add_library(${PROJECT_NAME}_boost module.cpp module_opencv3.cpp)
- else()
--add_library(${PROJECT_NAME}_boost module.cpp module_opencv2.cpp)
-+  add_library(${PROJECT_NAME}_boost module.cpp module_opencv2.cpp)
- endif()
- target_link_libraries(${PROJECT_NAME}_boost ${Boost_LIBRARIES}
-                                             ${catkin_LIBRARIES}
-
-From 8e01b44c5c1c0003dc91273076f8ca7feb9a8025 Mon Sep 17 00:00:00 2001
-From: BrutusTT <brutusthetschiepel@gmail.com>
-Date: Thu, 17 Oct 2019 14:37:40 +0100
-Subject: [PATCH 2/2] added missig file
-
----
- cv_bridge/src/module_opencv4.cpp | 371 +++++++++++++++++++++++++++++++
- 1 file changed, 371 insertions(+)
- create mode 100644 cv_bridge/src/module_opencv4.cpp
-
-diff --git a/cv_bridge/src/module_opencv4.cpp b/cv_bridge/src/module_opencv4.cpp
-new file mode 100644
-index 00000000..60a9d05d
---- /dev/null
-+++ b/cv_bridge/src/module_opencv4.cpp
-@@ -0,0 +1,371 @@
-+// Taken from opencv/modules/python/src2/cv2.cpp
-+
-+#include "module.hpp"
-+
-+#include "opencv2/core/types_c.h"
-+
-+#include "opencv2/opencv_modules.hpp"
-+
-+#include "pycompat.hpp"
-+
-+static PyObject* opencv_error = 0;
-+
-+static int failmsg(const char *fmt, ...)
-+{
-+    char str[1000];
-+
-+    va_list ap;
-+    va_start(ap, fmt);
-+    vsnprintf(str, sizeof(str), fmt, ap);
-+    va_end(ap);
-+
-+    PyErr_SetString(PyExc_TypeError, str);
-+    return 0;
-+}
-+
-+struct ArgInfo
-+{
-+    const char * name;
-+    bool outputarg;
-+    // more fields may be added if necessary
-+
-+    ArgInfo(const char * name_, bool outputarg_)
-+        : name(name_)
-+        , outputarg(outputarg_) {}
-+
-+    // to match with older pyopencv_to function signature
-+    operator const char *() const { return name; }
-+};
-+
-+class PyAllowThreads
-+{
-+public:
-+    PyAllowThreads() : _state(PyEval_SaveThread()) {}
-+    ~PyAllowThreads()
-+    {
-+        PyEval_RestoreThread(_state);
-+    }
-+private:
-+    PyThreadState* _state;
-+};
-+
-+class PyEnsureGIL
-+{
-+public:
-+    PyEnsureGIL() : _state(PyGILState_Ensure()) {}
-+    ~PyEnsureGIL()
-+    {
-+        PyGILState_Release(_state);
-+    }
-+private:
-+    PyGILState_STATE _state;
-+};
-+
-+#define ERRWRAP2(expr) \
-+try \
-+{ \
-+    PyAllowThreads allowThreads; \
-+    expr; \
-+} \
-+catch (const cv::Exception &e) \
-+{ \
-+    PyErr_SetString(opencv_error, e.what()); \
-+    return 0; \
-+}
-+
-+using namespace cv;
-+
-+static PyObject* failmsgp(const char *fmt, ...)
-+{
-+  char str[1000];
-+
-+  va_list ap;
-+  va_start(ap, fmt);
-+  vsnprintf(str, sizeof(str), fmt, ap);
-+  va_end(ap);
-+
-+  PyErr_SetString(PyExc_TypeError, str);
-+  return 0;
-+}
-+
-+class NumpyAllocator : public MatAllocator
-+{
-+public:
-+    NumpyAllocator() { stdAllocator = Mat::getStdAllocator(); }
-+    ~NumpyAllocator() {}
-+
-+    UMatData* allocate(PyObject* o, int dims, const int* sizes, int type, size_t* step) const
-+    {
-+        UMatData* u = new UMatData(this);
-+        u->data = u->origdata = (uchar*)PyArray_DATA((PyArrayObject*) o);
-+        npy_intp* _strides = PyArray_STRIDES((PyArrayObject*) o);
-+        for( int i = 0; i < dims - 1; i++ )
-+            step[i] = (size_t)_strides[i];
-+        step[dims-1] = CV_ELEM_SIZE(type);
-+        u->size = sizes[0]*step[0];
-+        u->userdata = o;
-+        return u;
-+    }
-+
-+    UMatData* allocate(int dims0, const int* sizes, int type, void* data, size_t* step, AccessFlag flags, UMatUsageFlags usageFlags) const
-+    {
-+        if( data != 0 )
-+        {
-+            CV_Error(Error::StsAssert, "The data should normally be NULL!");
-+            // probably this is safe to do in such extreme case
-+            return stdAllocator->allocate(dims0, sizes, type, data, step, flags, usageFlags);
-+        }
-+        PyEnsureGIL gil;
-+
-+        int depth = CV_MAT_DEPTH(type);
-+        int cn = CV_MAT_CN(type);
-+        const int f = (int)(sizeof(size_t)/8);
-+        int typenum = depth == CV_8U ? NPY_UBYTE : depth == CV_8S ? NPY_BYTE :
-+        depth == CV_16U ? NPY_USHORT : depth == CV_16S ? NPY_SHORT :
-+        depth == CV_32S ? NPY_INT : depth == CV_32F ? NPY_FLOAT :
-+        depth == CV_64F ? NPY_DOUBLE : f*NPY_ULONGLONG + (f^1)*NPY_UINT;
-+        int i, dims = dims0;
-+        cv::AutoBuffer<npy_intp> _sizes(dims + 1);
-+        for( i = 0; i < dims; i++ )
-+            _sizes[i] = sizes[i];
-+        if( cn > 1 )
-+            _sizes[dims++] = cn;
-+        PyObject* o = PyArray_SimpleNew(dims, _sizes.data(), typenum);
-+        if(!o)
-+            CV_Error_(Error::StsError, ("The numpy array of typenum=%d, ndims=%d can not be created", typenum, dims));
-+        return allocate(o, dims0, sizes, type, step);
-+    }
-+
-+    bool allocate(UMatData* u, AccessFlag accessFlags, UMatUsageFlags usageFlags) const CV_OVERRIDE
-+    {
-+        return stdAllocator->allocate(u, accessFlags, usageFlags);
-+    }
-+
-+    void deallocate(UMatData* u) const CV_OVERRIDE
-+    {
-+        if(!u)
-+            return;
-+        PyEnsureGIL gil;
-+        CV_Assert(u->urefcount >= 0);
-+        CV_Assert(u->refcount >= 0);
-+        if(u->refcount == 0)
-+        {
-+            PyObject* o = (PyObject*)u->userdata;
-+            Py_XDECREF(o);
-+            delete u;
-+        }                                                   
-+    }
-+
-+    const MatAllocator* stdAllocator;
-+};
-+
-+NumpyAllocator g_numpyAllocator;
-+
-+
-+template<typename T> static
-+bool pyopencv_to(PyObject* obj, T& p, const char* name = "<unknown>");
-+
-+template<typename T> static
-+PyObject* pyopencv_from(const T& src);
-+
-+enum { ARG_NONE = 0, ARG_MAT = 1, ARG_SCALAR = 2 };
-+
-+// special case, when the convertor needs full ArgInfo structure
-+static bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo info)
-+{
-+      // to avoid PyArray_Check() to crash even with valid array
-+    do_numpy_import( );
-+
-+
-+    bool allowND = true;
-+    if(!o || o == Py_None)
-+    {
-+        if( !m.data )
-+            m.allocator = &g_numpyAllocator;
-+        return true;
-+    }
-+
-+    if( PyInt_Check(o) )
-+    {
-+        double v[] = {(double)PyInt_AsLong((PyObject*)o), 0., 0., 0.};
-+        m = Mat(4, 1, CV_64F, v).clone();
-+        return true;
-+    }
-+    if( PyFloat_Check(o) )
-+    {
-+        double v[] = {PyFloat_AsDouble((PyObject*)o), 0., 0., 0.};
-+        m = Mat(4, 1, CV_64F, v).clone();
-+        return true;
-+    }
-+    if( PyTuple_Check(o) )
-+    {
-+        int i, sz = (int)PyTuple_Size((PyObject*)o);
-+        m = Mat(sz, 1, CV_64F);
-+        for( i = 0; i < sz; i++ )
-+        {
-+            PyObject* oi = PyTuple_GET_ITEM(o, i);
-+            if( PyInt_Check(oi) )
-+                m.at<double>(i) = (double)PyInt_AsLong(oi);
-+            else if( PyFloat_Check(oi) )
-+                m.at<double>(i) = (double)PyFloat_AsDouble(oi);
-+            else
-+            {
-+                failmsg("%s is not a numerical tuple", info.name);
-+                m.release();
-+                return false;
-+            }
-+        }
-+        return true;
-+    }
-+
-+    if( !PyArray_Check(o) )
-+    {
-+        failmsg("%s is not a numpy array, neither a scalar", info.name);
-+        return false;
-+    }
-+
-+    PyArrayObject* oarr = (PyArrayObject*) o;
-+
-+    bool needcopy = false, needcast = false;
-+    int typenum = PyArray_TYPE(oarr), new_typenum = typenum;
-+    int type = typenum == NPY_UBYTE ? CV_8U :
-+               typenum == NPY_BYTE ? CV_8S :
-+               typenum == NPY_USHORT ? CV_16U :
-+               typenum == NPY_SHORT ? CV_16S :
-+               typenum == NPY_INT ? CV_32S :
-+               typenum == NPY_INT32 ? CV_32S :
-+               typenum == NPY_FLOAT ? CV_32F :
-+               typenum == NPY_DOUBLE ? CV_64F : -1;
-+
-+    if( type < 0 )
-+    {
-+        if( typenum == NPY_INT64 || typenum == NPY_UINT64 || type == NPY_LONG )
-+        {
-+            needcopy = needcast = true;
-+            new_typenum = NPY_INT;
-+            type = CV_32S;
-+        }
-+        else
-+        {
-+            failmsg("%s data type = %d is not supported", info.name, typenum);
-+            return false;
-+        }
-+    }
-+
-+#ifndef CV_MAX_DIM
-+    const int CV_MAX_DIM = 32;
-+#endif
-+
-+    int ndims = PyArray_NDIM(oarr);
-+    if(ndims >= CV_MAX_DIM)
-+    {
-+        failmsg("%s dimensionality (=%d) is too high", info.name, ndims);
-+        return false;
-+    }
-+
-+    int size[CV_MAX_DIM+1];
-+    size_t step[CV_MAX_DIM+1];
-+    size_t elemsize = CV_ELEM_SIZE1(type);
-+    const npy_intp* _sizes = PyArray_DIMS(oarr);
-+    const npy_intp* _strides = PyArray_STRIDES(oarr);
-+    bool ismultichannel = ndims == 3 && _sizes[2] <= CV_CN_MAX;
-+
-+    for( int i = ndims-1; i >= 0 && !needcopy; i-- )
-+    {
-+        // these checks handle cases of
-+        //  a) multi-dimensional (ndims > 2) arrays, as well as simpler 1- and 2-dimensional cases
-+        //  b) transposed arrays, where _strides[] elements go in non-descending order
-+        //  c) flipped arrays, where some of _strides[] elements are negative
-+        if( (i == ndims-1 && (size_t)_strides[i] != elemsize) ||
-+            (i < ndims-1 && _strides[i] < _strides[i+1]) )
-+            needcopy = true;
-+    }
-+
-+    if( ismultichannel && _strides[1] != (npy_intp)elemsize*_sizes[2] )
-+        needcopy = true;
-+
-+    if (needcopy)
-+    {
-+        if (info.outputarg)
-+        {
-+            failmsg("Layout of the output array %s is incompatible with cv::Mat (step[ndims-1] != elemsize or step[1] != elemsize*nchannels)", info.name);
-+            return false;
-+        }
-+
-+        if( needcast ) {
-+            o = PyArray_Cast(oarr, new_typenum);
-+            oarr = (PyArrayObject*) o;
-+        }
-+        else {
-+            oarr = PyArray_GETCONTIGUOUS(oarr);
-+            o = (PyObject*) oarr;
-+        }
-+
-+        _strides = PyArray_STRIDES(oarr);
-+    }
-+
-+    for(int i = 0; i < ndims; i++)
-+    {
-+        size[i] = (int)_sizes[i];
-+        step[i] = (size_t)_strides[i];
-+    }
-+
-+    // handle degenerate case
-+    if( ndims == 0) {
-+        size[ndims] = 1;
-+        step[ndims] = elemsize;
-+        ndims++;
-+    }
-+
-+    if( ismultichannel )
-+    {
-+        ndims--;
-+        type |= CV_MAKETYPE(0, size[2]);
-+    }
-+
-+    if( ndims > 2 && !allowND )
-+    {
-+        failmsg("%s has more than 2 dimensions", info.name);
-+        return false;
-+    }
-+
-+    m = Mat(ndims, size, type, PyArray_DATA(oarr), step);
-+    m.u = g_numpyAllocator.allocate(o, ndims, size, type, step);
-+    m.addref();
-+
-+    if( !needcopy )
-+    {
-+        Py_INCREF(o);
-+    }
-+    m.allocator = &g_numpyAllocator;
-+
-+    return true;
-+}
-+
-+template<>
-+bool pyopencv_to(PyObject* o, Mat& m, const char* name)
-+{
-+    return pyopencv_to(o, m, ArgInfo(name, 0));
-+}
-+
-+PyObject* pyopencv_from(const Mat& m)
-+{
-+    if( !m.data )
-+        Py_RETURN_NONE;
-+    Mat temp, *p = (Mat*)&m;
-+    if(!p->u || p->allocator != &g_numpyAllocator)
-+    {
-+        temp.allocator = &g_numpyAllocator;
-+        ERRWRAP2(m.copyTo(temp));
-+        p = &temp;
-+    }
-+    PyObject* o = (PyObject*)p->u->userdata;
-+    Py_INCREF(o);
-+    return o;
-+}
-+
-+int convert_to_CvMat2(const PyObject* o, cv::Mat& m)
-+{
-+    pyopencv_to(const_cast<PyObject*>(o), m, "unknown");
-+    return 0;
-+}
diff --git a/dev-ros/depth_image_proc/Manifest b/dev-ros/depth_image_proc/Manifest
index d0155ab1382c..01397245d192 100644
--- a/dev-ros/depth_image_proc/Manifest
+++ b/dev-ros/depth_image_proc/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD depth_image_proc-1.12.22-r1.ebuild 732 BLAKE2B 16cf7f434921ef6754dee1ef95da566b2a13267c9b51f6d8da7515e36e8696da505e1a43650c0536595e0ab12912b7176ad4f0aecaaaf6bd77c9fd957c28f28c SHA512 c81f37aacce8a8ea5a41d735e6411d8a03b8ae834ee76ffc54dffc46296c7afae845cbfadae49bc189d9438e81569bab82eb2e4d0e193bc836e8b47e079e1681
-EBUILD depth_image_proc-1.12.23.ebuild 732 BLAKE2B a5ab72714539b5c587ede8dd2a791e45f8016fe934765bb0132555b78ece1174351ef31b1bfed432eda62d5c85e1094bba244a8e3622dcd5487a2956e08fc58c SHA512 87982442ec87ce04625e18f3df7256aceb7fc85130319aebd490e920a144e53370e1dee481d4233d4cbace5477de29dfd12456df7bd33ca18c312abf387a06ea
-EBUILD depth_image_proc-1.13.0.ebuild 729 BLAKE2B 2ed998c7d9bd47c6001459c29bce85d83935ef7896842cfb401879c37f54a46667f3461ff72aad04e4957b094c5b4e4117a09f5cc1250782decb81c527b8f1ae SHA512 a7cd7baf56694ce74e0ff2248ecc49b6c1b7e26614c45961a9c4fdde965565f95a6b8c7e72da7c3c4cfe3acfca7e653efd19a27877b9466306dfd3e9c0e25ad9
-EBUILD depth_image_proc-9999.ebuild 732 BLAKE2B 16cf7f434921ef6754dee1ef95da566b2a13267c9b51f6d8da7515e36e8696da505e1a43650c0536595e0ab12912b7176ad4f0aecaaaf6bd77c9fd957c28f28c SHA512 c81f37aacce8a8ea5a41d735e6411d8a03b8ae834ee76ffc54dffc46296c7afae845cbfadae49bc189d9438e81569bab82eb2e4d0e193bc836e8b47e079e1681
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD depth_image_proc-1.15.2.ebuild 730 BLAKE2B 3482014f0562d3a1ffe9ea79d603afd968c3b111a976413718fea27465e35226e3abc23922fb3224938fd047dd2d6564798171329195de8082b7e95750f6303c SHA512 48717a00873856350bc0002e9b76d4f1a077bde06653331e54c99de80772532899e0c656a149d4762ef699c519b4e59bac5539d8921a29d946cd39f6598c454c
+EBUILD depth_image_proc-9999.ebuild 730 BLAKE2B 3482014f0562d3a1ffe9ea79d603afd968c3b111a976413718fea27465e35226e3abc23922fb3224938fd047dd2d6564798171329195de8082b7e95750f6303c SHA512 48717a00873856350bc0002e9b76d4f1a077bde06653331e54c99de80772532899e0c656a149d4762ef699c519b4e59bac5539d8921a29d946cd39f6598c454c
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.12.22-r1.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.12.22-r1.ebuild
deleted file mode 100644
index 65c78ae415a8..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/eigen_conversions
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild
deleted file mode 100644
index 85a496111029..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/eigen_conversions
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild
deleted file mode 100644
index 6037fd6b4bca..000000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/eigen_conversions
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild
new file mode 100644
index 000000000000..4cbfec1b77ae
--- /dev/null
+++ b/dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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-9999.ebuild b/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
index 65c78ae415a8..4cbfec1b77ae 100644
--- a/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
+++ b/dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -21,11 +21,12 @@ RDEPEND="
 	dev-ros/image_transport
 	dev-ros/message_filters
 	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2
 	dev-ros/tf2_ros
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/depthimage_to_laserscan/Manifest b/dev-ros/depthimage_to_laserscan/Manifest
index 7aae46634c37..b7f520a1b042 100644
--- a/dev-ros/depthimage_to_laserscan/Manifest
+++ b/dev-ros/depthimage_to_laserscan/Manifest
@@ -1,6 +1,5 @@
 AUX isnan.patch 672 BLAKE2B 714348340fb583106891e467fb24815cb95e389ef863b39c8ed5d6250c2fc5d5467cf565590b0fa1e163c440fd6e282f6320d77395b676876bd51526a755e454 SHA512 c4993894868cbfbd66374b4062f43e7d58ef8e3d725024b06146144809cd059d6a01ba502626876089847688a58f1f069f8dfb788e657ac7c1a79e9cb8200a7b
-AUX pluginlib.patch 616 BLAKE2B 7ba7ce7e1af6b5f97987011a5f65edc200bcb56904cda31bbfb3e35a5a0ae5250bdef3d207cbcf7cd67a83a0aa04858162116631fdc1399159188d3168338d19 SHA512 f0ad07597c7b375e7b7ba566e19c21ef73a8cee9f7f124b0819056d061dd7a6e6b5a583ac6d9bfd66ced8e6bf4823e11867581789e2c82aa455e229291f26244
-DIST depthimage_to_laserscan-1.0.7.tar.gz 12121 BLAKE2B f8b69ce10311e39eaf963c42fd6ea653c8b0fe1c2381ab128d575d490d236b03d8667a213e8e9eb9423c4a9244697fb9746ebe8385ac0142776e47063fe9e5bf SHA512 4da5fa446d574dbb44c2924dd760f160e527e68d7df119e5d9e74d85efd3473ee31845e8565b0d023d2cf22c945b3b5c56b12a04facd4e38dc3dd1235dad73e9
-EBUILD depthimage_to_laserscan-1.0.7-r2.ebuild 733 BLAKE2B b34108683225362e8c46286ab6f0b68b29173e3f2cf658732bfb2c344d43071bfeefa6a37a9612ccf0cf8a9f79ca2d8c6c31d02f32d899e0db06cfea6b3c7c33 SHA512 eafc77e18ea8ae75459fa5f630ee82ea65df62ba0d0a4996b544d842ab5edcb78556a6b1e15245ab9ab881744fae64ded2cc0e8603fde9978d7593dc32d1e4ec
-EBUILD depthimage_to_laserscan-9999.ebuild 733 BLAKE2B b34108683225362e8c46286ab6f0b68b29173e3f2cf658732bfb2c344d43071bfeefa6a37a9612ccf0cf8a9f79ca2d8c6c31d02f32d899e0db06cfea6b3c7c33 SHA512 eafc77e18ea8ae75459fa5f630ee82ea65df62ba0d0a4996b544d842ab5edcb78556a6b1e15245ab9ab881744fae64ded2cc0e8603fde9978d7593dc32d1e4ec
+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 352 BLAKE2B 925e18de2139370d06d242cbf4c2d15f2d201df3c28036169eb868defaad60ef0e38814cae627c43efbe5efddfa21e311053970f7ad0b648650df538c1817a10 SHA512 3eafc06a8ac658f3f29903c2f23b88b53b2dd5b1a70fecb8788a4027646c5367a3d0384179c0ca1e75e58a8081ce53c00ae6def249f48a7fc7c2ea0365408d2c
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild
deleted file mode 100644
index 2e621e904b7b..000000000000
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-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/roscpp
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/isnan.patch" "${FILESDIR}/pluginlib.patch" )
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
new file mode 100644
index 000000000000..bee85b1f78d7
--- /dev/null
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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
index 2e621e904b7b..bee85b1f78d7 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,15 +13,20 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roscpp
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+
+	media-libs/opencv:=
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/isnan.patch" "${FILESDIR}/pluginlib.patch" )
+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/pluginlib.patch b/dev-ros/depthimage_to_laserscan/files/pluginlib.patch
deleted file mode 100644
index a367cd40c5f6..000000000000
--- a/dev-ros/depthimage_to_laserscan/files/pluginlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScanNodelet.cpp
-===================================================================
---- depthimage_to_laserscan-1.0.7.orig/src/DepthImageToLaserScanNodelet.cpp
-+++ depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScanNodelet.cpp
-@@ -57,5 +57,5 @@ private:
- }
- 
- #include <pluginlib/class_list_macros.h>
--PLUGINLIB_DECLARE_CLASS(depthimage_to_laserscan, DepthImageToLaserScanNodelet, depthimage_to_laserscan::DepthImageToLaserScanNodelet, nodelet::Nodelet);
-+PLUGINLIB_EXPORT_CLASS(depthimage_to_laserscan::DepthImageToLaserScanNodelet, nodelet::Nodelet)
- 
diff --git a/dev-ros/diagnostic_aggregator/Manifest b/dev-ros/diagnostic_aggregator/Manifest
index 95dcbd7e82a4..c92b9e099bac 100644
--- a/dev-ros/diagnostic_aggregator/Manifest
+++ b/dev-ros/diagnostic_aggregator/Manifest
@@ -1,6 +1,8 @@
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD diagnostic_aggregator-1.9.2-r1.ebuild 583 BLAKE2B bd9ec81e5f2d2fe41ee77bab6072bd87e7e4fd749471ac5d9672fd866df215fda5eaf6fe8f775717dc94144eccfd4e4b74a2aecd0edca252d385d45c64467c7d SHA512 77b3f633a06959a282f69aa0d73951fc5b83ceb85f2bfcce8b9f0a31f8130b7fa2e8fc4d4a546c1b009be21d3e39d165dafc537f386a25afb4e8a6b8df525845
-EBUILD diagnostic_aggregator-1.9.3.ebuild 583 BLAKE2B ab074a4b081d313ebdfd1744d030050e90c16aab4c9b37ed3efc9b6d9ad46eed3f5a4a5ca2b9fc244e5d86ee0ff6ae2f0fa7610b661855bc019d4a474adea7fb SHA512 e5953c56c3c8d1d786c5adcd07c19646ac21f66250196cf35cc76b38a8d15b417c1e374d0a8e65ad371e74c9946a9463d519f94f7b909e0be3260a1765a97c77
-EBUILD diagnostic_aggregator-9999.ebuild 583 BLAKE2B bd9ec81e5f2d2fe41ee77bab6072bd87e7e4fd749471ac5d9672fd866df215fda5eaf6fe8f775717dc94144eccfd4e4b74a2aecd0edca252d385d45c64467c7d SHA512 77b3f633a06959a282f69aa0d73951fc5b83ceb85f2bfcce8b9f0a31f8130b7fa2e8fc4d4a546c1b009be21d3e39d165dafc537f386a25afb4e8a6b8df525845
+DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+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_aggregator-1.10.1.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
+EBUILD diagnostic_aggregator-1.9.4-r1.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
+EBUILD diagnostic_aggregator-1.9.6.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
+EBUILD diagnostic_aggregator-9999.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.1.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.1.ebuild
new file mode 100644
index 000000000000..76db5fae27db
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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.9.2-r1.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.2-r1.ebuild
deleted file mode 100644
index 7a610fadd9fb..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	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:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild
deleted file mode 100644
index 650ad537d33a..000000000000
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates ROS diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	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:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.4-r1.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..76db5fae27db
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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.9.6.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.6.ebuild
new file mode 100644
index 000000000000..76db5fae27db
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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-9999.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
index 7a610fadd9fb..76db5fae27db 100644
--- a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,8 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
+	dev-ros/pluginlib:=
 		dev-libs/tinyxml2:=
 	dev-ros/roscpp
 	dev-ros/rospy
@@ -24,6 +23,14 @@ RDEPEND="
 	dev-ros/bondcpp
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
+	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
+	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_analysis/Manifest b/dev-ros/diagnostic_analysis/Manifest
index 2a27aa0f821c..8dfe0c37a122 100644
--- a/dev-ros/diagnostic_analysis/Manifest
+++ b/dev-ros/diagnostic_analysis/Manifest
@@ -1,14 +1,8 @@
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba445265b9cde19271d43274316af3ce734947a1a8a6226491c59e142a36e9f547edb996c797fec6ecaf143afa2c7363 SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef
-DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD diagnostic_analysis-1.8.10.ebuild 592 BLAKE2B 90fe81e38d40b8034946430666ba449e391fa9bee6b794774db68c87962bb913e004f6d67add27b01b973155c6af35a05de71f1e5cce0b9e7c0c01f9202bdf8c SHA512 6d1d6a956973c20eed5f491c68c71dc45d4e0260c70165b8fde6a6b1a9349a60dcd00cf618e7dff457b0a00b42d062dea0ec67fcd3c7149981e43c8c4afb3453
-EBUILD diagnostic_analysis-1.8.8.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
-EBUILD diagnostic_analysis-1.8.9.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
-EBUILD diagnostic_analysis-1.9.0.ebuild 592 BLAKE2B 91fb793da96827276f7219f1396ca4e3b174e853a5e18fdbea5e54a1ca06782470d4b45424ff81a5811e01d74d1987d009bc42325b6753043bb1285b911b4900 SHA512 097d5dcb4564e0e33bf8813e385a802d943d873528468064d6ae1adc1578b8f6b684e34906d2dbd6be801a9bacbe83baf1ddb3069f27c3a9bb219f501bdaa720
-EBUILD diagnostic_analysis-1.9.2.ebuild 592 BLAKE2B 91fb793da96827276f7219f1396ca4e3b174e853a5e18fdbea5e54a1ca06782470d4b45424ff81a5811e01d74d1987d009bc42325b6753043bb1285b911b4900 SHA512 097d5dcb4564e0e33bf8813e385a802d943d873528468064d6ae1adc1578b8f6b684e34906d2dbd6be801a9bacbe83baf1ddb3069f27c3a9bb219f501bdaa720
-EBUILD diagnostic_analysis-1.9.3.ebuild 592 BLAKE2B ec4aa558c8281f2641f62093d568569f66addaf50b1dd2378a9e1f634da6e85c9ef5699ab6f58113497bcc1ac11cd75839c4546a49080b9438dd885468933780 SHA512 c1ff79ca45ca2c7db39aa55147b4c19bab2f0c085f79710e81704c0bc18c455a425ff60454314009e31d87c89bad897e7ed0246b75be3f530cb0c8a8555c18f9
-EBUILD diagnostic_analysis-9999.ebuild 592 BLAKE2B 14c3b84ef2fa6763085a75a06ae72ba6e33a87dc9b9a41aeec2063f6d23d58a8ef5ad07da489c0565e8d815041f4de00a82f25789cf9eb5ecca2a0a749fcd2c8 SHA512 ce590b7a3a4c834e7bbd68043e42342214e5337c74de458306c03c4a5c655f7cb9d466e1c4a5b9c1a2cc39f8b56990511ef141abd162300645a0ac52e8933677
+DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+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.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 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.1.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.1.ebuild
new file mode 100644
index 000000000000..fdc2bbe90d68
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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.8.10.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.10.ebuild
deleted file mode 100644
index dc238916c796..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.8.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.8.ebuild
deleted file mode 100644
index f300b602d629..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild
deleted file mode 100644
index f300b602d629..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.0.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.0.ebuild
deleted file mode 100644
index b2b767204efd..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.2.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.2.ebuild
deleted file mode 100644
index b2b767204efd..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild
deleted file mode 100644
index 7e9226fd5c37..000000000000
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild
new file mode 100644
index 000000000000..fdc2bbe90d68
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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
new file mode 100644
index 000000000000..fdc2bbe90d68
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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
index f300b602d629..fdc2bbe90d68 100644
--- a/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,9 +15,14 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	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_common_diagnostics/Manifest b/dev-ros/diagnostic_common_diagnostics/Manifest
index e29b32c0b3a8..5afb072bff37 100644
--- a/dev-ros/diagnostic_common_diagnostics/Manifest
+++ b/dev-ros/diagnostic_common_diagnostics/Manifest
@@ -1,14 +1,8 @@
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba445265b9cde19271d43274316af3ce734947a1a8a6226491c59e142a36e9f547edb996c797fec6ecaf143afa2c7363 SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef
-DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD diagnostic_common_diagnostics-1.8.10.ebuild 535 BLAKE2B 50ff4a1d1d47927f267fd691e07c7806a8533b4ebcdf28ce2e014120b2bb0f5a7fe48a01526931e3d737c6a303a3844432def31405e6c51bc816cf887141875c SHA512 a32446e9b4c89170a6d8fe302d7bce35f43c69a6db3044a5c45800335275598cccd6361a11aa5db1eef40bddf43be24bd7cfc5dc88e22079abf923e2b2dffded
-EBUILD diagnostic_common_diagnostics-1.8.8.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
-EBUILD diagnostic_common_diagnostics-1.8.9.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
-EBUILD diagnostic_common_diagnostics-1.9.0.ebuild 535 BLAKE2B 2da998bc10c2334c000f658abdc86e2491cb224bc2e0fde1f6a05cd213be8636d99b5c80c391acb378eeefd35e70fc8c4d5ef9bc5fcbdd9f8126063ccb044234 SHA512 0b4ff0ce595287096da6d23d6f20d12f6a1fa01b978512d92aff859753497c2732fcd741d495dda3555375e409cc95284e7be25342fcf33671a20a45b030472b
-EBUILD diagnostic_common_diagnostics-1.9.2.ebuild 535 BLAKE2B 2da998bc10c2334c000f658abdc86e2491cb224bc2e0fde1f6a05cd213be8636d99b5c80c391acb378eeefd35e70fc8c4d5ef9bc5fcbdd9f8126063ccb044234 SHA512 0b4ff0ce595287096da6d23d6f20d12f6a1fa01b978512d92aff859753497c2732fcd741d495dda3555375e409cc95284e7be25342fcf33671a20a45b030472b
-EBUILD diagnostic_common_diagnostics-1.9.3.ebuild 535 BLAKE2B 4e308b6d8baf51618a63dadb3c06b889d8394d6245848df535ad177f03f838cca8f4ffb3a55072ee113d2910e98b78fd8f53056eb3884e9fc80a0382914738dd SHA512 87eafa4ab1038fe053db4855de5d90bc7e5c6a6e955d20ce4d1cc90ce88e0ac151599f96f8bd6f6796adfa749833ea25e3a2f5830160b76605db2d3ee97f35ed
-EBUILD diagnostic_common_diagnostics-9999.ebuild 535 BLAKE2B 29329eb9e0e7a8d8535177bc8cb80df513bb659e3615cf82b7d093c2b3cbb46a45ccb524ce1ff0adf7daab505ed5e8b429f3b624b4027d3fa75a8f119b55f513 SHA512 be114573e99cb90e9f3002747250ae6658ed00676e95290756950d5be712ef3e6514909c26e78683f875ccba102b58618bc3d2c868f7cf1108c7723c6d85f7c8
+DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+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.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 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
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
new file mode 100644
index 000000000000..7d94a89560d9
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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.8.10.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.10.ebuild
deleted file mode 100644
index 9f8282baad72..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.8.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.8.ebuild
deleted file mode 100644
index 4e399a800340..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild
deleted file mode 100644
index 4e399a800340..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.0.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.0.ebuild
deleted file mode 100644
index 49c81e178a94..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.2.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.2.ebuild
deleted file mode 100644
index 49c81e178a94..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild
deleted file mode 100644
index f34ad33f0501..000000000000
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Generic nodes for monitoring a linux host"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	app-admin/hddtemp"
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
new file mode 100644
index 000000000000..7d94a89560d9
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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
new file mode 100644
index 000000000000..7d94a89560d9
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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
index 4e399a800340..7d94a89560d9 100644
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,10 +14,17 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
+	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_msgs/Manifest b/dev-ros/diagnostic_msgs/Manifest
index e2bb7d4683b8..d4051cf3dd31 100644
--- a/dev-ros/diagnostic_msgs/Manifest
+++ b/dev-ros/diagnostic_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD diagnostic_msgs-1.12.5.ebuild 495 BLAKE2B f6415f305dd30050a7d7626340f8aa826f20fc1aafa2356a2b766d4b135308f8fb86bc4400792a999e249954b8b09f62f60f1456556d8dc70c8ae6d3b7b13114 SHA512 b28d1229b33fcdd6de947b2c93ef70efe592d1aeaeb6133fc3a8e0de006bba0f0a79901212d4d712a9ef89fe92faf4af6f8bebecd39a9ed1e85f5469e966131f
-EBUILD diagnostic_msgs-1.12.6.ebuild 495 BLAKE2B f6415f305dd30050a7d7626340f8aa826f20fc1aafa2356a2b766d4b135308f8fb86bc4400792a999e249954b8b09f62f60f1456556d8dc70c8ae6d3b7b13114 SHA512 b28d1229b33fcdd6de947b2c93ef70efe592d1aeaeb6133fc3a8e0de006bba0f0a79901212d4d712a9ef89fe92faf4af6f8bebecd39a9ed1e85f5469e966131f
-EBUILD diagnostic_msgs-1.12.7.ebuild 495 BLAKE2B f6415f305dd30050a7d7626340f8aa826f20fc1aafa2356a2b766d4b135308f8fb86bc4400792a999e249954b8b09f62f60f1456556d8dc70c8ae6d3b7b13114 SHA512 b28d1229b33fcdd6de947b2c93ef70efe592d1aeaeb6133fc3a8e0de006bba0f0a79901212d4d712a9ef89fe92faf4af6f8bebecd39a9ed1e85f5469e966131f
-EBUILD diagnostic_msgs-9999.ebuild 495 BLAKE2B f6415f305dd30050a7d7626340f8aa826f20fc1aafa2356a2b766d4b135308f8fb86bc4400792a999e249954b8b09f62f60f1456556d8dc70c8ae6d3b7b13114 SHA512 b28d1229b33fcdd6de947b2c93ef70efe592d1aeaeb6133fc3a8e0de006bba0f0a79901212d4d712a9ef89fe92faf4af6f8bebecd39a9ed1e85f5469e966131f
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD diagnostic_msgs-1.13.0.ebuild 455 BLAKE2B ad3b54387c724d20c5e19aea39fb995eed5c4bfce202e79482dbb12fee0e870a225242718fbf0b5a2ee3c71f3cace17b2c29e7053aeb4c5f37e492b71dd3e0ae SHA512 0c69cb5ae42c5196a3a23b09a4d8a5afdf368415e734def1c1ee5e4fd2565bd495efd0fba915198cbc44ec95313b0fe9f6b508b3177e01f2db23f2c588e6acc9
+EBUILD diagnostic_msgs-9999.ebuild 455 BLAKE2B ad3b54387c724d20c5e19aea39fb995eed5c4bfce202e79482dbb12fee0e870a225242718fbf0b5a2ee3c71f3cace17b2c29e7053aeb4c5f37e492b71dd3e0ae SHA512 0c69cb5ae42c5196a3a23b09a4d8a5afdf368415e734def1c1ee5e4fd2565bd495efd0fba915198cbc44ec95313b0fe9f6b508b3177e01f2db23f2c588e6acc9
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.5.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.5.ebuild
deleted file mode 100644
index d7e1dd47b266..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.6.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.6.ebuild
deleted file mode 100644
index d7e1dd47b266..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.7.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.7.ebuild
deleted file mode 100644
index d7e1dd47b266..000000000000
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.0.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..8dca48c249b7
--- /dev/null
+++ b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
index d7e1dd47b266..8dca48c249b7 100644
--- a/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
+++ b/dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/diagnostic_updater/Manifest b/dev-ros/diagnostic_updater/Manifest
index 047086620e6a..c6ec3c8d90c4 100644
--- a/dev-ros/diagnostic_updater/Manifest
+++ b/dev-ros/diagnostic_updater/Manifest
@@ -1,14 +1,8 @@
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba445265b9cde19271d43274316af3ce734947a1a8a6226491c59e142a36e9f547edb996c797fec6ecaf143afa2c7363 SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef
-DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD diagnostic_updater-1.8.10.ebuild 680 BLAKE2B e6874d6ee6169653d3f115e82a4191056a4113f767de94bff254ed7ccd96b70452fd4e91da5e20101f0a342dc99bd1485ee92a8c05a3ce3d1780377a2e4b40e2 SHA512 1232f52186e5ba463f6b92399881a92c0f70affbe532901719a6d361dd5024afc3b7c46d3d8236490bfe5bace2e7ddb292f0a1f9b9af5f32bf4da4671c8dc7aa
-EBUILD diagnostic_updater-1.8.8.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
-EBUILD diagnostic_updater-1.8.9.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
-EBUILD diagnostic_updater-1.9.0.ebuild 680 BLAKE2B dcdecb3b088fe7dd17cb5242d32158dfbffea204f0aa2148ec88cb0e7a6a5c5655ff67bfabdceabb82e570450154821c860dae2b22ba8db7ab59c78be9566aa6 SHA512 3d09548ad40f64f6aeedec3174cd8a114e12854e57c281a1e60cdff7ca8afdaa45f0a31c361e1bcb1e16108bf715ec2155ef2f13abd8125d8bd9ef73798d553e
-EBUILD diagnostic_updater-1.9.2.ebuild 680 BLAKE2B dcdecb3b088fe7dd17cb5242d32158dfbffea204f0aa2148ec88cb0e7a6a5c5655ff67bfabdceabb82e570450154821c860dae2b22ba8db7ab59c78be9566aa6 SHA512 3d09548ad40f64f6aeedec3174cd8a114e12854e57c281a1e60cdff7ca8afdaa45f0a31c361e1bcb1e16108bf715ec2155ef2f13abd8125d8bd9ef73798d553e
-EBUILD diagnostic_updater-1.9.3.ebuild 680 BLAKE2B f9d773983076c3887feb9102b5816299a0f245a8f992bbeaf8c5453cbcc34a9a10d0690dbd049e2898975d748e4326d7b48421b2a9b293c1945e4a0028908ce5 SHA512 410dc6493a54450821ec083d98e55c8e9587b3df0298c5f3391a6ad86e66f1ecd7a64c59e0d34efd97d30ad3298f6e45b1e9260327b308cf01d47df3893ec0cc
-EBUILD diagnostic_updater-9999.ebuild 680 BLAKE2B 9e144541f453c8f1947234290709bd3d49d9b6a055b07b843fd86b1c7df8d4d772371ab888c4216048ab399ac032ba979ad4d825f3f133e572ede6e760160164 SHA512 14dc098b31508d430e63d429d88e6289de31c7d230e18614715c084d1ec787da3149290bf19c30d705da2c3bbe505c4c10092fae84319ea4feacec8920b371f7
+DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+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.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 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.1.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.1.ebuild
new file mode 100644
index 000000000000..26dc8c7e62f7
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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.8.10.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.8.10.ebuild
deleted file mode 100644
index 1168d92b85c7..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.8.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.8.8.ebuild
deleted file mode 100644
index 11ea335900e4..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild
deleted file mode 100644
index 11ea335900e4..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.0.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.0.ebuild
deleted file mode 100644
index f4bd878c1610..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.2.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.2.ebuild
deleted file mode 100644
index f4bd878c1610..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild
deleted file mode 100644
index 961c2bf53258..000000000000
--- a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for updating diagnostics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild
new file mode 100644
index 000000000000..26dc8c7e62f7
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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
new file mode 100644
index 000000000000..26dc8c7e62f7
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.9.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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
index 11ea335900e4..26dc8c7e62f7 100644
--- a/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,11 +14,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
+	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/driver_base/Manifest b/dev-ros/driver_base/Manifest
index 58d03f59050e..08a66796982c 100644
--- a/dev-ros/driver_base/Manifest
+++ b/dev-ros/driver_base/Manifest
@@ -1,4 +1,4 @@
 DIST driver_common-1.6.8.tar.gz 15055 BLAKE2B 2d9a4c23d65b8e2f60343f5e3b454e1cc41334d34e0246891b533f216acb743df628d95dd2c0087b06284a85e0ea872baad495a7ed7b59c03e8f8ff32eba4ed8 SHA512 b698143d08785088ac13e62f5b96676bd590a84e4ffb147fa3698be6a8ded510f648d043ecdc1d31ba7b95fb3041d06ee1a39b224c359b8612adebdba259d188
-EBUILD driver_base-1.6.8.ebuild 526 BLAKE2B 95ab5407f70b126fd0cb95be1ab8c3ef421455399111f5a7d6e09574a9a6d8976925b5df5c9c49437090e216ed3653a80dcbaab70cf499d6e329cae5aee994e8 SHA512 23936ae388d66770780f853d05138b6f21cbcbfdab3e64cc48ce94422c7b3266bf65147e52b9ecf39039be7f5982ca56757d7c12c2e41dad560d2aaf09594b14
-EBUILD driver_base-9999.ebuild 526 BLAKE2B 95ab5407f70b126fd0cb95be1ab8c3ef421455399111f5a7d6e09574a9a6d8976925b5df5c9c49437090e216ed3653a80dcbaab70cf499d6e329cae5aee994e8 SHA512 23936ae388d66770780f853d05138b6f21cbcbfdab3e64cc48ce94422c7b3266bf65147e52b9ecf39039be7f5982ca56757d7c12c2e41dad560d2aaf09594b14
+EBUILD driver_base-1.6.8.ebuild 431 BLAKE2B a1c686c72ad08b5b38eaa150994282ed95a5e8ce5498d009f3288cf82be3347d83794c7a425eb37d9b8c1ee37616e219ce4a79ba4dc247b3543ed2a95fb1759f SHA512 7023a565d9447a317b0411748bc72c1b9d918fcfc834db8a4af4f22584779c428790d648af71f75034104286faf5ca4f4697a76126c1d3b625aae4cc556fe1cb
+EBUILD driver_base-9999.ebuild 431 BLAKE2B a1c686c72ad08b5b38eaa150994282ed95a5e8ce5498d009f3288cf82be3347d83794c7a425eb37d9b8c1ee37616e219ce4a79ba4dc247b3543ed2a95fb1759f SHA512 7023a565d9447a317b0411748bc72c1b9d918fcfc834db8a4af4f22584779c428790d648af71f75034104286faf5ca4f4697a76126c1d3b625aae4cc556fe1cb
 MISC metadata.xml 339 BLAKE2B 71ed9f79df6d8528f3d967c077f1d01e0290573400356e3749bd24254281651f09507894d2ca4029b8b8a77b51d31d080d9560d9995d3d9fde848f0d71ec083d SHA512 e24ff4ef526475ad5bff434350abb00afccb4c101ab624ee056c1502719d15ec4889eff9170c534af62ba8719bd5fe4f3cf206353244f56e486a29afea53ee7b
diff --git a/dev-ros/driver_base/driver_base-1.6.8.ebuild b/dev-ros/driver_base/driver_base-1.6.8.ebuild
index 9fb280a8b98f..6f9cd6b125e7 100644
--- a/dev-ros/driver_base/driver_base-1.6.8.ebuild
+++ b/dev-ros/driver_base/driver_base-1.6.8.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test"
+DESCRIPTION="Framework for writing drivers"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/driver_base/driver_base-9999.ebuild b/dev-ros/driver_base/driver_base-9999.ebuild
index 9fb280a8b98f..6f9cd6b125e7 100644
--- a/dev-ros/driver_base/driver_base-9999.ebuild
+++ b/dev-ros/driver_base/driver_base-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test"
+DESCRIPTION="Framework for writing drivers"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/dwa_local_planner/Manifest b/dev-ros/dwa_local_planner/Manifest
index 6f2b11b34a47..b83d3753085f 100644
--- a/dev-ros/dwa_local_planner/Manifest
+++ b/dev-ros/dwa_local_planner/Manifest
@@ -1,10 +1,4 @@
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD dwa_local_planner-1.16.1.ebuild 746 BLAKE2B 8b654dc13b03bc20450717659ec46fdb5aa7feb9c29b7ec53d06a85c3f2823773eaf58f2e2e63f33459ce9ebaacae9d1a49b25e0651e1dff3db2b2d62b70043d SHA512 fcfdb8d8c5899488c71c424c8507db0d6d65e18347b2b0d2d00ff20f6b09fc16f72c87839328c77fa251d2a7e7cb0ea376df819a289021f88a2cbab445c69984
-EBUILD dwa_local_planner-1.16.2.ebuild 827 BLAKE2B e82648179639420c67dfe780a59b37dbc4d4f7b14927f28c1a31a5e98ced5a3c057197f55b546a22fe6dcad8cec8e328318ea54660fa554f02f9092921b6cc65 SHA512 6b934ce33bf82f25e59bc498c603aee0f8afdae264b0ebac7b8b04346bd25a75abdd1afb6fa3fafed0a3a1015c7ea6deefe6d7ceacb9bd4beb3068c2f949b2d3
-EBUILD dwa_local_planner-1.16.3.ebuild 824 BLAKE2B 04e195b2d8cf1b215bdbe642bc45e0bf5957ab365f0884ec588305405aa8455b2d008290a78b6899b665884eb4be9974c2394c177dee5784fce2583c5e6dd822 SHA512 0c8bc1ec0aee66a0b59fd6429ca25abfd5ff3712f069458ae70f947f9030a6aa7a2360822d98a6b17650bf903f0139b48422155c0671a67174e2b45989279078
-EBUILD dwa_local_planner-1.16.6.ebuild 824 BLAKE2B 0b412e8be4d90c5c5bd6c881229f185c784914ef3bcf1402e9eaa9f6e478cf00f892e23ea22a054d0881e75867cb890ad2cd873a7e8258d86b4b1c544153b1a0 SHA512 eff80aabefee58c4bfa753427e5570554215140c7cb3871bdc50754d5b9951da8a3fbc3f25f2db2a3149e543f538ce2a53b290ad878e3e3af985347699c54f43
-EBUILD dwa_local_planner-9999.ebuild 827 BLAKE2B e82648179639420c67dfe780a59b37dbc4d4f7b14927f28c1a31a5e98ced5a3c057197f55b546a22fe6dcad8cec8e328318ea54660fa554f02f9092921b6cc65 SHA512 6b934ce33bf82f25e59bc498c603aee0f8afdae264b0ebac7b8b04346bd25a75abdd1afb6fa3fafed0a3a1015c7ea6deefe6d7ceacb9bd4beb3068c2f949b2d3
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD dwa_local_planner-1.17.0.ebuild 804 BLAKE2B c1988ed920a5840725c4d99b7b0838e45ad05b1a7293032762cd7e0f2e624921e6bf941256d3d1197edf9eefc66caa23900d4fe2e5d50f776e8d5a7b2888dfaf SHA512 bcaeb2bdc925fd6815c36f7031d7843f020f7cf89cbd67f16d4546f9c242c9263011e69d17c70146e896cdf66b88ce283596779944e20c2de4cbefe382e14121
+EBUILD dwa_local_planner-9999.ebuild 804 BLAKE2B c1988ed920a5840725c4d99b7b0838e45ad05b1a7293032762cd7e0f2e624921e6bf941256d3d1197edf9eefc66caa23900d4fe2e5d50f776e8d5a7b2888dfaf SHA512 bcaeb2bdc925fd6815c36f7031d7843f020f7cf89cbd67f16d4546f9c242c9263011e69d17c70146e896cdf66b88ce283596779944e20c2de4cbefe382e14121
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.1.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.1.ebuild
deleted file mode 100644
index cb86c0b5ae58..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.2.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.2.ebuild
deleted file mode 100644
index c2b31d506c31..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.3.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.3.ebuild
deleted file mode 100644
index de6f8be2fd78..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.6.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.6.ebuild
deleted file mode 100644
index 462c98c473a6..000000000000
--- a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.17.0.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.17.0.ebuild
new file mode 100644
index 000000000000..ae5574a54a45
--- /dev/null
+++ b/dev-ros/dwa_local_planner/dwa_local_planner-1.17.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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="Dynamic Window Approach to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-ros/dynamic_reconfigure[${PYTHON_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:=[threads]
+	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
index c2b31d506c31..ae5574a54a45 100644
--- a/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
+++ b/dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -18,19 +17,20 @@ RDEPEND="
 	dev-ros/angles
 	dev-ros/base_local_planner
 	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-cpp/eigen:3
 	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/pluginlib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 
 	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2_ros
 
 	dev-libs/boost:=[threads]
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+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/dynamic_reconfigure/Manifest b/dev-ros/dynamic_reconfigure/Manifest
index 3303e09ef497..c629ec15fbe8 100644
--- a/dev-ros/dynamic_reconfigure/Manifest
+++ b/dev-ros/dynamic_reconfigure/Manifest
@@ -1,8 +1,4 @@
-DIST dynamic_reconfigure-1.5.48.tar.gz 38764 BLAKE2B 740500b05274c1ebe8423f3061f73fa54bec422b96598d3867b49b5b6d7d3f9d68172d796b49ee4a1b6d6f0c411d3ddd0b9b664cc8fdcef22bd9700f6dfb5111 SHA512 f4bdc00b580c56feaf3e076540d669923e1330c862fef3518774f43c57212dcbf28bb848f61e7196294d4e7439b4d06c33351aa8d133b71042b739ac59e105a6
-DIST dynamic_reconfigure-1.5.49.tar.gz 38883 BLAKE2B 499fc907c6015941caf151dd8b8f84ff90b1a9abb08d499be00ce4281957045cd50900eecc79be21c77dede125f2e5c03c2bbd7ebae0dc4b62637923dea0e0aa SHA512 c8cba24424142333df4d66c013915526573c791a4ef97e51baffe8040293dce67d313c57036807c308fe4ca17af92f277e467cde6494f166f6e4ec4aa34050cf
-DIST dynamic_reconfigure-1.6.0.tar.gz 40026 BLAKE2B f08be83ac741b70af7b516623afaca494cf22d9d90e568e7f63599709ef48402dc17adfa25678f5c8388d3cbb85d1532a445f1f624946ea9590d92ee842de907 SHA512 3a43780af28597d5761264b09b26a9c82fefcdc33d9b08ad46a6b0ddeb23bd06d0ab6436bfbc546a8c626eff21fddac453e42eec7369b22e19f2f9c9178b0d4b
-EBUILD dynamic_reconfigure-1.5.48.ebuild 561 BLAKE2B 743c828fed64bd5a556fdeabc886cd825718c03e45ef529759beb09ce29140693034f454461ec99abb50d0020d0080e42d1743703fcf755e6f963feaf9433e61 SHA512 66bc324c67cf7a064a49f4aa1433d4d8a606ea9f4ea8cdbf1f734a58ebe0835e54c2f8bd417e74b8aae0004d43e53d84434e0c09fd96ab0f8a91e59073148891
-EBUILD dynamic_reconfigure-1.5.49.ebuild 561 BLAKE2B 743c828fed64bd5a556fdeabc886cd825718c03e45ef529759beb09ce29140693034f454461ec99abb50d0020d0080e42d1743703fcf755e6f963feaf9433e61 SHA512 66bc324c67cf7a064a49f4aa1433d4d8a606ea9f4ea8cdbf1f734a58ebe0835e54c2f8bd417e74b8aae0004d43e53d84434e0c09fd96ab0f8a91e59073148891
-EBUILD dynamic_reconfigure-1.6.0.ebuild 561 BLAKE2B 743c828fed64bd5a556fdeabc886cd825718c03e45ef529759beb09ce29140693034f454461ec99abb50d0020d0080e42d1743703fcf755e6f963feaf9433e61 SHA512 66bc324c67cf7a064a49f4aa1433d4d8a606ea9f4ea8cdbf1f734a58ebe0835e54c2f8bd417e74b8aae0004d43e53d84434e0c09fd96ab0f8a91e59073148891
-EBUILD dynamic_reconfigure-9999.ebuild 561 BLAKE2B 743c828fed64bd5a556fdeabc886cd825718c03e45ef529759beb09ce29140693034f454461ec99abb50d0020d0080e42d1743703fcf755e6f963feaf9433e61 SHA512 66bc324c67cf7a064a49f4aa1433d4d8a606ea9f4ea8cdbf1f734a58ebe0835e54c2f8bd417e74b8aae0004d43e53d84434e0c09fd96ab0f8a91e59073148891
+DIST dynamic_reconfigure-1.7.0.tar.gz 40420 BLAKE2B 8a08a96817c62552a5045e3d9435fd06465660513eef55c85a6454334db462c21dd6ebc2c48b3e5e59d66344c5904f87f6a86b701726c0e23de65967367a104a SHA512 5eb05bde8e283f319220331cbd1572f6735aba27f86964cd78c295e9a5a59904632aed0651cbc9f358cf6012299763ebe57bc4daee4a7af7d8537089394db845
+EBUILD dynamic_reconfigure-1.7.0.ebuild 685 BLAKE2B 1ed3ba6d2234715b9064d2a5ad15e6e26a97cff7a67e12c04da9b5c59d912623f8680d943a0054d03084a4b5c0e64599ada0dec063fda3182a061f8dff22c56d SHA512 688090727222428322c0a0019c344d3cb16ac2a04543a110a2d8bed7c9a2fe6579b49ff431e539dc53f17d5392e82a593ce96b299cfd20415836bc0f0b6c4cbd
+EBUILD dynamic_reconfigure-9999.ebuild 685 BLAKE2B 1ed3ba6d2234715b9064d2a5ad15e6e26a97cff7a67e12c04da9b5c59d912623f8680d943a0054d03084a4b5c0e64599ada0dec063fda3182a061f8dff22c56d SHA512 688090727222428322c0a0019c344d3cb16ac2a04543a110a2d8bed7c9a2fe6579b49ff431e539dc53f17d5392e82a593ce96b299cfd20415836bc0f0b6c4cbd
 MISC metadata.xml 337 BLAKE2B c2b63166315cf868635f9abe7b49158c32f30d031cfd454ef9ebfb16fe7fc96c00cecc77c59bb3f91d4f07c77783bb2e1750d24f87da0507106355401ffe069b SHA512 19705df6cde1a0ae66f58cccc95a96e26302960f7e055a8c2b5fc15f0d995b2adaf0ac61c87470f7562e2ad03012845fd3abac6b4a081c1d6e01e9b91d53e561
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.48.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.48.ebuild
deleted file mode 100644
index 45442499ccd4..000000000000
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.48.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild
deleted file mode 100644
index 45442499ccd4..000000000000
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild
deleted file mode 100644
index 45442499ccd4..000000000000
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
new file mode 100644
index 000000000000..150b8c47d782
--- /dev/null
+++ b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
@@ -0,0 +1,33 @@
+# 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/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:=[threads]
+	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
index 45442499ccd4..150b8c47d782 100644
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
+++ b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
@@ -1,23 +1,33 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
+DESCRIPTION="Provides a means to change node parameters at runtime"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/roscpp
 "
-DEPEND="${RDEPEND}"
+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/eigen_conversions/Manifest b/dev-ros/eigen_conversions/Manifest
index a1d41140e706..f48348e64ebb 100644
--- a/dev-ros/eigen_conversions/Manifest
+++ b/dev-ros/eigen_conversions/Manifest
@@ -1,6 +1,4 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD eigen_conversions-1.11.9-r1.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
-EBUILD eigen_conversions-1.12.0.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
-EBUILD eigen_conversions-9999.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
+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 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.11.9-r1.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.11.9-r1.ebuild
deleted file mode 100644
index 4065fd42f096..000000000000
--- a/dev-ros/eigen_conversions/eigen_conversions-1.11.9-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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:=
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild
deleted file mode 100644
index 4065fd42f096..000000000000
--- a/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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:=
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild
new file mode 100644
index 000000000000..c6eeb55ec947
--- /dev/null
+++ b/dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild
@@ -0,0 +1,25 @@
+# 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
index 4065fd42f096..c6eeb55ec947 100644
--- a/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
+++ b/dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/geometry"
 KEYWORDS="~amd64 ~arm"
@@ -16,9 +16,10 @@ 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
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_stl_containers/Manifest b/dev-ros/eigen_stl_containers/Manifest
index 94fb7ab823fb..8c4564e83f9e 100644
--- a/dev-ros/eigen_stl_containers/Manifest
+++ b/dev-ros/eigen_stl_containers/Manifest
@@ -1,12 +1,4 @@
-DIST eigen_stl_containers-0.1.4.tar.gz 2128 BLAKE2B 1e9f1f39776f80f5843f7d2016f18df84c79cddec98a19c41457ff623e0eadd33d2157fa39c447757be09d3332a2349b0cddec227a76ff31602b8e5a2b650600 SHA512 57e67dd63536c7e35b4055d0072575f16e517b797c8383be6ed80eadd536bd044aa787c657bc5da125bf91a9be273515b35c0459a42cbbf02cd405dbf9f05f1f
-DIST eigen_stl_containers-0.1.5.tar.gz 2571 BLAKE2B b0d7dcc007d2b8039a4a480f0f126c761ca6c1c093e768508d52ae9d12db6505f8124f06fa5a993dd4b5ac71143500722e076888d111b248933f2486c96b569b SHA512 57b9825860e959523187a8d4221f9b59805e2934aa1e842bd87cffae308458e89171fc99f0996ee52e7b475e4ac0de13d3a330c86adc9e3e6925dbff234a8337
-DIST eigen_stl_containers-0.1.6.tar.gz 2763 BLAKE2B 0533d8c89e74652f64859012e22130594e6085751d06ec2eb8dfc08018de4576435fafa3d3590447deadcac59d1c264d9993209e4ee1bb09aa12e293440db1a0 SHA512 60adc1859837972af7b620de3b163d40020eede421c89977c0669ccd1714c136637e5cde99868d96d5f9f24d7fb48eb3f5f34591f134b5b84ce3eb25a843a7d5
-DIST eigen_stl_containers-0.1.7.tar.gz 2951 BLAKE2B 95202e6076a6ca6ec5d90f77b7849b1bc239e713f5a9c541e472bca84b72ccaac6680b49275ce7cca57757f4f37f371b766bbfe0c669b336f78c9bfed048813a SHA512 e97f3157287fa084a4e59fd2d97a7190c63e48550d8bf7ea124ced1f1a91e60833d27abbe1db0f53767a21c38aca0d53b5dc82d417d3a4eba29b5fe7372ba82e
 DIST eigen_stl_containers-0.1.8.tar.gz 3242 BLAKE2B 8ca2544eb541a6641c20e417ca5574de85181e3c5f0428d862e7fb9b60ee2f70c2851cc8b01e29a6010358014769add42a5d251eb0b5cf2efb6a935463ed47b9 SHA512 1a964aaca26fda9aefe393f6bd6a875633e3b2824d073b7bab035b4199be3513402ed90034192caa9c3e6a5f8a5640ef5aa924e2cc7cef5dc30e4bfdd93526b9
-EBUILD eigen_stl_containers-0.1.4.ebuild 390 BLAKE2B 5c75b7996dd7fc3872deb9cbcc4a76c6a8c034203dc9441dcb18ee6322425fd0d7d29c062a8e3897192823808a7c39b2bb081aaa2ce72523c2b2145c740931a6 SHA512 b09ff48a38d449c2c0f45de49c69ab251b4c862779cf8e364b68f1b9cc99b02d2f06fc92c448cecd7629084dfb8a637502c3dec8c6a703989bb540819c2bda14
-EBUILD eigen_stl_containers-0.1.5.ebuild 390 BLAKE2B 5c75b7996dd7fc3872deb9cbcc4a76c6a8c034203dc9441dcb18ee6322425fd0d7d29c062a8e3897192823808a7c39b2bb081aaa2ce72523c2b2145c740931a6 SHA512 b09ff48a38d449c2c0f45de49c69ab251b4c862779cf8e364b68f1b9cc99b02d2f06fc92c448cecd7629084dfb8a637502c3dec8c6a703989bb540819c2bda14
-EBUILD eigen_stl_containers-0.1.6.ebuild 390 BLAKE2B e20f5970612f0dca5082c8055657b6634545e1aa10d2e080e61a355d4e918d1de59f304f3c781aa2f697bdbb518c8a10f3ff2d72d7503c99a4fbe173bea5c0c0 SHA512 141a0681122137e6692572a449963d4578ae0fe8972a145800260be1276cc54112e1f89b91ba36f543fdf21ced765ddd93df0e1e5d2cd89fa563768cd7c4124c
-EBUILD eigen_stl_containers-0.1.7.ebuild 390 BLAKE2B 4f015c2c54e5b6e8742a180f01397ae973124bc002935f91749deb760841164826de7f26398fc23e4c43406dd369e2b3b8a13ed0e893ae992a607de0b7ae41c1 SHA512 0bdb83503e4d4efe502a078cc48d26d1bf3e20f119eb71ec7d9b44234ea9c8e38036d1fc2fb9b748761284652f67d33cbc4632139147b38b89c75b0f0c5e125f
-EBUILD eigen_stl_containers-0.1.8.ebuild 390 BLAKE2B 4f015c2c54e5b6e8742a180f01397ae973124bc002935f91749deb760841164826de7f26398fc23e4c43406dd369e2b3b8a13ed0e893ae992a607de0b7ae41c1 SHA512 0bdb83503e4d4efe502a078cc48d26d1bf3e20f119eb71ec7d9b44234ea9c8e38036d1fc2fb9b748761284652f67d33cbc4632139147b38b89c75b0f0c5e125f
-EBUILD eigen_stl_containers-9999.ebuild 390 BLAKE2B 5c75b7996dd7fc3872deb9cbcc4a76c6a8c034203dc9441dcb18ee6322425fd0d7d29c062a8e3897192823808a7c39b2bb081aaa2ce72523c2b2145c740931a6 SHA512 b09ff48a38d449c2c0f45de49c69ab251b4c862779cf8e364b68f1b9cc99b02d2f06fc92c448cecd7629084dfb8a637502c3dec8c6a703989bb540819c2bda14
+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 338 BLAKE2B 60ed2878337f7236e0da2888249ac635dcac5062cd37348da21c03c1696f13b252c4c54b1f960c15ebe7fe29e4f2b91d8fa952cb014a378d75941cafc1eacb94 SHA512 ccba1e4bcebbb8a9eb820121d330340e335ef2560c3052e3c4558cf7e3764a7909714cdd40aae74b26c0c32f42ead2ddfa1c9b6a64e8386582b93d4aeb024c08
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.4.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.4.ebuild
deleted file mode 100644
index c4c7806c3932..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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-0.1.5.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.5.ebuild
deleted file mode 100644
index c4c7806c3932..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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-0.1.6.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.6.ebuild
deleted file mode 100644
index 57a2a251503b..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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-0.1.7.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.7.ebuild
deleted file mode 100644
index e36187ab0a96..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/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-0.1.8.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
index e36187ab0a96..d64a546a919d 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
index c4c7806c3932..d64a546a919d 100644
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
+++ b/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
index 294a308b4ab1..d6a3a8f8f76c 100644
--- a/dev-ros/fake_localization/Manifest
+++ b/dev-ros/fake_localization/Manifest
@@ -1,4 +1,4 @@
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD fake_localization-1.16.6.ebuild 778 BLAKE2B 47f02bad288a9dcf6428a4d45678aa54f23729fcedd4db97b05b754b00b21baee9eaed040f68485928dd6c7f60afe2b53dff42dfd16c3670793292f2b6e21798 SHA512 b9c4255d6607731b61245667c90c571e52cba635c068d4559c3930cbe3c9e80ec05189efa78405bd7293d8327c30470c4c187a23b4726fd438c537052cc51b1e
-EBUILD fake_localization-9999.ebuild 778 BLAKE2B 47f02bad288a9dcf6428a4d45678aa54f23729fcedd4db97b05b754b00b21baee9eaed040f68485928dd6c7f60afe2b53dff42dfd16c3670793292f2b6e21798 SHA512 b9c4255d6607731b61245667c90c571e52cba635c068d4559c3930cbe3c9e80ec05189efa78405bd7293d8327c30470c4c187a23b4726fd438c537052cc51b1e
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD fake_localization-1.17.0.ebuild 785 BLAKE2B a6aaf99ea770055a21558dbd66456f4d70ff3a38ba254e2eef02f3d292eebfb1c34ffac7692609e93eaa58a1a0ea8507ef8df90b0982165f8ae700fedfe54380 SHA512 e991ca25d41d3be88b4db190d9ed339239af0af482de98bd8e08c7055c5e534fe60a32e7b1cc02d8744df204388834f47d0ee5629352d6c76d22e94b7b7b2a53
+EBUILD fake_localization-9999.ebuild 785 BLAKE2B a6aaf99ea770055a21558dbd66456f4d70ff3a38ba254e2eef02f3d292eebfb1c34ffac7692609e93eaa58a1a0ea8507ef8df90b0982165f8ae700fedfe54380 SHA512 e991ca25d41d3be88b4db190d9ed339239af0af482de98bd8e08c7055c5e534fe60a32e7b1cc02d8744df204388834f47d0ee5629352d6c76d22e94b7b7b2a53
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/fake_localization/fake_localization-1.16.6.ebuild b/dev-ros/fake_localization/fake_localization-1.16.6.ebuild
deleted file mode 100644
index 1634273142ee..000000000000
--- a/dev-ros/fake_localization/fake_localization-1.16.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-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
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_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-1.17.0.ebuild b/dev-ros/fake_localization/fake_localization-1.17.0.ebuild
new file mode 100644
index 000000000000..532a449c1399
--- /dev/null
+++ b/dev-ros/fake_localization/fake_localization-1.17.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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="A ROS node that simply forwards odometry information"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/angles
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_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
index 1634273142ee..532a449c1399 100644
--- a/dev-ros/fake_localization/fake_localization-9999.ebuild
+++ b/dev-ros/fake_localization/fake_localization-9999.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-ros/angles
 	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	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}]
diff --git a/dev-ros/filters/Manifest b/dev-ros/filters/Manifest
index 773b73eba041..f50d757a7046 100644
--- a/dev-ros/filters/Manifest
+++ b/dev-ros/filters/Manifest
@@ -1,4 +1,4 @@
-DIST filters-1.8.1.tar.gz 18815 BLAKE2B a34bf445e7626d1af74bf76267784b30d13acfdb35ba20eed7ebd77ca55271fab646f2670378b54cb75edec1b210683bcaee0c8f5e7b70b081fc0d70a3c5dc73 SHA512 3fd6fc649d64a982b5cf4841c9556413508c0648952c008af623970ab44cd4147c3d7e0ecee9963ebc097b8e2db48b5a40810519d838b862d30f07a88ba06194
-EBUILD filters-1.8.1-r1.ebuild 479 BLAKE2B e7dadc2e9082d6e4bee674a94154a1008bb5130710673a5cb247f8f2fc22dd22f4167742f64cf819e9314e600f344c8b261ddc3587b2fec2814febd929e2347b SHA512 da31ff9af780a41e370688501d5ab59d81f7a021226d43f4a5e438ee15861b5367ceef902dd028b51fede63ba859dc423d04cc1aaae03477209461ab84ffcee0
-EBUILD filters-9999.ebuild 479 BLAKE2B e7dadc2e9082d6e4bee674a94154a1008bb5130710673a5cb247f8f2fc22dd22f4167742f64cf819e9314e600f344c8b261ddc3587b2fec2814febd929e2347b SHA512 da31ff9af780a41e370688501d5ab59d81f7a021226d43f4a5e438ee15861b5367ceef902dd028b51fede63ba859dc423d04cc1aaae03477209461ab84ffcee0
+DIST filters-1.9.0.tar.gz 18865 BLAKE2B 0ef5508cbd32d2af42c38655aef0075b0d16339c4264bac6b3356b96a08b1344a4002c60c9c57af61846615ed28bfbfcd8cff74677e0f70e78778b3cc643c7bc SHA512 df1823a2a2a3e49bdc6c22c7bacfe696bed4eb9fa1f1339854e47e6b2757c8d7a8256c3bbf83154d22f47ae6d79af4a2fc4b878b83ad6eb9445072481326b3d3
+EBUILD filters-1.9.0.ebuild 636 BLAKE2B 4ac7170beb71921fbdaf266f72de3c82d3fcaa84ea1b7b14d1621de6c4ab44b1262dd7379851eddc66d98973214fbc221e9040365e9b805aa5a480a7e428a8f8 SHA512 428539797b5040bcc3b6db8ead1a69bdeba07d79faf4c652312f36369a1bc84dff134cd7a3460280948007984c240d13a84f60d35ba0f83a9806f3427ed4b07a
+EBUILD filters-9999.ebuild 636 BLAKE2B 4ac7170beb71921fbdaf266f72de3c82d3fcaa84ea1b7b14d1621de6c4ab44b1262dd7379851eddc66d98973214fbc221e9040365e9b805aa5a480a7e428a8f8 SHA512 428539797b5040bcc3b6db8ead1a69bdeba07d79faf4c652312f36369a1bc84dff134cd7a3460280948007984c240d13a84f60d35ba0f83a9806f3427ed4b07a
 MISC metadata.xml 325 BLAKE2B 30488d99f978ac45d5d92e7aba99a4b2feb88e39702cf4ed5db2e762c45be68fe99fd18a08604da15f72116b509e5a0be4f8d74a2574f88b726db31610b20d7a SHA512 2601fa313386b132cf09dd5c27b9894b1520e1cc6af09f438cc0294a27ebc7e3d2f53f2020d477bef3b0cbd85f244a0651048f9dc1a081f509f19e82f54cee97
diff --git a/dev-ros/filters/filters-1.8.1-r1.ebuild b/dev-ros/filters/filters-1.8.1-r1.ebuild
deleted file mode 100644
index 4de9b7a86c06..000000000000
--- a/dev-ros/filters/filters-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/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:=[threads]
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/filters/filters-1.9.0.ebuild b/dev-ros/filters/filters-1.9.0.ebuild
new file mode 100644
index 000000000000..5fdc9dc5d689
--- /dev/null
+++ b/dev-ros/filters/filters-1.9.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 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:=[threads]
+	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
index 4de9b7a86c06..5fdc9dc5d689 100644
--- a/dev-ros/filters/filters-9999.ebuild
+++ b/dev-ros/filters/filters-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/filters"
 KEYWORDS="~amd64 ~arm"
@@ -19,3 +19,9 @@ RDEPEND="dev-ros/roscpp
 	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/gazebo_dev/Manifest b/dev-ros/gazebo_dev/Manifest
index fc929d12ea36..22bbe74df00d 100644
--- a/dev-ros/gazebo_dev/Manifest
+++ b/dev-ros/gazebo_dev/Manifest
@@ -1,12 +1,4 @@
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_dev-2.7.3.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
-EBUILD gazebo_dev-2.7.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
-EBUILD gazebo_dev-2.8.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
-EBUILD gazebo_dev-2.8.5.ebuild 426 BLAKE2B f3a1c0411f63f023e771d8196cc2bdeade104317a27fa785a70f47909b6a0cb23df920f20452047a7c34fb2f265b2b20065ff09dfe9766d3c320f25e8b523055 SHA512 cc17d8c023011dcfe5a7af0876eea0164611220cac10c26ddd7ff8fcfc5fdbe06b068b9d178072293ca6eed7c4644a12f70c6cd749ef8f3727a2b86774e6769b
-EBUILD gazebo_dev-2.8.7.ebuild 426 BLAKE2B 8fdc674a5cb07104c7b90def41f6f9a7f97341012646d4a6fb933136585f134698fc84e940ff5ed50f181bfc073f9cefbaffbf391f204d4cf4c17dfbb85a4093 SHA512 0fb06d1d8b2a5817eb5ecfb7653975b16ccb4fbd39ac8917eb1de586d68d6988c044442ede6806fd2937d0d7964a073784b6fe073f1507fc478e78707e85a672
-EBUILD gazebo_dev-9999.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_dev-2.9.1.ebuild 414 BLAKE2B c5293e395a3351ed6241633d009f1ca3dae36fb1210788d6de62f296cac9b2b31f3bafd60417caf1360445414104b68c1a388eae2757fac594ee78970634e58b SHA512 ea3e7dfc7259d74da1f464cbe3695af5458ccd2f47a3b977769a92d75b903ae84328504f6fd70c14b1bbcb9b2308fcb300918e3063b6b6f754912d2e6f177bc7
+EBUILD gazebo_dev-9999.ebuild 414 BLAKE2B c5293e395a3351ed6241633d009f1ca3dae36fb1210788d6de62f296cac9b2b31f3bafd60417caf1360445414104b68c1a388eae2757fac594ee78970634e58b SHA512 ea3e7dfc7259d74da1f464cbe3695af5458ccd2f47a3b977769a92d75b903ae84328504f6fd70c14b1bbcb9b2308fcb300918e3063b6b6f754912d2e6f177bc7
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild
deleted file mode 100644
index b7ed4eb9139f..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a 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.7.4.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild
deleted file mode 100644
index b7ed4eb9139f..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a 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.8.4.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.8.4.ebuild
deleted file mode 100644
index b7ed4eb9139f..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.8.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a 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.8.5.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
deleted file mode 100644
index 02ff0da21fb6..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a 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.8.7.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.8.7.ebuild
deleted file mode 100644
index 20ebd7592009..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.8.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=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a 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.1.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild
new file mode 100644
index 000000000000..07c8fa9a0db0
--- /dev/null
+++ b/dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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-9999.ebuild b/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
index b7ed4eb9139f..07c8fa9a0db0 100644
--- a/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
+++ b/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+DESCRIPTION="Cmake config for the default version of Gazebo for the ROS distribution"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/gazebo_msgs/Manifest b/dev-ros/gazebo_msgs/Manifest
index 2c5eb5300d4b..ed9f2171ce93 100644
--- a/dev-ros/gazebo_msgs/Manifest
+++ b/dev-ros/gazebo_msgs/Manifest
@@ -1,14 +1,4 @@
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_msgs-2.6.2.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.7.3.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.7.4.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.8.4.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.8.5.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.8.7.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-9999.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_msgs-2.9.1.ebuild 541 BLAKE2B 8640653d846d95b7b2c50820f4528cde68a76b5ff80fad6eeaa9e7f0d921efd13c53db863652af58042612707e62ba7775be916a35f048862221c601169f6c2c SHA512 49bcb8f3dd29b78374ba122f5c89091cafa11d94e190c3bfbae5e027633ee78282deba3d5e699fa1b6b7574c125d8cc26f2f42749b38d87b254065023775b1b8
+EBUILD gazebo_msgs-9999.ebuild 541 BLAKE2B 8640653d846d95b7b2c50820f4528cde68a76b5ff80fad6eeaa9e7f0d921efd13c53db863652af58042612707e62ba7775be916a35f048862221c601169f6c2c SHA512 49bcb8f3dd29b78374ba122f5c89091cafa11d94e190c3bfbae5e027633ee78282deba3d5e699fa1b6b7574c125d8cc26f2f42749b38d87b254065023775b1b8
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.6.2.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.6.2.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.6.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=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-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.7.3.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.3.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.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=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-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.7.4.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.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=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-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.8.4.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.4.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.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=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-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.8.5.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.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=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-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.8.7.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.7.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.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=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-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.1.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild
new file mode 100644
index 000000000000..8e7fc5d60e03
--- /dev/null
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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-9999.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
index b8da68f271a3..8e7fc5d60e03 100644
--- a/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 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"
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index dd17276b0c7e..f16859f999bb 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,5 +1,4 @@
-AUX ocv4.patch 557 BLAKE2B 65adfeae5045dc21b29193a7bcbbf22cb4649425d551b8710bc557cbcf13f04f00fb319a2ea8962cd4cd4dd08976ad0257897f37a746410c59af12cd2cd4857d SHA512 335f85ee02cc1b54504d33fb8c06b49fb80f1d1e7bbb427870718a0adc92227bff9ba4ecfc7e6e7dc8f4bf95a404ef2d7894305504b4fe9f97ceeda84f4f2a5d
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_plugins-2.8.7.ebuild 1415 BLAKE2B a6dbfc7f5c2f6bc6c6b97faf626458a4a4e439be31bd91dc5fcf603b999bc13e5ad46bb5f01f4533329e05f6c29e50eb4a14f2699e53905fc48b481d22d53e8b SHA512 e893574f0285188529395c524dbe67bda5b1b95b3c32cfc0466d49a33f76173fdacdcbc1f9cd0893b5f338bfda582856613760b2faef535e6e456be0602db341
-EBUILD gazebo_plugins-9999.ebuild 1415 BLAKE2B a6dbfc7f5c2f6bc6c6b97faf626458a4a4e439be31bd91dc5fcf603b999bc13e5ad46bb5f01f4533329e05f6c29e50eb4a14f2699e53905fc48b481d22d53e8b SHA512 e893574f0285188529395c524dbe67bda5b1b95b3c32cfc0466d49a33f76173fdacdcbc1f9cd0893b5f338bfda582856613760b2faef535e6e456be0602db341
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_plugins-2.9.1.ebuild 1399 BLAKE2B 772438439e62014bad0fe4996181e5020df138a843a61f9396381aa123f34aec150af31157d86a07f94d84f5aa7baafa2815d7d54a9328577b4acc8f3bb374db SHA512 f87939c38cd358d99502b4cdcb6528c03cab2b5fa28468acd9c990157abce6974d44ef25a2fed3aaebbdf329e7fdd3795d79ee095aae9fbad553ad99acb13a29
+EBUILD gazebo_plugins-9999.ebuild 1399 BLAKE2B 772438439e62014bad0fe4996181e5020df138a843a61f9396381aa123f34aec150af31157d86a07f94d84f5aa7baafa2815d7d54a9328577b4acc8f3bb374db SHA512 f87939c38cd358d99502b4cdcb6528c03cab2b5fa28468acd9c990157abce6974d44ef25a2fed3aaebbdf329e7fdd3795d79ee095aae9fbad553ad99acb13a29
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/files/ocv4.patch b/dev-ros/gazebo_plugins/files/ocv4.patch
deleted file mode 100644
index 6d93feac4be9..000000000000
--- a/dev-ros/gazebo_plugins/files/ocv4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gazebo_plugins/src/gazebo_ros_prosilica.cpp
-===================================================================
---- gazebo_plugins.orig/src/gazebo_ros_prosilica.cpp
-+++ gazebo_plugins/src/gazebo_ros_prosilica.cpp
-@@ -44,10 +44,8 @@
- #include <diagnostic_updater/diagnostic_updater.h>
- #include <sensor_msgs/RegionOfInterest.h>
- 
--#include <opencv/cv.h>
--#include <opencv/highgui.h>
--
--#include <opencv/cvwimage.h>
-+#include <opencv2/core/core_c.h>
-+#include <opencv2/highgui/highgui_c.h>
- 
- #include <boost/scoped_ptr.hpp>
- #include <boost/bind.hpp>
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild
deleted file mode 100644
index cb8474d4c001..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 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}
-
-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
-	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_USEDEP}]
-	dev-ros/driver_base[${PYTHON_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_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}]
-"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
new file mode 100644
index 000000000000..743965d423ed
--- /dev/null
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 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}
+
+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
+	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}]
+"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
index cb8474d4c001..743965d423ed 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	dev-ros/urdf
 	dev-ros/tf
 	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/driver_base[${PYTHON_USEDEP}]
+	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
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-games/ogre
 	sci-libs/pcl
 	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
@@ -52,4 +52,3 @@ DEPEND="${RDEPEND}
 	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
index c9e87f7065cd..2f3830cf9d48 100644
--- a/dev-ros/gazebo_ros/Manifest
+++ b/dev-ros/gazebo_ros/Manifest
@@ -1,15 +1,4 @@
-DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_ros-2.6.2.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
-EBUILD gazebo_ros-2.7.3.ebuild 1282 BLAKE2B 2ad6a1a6e9a192a34ac8140b20ebc4787a31971d176e4ddd7f929746b1d694955e50b166f732908906ee1b5385dd51cbca746ee1ff4727e48948fca8c3ce0f37 SHA512 5d25298b56befcd572bd1939b075ed34a772410e10ebe73975a6e1f756e10bd090a2cd4776fa4bda21bd994ed1cce20155a1dae02bf8918e46259228ec3c43f8
-EBUILD gazebo_ros-2.7.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
-EBUILD gazebo_ros-2.8.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
-EBUILD gazebo_ros-2.8.5.ebuild 1026 BLAKE2B befc99333d36e2366eb794f9d2a820a310759ec9aa3e573d382f7fa7aac1e1499d8c1d7844e9343843ef66012a38e9a22781471e8c496758dce10360144f5961 SHA512 373e347c174d56497d381d3e0c6a76795caaeea32c083e878fd245b012b661c9385da8f51e19282f06ff7595fddf40ac0f573c491cc21ee1abf0611dfe1da35b
-EBUILD gazebo_ros-2.8.7.ebuild 1026 BLAKE2B df4eeb0fce0223ce1fcc82edd1f86803dc8976ee18817aba06785284df4de4fa058fa8006d83d6150b5148c149bdda6d2c5d161d55879f0363e1a082b287aceb SHA512 92d9f63c5fe95142d6dbc89c83392f93ead16c9f0895cfae48c34c6b892e573f8e118ef7426f5c12d9f0122c577ca2c5f73877feed58272bb6a8fd4e795d73e2
-EBUILD gazebo_ros-9999.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_ros-2.9.1.ebuild 1085 BLAKE2B df33199d29c4f98b0bdcac64b8758ef8a70871560999833501f27802faa715e603a981c69c1366c34e3f8816ac4596a6b72c0f169c842fd7cd7887863d4e5333 SHA512 f1de76be96789c41356aaaea2d9d08885d2dc8bd001bf0f0dbffa9ab6243a7bec352609acafeb79e9c28536bf3d6adb9c1958c37e3eaf05713d3912c89d04b81
+EBUILD gazebo_ros-9999.ebuild 1085 BLAKE2B df33199d29c4f98b0bdcac64b8758ef8a70871560999833501f27802faa715e603a981c69c1366c34e3f8816ac4596a6b72c0f169c842fd7cd7887863d4e5333 SHA512 f1de76be96789c41356aaaea2d9d08885d2dc8bd001bf0f0dbffa9ab6243a7bec352609acafeb79e9c28536bf3d6adb9c1958c37e3eaf05713d3912c89d04b81
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild
deleted file mode 100644
index 168e26eb91b1..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
deleted file mode 100644
index 191679505052..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin eutils
-
-DESCRIPTION="ROS plugins that offer message and service publishers 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_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2"
-
-src_prepare() {
-	pushd "${WORKDIR}/gazebo_ros_pkgs-${PV}" || die
-	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	popd || die
-	ros-catkin_src_prepare
-}
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
deleted file mode 100644
index ca217b085352..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers 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_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild
deleted file mode 100644
index ca217b085352..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers 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_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
deleted file mode 100644
index 107dee905b18..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers 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_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild
deleted file mode 100644
index 254d5552bb46..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.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=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers 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_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild
new file mode 100644
index 000000000000..40f612568195
--- /dev/null
+++ b/dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 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}
+
+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:=[threads]
+	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
index ca217b085352..40f612568195 100644
--- a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
+++ b/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+DESCRIPTION="ROS plugins that offer messages and services for interfacing with gazebo"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
@@ -20,17 +19,20 @@ RDEPEND="
 	dev-libs/tinyxml
 	sci-electronics/gazebo:=
 	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/gazebo_plugins[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/dynamic_reconfigure
 	dev-libs/libxml2
 	dev-libs/boost:=[threads]
+	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
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_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},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
index 32c5f14d59d4..06e066a76788 100644
--- a/dev-ros/gazebo_ros_control/Manifest
+++ b/dev-ros/gazebo_ros_control/Manifest
@@ -1,16 +1,4 @@
-AUX urdfdom1.patch 590 BLAKE2B bd90ab431b09a009e19d664e1161cfe07d5f4783827dbb364c9ef9816fe7ba208ef3ca0dc7b3fd4a6c9c7127ec964e5de6c66045865c4a6742cd93d1e8cb7677 SHA512 8476e9ba0a1f1977de88f299c5222f72361be8c334a37d1f4c7834c311f6a4cad2a49553d5fcee67ef5e9f2d164855dc89671958c2d069a7f6a301c3a43891dc
-DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_ros_control-2.6.2-r1.ebuild 743 BLAKE2B 7398cf457863ad2296e87275ad1a5dca21c5742d48bc9713a11a0a16d3b24906913460380349161f809abf61843616b12a18eea9472169db97f258b6d490fa60 SHA512 f7cee8fa23e02e997dea2462c6d87bfdf12fe68c6e5cc812c81fa119389517b4ee0743f93201bc4f2845ac154ac802ee0118da00a96c075a9296cad87b10dda0
-EBUILD gazebo_ros_control-2.7.3.ebuild 975 BLAKE2B 6c89cd3e49119edcd893a7f764d359035a08774b429f3b458178614f60dd0db9488f2c68f35f85c24cc100cd4705403e8b99df0a8fab1ce49a9b31c8c98c23d4 SHA512 94554d46030657d71e14614c0f297ad9e7541ef08bb601a2e8578d7187e31186c997f8298626a07b28d8110c8017e0cc129b4c07ab8831cf14c1c8df774a4e60
-EBUILD gazebo_ros_control-2.7.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
-EBUILD gazebo_ros_control-2.8.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
-EBUILD gazebo_ros_control-2.8.5.ebuild 719 BLAKE2B 5ff337b05ffaf84f0ba0e11b1b681e7e31e86af8c3829916404b85c4516e2ac080f42ff38f6bc9e2e432bc19930059ea627a4d3fa6b2432f1553eb2b8093d10d SHA512 4598b1d44a404b4ece5d67379c85798bf8db7c9d2e0580a7afb73d35ccad375bb68b95a566fba1a2e7c721a449a62b84f2d51552c3eb76619ee8acdccf5caadc
-EBUILD gazebo_ros_control-2.8.7.ebuild 719 BLAKE2B 483855692f3b863287a79e05125f097dd0bb4708c00658019140c3c56f20fb036c7803b88905875a0044da48f052eed1cd78580c988f3139573c7b8e6bdb7e3a SHA512 aece3d186009bcef502fc6d1296fd2aead0808d1a652783181cf53abd4b626f3f77e6eec29d6c4f5b5312e01c28dd4027b34f53edbef97be24cc6a9af322832a
-EBUILD gazebo_ros_control-9999.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_ros_control-2.9.1.ebuild 719 BLAKE2B 5b9b62e64ed6cda669bd10cd66aae557a64ccdee6a253adcfcc9a0f583b91525176cc99cc92db51a38c0805bda246ed86b8991c4ba0b2ca552262a17647f1af9 SHA512 8fe67b9f2ec26bfb0afe7b23eef6506b9407e704f62c1fb0b39d37e21c79812b599994879e6b3a0ada2e6acb0496ef711b3429277bb1fc7f7f2670a994b37a47
+EBUILD gazebo_ros_control-9999.ebuild 719 BLAKE2B 5b9b62e64ed6cda669bd10cd66aae557a64ccdee6a253adcfcc9a0f583b91525176cc99cc92db51a38c0805bda246ed86b8991c4ba0b2ca552262a17647f1af9 SHA512 8fe67b9f2ec26bfb0afe7b23eef6506b9407e704f62c1fb0b39d37e21c79812b599994879e6b3a0ada2e6acb0496ef711b3429277bb1fc7f7f2670a994b37a47
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros_control/files/urdfdom1.patch b/dev-ros/gazebo_ros_control/files/urdfdom1.patch
deleted file mode 100644
index 0da763186ca9..000000000000
--- a/dev-ros/gazebo_ros_control/files/urdfdom1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gazebo_ros_control/src/default_robot_hw_sim.cpp
-===================================================================
---- gazebo_ros_control.orig/src/default_robot_hw_sim.cpp
-+++ gazebo_ros_control/src/default_robot_hw_sim.cpp
-@@ -381,7 +381,7 @@ void DefaultRobotHWSim::registerJointLim
- 
-   if (urdf_model != NULL)
-   {
--    const boost::shared_ptr<const urdf::Joint> urdf_joint = urdf_model->getJoint(joint_name);
-+    const std::shared_ptr<const urdf::Joint> urdf_joint = urdf_model->getJoint(joint_name);
-     if (urdf_joint != NULL)
-     {
-       *joint_type = urdf_joint->type;
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.2-r1.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.2-r1.ebuild
deleted file mode 100644
index 778913a057cc..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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_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:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/urdfdom1.patch" )
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild
deleted file mode 100644
index 0a2bc106d8c0..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin eutils
-
-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:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2"
-
-src_prepare() {
-	pushd "${WORKDIR}/gazebo_ros_pkgs-${PV}" || die
-	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	popd || die
-	ros-catkin_src_prepare
-}
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
deleted file mode 100644
index e824028e5285..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.4.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.4.ebuild
deleted file mode 100644
index e824028e5285..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
deleted file mode 100644
index c98bd84a588a..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.7.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.7.ebuild
deleted file mode 100644
index 886fb0efaaf6..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-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:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1.ebuild
new file mode 100644
index 000000000000..69cdfcc93cd1
--- /dev/null
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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="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:=[threads]
+	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
index e824028e5285..69cdfcc93cd1 100644
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/gencpp/Manifest b/dev-ros/gencpp/Manifest
index f464c6dd92f9..817d45896451 100644
--- a/dev-ros/gencpp/Manifest
+++ b/dev-ros/gencpp/Manifest
@@ -1,4 +1,4 @@
 DIST gencpp-0.6.5.tar.gz 9803 BLAKE2B 3f22693cf8924a9c6c88aea287eb44f15670c0289c441a4dc631e9386d28702be074551ce2f0585cfc8f237a4d3925206c56d9cd760aae63655c9e7fc6bd82d2 SHA512 37f8869f2671a2dbbaf2d6fe9517cf0675639b3d1ce1940cb3ae3ce40432a61cafbe8e272a71b49cc1068f33dd5201cf3e0a2e0bed1c9ed1a5053669e35596aa
-EBUILD gencpp-0.6.5.ebuild 411 BLAKE2B 65fbfe4a890a867e2e47add66048d5b3847acdbe31904828976c34d519590c4745d82fce9c7171fa0bbf66f456447cf0cfcf22f57abcdba36999535292b84109 SHA512 ab067fcec07f504bf4df0118c1101f61fe4b7c4680780d7a1b44e116f7be99be895da92cf1d3d8431e8add53ed558a32c47fe7b0c57ac4e9115b9a78e9a00060
-EBUILD gencpp-9999.ebuild 411 BLAKE2B 65fbfe4a890a867e2e47add66048d5b3847acdbe31904828976c34d519590c4745d82fce9c7171fa0bbf66f456447cf0cfcf22f57abcdba36999535292b84109 SHA512 ab067fcec07f504bf4df0118c1101f61fe4b7c4680780d7a1b44e116f7be99be895da92cf1d3d8431e8add53ed558a32c47fe7b0c57ac4e9115b9a78e9a00060
+EBUILD gencpp-0.6.5.ebuild 419 BLAKE2B e9ee054671d8be3df2d2a8f652ca7610add0b067843a51a4916009e8455c5b92cd77d871979d114c95ba3e19b8fcf71f02fc23d869b8d08ea195c912c11bf609 SHA512 09ae8a02e185c3c6a3ec3698169d2cde259e0359c5167f4e463d7b9ede123675b9f3167dc72eb9270524121588c3401e3de5f61bf583c42bdb1564bd09c67791
+EBUILD gencpp-9999.ebuild 419 BLAKE2B e9ee054671d8be3df2d2a8f652ca7610add0b067843a51a4916009e8455c5b92cd77d871979d114c95ba3e19b8fcf71f02fc23d869b8d08ea195c912c11bf609 SHA512 09ae8a02e185c3c6a3ec3698169d2cde259e0359c5167f4e463d7b9ede123675b9f3167dc72eb9270524121588c3401e3de5f61bf583c42bdb1564bd09c67791
 MISC metadata.xml 324 BLAKE2B acb13fb86def5c4a53edd5c0db5d4c65d73e99f6d18a2fa1509981878637f006f9b14c5cd40e56b886b73c4ac8ec957844da3e424bb515248c07298388eb23c4 SHA512 031c6670cbdd1abdf53174d877a08985012d75ffa1fb16415501d128ac519567f6b9ae3c786a878aba25481c4413ebbcbc34d3782bf1d85cc6976caccd1aaaac
diff --git a/dev-ros/gencpp/gencpp-0.6.5.ebuild b/dev-ros/gencpp/gencpp-0.6.5.ebuild
index 87b3e6abb207..dca06b5f534d 100644
--- a/dev-ros/gencpp/gencpp-0.6.5.ebuild
+++ b/dev-ros/gencpp/gencpp-0.6.5.ebuild
@@ -9,10 +9,10 @@ KEYWORDS="~amd64 ~arm"
 inherit ros-catkin
 
 DESCRIPTION="ROS C++ message definition and serialization generators"
-HOMEPAGE="http://wiki.ros.org/gencpp"
+HOMEPAGE="https://wiki.ros.org/gencpp"
 LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+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
index 87b3e6abb207..dca06b5f534d 100644
--- a/dev-ros/gencpp/gencpp-9999.ebuild
+++ b/dev-ros/gencpp/gencpp-9999.ebuild
@@ -9,10 +9,10 @@ KEYWORDS="~amd64 ~arm"
 inherit ros-catkin
 
 DESCRIPTION="ROS C++ message definition and serialization generators"
-HOMEPAGE="http://wiki.ros.org/gencpp"
+HOMEPAGE="https://wiki.ros.org/gencpp"
 LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/geneus/Manifest b/dev-ros/geneus/Manifest
index c02628dfd489..972aac766d24 100644
--- a/dev-ros/geneus/Manifest
+++ b/dev-ros/geneus/Manifest
@@ -1,4 +1,4 @@
 DIST geneus-3.0.0.tar.gz 21401 BLAKE2B 4e7b779956e8c03676ea315664bb7e669cef31112f4b45fb3cd784cdca78e7c344dcd34ab0c6ad42940cc8c1a7648385334ecb84d9a41379bf033aa60ff7baf5 SHA512 f97cd44628d11fd9be4a369dac931b94e4789b032a6f22cf11f84666a0f6750326581146821e995ffa44c3bfcfbff6ac7075c50af0ead9682620fbdf75e84da1
-EBUILD geneus-3.0.0.ebuild 368 BLAKE2B 16c787a8f00c45356a14a1d850ba794024848d82f868c48f82998fb3197fa87eb6262a159e74f72a65f4d9f11c8ad3f2a1509bdc1374cc691d003697d9713ca3 SHA512 ea4889d4ca6ad505c3facbc1a4bd3a70e5d73050daebd1afe5f20284601b72972deeb9c8ccee30b72f19a0b9b93ff8b783277aa0bd2043e1fc5c29594ca8d416
-EBUILD geneus-9999.ebuild 368 BLAKE2B 16c787a8f00c45356a14a1d850ba794024848d82f868c48f82998fb3197fa87eb6262a159e74f72a65f4d9f11c8ad3f2a1509bdc1374cc691d003697d9713ca3 SHA512 ea4889d4ca6ad505c3facbc1a4bd3a70e5d73050daebd1afe5f20284601b72972deeb9c8ccee30b72f19a0b9b93ff8b783277aa0bd2043e1fc5c29594ca8d416
+EBUILD geneus-3.0.0.ebuild 375 BLAKE2B 179cb85f56907d02b97115029a50574ae201032f9e354e06b0a0c5b0453fc735fd42b34bfbd065d13c58937c91539c1a31400e7e667f1f22b0652771e00c5636 SHA512 1417687fa08c64acb5bf922a60500026d2cc024b7605462ddb326deb795d3249a15404f4dc44d119a950b116778ee30ffc48b9f8e3b4121001e42038348c99c8
+EBUILD geneus-9999.ebuild 375 BLAKE2B 179cb85f56907d02b97115029a50574ae201032f9e354e06b0a0c5b0453fc735fd42b34bfbd065d13c58937c91539c1a31400e7e667f1f22b0652771e00c5636 SHA512 1417687fa08c64acb5bf922a60500026d2cc024b7605462ddb326deb795d3249a15404f4dc44d119a950b116778ee30ffc48b9f8e3b4121001e42038348c99c8
 MISC metadata.xml 332 BLAKE2B a24bf94d452832939c570e02b18234732d90f1fd266843a9503d5062938ef59482137d2b12795ccd0bb8742abcc2ede1ba7336f6f3a13647e5f2b79375d7f030 SHA512 31f145f147c19fd15f90fa280eba4580ce22dbef5dc9477f97932f5dd306061a7bcc26aaa62074ccbd3eafd413dd4dbb307ca8410b030c061550e70ee40607ba
diff --git a/dev-ros/geneus/geneus-3.0.0.ebuild b/dev-ros/geneus/geneus-3.0.0.ebuild
index 7959c6dd1a03..3f4bbffd97ca 100644
--- a/dev-ros/geneus/geneus-3.0.0.ebuild
+++ b/dev-ros/geneus/geneus-3.0.0.ebuild
@@ -13,5 +13,5 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/geneus/geneus-9999.ebuild b/dev-ros/geneus/geneus-9999.ebuild
index 7959c6dd1a03..3f4bbffd97ca 100644
--- a/dev-ros/geneus/geneus-9999.ebuild
+++ b/dev-ros/geneus/geneus-9999.ebuild
@@ -13,5 +13,5 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/genlisp/Manifest b/dev-ros/genlisp/Manifest
index 4365b1fcf2ef..1e1b75542ef3 100644
--- a/dev-ros/genlisp/Manifest
+++ b/dev-ros/genlisp/Manifest
@@ -1,4 +1,4 @@
 DIST genlisp-0.4.18.tar.gz 10243 BLAKE2B 437fcb5de19d543cf0b34466260541f9d64bfda96ad6521e3300a020faddb57c5fc625ecc7d7d2e25c336569f0cf7b32e79dfa61b1971105cad524458926efd9 SHA512 300c4c84d96d80fa20d8c8ea01def4f3eaec41d06b4c57b6d8a7885f22a1e38259a7526542bc13dfdde6276b5e51ecc7f59bed2a5092883f5494e3aba439c45d
-EBUILD genlisp-0.4.18.ebuild 365 BLAKE2B 027684d2f3c02547ee8e0bc1526ba41a4b089e378f6d15bc9d348a784b0e56c84c3a18806fed2019ccbd8087836497c6ad71530e78755d33f15b3a6ef8e5313e SHA512 2c45c3c915133bf8b125e065544ea9f2b5daf7db7e66e98a6dded57aad387ccc9ac40859883555450122f1665efbecafad66d60d608347485c9e245a2687ca89
-EBUILD genlisp-9999.ebuild 365 BLAKE2B 027684d2f3c02547ee8e0bc1526ba41a4b089e378f6d15bc9d348a784b0e56c84c3a18806fed2019ccbd8087836497c6ad71530e78755d33f15b3a6ef8e5313e SHA512 2c45c3c915133bf8b125e065544ea9f2b5daf7db7e66e98a6dded57aad387ccc9ac40859883555450122f1665efbecafad66d60d608347485c9e245a2687ca89
+EBUILD genlisp-0.4.18.ebuild 372 BLAKE2B 25d67c1bd6e13d6f8641dead34a04aeae83070f723aca6a9701067d0d6e5d535a74e174e405f9236c61f98efd22df143bbfa2f326c3d4862efb4b3e52d52746b SHA512 3dcb8ecf53b464d6daeda6b897bf5fe20e65b521127d2b75f8bfa609bb4257e706fa2c3bcd1026b024cadb7240e402af1a2b2566e8e9951fe127cfe78a09ebec
+EBUILD genlisp-9999.ebuild 372 BLAKE2B 25d67c1bd6e13d6f8641dead34a04aeae83070f723aca6a9701067d0d6e5d535a74e174e405f9236c61f98efd22df143bbfa2f326c3d4862efb4b3e52d52746b SHA512 3dcb8ecf53b464d6daeda6b897bf5fe20e65b521127d2b75f8bfa609bb4257e706fa2c3bcd1026b024cadb7240e402af1a2b2566e8e9951fe127cfe78a09ebec
 MISC metadata.xml 325 BLAKE2B 0aaea5b7b4f0c686a5c27a7551d9b33da2fee26858b13837bc30810b880a0b70850b7f85d6cdaa7b60975cc66087f4a0370d417ef1879659737530617696b5dc SHA512 f1bda8492546d5a2cecaed684a06df6d41b1b1883cf1dba70dd51f88993a5466924394468d750fc5778bd1530b660e12c0d1e186f30530e5919c9a46a9382159
diff --git a/dev-ros/genlisp/genlisp-0.4.18.ebuild b/dev-ros/genlisp/genlisp-0.4.18.ebuild
index 57df2bad4108..606bc537fd79 100644
--- a/dev-ros/genlisp/genlisp-0.4.18.ebuild
+++ b/dev-ros/genlisp/genlisp-0.4.18.ebuild
@@ -13,5 +13,5 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+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
index 57df2bad4108..606bc537fd79 100644
--- a/dev-ros/genlisp/genlisp-9999.ebuild
+++ b/dev-ros/genlisp/genlisp-9999.ebuild
@@ -13,5 +13,5 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/genmsg/Manifest b/dev-ros/genmsg/Manifest
index 31e48f5fac25..e3acbce927f3 100644
--- a/dev-ros/genmsg/Manifest
+++ b/dev-ros/genmsg/Manifest
@@ -1,4 +1,4 @@
 DIST genmsg-0.5.16.tar.gz 60357 BLAKE2B 5d26540123606cac3590d54848f5999fc470008fe5c71abeaac01108f7b22a4d5b0282ebc109e747d1caf459daa88bce26ce206b480f63626205adba7decb1ed SHA512 6a658cc3a895f546592a540f2bcbfb3819321242ddaf47eabbf02207994af4cf4152bce042846d4ae3fcdda2664b6b255702a2cebfcaa80892b964a6822a5390
-EBUILD genmsg-0.5.16.ebuild 394 BLAKE2B c745821f7622046d2b16b92c1b29bc744d0579780b68a55ce5dbf8339ca3c67981571e1e6651fb0c25876a29b67aa00edbc1c099bc406b7852c00e09ff7c4bc9 SHA512 9c177d74dff0af31bf9762a18687afa4797e92cfd2579698321f43877c343f405963415fd7ca73de3908ab5cd17fc206b9be907473d1b1447c1630daf7222c47
-EBUILD genmsg-9999.ebuild 394 BLAKE2B c745821f7622046d2b16b92c1b29bc744d0579780b68a55ce5dbf8339ca3c67981571e1e6651fb0c25876a29b67aa00edbc1c099bc406b7852c00e09ff7c4bc9 SHA512 9c177d74dff0af31bf9762a18687afa4797e92cfd2579698321f43877c343f405963415fd7ca73de3908ab5cd17fc206b9be907473d1b1447c1630daf7222c47
+EBUILD genmsg-0.5.16.ebuild 420 BLAKE2B ca149b07462e5685ecb165a60dc5051390fd0a2b571eff994e1676515ca007054d315ffb4897fa6d89f5447a4e3265feb4815b8b87a836d9fef92b35a1bcbcc2 SHA512 00ee8810e797c1b4525310e3a19e8071a58f4339441ce4826541fc9065cd08e7b5d447e086f83045851ac5302d3f34b1445c3d9e6b2e7efa6a45decd98e99021
+EBUILD genmsg-9999.ebuild 420 BLAKE2B ca149b07462e5685ecb165a60dc5051390fd0a2b571eff994e1676515ca007054d315ffb4897fa6d89f5447a4e3265feb4815b8b87a836d9fef92b35a1bcbcc2 SHA512 00ee8810e797c1b4525310e3a19e8071a58f4339441ce4826541fc9065cd08e7b5d447e086f83045851ac5302d3f34b1445c3d9e6b2e7efa6a45decd98e99021
 MISC metadata.xml 324 BLAKE2B 4e885cafaf86dab897c52a6e27092584252b7daff9d9597c0bfd45b148b91ec763c3e46abbeb3db64fb5d17fc2d1ff83cf252201c165a3b52bc5e4d4033abcc6 SHA512 be0ee3a5595270480a29bf98888215b692009bdfaf06591c3cd56196b1c437e847abac787d4304f0166e76525b5ca7d82d81f660f1309a5139081bd205d95939
diff --git a/dev-ros/genmsg/genmsg-0.5.16.ebuild b/dev-ros/genmsg/genmsg-0.5.16.ebuild
index 7e40ce45fa63..7ae92b459ca2 100644
--- a/dev-ros/genmsg/genmsg-0.5.16.ebuild
+++ b/dev-ros/genmsg/genmsg-0.5.16.ebuild
@@ -14,5 +14,5 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	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
index 7e40ce45fa63..7ae92b459ca2 100644
--- a/dev-ros/genmsg/genmsg-9999.ebuild
+++ b/dev-ros/genmsg/genmsg-9999.ebuild
@@ -14,5 +14,5 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
 "
diff --git a/dev-ros/gennodejs/Manifest b/dev-ros/gennodejs/Manifest
index 23a0e65e2242..76ba5757f78f 100644
--- a/dev-ros/gennodejs/Manifest
+++ b/dev-ros/gennodejs/Manifest
@@ -1,4 +1,4 @@
 DIST gennodejs-2.0.1.tar.gz 14902 BLAKE2B 36e2531addf02cf16c75e8186aaa3722c973b5ae9a70377d1e8b59cc4f5f5e33214198736c432fbbca14cd44c065d637009764a16ae4c4ada0bf1288a68f76cd SHA512 53a518e494235b5858497385a31407fee06337ab01fd0733201af2cf916a76a3b81098f12a12e38ac0945b04a5ddabb1a155d14f4fd3023591d3e478e31d3648
-EBUILD gennodejs-2.0.1.ebuild 477 BLAKE2B 72138ac25876db6583a875307889e880f21613510ba66c0255f2b377eea5c765d9d6db5ea7254dc8610f0f0b0db6f034f27716caf71558f2b6f556f68cffddca SHA512 261a2d88e8e6b099565588efa6a68fc4cf8502ed8d784e572badd9b255c0b54142a23bd9f8062deee5bd1d8678dd98479110501302da7fa5466ee3dc560a2e28
-EBUILD gennodejs-9999.ebuild 477 BLAKE2B 72138ac25876db6583a875307889e880f21613510ba66c0255f2b377eea5c765d9d6db5ea7254dc8610f0f0b0db6f034f27716caf71558f2b6f556f68cffddca SHA512 261a2d88e8e6b099565588efa6a68fc4cf8502ed8d784e572badd9b255c0b54142a23bd9f8062deee5bd1d8678dd98479110501302da7fa5466ee3dc560a2e28
+EBUILD gennodejs-2.0.1.ebuild 445 BLAKE2B e224bf930d025570527c10a2c36e7e72de6948cbcabdc45149dc2cb037566f2ed3dff6ece9e45f93d9695e42ecf90f3b72087e9797fb7cb359d3e5cfd5b07541 SHA512 ef442ffb9fa4a2874d32c4b7f7a386528b0ee592da1cdfa4d43eeace32c00795f971752826ef15050c63cca8ba5f56b5225ef5082efad0069292de7a9187c509
+EBUILD gennodejs-9999.ebuild 445 BLAKE2B e224bf930d025570527c10a2c36e7e72de6948cbcabdc45149dc2cb037566f2ed3dff6ece9e45f93d9695e42ecf90f3b72087e9797fb7cb359d3e5cfd5b07541 SHA512 ef442ffb9fa4a2874d32c4b7f7a386528b0ee592da1cdfa4d43eeace32c00795f971752826ef15050c63cca8ba5f56b5225ef5082efad0069292de7a9187c509
 MISC metadata.xml 350 BLAKE2B 1ebaa467c6cdc15850439e260685172ef9c00f5b004f628b8c600b077a96b920567f404f943810640d6e383f21c249b8f4179dbe68549dd148a7bb7e3f806b77 SHA512 42fac74570a816402422ae5dc0923ca8a39e41229c895fcba7c7bdc261326b3b540fafb926c238ddebf99152a54e89376fa2f11112c3849e69225391af3daed7
diff --git a/dev-ros/gennodejs/gennodejs-2.0.1.ebuild b/dev-ros/gennodejs/gennodejs-2.0.1.ebuild
index e9830ab0e418..28a1ae194541 100644
--- a/dev-ros/gennodejs/gennodejs-2.0.1.ebuild
+++ b/dev-ros/gennodejs/gennodejs-2.0.1.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/RethinkRobotics-opensource/gennodejs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
 DESCRIPTION="Javascript ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/gennodejs"
+HOMEPAGE="https://wiki.ros.org/gennodejs"
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+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
index e9830ab0e418..28a1ae194541 100644
--- a/dev-ros/gennodejs/gennodejs-9999.ebuild
+++ b/dev-ros/gennodejs/gennodejs-9999.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/RethinkRobotics-opensource/gennodejs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
 DESCRIPTION="Javascript ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/gennodejs"
+HOMEPAGE="https://wiki.ros.org/gennodejs"
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index 756379708e70..e071cb20be13 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,5 +1,7 @@
 AUX yaml.patch 543 BLAKE2B c476c582c2363bd5bdf9b472dc784726eb2bd65081d3629f7d822decbb92ecfe0c695691219c661b7bad850521346eb591c9c00498c3ab1e0f85597b8497c3a8 SHA512 4fc53e0c904d5dfa637476b833e8a5038305ebd0672f5acf08f81b2ae97970b0e4996df483ff087a2eb16957b659d0a528545fe8704cc26f1f6029105a2aea87
 DIST genpy-0.6.11.tar.gz 53128 BLAKE2B c0c6d9aa8d713e873a5cbceda8763c23e4b6259f5708be1575c4eae600b3f96bd8f05cda281711c799a0a4e00d69623ed0ddcb7812b4894d7c45717121f51c00 SHA512 267391cce6119085ae974f00fa4a33767b2b62a5d61bd290b3d2164cee275ce88b21d124b2da9ca9d85ac6a3a030ceddef766be34fba9c0d57ba26d6e1e41186
-EBUILD genpy-0.6.11.ebuild 519 BLAKE2B 9f3ce5dfb4bf2fbf28fefb6039d5b62075de77e5b51acecc86ead5c897e01850c805b6cf488a9a587a76ec4dcab42303f55f092c5baee81dd81707d5f5a6f395 SHA512 54bb873005224a1dcf347c02bd26282d0dfd67f4b526bb9aa674e9be8e557366afbcb7a2bdf6e887dac2b3778b8b5a40dbf6995e1bf788bd7530e67e51eea872
-EBUILD genpy-9999.ebuild 519 BLAKE2B 9f3ce5dfb4bf2fbf28fefb6039d5b62075de77e5b51acecc86ead5c897e01850c805b6cf488a9a587a76ec4dcab42303f55f092c5baee81dd81707d5f5a6f395 SHA512 54bb873005224a1dcf347c02bd26282d0dfd67f4b526bb9aa674e9be8e557366afbcb7a2bdf6e887dac2b3778b8b5a40dbf6995e1bf788bd7530e67e51eea872
+DIST genpy-0.6.14.tar.gz 53964 BLAKE2B ff1503a56fdb07a5165d2891589450e3b40e85f68d541990828959b8d7f0e440091d77fd0bb4ac70fa0e39114b366c061e8d03979482539d2e5ca6cc3ff15b8c SHA512 5ce357ef41d2c06025ca2a06ca4111baf0d3b92dbdf877ea0ce5515d516d9e0fa46171057293ba96d5b55c5fa32b7c24ef28cfcd45be8bf9c3d73302feec6957
+EBUILD genpy-0.6.11.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
+EBUILD genpy-0.6.14.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
+EBUILD genpy-9999.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
 MISC metadata.xml 323 BLAKE2B 025145a67d18622d14ea6ac43585246aac2cdc4f65e63b04dbfd32aa6f04f4e301e22f2e326a486e2fad3c1ef82f9890179a8dc142f4aa551b5b9db155e616da SHA512 523ec83e710fb0b80d731b536c8605a4211bfa176951a1af5ee6f6e60fee1ca3634c0d659b2d3ae71f3bb9d3765cc44cfdada5c7a364cea63f323c462227f364
diff --git a/dev-ros/genpy/genpy-0.6.11.ebuild b/dev-ros/genpy/genpy-0.6.11.ebuild
index 29c86a165741..a5796a02b2e9 100644
--- a/dev-ros/genpy/genpy-0.6.11.ebuild
+++ b/dev-ros/genpy/genpy-0.6.11.ebuild
@@ -9,16 +9,18 @@ KEYWORDS="~amd64 ~arm"
 inherit ros-catkin
 
 DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
+HOMEPAGE="https://wiki.ros.org/genpy"
 LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+"
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)
 "
 PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/genpy-0.6.14.ebuild b/dev-ros/genpy/genpy-0.6.14.ebuild
new file mode 100644
index 000000000000..a5796a02b2e9
--- /dev/null
+++ b/dev-ros/genpy/genpy-0.6.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 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}]")
+	)
+"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/genpy-9999.ebuild b/dev-ros/genpy/genpy-9999.ebuild
index 29c86a165741..a5796a02b2e9 100644
--- a/dev-ros/genpy/genpy-9999.ebuild
+++ b/dev-ros/genpy/genpy-9999.ebuild
@@ -9,16 +9,18 @@ KEYWORDS="~amd64 ~arm"
 inherit ros-catkin
 
 DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
+HOMEPAGE="https://wiki.ros.org/genpy"
 LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+"
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)
 "
 PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/geodesy/Manifest b/dev-ros/geodesy/Manifest
index cae190019742..4dd262bc9ca1 100644
--- a/dev-ros/geodesy/Manifest
+++ b/dev-ros/geodesy/Manifest
@@ -1,6 +1,5 @@
-DIST geographic_info-0.5.2.tar.gz 27336 BLAKE2B f864d8b70b5b0d797cec81e25a25d0dd708bcc49c169f68216616d900b1d11918583f6f5ec4a919ad03b08ee86b2a36cde575c1054c58a93974d4c4faf6e2aae SHA512 8b512399ef61ebfb9816c613ed4fcde23ec52a9b4bbd1bb7268c8ec7fe03b1a157435fef17b8af72fdf88ce6ed0b9130473183402e0875a25eac0ac46df0d00d
-DIST geographic_info-0.5.3.tar.gz 27446 BLAKE2B 51463f872829224c618b1d37c3d07ba53ee00b4f3e48bbc202d9ab4abfe8db8148dbbfdb6780af5aaf36ab9e9a7dca973b603a22139a192a96f6bcef87fa52a5 SHA512 681aad5ba62363cf96255351e884c8ba8d3110571e6e97c9340f8d15f38183900c2a04e109416b4113a0a042ebd9cdb8fe075c507200dac06052b444f4212ab3
-EBUILD geodesy-0.5.2.ebuild 922 BLAKE2B 170b34114ed6956bfdc5ef882506f98fc204eba06c7d8170a856a4755227f04e89fddabfa136b440bf41b392535a6380cbb62f7fa460158560af70d8f684b331 SHA512 f6bfc50f7a3a6ee2adc0d289b8c228d6ef6a5b81cbb871aa2bc5eb199dc3279ac31dcb53ee21024e98eab14f6a9192c8d3043dfee53ce3a686955770361105a6
-EBUILD geodesy-0.5.3.ebuild 922 BLAKE2B 64d71fb96af8e464eef79ace35a2dbde3e872f700722564954749db2340915e52ee2fd2024e748e32e73deb2582645d0b23ee16fff098e7b2d22bf7d0afd34c4 SHA512 c700061f025f946a9ff4d53172c55a3df92c4f32cfaff97454c471293f978b39e46c05ebbeea7ce0d92cb1ba891e6d5d43c24157cf197159886a9d1a59a19f00
-EBUILD geodesy-9999.ebuild 922 BLAKE2B 170b34114ed6956bfdc5ef882506f98fc204eba06c7d8170a856a4755227f04e89fddabfa136b440bf41b392535a6380cbb62f7fa460158560af70d8f684b331 SHA512 f6bfc50f7a3a6ee2adc0d289b8c228d6ef6a5b81cbb871aa2bc5eb199dc3279ac31dcb53ee21024e98eab14f6a9192c8d3043dfee53ce3a686955770361105a6
+AUX py3.patch 1627 BLAKE2B 050e4fe368d65e09ff9074c07e430d695fb5d0829ca75716146f861ad13a522bb364d70482840b225a4f71b5fed06f093bc8e5069e7d22c7156c615e6cf2792d SHA512 d2fd39c0c797dee88da86efc1a10e49f3bd8383b0f97e0e0f20461347aeaa2649ca7e426a872c7f2c5f2323d914e1beda5de7022c5cb7561e29b942c1d92ce8f
+DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
+EBUILD geodesy-0.5.5.ebuild 1008 BLAKE2B f5f79e5f165f7277ae83f9fd363c3458c8496d4f9d315f457a22c8e8281089b5d916015d259e9ec4509fb2891580da63b6054ecd06e9c72da50fa2c154bb3696 SHA512 64a105b628a9d5adbb6d1ee222f34736acd065e93c45e2c23922e063fd480364efb165cdc14f022ea789ced48efa744a244246a5bfdd270563e0283f016563f3
+EBUILD geodesy-9999.ebuild 1008 BLAKE2B f5f79e5f165f7277ae83f9fd363c3458c8496d4f9d315f457a22c8e8281089b5d916015d259e9ec4509fb2891580da63b6054ecd06e9c72da50fa2c154bb3696 SHA512 64a105b628a9d5adbb6d1ee222f34736acd065e93c45e2c23922e063fd480364efb165cdc14f022ea789ced48efa744a244246a5bfdd270563e0283f016563f3
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geodesy/files/py3.patch b/dev-ros/geodesy/files/py3.patch
new file mode 100644
index 000000000000..08259ee976c1
--- /dev/null
+++ b/dev-ros/geodesy/files/py3.patch
@@ -0,0 +1,41 @@
+Index: geodesy/src/geodesy/wu_point.py
+===================================================================
+--- geodesy.orig/src/geodesy/wu_point.py
++++ geodesy/src/geodesy/wu_point.py
+@@ -159,12 +159,12 @@ class WuPointSet():
+         # Initialize way point information.
+         self.way_point_ids = {}         # points symbol table
+         self.n_points = len(self.points)
+-        for wid in xrange(self.n_points):
++        for wid in range(self.n_points):
+             self.way_point_ids[self.points[wid].id.uuid] = wid
+ 
+         # Create empty list of UTM points, corresponding to map points.
+         # They will be evaluated lazily, when first needed.
+-        self.utm_points = [None for wid in xrange(self.n_points)]
++        self.utm_points = [None for wid in range(self.n_points)]
+ 
+     def __contains__(self, item):
+         """ Point set membership. """
+@@ -259,7 +259,7 @@ class WuPointSet():
+         """
+         return self.way_point_ids.get(key, default)
+ 
+-    def next(self):
++    def __next__(self):
+         """ Next iteration point.
+ 
+         :returns: Next :class:`WuPoint`.
+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.2.ebuild b/dev-ros/geodesy/geodesy-0.5.2.ebuild
deleted file mode 100644
index ea8aaeb6424f..000000000000
--- a/dev-ros/geodesy/geodesy-0.5.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/unique_id
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pyproj[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/geodesy/geodesy-0.5.3.ebuild b/dev-ros/geodesy/geodesy-0.5.3.ebuild
deleted file mode 100644
index c2cd15d3b654..000000000000
--- a/dev-ros/geodesy/geodesy-0.5.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/unique_id
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pyproj[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/geodesy/geodesy-0.5.5.ebuild b/dev-ros/geodesy/geodesy-0.5.5.ebuild
new file mode 100644
index 000000000000..88ea377b0cc7
--- /dev/null
+++ b/dev-ros/geodesy/geodesy-0.5.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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/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
+	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
index ea8aaeb6424f..88ea377b0cc7 100644
--- a/dev-ros/geodesy/geodesy-9999.ebuild
+++ b/dev-ros/geodesy/geodesy-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -17,18 +15,21 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/angles
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	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}]
-	dev-python/pyproj[${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_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
+PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/geographic_msgs/Manifest b/dev-ros/geographic_msgs/Manifest
index a22c2730cea1..7db5efcee3ae 100644
--- a/dev-ros/geographic_msgs/Manifest
+++ b/dev-ros/geographic_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST geographic_info-0.5.0.tar.gz 27102 BLAKE2B 40d635f8fdd0fbb034649e03f8917f9f7be207a5e30ba3afb25bbbf3b24a83a23ec3d4a94ff9f91ececda46e8ea167c989552b414c87b3c448513f2ea72e4d40 SHA512 c6c4937a7c9873c071be9e3fc4fcdb99f831028dce93793e537f8819e2fb8633b995e7d46d7192ddc3457a3b79d27c54c3e0b6656af30e2daabf1f0e7dff9f05
-DIST geographic_info-0.5.2.tar.gz 27336 BLAKE2B f864d8b70b5b0d797cec81e25a25d0dd708bcc49c169f68216616d900b1d11918583f6f5ec4a919ad03b08ee86b2a36cde575c1054c58a93974d4c4faf6e2aae SHA512 8b512399ef61ebfb9816c613ed4fcde23ec52a9b4bbd1bb7268c8ec7fe03b1a157435fef17b8af72fdf88ce6ed0b9130473183402e0875a25eac0ac46df0d00d
-DIST geographic_info-0.5.3.tar.gz 27446 BLAKE2B 51463f872829224c618b1d37c3d07ba53ee00b4f3e48bbc202d9ab4abfe8db8148dbbfdb6780af5aaf36ab9e9a7dca973b603a22139a192a96f6bcef87fa52a5 SHA512 681aad5ba62363cf96255351e884c8ba8d3110571e6e97c9340f8d15f38183900c2a04e109416b4113a0a042ebd9cdb8fe075c507200dac06052b444f4212ab3
-EBUILD geographic_msgs-0.5.0.ebuild 551 BLAKE2B a646000efd2f3d9e9f6e2c04ada587a49a00f751d6cd0ecf342af9a30eabb74303b59c104704fa70049c212a7a54f2756019c37e9596d64c5878e286c558e0ab SHA512 de80886482513b1b6d14927e880a9c6326dd591c7a944327f675519a7c09c4e4859910dd0d78a308b00720d8c62aa0d20cbc838631c7d3801ce165a67473a365
-EBUILD geographic_msgs-0.5.2.ebuild 551 BLAKE2B a646000efd2f3d9e9f6e2c04ada587a49a00f751d6cd0ecf342af9a30eabb74303b59c104704fa70049c212a7a54f2756019c37e9596d64c5878e286c558e0ab SHA512 de80886482513b1b6d14927e880a9c6326dd591c7a944327f675519a7c09c4e4859910dd0d78a308b00720d8c62aa0d20cbc838631c7d3801ce165a67473a365
-EBUILD geographic_msgs-0.5.3.ebuild 551 BLAKE2B a646000efd2f3d9e9f6e2c04ada587a49a00f751d6cd0ecf342af9a30eabb74303b59c104704fa70049c212a7a54f2756019c37e9596d64c5878e286c558e0ab SHA512 de80886482513b1b6d14927e880a9c6326dd591c7a944327f675519a7c09c4e4859910dd0d78a308b00720d8c62aa0d20cbc838631c7d3801ce165a67473a365
-EBUILD geographic_msgs-9999.ebuild 551 BLAKE2B a646000efd2f3d9e9f6e2c04ada587a49a00f751d6cd0ecf342af9a30eabb74303b59c104704fa70049c212a7a54f2756019c37e9596d64c5878e286c558e0ab SHA512 de80886482513b1b6d14927e880a9c6326dd591c7a944327f675519a7c09c4e4859910dd0d78a308b00720d8c62aa0d20cbc838631c7d3801ce165a67473a365
+DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
+EBUILD geographic_msgs-0.5.5.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
+EBUILD geographic_msgs-9999.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geographic_msgs/geographic_msgs-0.5.0.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.0.ebuild
deleted file mode 100644
index e0c349885f80..000000000000
--- a/dev-ros/geographic_msgs/geographic_msgs-0.5.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.2.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.2.ebuild
deleted file mode 100644
index e0c349885f80..000000000000
--- a/dev-ros/geographic_msgs/geographic_msgs-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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.3.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.3.ebuild
deleted file mode 100644
index e0c349885f80..000000000000
--- a/dev-ros/geographic_msgs/geographic_msgs-0.5.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.5.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild
new file mode 100644
index 000000000000..f04fb523fac4
--- /dev/null
+++ b/dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
index e0c349885f80..f04fb523fac4 100644
--- a/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
+++ b/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
 
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index ce46ec89f028..af6417dfe631 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,4 +1,4 @@
-DIST geometric_shapes-0.6.1.tar.gz 62249 BLAKE2B 3c28bbe1fb987364f1e7c5b780f22b5927169b49b8d48c2dbe9def262e8f0c7e95799772cd07e6247501e62841c04590b92a58ef2d6b409b974bf259acdadd4e SHA512 bdfd9f0a710bdee0b80e1dbddd545a3e311c992853d9ccff5672c5815ed64f8c7c69cae355e8b91bb89085301e8e9cf0eb27310f3e0a4bd252fb622fc494ef19
-EBUILD geometric_shapes-0.6.1.ebuild 700 BLAKE2B 565287501a45b3c42bf12d7a5b0ac8177dc34dc41562ca5b3acb7bb21fe675ada2c6cb4a37e97da4c9a653118f73759a38696e31dd2f04b1aaeb0091e5c8d79e SHA512 bc4f6bf9d90570a23b8303d94dce35bf77beaafa5e7de7b66d273f25f26e39cc11d4dbb26d07e5e47c57eb9431ead1eb25856f0c7d2b583056764ff9ca267eb8
-EBUILD geometric_shapes-9999.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
+DIST geometric_shapes-0.7.0.tar.gz 84518 BLAKE2B 948f84959c526f6155bc9769a264cc631e04171ee22bedb435667668c621c3ca2d983d7b2b964690735b3b48b8ed71058c32aefc67d6370da3cc0528ed448f3e SHA512 9f5886841dfc23db40e68d69a386879ec0b93c03faea6f2e6e33d92b303c314fbba6cfdf548e6236424d5d0131209824e0a8bc116bd64015688c2fd477eb44f0
+EBUILD geometric_shapes-0.7.0.ebuild 949 BLAKE2B 79b3a035a2856b31082145186b1d992d78831051c576246ecaf943d26a10185f75c481e0d3bad10e4c40af931080d887ee9e67e14d2fb0ef43b4cd7375daf37f SHA512 b2ced15ec139d324c9ded0303108aca66c4e7e73a978072df87b616b0a8b2d23ed0b79b81b362ae5244f9950d479293c14fd9e1bf122cd5a1bdb2c0142d90629
+EBUILD geometric_shapes-9999.ebuild 949 BLAKE2B 79b3a035a2856b31082145186b1d992d78831051c576246ecaf943d26a10185f75c481e0d3bad10e4c40af931080d887ee9e67e14d2fb0ef43b4cd7375daf37f SHA512 b2ced15ec139d324c9ded0303108aca66c4e7e73a978072df87b616b0a8b2d23ed0b79b81b362ae5244f9950d479293c14fd9e1bf122cd5a1bdb2c0142d90629
 MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.6.1.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.6.1.ebuild
deleted file mode 100644
index 6a90d81c7883..000000000000
--- a/dev-ros/geometric_shapes/geometric_shapes-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Generic definitions of geometric shapes and bodies"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	media-libs/qhull
-	media-libs/assimp
-	sci-libs/octomap
-	dev-ros/random_numbers
-	dev-ros/resource_retriever
-	dev-ros/eigen_stl_containers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit )
-"
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
new file mode 100644
index 000000000000..6fed36fb4824
--- /dev/null
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 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/geometric_shapes"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Generic definitions of geometric shapes and bodies"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	media-libs/qhull
+	media-libs/assimp
+	sci-libs/octomap
+	dev-ros/random_numbers
+	dev-ros/resource_retriever
+	dev-ros/eigen_stl_containers
+	dev-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
index 80708cfa63ea..6fed36fb4824 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
 KEYWORDS="~amd64 ~arm"
 
@@ -21,10 +21,18 @@ RDEPEND="
 	dev-ros/random_numbers
 	dev-ros/resource_retriever
 	dev-ros/eigen_stl_containers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
+	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/geometry_msgs/Manifest b/dev-ros/geometry_msgs/Manifest
index ecd600bcf5a0..1b3452d0da2a 100644
--- a/dev-ros/geometry_msgs/Manifest
+++ b/dev-ros/geometry_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD geometry_msgs-1.12.5.ebuild 491 BLAKE2B f4b72707c0aac23ebf9a21be97e9e239a862ffd88b9ca9305722fee3c211f960b0bb3858219cd6963dea131a3e16ac6f2b09fb714c5fa2b76236b8ab1784fb0a SHA512 70c2fa663f1b22509a8c7534f27588d47a6eb0fc0d28603272f594ced520e6c7b0020ec17290940e12d943e91c42a01762f9b29026c66fff555aeaf962578f46
-EBUILD geometry_msgs-1.12.6.ebuild 491 BLAKE2B f4b72707c0aac23ebf9a21be97e9e239a862ffd88b9ca9305722fee3c211f960b0bb3858219cd6963dea131a3e16ac6f2b09fb714c5fa2b76236b8ab1784fb0a SHA512 70c2fa663f1b22509a8c7534f27588d47a6eb0fc0d28603272f594ced520e6c7b0020ec17290940e12d943e91c42a01762f9b29026c66fff555aeaf962578f46
-EBUILD geometry_msgs-1.12.7.ebuild 491 BLAKE2B f4b72707c0aac23ebf9a21be97e9e239a862ffd88b9ca9305722fee3c211f960b0bb3858219cd6963dea131a3e16ac6f2b09fb714c5fa2b76236b8ab1784fb0a SHA512 70c2fa663f1b22509a8c7534f27588d47a6eb0fc0d28603272f594ced520e6c7b0020ec17290940e12d943e91c42a01762f9b29026c66fff555aeaf962578f46
-EBUILD geometry_msgs-9999.ebuild 491 BLAKE2B f4b72707c0aac23ebf9a21be97e9e239a862ffd88b9ca9305722fee3c211f960b0bb3858219cd6963dea131a3e16ac6f2b09fb714c5fa2b76236b8ab1784fb0a SHA512 70c2fa663f1b22509a8c7534f27588d47a6eb0fc0d28603272f594ced520e6c7b0020ec17290940e12d943e91c42a01762f9b29026c66fff555aeaf962578f46
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD geometry_msgs-1.13.0.ebuild 451 BLAKE2B 39a05e85cab199e2453dc34695bbd609db63d8dc510d737c9d776ea64f61f94a40660fd630700e903d828ee6941c580cfa1b3fb73cfbd8a4dbed7a8d0e6ac0fd SHA512 2e8682b8dd369f01515f289dba73ad2ef975feb2b97277b89935b850657c83748e1eb380e132552d8ea229f87fd757b5d0196b1b9e81203dc87538d60b6e3365
+EBUILD geometry_msgs-9999.ebuild 451 BLAKE2B 39a05e85cab199e2453dc34695bbd609db63d8dc510d737c9d776ea64f61f94a40660fd630700e903d828ee6941c580cfa1b3fb73cfbd8a4dbed7a8d0e6ac0fd SHA512 2e8682b8dd369f01515f289dba73ad2ef975feb2b97277b89935b850657c83748e1eb380e132552d8ea229f87fd757b5d0196b1b9e81203dc87538d60b6e3365
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.12.5.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.5.ebuild
deleted file mode 100644
index 919f51717116..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.6.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.6.ebuild
deleted file mode 100644
index 919f51717116..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.7.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.7.ebuild
deleted file mode 100644
index 919f51717116..000000000000
--- a/dev-ros/geometry_msgs/geometry_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.0.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..ccebfac4361b
--- /dev/null
+++ b/dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
index 919f51717116..ccebfac4361b 100644
--- a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
+++ b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/global_planner/Manifest b/dev-ros/global_planner/Manifest
index 17a3e47ab736..efb2751017f7 100644
--- a/dev-ros/global_planner/Manifest
+++ b/dev-ros/global_planner/Manifest
@@ -1,16 +1,4 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD global_planner-1.15.1-r1.ebuild 665 BLAKE2B 2f62de5934ed9a91e6a1e56e8028e2bb09e3166688530461b25cb9a3de23213bcd80b39c8c7ecaffd48b848f6cbaa79d429fabc344cb402e7ea1e1ab0df70ce6 SHA512 12c07e61b53c227e1ba6b4d8866a9e2addaac4bc156b7d4cb5520b07aeb0726f7a7b492cc222f9152d341de11a0f5fc2f9fef600b539ea4227afb2b37ab506a7
-EBUILD global_planner-1.15.2.ebuild 665 BLAKE2B 63ee38169ee7c4305119341480e3cb7e654fa060a1f7ef7e0d3260e3f116027cea6810d8e5c1ed90e7df16dc989af05a00a1fe4eb3a8ccbdd1ccb9525485b21a SHA512 695a3bc09081066c1535a42fca547b0367b3c0ebcdba1ba0a0a6e904353ad723d07a9762370103e9c16071b44f8ff5ed2ccefa1536d777097c78efa673516f7b
-EBUILD global_planner-1.16.0.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
-EBUILD global_planner-1.16.1.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
-EBUILD global_planner-1.16.2.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
-EBUILD global_planner-1.16.3.ebuild 750 BLAKE2B ccf5b21111e750c0a47c7c9d4af27177b4157e4035316a630705cc18be947b9a86ec585704d1668235d65620a4e4b7b10da21a2a8ce446635e9adc7bed0a65de SHA512 bc37925e2dcfbbe7f8e59841a96aea4910338cc346e01c5fd251abf13e942201e0d94b04ab0bfb35dea872e8ef2d0479d4029df9acb2fdbc822df4ac27001fa0
-EBUILD global_planner-1.16.6.ebuild 750 BLAKE2B 5bbeece139b29ae0915f1b459863653c028b0ca8d3e92977ceeec6ddf2aeb67867a7582ff7f131a369501becb3bcda3f1b417b6840a11f3a1fb5b19a99f7b3fa SHA512 942279e6f904135aecc5ee487fb274a2cf57ba9c53a203538f5d630a585dee0809d00e8bfc093cfe91de55cfe500bd10e1e021ba8921b636db07f44eedbf44b6
-EBUILD global_planner-9999.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD global_planner-1.17.0.ebuild 730 BLAKE2B c8da9232a845258d0ba889ae3a437e9640a0d17c80a2ae31021d4ac823fdc73a9ee9408e187a418f7478263cb5c02e76f880ffbae904f776ceea11f05fb244ea SHA512 603dfb1793d6f0cf79e12d38bc46ba65e8d74eb7381ec3bc8496c3792e25627a80ec2bf3269f7d62ff45be79d50596ea0f101b1eb6fa072f47540a58fdcb8f11
+EBUILD global_planner-9999.ebuild 730 BLAKE2B c8da9232a845258d0ba889ae3a437e9640a0d17c80a2ae31021d4ac823fdc73a9ee9408e187a418f7478263cb5c02e76f880ffbae904f776ceea11f05fb244ea SHA512 603dfb1793d6f0cf79e12d38bc46ba65e8d74eb7381ec3bc8496c3792e25627a80ec2bf3269f7d62ff45be79d50596ea0f101b1eb6fa072f47540a58fdcb8f11
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/global_planner/global_planner-1.15.1-r1.ebuild b/dev-ros/global_planner/global_planner-1.15.1-r1.ebuild
deleted file mode 100644
index 795f804d8ce5..000000000000
--- a/dev-ros/global_planner/global_planner-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Path planner library and node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/global_planner-1.15.2.ebuild b/dev-ros/global_planner/global_planner-1.15.2.ebuild
deleted file mode 100644
index 5e101fb3111b..000000000000
--- a/dev-ros/global_planner/global_planner-1.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Path planner library and node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/global_planner-1.16.0.ebuild b/dev-ros/global_planner/global_planner-1.16.0.ebuild
deleted file mode 100644
index 53f5c3324f95..000000000000
--- a/dev-ros/global_planner/global_planner-1.16.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/angles
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/global_planner-1.16.1.ebuild b/dev-ros/global_planner/global_planner-1.16.1.ebuild
deleted file mode 100644
index 53f5c3324f95..000000000000
--- a/dev-ros/global_planner/global_planner-1.16.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/angles
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/global_planner-1.16.2.ebuild b/dev-ros/global_planner/global_planner-1.16.2.ebuild
deleted file mode 100644
index 53f5c3324f95..000000000000
--- a/dev-ros/global_planner/global_planner-1.16.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/angles
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/global_planner-1.16.3.ebuild b/dev-ros/global_planner/global_planner-1.16.3.ebuild
deleted file mode 100644
index d0530a169af8..000000000000
--- a/dev-ros/global_planner/global_planner-1.16.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/angles
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/global_planner-1.16.6.ebuild b/dev-ros/global_planner/global_planner-1.16.6.ebuild
deleted file mode 100644
index cc0651737472..000000000000
--- a/dev-ros/global_planner/global_planner-1.16.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=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/navfn
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/angles
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/global_planner/global_planner-1.17.0.ebuild b/dev-ros/global_planner/global_planner-1.17.0.ebuild
new file mode 100644
index 000000000000..8d1a9dbe0d24
--- /dev/null
+++ b/dev-ros/global_planner/global_planner-1.17.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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="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
+"
+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
index 53f5c3324f95..8d1a9dbe0d24 100644
--- a/dev-ros/global_planner/global_planner-9999.ebuild
+++ b/dev-ros/global_planner/global_planner-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,10 +15,8 @@ IUSE=""
 
 RDEPEND="
 	>=dev-ros/costmap_2d-1.16
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/nav_core
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/navfn
 	dev-ros/pluginlib
 	dev-ros/roscpp
@@ -29,6 +26,9 @@ RDEPEND="
 	dev-libs/console_bridge:=
 
 	dev-ros/angles
+"
+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}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index da87d350f1d1..52237b02c614 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,7 +1,4 @@
-AUX boost170.patch 428 BLAKE2B 047a099ab5a36f3f603ecc10b5cf1e0edb25c880bf1ade298dfcfef7864bb9c445f2f0902299857003d8e32dcf7612ad149a70364fb6fa64fa86b84b620b346b SHA512 e9a2bb68993387b4ac6268d15151a4feedf1c6f73c84ee927590220edc1b826e18355fa3553d3605ca1afabd5b7b74b7e8c242797965b17fa9aa7449b406c493
-DIST slam_gmapping-1.3.10.tar.gz 21032 BLAKE2B cca0779e64d45622dad4ec29cb3c1d0162176038288c0aa7b117f1a76a7655f3af3024dba7ff1025948e400e0176794a553e357a235187d9196161a635ab6d01 SHA512 fa4485ddc9fcfaac63a63d209a5a994e33e78546a39edcf47eb3c3f1775f0d87a1f562319058868838990bbf85a9515ff0228779dce7531148f208b3522e7e7a
-DIST slam_gmapping-1.4.0.tar.gz 21123 BLAKE2B 088d1bfaa69bf98eb2b2176afbfadf843f5f478f9c54dc7eb32fa91116da31bab66f9a1ac09d0535629cc5a7f604d153c90c5a25f173fb867369aa9e33d4d7b2 SHA512 ae7984716113e24e1bced88523729481829303a2b88d247b8fc8bdd23c0f38b4ce6260d7086d79a6653ecfdbe8ba60ae011af20180ffcb5025cd9d347d3e76b1
-EBUILD gmapping-1.3.10.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
-EBUILD gmapping-1.4.0.ebuild 572 BLAKE2B d57a0f72d1343457fef74a3da8cd76103526209a99a2ab4ebcf815672ed387aa4d6504068f3da6d3441e6e51147565a0c200ab9ba109e54d6b77a3bd0d86f260 SHA512 b64efeb32bc2b14c13a3e898358a8ed7094e1d7bbc201333ac850794583a4c309ddaa61229fc2d99f67a4b8e55879ab0ec256e82b4223f9fcf8fc2dd389abe8a
-EBUILD gmapping-9999.ebuild 531 BLAKE2B 3674f6396da0e8f9dc6b0bbb16e5d627678b02a03807775f54fc7f26910cfe918b00445b780918b74ade87a304543b632c08580cc205aba1e5ab5bceb0b3f260 SHA512 019a01e8efeb054beaa804025619988c5b42ea220621c27b57deb0da4069aa3a964f10f897aa255bf09ffb7be07a3177d305bd7e747c0ec769769ddabc7d475c
+DIST slam_gmapping-1.4.1.tar.gz 21258 BLAKE2B 61b6ee8064be43a3f6e1cafba4efb24b9cf9faa471f749539dcf5aaba9a027885f32549f9df465b88cf02a38f7ebca8fdea469880512298ab0ebf221a3e18bfb SHA512 adc458a033ed0c573a1099ff8c8164d5157b5fd94efafa92fc3a45bcde86a0754f582e87743289637c2f6f7632557ac924ed2cf62d89b15f1a47b822773dbdba
+EBUILD gmapping-1.4.1.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
+EBUILD gmapping-9999.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/files/boost170.patch b/dev-ros/gmapping/files/boost170.patch
deleted file mode 100644
index e3a599471991..000000000000
--- a/dev-ros/gmapping/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gmapping/CMakeLists.txt
-===================================================================
---- gmapping.orig/CMakeLists.txt
-+++ gmapping/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(gmapping)
- 
- find_package(catkin REQUIRED nav_msgs nodelet openslam_gmapping roscpp tf rosbag_storage)
- 
--find_package(Boost REQUIRED signals)
-+find_package(Boost REQUIRED)
- 
- include_directories(${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
- 
diff --git a/dev-ros/gmapping/gmapping-1.3.10.ebuild b/dev-ros/gmapping/gmapping-1.3.10.ebuild
deleted file mode 100644
index ca6f43afe50c..000000000000
--- a/dev-ros/gmapping/gmapping-1.3.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-	dev-ros/gmapping
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.4.0.ebuild b/dev-ros/gmapping/gmapping-1.4.0.ebuild
deleted file mode 100644
index aaad570edc05..000000000000
--- a/dev-ros/gmapping/gmapping-1.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-	dev-ros/gmapping
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/gmapping/gmapping-1.4.1.ebuild b/dev-ros/gmapping/gmapping-1.4.1.ebuild
new file mode 100644
index 000000000000..c3d87b4563b2
--- /dev/null
+++ b/dev-ros/gmapping/gmapping-1.4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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/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/gmapping
+"
+DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index 307f03f929b1..c3d87b4563b2 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,7 +15,6 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-ros/tf
 	dev-ros/openslam_gmapping
@@ -23,4 +22,5 @@ RDEPEND="
 	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rostest"
diff --git a/dev-ros/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
index b776cfe91324..354326817b3f 100644
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@@ -1,4 +1,4 @@
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD hardware_interface-0.15.1.ebuild 389 BLAKE2B ea9053d0704382f430d5f292b6e85bfbca99f4195300bfe08c2367533c79115207af69b881110c13ecd8c01f1bcef9c4d3bf77eb81b77c322ab610488c38db23 SHA512 e1435146e9df259f3d9442a6cd429a685f422a3f854e07a32e6f0092a7e368b04d3cd47286ef70fc869d0ab24d13b8b6e52f953b119e85027337629f831547bf
-EBUILD hardware_interface-9999.ebuild 389 BLAKE2B ea9053d0704382f430d5f292b6e85bfbca99f4195300bfe08c2367533c79115207af69b881110c13ecd8c01f1bcef9c4d3bf77eb81b77c322ab610488c38db23 SHA512 e1435146e9df259f3d9442a6cd429a685f422a3f854e07a32e6f0092a7e368b04d3cd47286ef70fc869d0ab24d13b8b6e52f953b119e85027337629f831547bf
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD hardware_interface-0.19.1.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
+EBUILD hardware_interface-9999.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild b/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
deleted file mode 100644
index a2893f32df40..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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.1.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild
new file mode 100644
index 000000000000..534f5a3f8d25
--- /dev/null
+++ b/dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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-9999.ebuild b/dev-ros/hardware_interface/hardware_interface-9999.ebuild
index a2893f32df40..534f5a3f8d25 100644
--- a/dev-ros/hardware_interface/hardware_interface-9999.ebuild
+++ b/dev-ros/hardware_interface/hardware_interface-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/hector_compressed_map_transport/Manifest b/dev-ros/hector_compressed_map_transport/Manifest
index 8ecc656ebc3e..e13e3f628a04 100644
--- a/dev-ros/hector_compressed_map_transport/Manifest
+++ b/dev-ros/hector_compressed_map_transport/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_compressed_map_transport-0.3.5.ebuild 681 BLAKE2B 9cf4298c6f7ea184628c57b73fc0f75503dffb7045e73baf16b7b1961ee9c1dbf0f4d96e57c6b7c12e408a90f069f63d4e9626106a1756dbd30e7afa8ab25843 SHA512 16ab28ea3883791d0083f78f6b883001f3de49eb381762ab15e56fc64105a5956d7cdb2e4f584dca8a714728f1a2a59d46dd2f36c8cf00c399de10fa97c7476b
-EBUILD hector_compressed_map_transport-0.4.0.ebuild 678 BLAKE2B 2c8bbe5a4fa8a0b325d9c794d27d1aa08b7e3b0f8503f4ac6a9a0ecda294179f87802232f737fe85dc46a133bcb14883acb0d55ed65c50ed0035137b6350bd4c SHA512 5f1692fe97dd8cb1276cd50954bfd18d29f7bfc09a4e72194ffde1fdef60511d3d7281f205dba2a859307845df5722fd41c5ed46069f9b3b5d64aa01c2d66ef7
-EBUILD hector_compressed_map_transport-9999.ebuild 681 BLAKE2B 9cf4298c6f7ea184628c57b73fc0f75503dffb7045e73baf16b7b1961ee9c1dbf0f4d96e57c6b7c12e408a90f069f63d4e9626106a1756dbd30e7afa8ab25843 SHA512 16ab28ea3883791d0083f78f6b883001f3de49eb381762ab15e56fc64105a5956d7cdb2e4f584dca8a714728f1a2a59d46dd2f36c8cf00c399de10fa97c7476b
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_compressed_map_transport-0.4.1.ebuild 678 BLAKE2B 347105c139dad0aefe18fb25051b778e61e332e15e9a47c6bd5241f2e074d51ec40b4c78f2d5212e78e11390def6ac4a251bf4e3f7e3c3e274d17cc8d4c83e73 SHA512 9f60acb8ecb6fa9dfed30e7bdd986c37941b9c4e8b2bc8dc16503bc68a43ffbaf60a1bad6679e6d67b4698b67ae08661c57b5ebc96a51ab762dd47c955d52c2b
+EBUILD hector_compressed_map_transport-9999.ebuild 678 BLAKE2B 347105c139dad0aefe18fb25051b778e61e332e15e9a47c6bd5241f2e074d51ec40b4c78f2d5212e78e11390def6ac4a251bf4e3f7e3c3e274d17cc8d4c83e73 SHA512 9f60acb8ecb6fa9dfed30e7bdd986c37941b9c4e8b2bc8dc16503bc68a43ffbaf60a1bad6679e6d67b4698b67ae08661c57b5ebc96a51ab762dd47c955d52c2b
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.5.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.5.ebuild
deleted file mode 100644
index 18ab3858d785..000000000000
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/hector_map_tools
-	dev-ros/image_transport
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild
deleted file mode 100644
index 023fcb3fe456..000000000000
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/hector_map_tools
-	dev-ros/image_transport
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild
new file mode 100644
index 000000000000..74e246177533
--- /dev/null
+++ b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild
@@ -0,0 +1,27 @@
+# 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/hector_compressed_map_transport-9999.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild
index 18ab3858d785..74e246177533 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,12 +16,12 @@ IUSE=""
 RDEPEND="
 	dev-ros/cv_bridge
 	media-libs/opencv:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/hector_map_tools
 	dev-ros/image_transport
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	media-libs/opencv
 "
 DEPEND="${RDEPEND}
+	dev-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_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
index ac2a5ca1f5a8..4198670cfb2c 100644
--- a/dev-ros/hector_geotiff/Manifest
+++ b/dev-ros/hector_geotiff/Manifest
@@ -1,7 +1,5 @@
 AUX qt5.patch 3068 BLAKE2B 0ff205aab12c65b94ee200f770a30c3c34252237d536374f6684606f3cad170fd3045c80b8de021fea538d06f33c4495b5ecc10ebbac2d3a0d470be11cbf148f SHA512 26f6bbcd939f3119cbb6de237c1ba76703cb02ac6af22fa5c7ed1a9022b5c33c785d4891c12e14ddaee949b09283c0500984fd0455b3c69a4cae51192b8b98c1
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_geotiff-0.3.5-r2.ebuild 806 BLAKE2B bc7c9512e331563c0fa96c6fab8691e4a58dced6e79cb73dbfe2a869b4dd894dd3346626f9d901512cbcd5519ec3f21230203fb5e020a681d80887a673d5934d SHA512 68ae0ad97a56b1a6b31a42c2e5d8eee6e03b288c59fb09dd96d5590429bb08ab3c905ffef8a5d84fb8e5f1059a5967185ea941145df3eb18ba9777d595ef5461
-EBUILD hector_geotiff-0.4.0.ebuild 803 BLAKE2B 90d17009fb76b1c51c2f4e7374c34cca46687e97d48c244c9c960a57fec38dcb039e289832f27476322e9dfd37eaa9ff8a5ef198fa83ff71b8fa04d0486483dc SHA512 06835a42b6df6e00ae588e3212c7cd83a26f83a8cade64959bf02b75dac9b7f02dbd286498d7f69ccb3d1541e77c3c4501c58dc3f1b54bf613d24030d2d3e8bc
-EBUILD hector_geotiff-9999.ebuild 806 BLAKE2B bc7c9512e331563c0fa96c6fab8691e4a58dced6e79cb73dbfe2a869b4dd894dd3346626f9d901512cbcd5519ec3f21230203fb5e020a681d80887a673d5934d SHA512 68ae0ad97a56b1a6b31a42c2e5d8eee6e03b288c59fb09dd96d5590429bb08ab3c905ffef8a5d84fb8e5f1059a5967185ea941145df3eb18ba9777d595ef5461
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_geotiff-0.4.1.ebuild 784 BLAKE2B a4fe9bfa41c28739d950c5409d588b5efa8615f9dc96741f720c6b5d950766449870560e2a3ad023d56aa5bba03da69370c6d471a1929904a80965174e2b61b0 SHA512 21b6dcf48b6f0b00a884c649ab4f4ebc0c4db6d50142d96cb283f9ec346b27326f6f22f9aff4686100ee720467a9f5626e25b5534de60ef73be72a9e80c2bb78
+EBUILD hector_geotiff-9999.ebuild 784 BLAKE2B a4fe9bfa41c28739d950c5409d588b5efa8615f9dc96741f720c6b5d950766449870560e2a3ad023d56aa5bba03da69370c6d471a1929904a80965174e2b61b0 SHA512 21b6dcf48b6f0b00a884c649ab4f4ebc0c4db6d50142d96cb283f9ec346b27326f6f22f9aff4686100ee720467a9f5626e25b5534de60ef73be72a9e80c2bb78
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild
deleted file mode 100644
index 1bc71fd4e8be..000000000000
--- a/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_map_tools
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
-
-PATCHES=( "${FILESDIR}/qt5.patch" )
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild
deleted file mode 100644
index 7a60491232d1..000000000000
--- a/dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_map_tools
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
-
-PATCHES=( "${FILESDIR}/qt5.patch" )
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild
new file mode 100644
index 000000000000..0fd828ef8d7d
--- /dev/null
+++ b/dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild
@@ -0,0 +1,33 @@
+# 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="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"
+
+PATCHES=( "${FILESDIR}/qt5.patch" )
diff --git a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild b/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
index 1bc71fd4e8be..0fd828ef8d7d 100644
--- a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
+++ b/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
@@ -1,33 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
+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/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/pluginlib
 		dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
+	dev-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"
 
 PATCHES=( "${FILESDIR}/qt5.patch" )
diff --git a/dev-ros/hector_geotiff_plugins/Manifest b/dev-ros/hector_geotiff_plugins/Manifest
index 305c5170fcc7..78c121bd60d9 100644
--- a/dev-ros/hector_geotiff_plugins/Manifest
+++ b/dev-ros/hector_geotiff_plugins/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_geotiff_plugins-0.3.5-r1.ebuild 507 BLAKE2B 2dc90c53ca514069ab636629aa4cc3ca96ed9aaab664390a74efbea09f6f46c43a3434b2e5261ebca899defebd0f05fc3b85ef1c22314ccea1e24539eef9872f SHA512 b1d95ad79cab89a60d68015e8e292b08a792cda394536cef26a35ae8579632e310247084a8cb70ee39003c5f8333cd519e004680b0b2ff640c383047f1b62684
-EBUILD hector_geotiff_plugins-0.4.0.ebuild 504 BLAKE2B 23181f51d227e6eeeb26f5edce792c3d15fcb719c1268709880b895ab165393b8d3980cdc7d7036a5d6cc3b788e5ee44312ca0d05a8e0fd85f4a7dabb1b78c6d SHA512 6ead56c30dc1d48ce29612f441d71580924ce00f32d2b6cca137623a09ded41a3990b25c078de8114cf57696b1082fdb1e76563045ab404b0530a25e623669a5
-EBUILD hector_geotiff_plugins-9999.ebuild 507 BLAKE2B 2dc90c53ca514069ab636629aa4cc3ca96ed9aaab664390a74efbea09f6f46c43a3434b2e5261ebca899defebd0f05fc3b85ef1c22314ccea1e24539eef9872f SHA512 b1d95ad79cab89a60d68015e8e292b08a792cda394536cef26a35ae8579632e310247084a8cb70ee39003c5f8333cd519e004680b0b2ff640c383047f1b62684
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_geotiff_plugins-0.4.1.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
+EBUILD hector_geotiff_plugins-9999.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.5-r1.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.5-r1.ebuild
deleted file mode 100644
index 1afec5c73a1b..000000000000
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild
deleted file mode 100644
index 6aa8740176ca..000000000000
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild
new file mode 100644
index 000000000000..0ca7feb396de
--- /dev/null
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# 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-9999.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
index 1afec5c73a1b..0ca7feb396de 100644
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,8 +15,9 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/hector_geotiff
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_attitude_to_tf/Manifest b/dev-ros/hector_imu_attitude_to_tf/Manifest
index 8232956bb62c..5241b9ca5ac4 100644
--- a/dev-ros/hector_imu_attitude_to_tf/Manifest
+++ b/dev-ros/hector_imu_attitude_to_tf/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_imu_attitude_to_tf-0.3.5.ebuild 491 BLAKE2B d6b54087550587bb06a1d4c60f9b36baac278a5b1c0b6fe1f0d486d5bec63b65edd25b4981c08a426e5c79e6ced4c1beb19ae05e3dc4850d12f96d6013e26ac2 SHA512 02d588f4559b130a0189affd882850b11e88af9a3f736545003d869f0f190855e96ae9841cac89d60ca23256cb51cc75d10da1ca39f7ea26c433059212b6119d
-EBUILD hector_imu_attitude_to_tf-0.4.0.ebuild 488 BLAKE2B 8caef14bf71b85987c5a9547bc954e206ef7b1c6bf2f3f2051fb1a54824f1252392b8ce5f88e49d8204be02411fa7a372444db1e9f63f71643d76ac731b8c380 SHA512 d54ba1635d51a11c5c677e69d92acbc5023120f35d4970df360f159f9e64e63e553c5099354d2d2c2eeee2cb2a06bcb1ec18658a81332fd53bf2a42efd413b56
-EBUILD hector_imu_attitude_to_tf-9999.ebuild 491 BLAKE2B d6b54087550587bb06a1d4c60f9b36baac278a5b1c0b6fe1f0d486d5bec63b65edd25b4981c08a426e5c79e6ced4c1beb19ae05e3dc4850d12f96d6013e26ac2 SHA512 02d588f4559b130a0189affd882850b11e88af9a3f736545003d869f0f190855e96ae9841cac89d60ca23256cb51cc75d10da1ca39f7ea26c433059212b6119d
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_imu_attitude_to_tf-0.4.1.ebuild 489 BLAKE2B a24246dc0be0680b78059fd194246a0ba24b92ab2b83b087345f2263e5abe7bf319fca117b5af771604a745bc7ef4066cc38af154a25b81fdabc8c089485dd06 SHA512 a448d96cbdc03f40c676489151ef8fdc4197f50f063fe1c3b2b9a07788465155a561502cacd2a17eaef167664aa73b62cca98c1a12fe99cd8a78b627633bbaa1
+EBUILD hector_imu_attitude_to_tf-9999.ebuild 489 BLAKE2B a24246dc0be0680b78059fd194246a0ba24b92ab2b83b087345f2263e5abe7bf319fca117b5af771604a745bc7ef4066cc38af154a25b81fdabc8c089485dd06 SHA512 a448d96cbdc03f40c676489151ef8fdc4197f50f063fe1c3b2b9a07788465155a561502cacd2a17eaef167664aa73b62cca98c1a12fe99cd8a78b627633bbaa1
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.5.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.5.ebuild
deleted file mode 100644
index a5f53aebbfba..000000000000
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild
deleted file mode 100644
index ff3bcfe62c69..000000000000
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild
new file mode 100644
index 000000000000..ae76fd8031f7
--- /dev/null
+++ b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# 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/hector_imu_attitude_to_tf-9999.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild
index a5f53aebbfba..ae76fd8031f7 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,7 +16,8 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_tools/Manifest b/dev-ros/hector_imu_tools/Manifest
index ac80d7808b1a..64f41110d999 100644
--- a/dev-ros/hector_imu_tools/Manifest
+++ b/dev-ros/hector_imu_tools/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_imu_tools-0.3.5.ebuild 556 BLAKE2B 8e2177d9ad2f93555f6efca1c4c1755b2f757fe87e7d3e0d13a8727a08f2398d227e50392c339eb3f33874d69251a774f42f63edda162e4dbbb34c64e4a6a93b SHA512 867afdb59941f7c2486c32c330015690818b798286f4f9c2a3e08b65b8d6f7b0e2594d6a4f9657713f8316b4916c11a499b48b07c37742d2a72a7901a12beae5
-EBUILD hector_imu_tools-0.4.0.ebuild 553 BLAKE2B 3724f0fa25ffd770002e76f7c4909f437e7621a4a1798b12d4d3d4ef92b51faf24c07142d37b548d640bd51e08be9fb7f03c479bfb635140a74af76b69ca2e69 SHA512 2c68baa546f2120ca631b1700c13dc39ac1d14b65bf7105ac353279f1f6a7313a5a4697ddee84bf881f826456680852c97c565bf996954c0ef50d6424a19c178
-EBUILD hector_imu_tools-9999.ebuild 556 BLAKE2B 8e2177d9ad2f93555f6efca1c4c1755b2f757fe87e7d3e0d13a8727a08f2398d227e50392c339eb3f33874d69251a774f42f63edda162e4dbbb34c64e4a6a93b SHA512 867afdb59941f7c2486c32c330015690818b798286f4f9c2a3e08b65b8d6f7b0e2594d6a4f9657713f8316b4916c11a499b48b07c37742d2a72a7901a12beae5
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_imu_tools-0.4.1.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
+EBUILD hector_imu_tools-9999.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.3.5.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.3.5.ebuild
deleted file mode 100644
index 2ed4b21ceb5f..000000000000
--- a/dev-ros/hector_imu_tools/hector_imu_tools-0.3.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing IMU messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild
deleted file mode 100644
index 4b1a7e4f1d0b..000000000000
--- a/dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing IMU messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild
new file mode 100644
index 000000000000..2bdbee5df273
--- /dev/null
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# 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-9999.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
index 2ed4b21ceb5f..2bdbee5df273 100644
--- a/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,9 +16,10 @@ 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}]
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_server/Manifest b/dev-ros/hector_map_server/Manifest
index b23134c3b2d8..6ed2e0f1f055 100644
--- a/dev-ros/hector_map_server/Manifest
+++ b/dev-ros/hector_map_server/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_map_server-0.3.5.ebuild 610 BLAKE2B 71437b223d9d430ad2f94398f850feb8e0547a5cadbc1f0fb92c839d867d957168ea2801170b5da8b035a172b63d05a83b5d2cec197c290c1c6854ee91a567d6 SHA512 7c2687184ca357989bead7b3ac30319c14c7768645a1b7f764f7a5953215184fda3c6cd0d689fdf068f4614b061a5dcd3258e9a771b14b94d60de8c2bd7997de
-EBUILD hector_map_server-0.4.0.ebuild 607 BLAKE2B ec9f540ddcb10bd0f34eeeb6deca5e15e8bce6955301385777d369f257cd926480f14950a278c0d958bdfb170afc60f2d016918b85e9a3ff974d0eb46da5fce6 SHA512 ba69e386b6010b74867e84a86c41fb9066e7e73cb6247465584721882ded4f19c6e6b8cf7c61ee3b5b3625b9b330892b1b521f316272dea3a1597ec1966a126d
-EBUILD hector_map_server-9999.ebuild 610 BLAKE2B 71437b223d9d430ad2f94398f850feb8e0547a5cadbc1f0fb92c839d867d957168ea2801170b5da8b035a172b63d05a83b5d2cec197c290c1c6854ee91a567d6 SHA512 7c2687184ca357989bead7b3ac30319c14c7768645a1b7f764f7a5953215184fda3c6cd0d689fdf068f4614b061a5dcd3258e9a771b14b94d60de8c2bd7997de
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_map_server-0.4.1.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
+EBUILD hector_map_server-9999.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_server/hector_map_server-0.3.5.ebuild b/dev-ros/hector_map_server/hector_map_server-0.3.5.ebuild
deleted file mode 100644
index 5b5d6a35bb53..000000000000
--- a/dev-ros/hector_map_server/hector_map_server-0.3.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/hector_marker_drawing
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild b/dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild
deleted file mode 100644
index 906092c6f673..000000000000
--- a/dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/hector_marker_drawing
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild b/dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild
new file mode 100644
index 000000000000..d315b87686ab
--- /dev/null
+++ b/dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild
@@ -0,0 +1,26 @@
+# 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-9999.ebuild b/dev-ros/hector_map_server/hector_map_server-9999.ebuild
index 5b5d6a35bb53..d315b87686ab 100644
--- a/dev-ros/hector_map_server/hector_map_server-9999.ebuild
+++ b/dev-ros/hector_map_server/hector_map_server-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -17,9 +17,10 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hector_map_tools
 	dev-ros/hector_marker_drawing
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+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_tools/Manifest b/dev-ros/hector_map_tools/Manifest
index 5e63c0e99b9e..52df4ec5fbf0 100644
--- a/dev-ros/hector_map_tools/Manifest
+++ b/dev-ros/hector_map_tools/Manifest
@@ -1,4 +1,4 @@
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_map_tools-0.4.0-r1.ebuild 454 BLAKE2B 4ab43a0c435e47ccbee0f4131b34b876cfcdcc8fc0ec735e61253ffdb86f3545401ca03c0deccccdcfb3f0adab6c0089779700ac97558a585b115416c8cb230e SHA512 4234a1daf49bde6fa625c6755893c52321f5cd84219d3f98fa180c40b0f014151d0da03a77004c20a2763caebe48e934453421ac5cb371fab9deaab723ff6a57
-EBUILD hector_map_tools-9999.ebuild 454 BLAKE2B 4ab43a0c435e47ccbee0f4131b34b876cfcdcc8fc0ec735e61253ffdb86f3545401ca03c0deccccdcfb3f0adab6c0089779700ac97558a585b115416c8cb230e SHA512 4234a1daf49bde6fa625c6755893c52321f5cd84219d3f98fa180c40b0f014151d0da03a77004c20a2763caebe48e934453421ac5cb371fab9deaab723ff6a57
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_map_tools-0.4.1.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
+EBUILD hector_map_tools-9999.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.4.0-r1.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.4.0-r1.ebuild
deleted file mode 100644
index 298849dc5dfa..000000000000
--- a/dev-ros/hector_map_tools/hector_map_tools-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..a1602d9cd84b
--- /dev/null
+++ b/dev-ros/hector_map_tools/hector_map_tools-0.4.1.ebuild
@@ -0,0 +1,20 @@
+# 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-9999.ebuild b/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
index 298849dc5dfa..a1602d9cd84b 100644
--- a/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
+++ b/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -13,8 +13,8 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="
+RDEPEND=""
+DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index 97d2b1ba89f4..0b050e211443 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1,7 +1,4 @@
-AUX boost170.patch 631 BLAKE2B 9b1d25a62617b44e6a6f81b4f281ff9331051b242698cc9ae4864237b5a7d18e77298a7f00927a1215982dbec91bb9279878cd5805233d16b9f94caab1db4ab5 SHA512 f61c0def48c65577eace4e2c4bf49b5540f74beb1f54e34f4f75df82325cf0446928e664ce3256205591bac877ae65b371348948e6eea4013a3627b83e97bcdd
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_mapping-0.3.5.ebuild 742 BLAKE2B b283653e4e6a778cf83357bfedf2dc4cdb76a907dd79b31c113160236f572db1e252ad80ecb63f1c99b17287bb97260e5de9f5c94ec910278c5142f7fba78d82 SHA512 e6c599d491ac9aa97af06c9c75b0adaace4e813860a0f208fc6e9c680568179c9f744f08142bf96e4d52b953d799ff7a62553acaa19a197afe13621f6a2f95dd
-EBUILD hector_mapping-0.4.0.ebuild 742 BLAKE2B b283653e4e6a778cf83357bfedf2dc4cdb76a907dd79b31c113160236f572db1e252ad80ecb63f1c99b17287bb97260e5de9f5c94ec910278c5142f7fba78d82 SHA512 e6c599d491ac9aa97af06c9c75b0adaace4e813860a0f208fc6e9c680568179c9f744f08142bf96e4d52b953d799ff7a62553acaa19a197afe13621f6a2f95dd
-EBUILD hector_mapping-9999.ebuild 701 BLAKE2B 84c04288035add5acba5a319d0d0d642bec8931a10e1291257fb46328d334d4da51863aa1149f0cd65f5e23cc6a9b54a4d7bac9f60722320c54ba36157840a85 SHA512 d9624076f101a717ca2fcf087a59afde14d673810fc491d147388b0a71a1908ad9878f64aa261966829a0526370a981fee52c793c093224d63041031d38d9612
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_mapping-0.4.1.ebuild 645 BLAKE2B 670ed45b91746b41b9181cd2558245a75355a4e5b22960765e7c03e27bd42b29cfc73947734e230f509faaf8d431e148f8bffdd6f144a584134a41f014dfb821 SHA512 4bd801bba800bcce0f8ad74a10038cf48db014ef2246e52ca72285c1d9be023229f0afabccc97317b1630c5f52c6f06b6b5c1832c58f829e2a7728575bda9bb1
+EBUILD hector_mapping-9999.ebuild 645 BLAKE2B 670ed45b91746b41b9181cd2558245a75355a4e5b22960765e7c03e27bd42b29cfc73947734e230f509faaf8d431e148f8bffdd6f144a584134a41f014dfb821 SHA512 4bd801bba800bcce0f8ad74a10038cf48db014ef2246e52ca72285c1d9be023229f0afabccc97317b1630c5f52c6f06b6b5c1832c58f829e2a7728575bda9bb1
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_mapping/files/boost170.patch b/dev-ros/hector_mapping/files/boost170.patch
deleted file mode 100644
index 89bc05d2f7da..000000000000
--- a/dev-ros/hector_mapping/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hector_mapping/CMakeLists.txt
-===================================================================
---- hector_mapping.orig/CMakeLists.txt
-+++ hector_mapping/CMakeLists.txt
-@@ -7,7 +7,7 @@ project(hector_mapping)
- find_package(catkin REQUIRED COMPONENTS roscpp nav_msgs visualization_msgs tf message_filters laser_geometry tf_conversions message_generation)
- 
- ## System dependencies are found with CMake's conventions
--find_package(Boost REQUIRED COMPONENTS thread signals)
-+find_package(Boost REQUIRED COMPONENTS thread)
- include_directories(${Boost_INCLUDE_DIRS})
- 
- # Find Eigen3 (from http://wiki.ros.org/jade/Migration)
diff --git a/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild b/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
deleted file mode 100644
index 3705df75d030..000000000000
--- a/dev-ros/hector_mapping/hector_mapping-0.3.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=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/tf_conversions
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild b/dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild
deleted file mode 100644
index 3705df75d030..000000000000
--- a/dev-ros/hector_mapping/hector_mapping-0.4.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=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/tf_conversions
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/hector_mapping/hector_mapping-0.4.1.ebuild b/dev-ros/hector_mapping/hector_mapping-0.4.1.ebuild
new file mode 100644
index 000000000000..071ffb576190
--- /dev/null
+++ b/dev-ros/hector_mapping/hector_mapping-0.4.1.ebuild
@@ -0,0 +1,27 @@
+# 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}
+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:=[threads]
+"
+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
index 21a4b93138fd..071ffb576190 100644
--- a/dev-ros/hector_mapping/hector_mapping-9999.ebuild
+++ b/dev-ros/hector_mapping/hector_mapping-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion"
+DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/hector_marker_drawing/Manifest b/dev-ros/hector_marker_drawing/Manifest
index 7e7ce473d120..3465a33738e3 100644
--- a/dev-ros/hector_marker_drawing/Manifest
+++ b/dev-ros/hector_marker_drawing/Manifest
@@ -1,10 +1,4 @@
-DIST hector_slam-0.3.3.tar.gz 64368 BLAKE2B 8e046c9b69103c325004139528c12cba61198b4f55074c63fccc1f47df773533190e9bad7e0cf661490b38602e1e4aba00d82c7fe23f8fc4a1092ea50be333ca SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0
-DIST hector_slam-0.3.4.tar.gz 64569 BLAKE2B 17795b9ed735eee07aaa7069c84c1d055ce1f505743c6a33dc8c4bdf96ea7b65174a0b0eeea9c312541769199818d546617917b672f6e38b8cb6e90aa661d38b SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_marker_drawing-0.3.3.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
-EBUILD hector_marker_drawing-0.3.4.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
-EBUILD hector_marker_drawing-0.3.5.ebuild 482 BLAKE2B 23cb3ff973180b728f90575508b36a76fb806cab36a9abd78806a98b0da0733fa72a55ac23fbb476395ee8fea7efc0f57e954f52c299237ebf96cc2aa73da590 SHA512 5bb1601ced5aec7c25ce1c6dec2750d4c704d020b0b1455a513eb771f2927860e6eb209b7084129b3a6c4af3f03fc584972979be32f877e534f7ba6e219891d2
-EBUILD hector_marker_drawing-0.4.0.ebuild 479 BLAKE2B 471de32a229ede3d85b8fda14dcd02e70ff9502d3541cc6ebfb185d7889a6ca4a423674adc822c1a876831c84ed560f5f24384a6a5ac1e5f67a3ef23f54ea89e SHA512 f9d8a0bb5ce921ab11ed3a41d911b5882bd7e04c7548d1ac0a5bf10e4b60897131002cc9a2f9a7a5132e87e007072692dd033969a5941c172013d04710c2016b
-EBUILD hector_marker_drawing-9999.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_marker_drawing-0.4.1.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
+EBUILD hector_marker_drawing-9999.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.3.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.3.ebuild
deleted file mode 100644
index 74d3a3965850..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild
deleted file mode 100644
index 74d3a3965850..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.5.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.5.ebuild
deleted file mode 100644
index b3455d3e37ba..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild
deleted file mode 100644
index 4c95bac38c6d..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild
new file mode 100644
index 000000000000..1e9c4c56ec4f
--- /dev/null
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild
@@ -0,0 +1,21 @@
+# 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-9999.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
index 74d3a3965850..1e9c4c56ec4f 100644
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_nav_msgs/Manifest b/dev-ros/hector_nav_msgs/Manifest
index 9d7d6ef16f0a..7ced756327e1 100644
--- a/dev-ros/hector_nav_msgs/Manifest
+++ b/dev-ros/hector_nav_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_nav_msgs-0.3.5.ebuild 506 BLAKE2B d1cfb04c4505ae386f20b6684d6b656d1ed607d961e149282ce9af5461dcddcc03cc05fbcb9547f9aa6df893717e9a16724ab4e371fe9e7424818d6c23293c71 SHA512 46be9c83ee2851921a45997a5e3e9871939708233f83df1602bc31e6b479a5b149e14f1ca6fc674d7d15175dcb95dc6d1a3f6b0a385a487adc86b34024193fca
-EBUILD hector_nav_msgs-0.4.0.ebuild 506 BLAKE2B d1cfb04c4505ae386f20b6684d6b656d1ed607d961e149282ce9af5461dcddcc03cc05fbcb9547f9aa6df893717e9a16724ab4e371fe9e7424818d6c23293c71 SHA512 46be9c83ee2851921a45997a5e3e9871939708233f83df1602bc31e6b479a5b149e14f1ca6fc674d7d15175dcb95dc6d1a3f6b0a385a487adc86b34024193fca
-EBUILD hector_nav_msgs-9999.ebuild 506 BLAKE2B d1cfb04c4505ae386f20b6684d6b656d1ed607d961e149282ce9af5461dcddcc03cc05fbcb9547f9aa6df893717e9a16724ab4e371fe9e7424818d6c23293c71 SHA512 46be9c83ee2851921a45997a5e3e9871939708233f83df1602bc31e6b479a5b149e14f1ca6fc674d7d15175dcb95dc6d1a3f6b0a385a487adc86b34024193fca
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_nav_msgs-0.4.1.ebuild 466 BLAKE2B 4e31ebcbb188491fd7da8ad525a64f38e25ee66d5a98dd7e7d5f3d4c3390bcaf3f9fce060218cc304b608bac9997b1bd5da5bdec09d5576d788c65b0596f9dc6 SHA512 1dfb4b3d6d948a8ddc30ec7b2a1ce03baa8ce27d4bb750dbf15857b7ddba7f6522cc178dfc854fae6675c69033107de0e5097ed6188e67cae14b2c1e725839e8
+EBUILD hector_nav_msgs-9999.ebuild 466 BLAKE2B 4e31ebcbb188491fd7da8ad525a64f38e25ee66d5a98dd7e7d5f3d4c3390bcaf3f9fce060218cc304b608bac9997b1bd5da5bdec09d5576d788c65b0596f9dc6 SHA512 1dfb4b3d6d948a8ddc30ec7b2a1ce03baa8ce27d4bb750dbf15857b7ddba7f6522cc178dfc854fae6675c69033107de0e5097ed6188e67cae14b2c1e725839e8
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.5.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.5.ebuild
deleted file mode 100644
index 8a17560e0722..000000000000
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.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=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_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.4.0.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.0.ebuild
deleted file mode 100644
index 8a17560e0722..000000000000
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.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=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_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.4.1.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild
new file mode 100644
index 000000000000..0177e578893d
--- /dev/null
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild
@@ -0,0 +1,19 @@
+# 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}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_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
index 8a17560e0722..0177e578893d 100644
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/hector_pose_estimation/Manifest b/dev-ros/hector_pose_estimation/Manifest
index 2e61a693f644..dcea85c3a0b5 100644
--- a/dev-ros/hector_pose_estimation/Manifest
+++ b/dev-ros/hector_pose_estimation/Manifest
@@ -1,5 +1,5 @@
-AUX hector_pose_estimation-0.3.0-pluginlib.patch 1014 BLAKE2B b98d2357c13d61919f32d45f19d267832d855a9a8490519c838540b2b7217227e854b53cced737dda7551bc61c99eff78fa61f6b7a3557271bd81e4cb6e9bb03 SHA512 a3e4f2e63aa1d639f8acb178032bb6e9d95640d478cf75715ceb0136bd150d704ada3ceac279932083126c79201bd1b530937f1d7182188bde9710c30f8fc6f7
+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
-EBUILD hector_pose_estimation-0.3.0-r1.ebuild 763 BLAKE2B e0725468681b66e5717d69e3dc3f987b5e7b837f3a07d3da2738dce90392dea03f1656f4096dac90094e076f47e86522122c9767f31541d29cfd93d35f02ea9f SHA512 dc3cb0874189d1f82628c7393bf229ee1556895cefb6cc7e1f7579438c7b594f5232bfcd54ef6f3819bedab5219721f53fdee2ab5288f5d368b2965f8069428b
-EBUILD hector_pose_estimation-9999.ebuild 711 BLAKE2B 67d3ab3da4f47e0b7784bc578f31983b5dca9c09b344d88c0c1f42355de74a126a5339b6179b8e43dc73693c8fe89e5384df3080bc742a05090f5ab250511834 SHA512 abeb93640c11c0d1359ce0e84adc9ce43b42461b259225f39c2189688a164ebc7d4f76195ca89c9e77a545f21b4dfd1e83ac13b07c657c063f86f95ca0a4da9b
+EBUILD hector_pose_estimation-0.3.0-r1.ebuild 763 BLAKE2B 64a0eec66ca9a4de09f2e63630c32e19f1000d54266316dcd638fe91a9b7b0c68e6636af6bf534728d3e6efcd01e131bc1a5ae1a6cb707a09d39cf6780f55c88 SHA512 fcc228e912fdf46b58489cc455d14cf3ef1734c7a770511add1efe19b0c745d275c8e7b0122cd03c85a1bcae874ab762178c9a0075f472a4ed2e8a0e2b07cf6b
+EBUILD hector_pose_estimation-9999.ebuild 709 BLAKE2B 47c1f5e8aaa989553422e72b3f0e416dc125b9e1dd09e7d93314d94090153cd18df953287829bb62185870252774266c810d2d5eb518ef1dc09d57f0282fab34 SHA512 c058f013576bc391ae21444177d03ec8c63a3719aab9ec0957ac9f9865eaa9b39515c28a796d2dca045c9ea0d1fa30680a5d8a7a6910fd5f8bdfe9921251c47b
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
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
index a226c40e9fce..59349bbfe02f 100644
--- 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
@@ -9,8 +9,8 @@ Subject: [PATCH] update to use non deprecated pluginlib macro
 
 diff --git a/hector_pose_estimation/src/pose_estimation_nodelet.cpp b/hector_pose_estimation/src/pose_estimation_nodelet.cpp
 index 7da3ca6..97ba5b0 100644
---- a/hector_pose_estimation/src/pose_estimation_nodelet.cpp
-+++ b/hector_pose_estimation/src/pose_estimation_nodelet.cpp
+--- 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
  
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
index 284a8883bbab..783aaeb2225c 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,15 +16,15 @@ IUSE=""
 RDEPEND="
 	dev-ros/hector_pose_estimation_core
 	dev-ros/nodelet
-	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/tf
 	dev-ros/message_filters
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 # dev-ros/hector_timing
-DEPEND="${RDEPEND}"
-
+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-9999.ebuild b/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
index 7cc3dd4e6490..8bfff8077200 100644
--- a/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
+++ b/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,13 +16,14 @@ IUSE=""
 RDEPEND="
 	dev-ros/hector_pose_estimation_core
 	dev-ros/nodelet
-	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/tf
 	dev-ros/message_filters
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 # dev-ros/hector_timing
-DEPEND="${RDEPEND}"
+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_core/Manifest b/dev-ros/hector_pose_estimation_core/Manifest
index dcb8906000fc..8abee9434c54 100644
--- a/dev-ros/hector_pose_estimation_core/Manifest
+++ b/dev-ros/hector_pose_estimation_core/Manifest
@@ -1,7 +1,7 @@
 AUX eigen.patch 892 BLAKE2B 68b8df118a6d2a644ee1bd8407144f50fc270bc767984093e146cf537799e9dee11db670006c5cf467bd98c3ffd3f6c2cb1db6c9e8ab81618bb6a29489cf6bf1 SHA512 302e4fecdfb674b66d737d93d427b61e5fb00932469190c3b631c6e2fc4647c2622591ec83975b42d9e1bb71b70f8d942c3fe4101d9927ce2c909c1baef38d35
 AUX gcc6.patch 1597 BLAKE2B 9df1a297741dbcb957ef9bc910332e237a84ffcef87547f0d29573c4a3aa4255a0d65fb0f2eb7b404a8c9ecf4441b2a9dee60dd1d832b7690baceb2b1ae39951 SHA512 7ef60982584cf5021d9a8c084492de84d54dc0150ad0cd5acfc9c709641935c5a9ee649e5546cae6d2da061a0e3a887e5f1ea97e1fa3848ad9dd4de7ff3ee817
-AUX includes.patch 562 BLAKE2B 2a6bf54f37cf5275014d2f69428568eb4e5b5c967c88129c3fde9ff89f0bcf3ab26abd2c538d5ea5977182393e189ab156bb9a24446df822106de72cf7a2bd1f SHA512 a689645403095ef37be5a259d593ee8e6f412a77a0997b5025c85c5c9f09ef9bce622d4afccc58e9baed89576db9280d615f4a0df2eee22a18ee832f12e786a8
+AUX includes.patch 506 BLAKE2B 40b3b640324f8ae1b36f3ee3f760384e4365500f8e29a1111376a0bcb8206e77429565ba9ed9dacb4420543378963d5c6b3798151a3eb4672f28bff6fb5d620c SHA512 2d02b76c2ee1032527582ae32685014b815fcc5cb6fd2e02de84299d2c634a2e54c2d3b7d7307442f972259db44f84d4ae35ca6a38369207e29639fd15cda08f
 DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
-EBUILD hector_pose_estimation_core-0.3.0-r1.ebuild 803 BLAKE2B 55419c38502f1264a29b5932f2aa00e467730d6b92ab66ea1cc3067aa2cb70851d88ef0439b77e5e9374887da338c151d5bcf615536c4e980fdc321008ce5124 SHA512 59a73b76930f02107c3308545ebce88ce5b1198b46803858066244e493997bfdfe2ede29ee6bb3603b31b793e694f56491cc792d4bae9eb5295e301aeba83d58
-EBUILD hector_pose_estimation_core-9999.ebuild 711 BLAKE2B e1455cf2d4af72fe418a0bbfb386de51c867af6bdb4dba92efaf12a8204f9fa239c2bccf7a9b40a2f63432f469040c073d18907b409f2d7b085693d32e7c4384 SHA512 8b67fb9ce6030102d7cc9b82db7f0921bae58770e272b1a8527e60f3e9576f71f53523ffa0fb563bf348fda33eadcd0c56353e7c5f99467357d132a334f45e6c
+EBUILD hector_pose_estimation_core-0.3.0-r1.ebuild 800 BLAKE2B 8767f45674f3455c9722432d93f70d364a815f9f74cbee89b6391e79d94ea470576a94f9da228c969e71c9daa47385e087785a78f9cc97ba6d5e92d88637b039 SHA512 5a3906fef2e106c51b06e54e3202e74e58204c1eabdd690a4297acfa66797a587fc7fc5b62c086332cf0044a1b7df754205f7e097e281736f701c65fdba0bf34
+EBUILD hector_pose_estimation_core-9999.ebuild 708 BLAKE2B 4c7dcfb1673f5a3e1c016441ca85ba0000874ee6a9c63296069187841a3b60398787340f793d46103e01462786571484d91b461a344ba37efb73c924477af8a4 SHA512 637c5cdb5da52e3634356e15c70dbc9fe089e8111ac8511bb54af2cf9b9cf4ed3592ad1f104be12b610720ee2b81f19d202e03881f5a05dfc083673646a7ae58
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
diff --git a/dev-ros/hector_pose_estimation_core/files/includes.patch b/dev-ros/hector_pose_estimation_core/files/includes.patch
index 0188d027ed9d..2b530f18633c 100644
--- a/dev-ros/hector_pose_estimation_core/files/includes.patch
+++ b/dev-ros/hector_pose_estimation_core/files/includes.patch
@@ -1,7 +1,7 @@
 Index: hector_localization-0.3.0/hector_pose_estimation_core/include/hector_pose_estimation/state.h
 ===================================================================
---- hector_localization-0.3.0.orig/hector_pose_estimation_core/include/hector_pose_estimation/state.h
-+++ 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
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
index 8c95893cad5a..19defd1cae45 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -17,13 +17,13 @@ RDEPEND="
 	dev-ros/rostime
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	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-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-9999.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild
index 8c1ce15dafe8..3464c3898757 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -17,12 +17,12 @@ RDEPEND="
 	dev-ros/rostime
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	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-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_slam_launch/Manifest b/dev-ros/hector_slam_launch/Manifest
index d8f1a86a0601..359d79a13401 100644
--- a/dev-ros/hector_slam_launch/Manifest
+++ b/dev-ros/hector_slam_launch/Manifest
@@ -1,10 +1,4 @@
-DIST hector_slam-0.3.3.tar.gz 64368 BLAKE2B 8e046c9b69103c325004139528c12cba61198b4f55074c63fccc1f47df773533190e9bad7e0cf661490b38602e1e4aba00d82c7fe23f8fc4a1092ea50be333ca SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0
-DIST hector_slam-0.3.4.tar.gz 64569 BLAKE2B 17795b9ed735eee07aaa7069c84c1d055ce1f505743c6a33dc8c4bdf96ea7b65174a0b0eeea9c312541769199818d546617917b672f6e38b8cb6e90aa661d38b SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_slam_launch-0.3.3.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
-EBUILD hector_slam_launch-0.3.4.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
-EBUILD hector_slam_launch-0.3.5.ebuild 552 BLAKE2B 7832e18da52086b053d473ffe615f4e1359bf9911f8356112adeb3b802ebeba137547d27c159728ebf080a8c8a4a15ded3553ea132c052c9cd9eaa6ede2cbaa3 SHA512 92c8ba3f878de452948aa4692c5ff8f60d9cf3cc77d17283c3a1fd7a25a232a245c5d8efea2cb2240e17389c7a67cd043b9527cd3f9df64a225a1671cca65d4e
-EBUILD hector_slam_launch-0.4.0.ebuild 549 BLAKE2B aac6563ad3f53b9568e09afad601b6ae092f70339f45036dcfc450e0ada145b56e0a132df0767b9c2ee26d166583e565155156c611c61bef73d19794adf63c4c SHA512 ecc9bca9ed1f757159898123896444591b2c1196fc36412216b03516bf25f85c477e15fb5b9ae7d0bdf02a31d96ba0e7368937f833369f7ad3094140ef18fea4
-EBUILD hector_slam_launch-9999.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_slam_launch-0.4.1.ebuild 519 BLAKE2B 53190caf679c2f36115cb1c74a21ec8d8c967797d708071d14442f60e86fc9ef74d1e091da8f532a79b9f0b6f2763ec2caf7e77b359f4b5ffd1b7400ff3c17b5 SHA512 c718a7784284dc5de1b80f9c3f5ff7813f13fb473beb4defb739a31bd88ebf82b7dd4a095cb78cc2f6186ee8eaae61f0739034579ddef903a38dfb6b96f94720
+EBUILD hector_slam_launch-9999.ebuild 519 BLAKE2B 53190caf679c2f36115cb1c74a21ec8d8c967797d708071d14442f60e86fc9ef74d1e091da8f532a79b9f0b6f2763ec2caf7e77b359f4b5ffd1b7400ff3c17b5 SHA512 c718a7784284dc5de1b80f9c3f5ff7813f13fb473beb4defb739a31bd88ebf82b7dd4a095cb78cc2f6186ee8eaae61f0739034579ddef903a38dfb6b96f94720
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.3.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.3.3.ebuild
deleted file mode 100644
index 9993f129fe07..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild
deleted file mode 100644
index 9993f129fe07..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.5.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.3.5.ebuild
deleted file mode 100644
index 192819a66ee2..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild
deleted file mode 100644
index 04c3c251fa9c..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild
new file mode 100644
index 000000000000..a3654d956875
--- /dev/null
+++ b/dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# 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/hector_slam_launch-9999.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
index 9993f129fe07..a3654d956875 100644
--- a/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
+++ b/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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 systems/setups/postprocessing scenarios"
+DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/hector_trajectory_server/Manifest b/dev-ros/hector_trajectory_server/Manifest
index 8221ac8704b5..35491a5a5a02 100644
--- a/dev-ros/hector_trajectory_server/Manifest
+++ b/dev-ros/hector_trajectory_server/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_trajectory_server-0.3.5.ebuild 584 BLAKE2B 2d23544a01e6ee3c24900240ba3312ed5d63a1cc04073141a2117b7fe72bf1257f936c9e1c04e28dd3e58c713d53ca19f29865eb8b11c0ca6386acd87f4f3ccc SHA512 573850704ea327f43f3c4ca322c136035fc56f9247e01f38038d60f0ae783fdcce4be273315ad7ab0e6685cd2e37f564052d9b750f590fff3f25a64922ac9b7a
-EBUILD hector_trajectory_server-0.4.0.ebuild 581 BLAKE2B eec09877cb696376880842ca0458308cfa47fa0f406012bcbb3c5dca821a23bcb31f2f3f88bd2805a6cde0b3ea07ed2f62b5a53c2e5d99364e52038c0df9f117 SHA512 f92a42a6779ac4859fe212b48fc1c9b4c416bdb0be37aee3c0674fd9a6d51f065cb794807758790a0867b8d1602375f67dc52cfab10bee46d698f81385b388cd
-EBUILD hector_trajectory_server-9999.ebuild 584 BLAKE2B 2d23544a01e6ee3c24900240ba3312ed5d63a1cc04073141a2117b7fe72bf1257f936c9e1c04e28dd3e58c713d53ca19f29865eb8b11c0ca6386acd87f4f3ccc SHA512 573850704ea327f43f3c4ca322c136035fc56f9247e01f38038d60f0ae783fdcce4be273315ad7ab0e6685cd2e37f564052d9b750f590fff3f25a64922ac9b7a
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_trajectory_server-0.4.1.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
+EBUILD hector_trajectory_server-9999.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.5.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.5.ebuild
deleted file mode 100644
index 72edb675f780..000000000000
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible via a service and topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/hector_map_tools
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild
deleted file mode 100644
index 61596f0891a0..000000000000
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible via a service and topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/hector_map_tools
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild
new file mode 100644
index 000000000000..37fc87495b5d
--- /dev/null
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# 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-9999.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
index 72edb675f780..37fc87495b5d 100644
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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 via a service and topic"
+DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/hector_map_tools
 	dev-ros/tf
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
index 2bbc98ad1426..0d6584c0849e 100644
--- a/dev-ros/image_cb_detector/Manifest
+++ b/dev-ros/image_cb_detector/Manifest
@@ -2,6 +2,6 @@ AUX boost170.patch 551 BLAKE2B c98a11a8faa4c22d78e991bfa911b13bcf66fe3b8b8be2efc
 AUX c11.patch 587 BLAKE2B 2cf07b3b5eebf9840bd45aa419283cc53e03dc45c5cf4eab6cd5894143983c7cb05146c9242c91ac105c90bba8d878ff8da4776629f04fc3f32b5290aa59fd87 SHA512 1ae09e987fb231400594019832f8a6d42ca1ebd07eafaca151d08812d8a4b62f95d4fadac0227c96d115c69da24bc3889f7d30af27000347ee000a937ae2b498
 AUX gcc6.patch 495 BLAKE2B 50ac60a74148e3e32b2a69750cad6d98ce2ecef22ed4462431821075f6e247290e28b8d57b58b4b86a7cb9600988a8e22ea2aa5508da6dd6ac85a93aac197ad1 SHA512 5b99edada624eabd4830997677ebb4916c6a9a3c631eead6ae723985e3ce5a0f3b77c484777182a34e727dba869181d11002ba38cfb49cf20eb0832aca67f6bb
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD image_cb_detector-0.10.14-r1.ebuild 959 BLAKE2B 13f8864e7892b30be430d1c3f5b9753a049ad9cb9fb61dcef6eb9bb6578a5687c0eb5724f9727455b463e7becd0d10e49e49e72246974f6f8eedba63c36ba07c SHA512 0e4bacf6310c9bd1c7fec693b39570ef1a8ef004a11769a5f83a5520f23cd101f6d152b38890008c83f60139bfb36dd1d7b48e97ba96b84115c057a02ae96e44
-EBUILD image_cb_detector-9999.ebuild 933 BLAKE2B afb1d6def81a9a3ca97bb1beefbf761626ca7a671268bb41f5fe7ef56c86a02028143f34a0d95ad82fb461181a9458aa9f13e38b77ddfa5e48c25ed2d3ed5357 SHA512 a74f31fc57efb8c52cc67127f694cf1776257773b2b575cb3786ede25618453980c0688bf519bf63e34947e31ca3fbb24703dc7e5506e6962f1bd4999d2756a9
+EBUILD image_cb_detector-0.10.14-r1.ebuild 975 BLAKE2B ae10cccd30bee2a3c024bd725d215d554f65a80aa9638d57244f9f2e7e7f554e702bdf60eb395541682f228f38901d78c0ddb868b725f25e60c5d889644eb64e SHA512 4f5bff2bd10d0dc96507cf3734e077948188a8192cc20679c07b27fd980ebdb71c96fb22d84cc068e3a72fefc589d4e28748922ef39b51d904f705abf6d67131
+EBUILD image_cb_detector-9999.ebuild 975 BLAKE2B ae10cccd30bee2a3c024bd725d215d554f65a80aa9638d57244f9f2e7e7f554e702bdf60eb395541682f228f38901d78c0ddb868b725f25e60c5d889644eb64e SHA512 4f5bff2bd10d0dc96507cf3734e077948188a8192cc20679c07b27fd980ebdb71c96fb22d84cc068e3a72fefc589d4e28748922ef39b51d904f705abf6d67131
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
index 2502c78f860a..a89eff2125cd 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
 
@@ -17,16 +16,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/actionlib[${PYTHON_USEDEP}]
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+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}/boost170.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
index 8b96da0e6b06..a89eff2125cd 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
 
@@ -17,16 +16,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/actionlib[${PYTHON_USEDEP}]
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )
+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}/boost170.patch" )
diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest
index 51023c19185e..b1afb3d02183 100644
--- a/dev-ros/image_geometry/Manifest
+++ b/dev-ros/image_geometry/Manifest
@@ -1,14 +1,4 @@
-DIST vision_opencv-1.12.3.tar.gz 80497 BLAKE2B 97e9c6d623108307216ae88dd5a4c6231b61d64826907c130233bab7c1590a50adf4e6bfdca3f6130365848a98ff1d2f58228c7f2dbc256aff6bbe04f164161b SHA512 2f732c7f9d9b5aa68b775fa08c8836bfb01cd3fe0fee9bd9bf862fecb26a23a58d754a96e723b420663b48b590f24e454e5a1871b6f4dcd4219d3c3e413ade3c
-DIST vision_opencv-1.12.4.tar.gz 80675 BLAKE2B e07f89942f471e25ec76ae43b07dee79eaf4637e5f5775151e066cc92a92f8993a6bc047ddc35adbb77745e6070797111d78add690ee7bb54cc8179cf2f7cfa5 SHA512 9ed426ddae7af343eed01d6ebf2769d654476bb28b095d67394e75feeec8440859aca34f62c9faff81018cf98fe58b731b96f3f7ffeaa459d14e6a3c59ad02e5
-DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
-DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
-DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
-DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD image_geometry-1.12.3.ebuild 573 BLAKE2B 57d843b24727e237d1a934271762c2ffce2b90f0de3564d6098ae3ed91225b279ecb114ba7eae2ca5cb25e34d23eac07dbfae565e36ec8d1a17027b665210dae SHA512 b5032a90e9d488251c830082437aafb9cf4d751fdd1c15d7d245ba26d6d282622b30bde351ae8427841646dc7ce30ab303881b6e8a3ff117b0117c36a2650973
-EBUILD image_geometry-1.12.4.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
-EBUILD image_geometry-1.12.5.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
-EBUILD image_geometry-1.12.7.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
-EBUILD image_geometry-1.12.8.ebuild 573 BLAKE2B b5475075d7374dc72731c9420a6c60f4ae6407f09644a7bc781c56554af3ee4db3a7f82a6a97ed130cf2286c924101c7698705153601ec5bd7eeb3bc8ef2c7f6 SHA512 d50375d31c899e44567a7167a3229aacaef924f5bc2b3903d16a168aee3aa3fba43d6f19e727efacfc43a97c072be214c6de047f22af20d2ff16fb1823ffee63
-EBUILD image_geometry-1.13.0.ebuild 573 BLAKE2B b5475075d7374dc72731c9420a6c60f4ae6407f09644a7bc781c56554af3ee4db3a7f82a6a97ed130cf2286c924101c7698705153601ec5bd7eeb3bc8ef2c7f6 SHA512 d50375d31c899e44567a7167a3229aacaef924f5bc2b3903d16a168aee3aa3fba43d6f19e727efacfc43a97c072be214c6de047f22af20d2ff16fb1823ffee63
-EBUILD image_geometry-9999.ebuild 573 BLAKE2B 5d941d4bdac14a1792893e7de1e8fe5ba96114c454e54675577cd64966c89105b0501f7d7fdd5e63905d3e6642be8537d4523859ee65bef3051a15a5e3a16bf5 SHA512 62ff031953231cc9d983aae2e77c01f0b8a15f0d80b95ee6289994e76a02f8ca38b224ed2ab6700ed82531a84f8058121d11bac28d424f49282c60bc25ee3ada
+DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
+EBUILD image_geometry-1.15.0.ebuild 638 BLAKE2B d637955fd2630b3b1f845f392638e14332e2c1155478711ff8d82ef9c3b8cbccee40a2fc5a8785d9a79e6a912db63a5314c550f0abda13698ddc778c4e79a690 SHA512 49dfacdfb64b53b3f503fd9535e0bcc5c69fae30a745e4eb05f517bdfb7df3c5d502ac18a03fe0829beb4f0c5dda359bbcd62db714d7660690cfa6851084b09b
+EBUILD image_geometry-9999.ebuild 638 BLAKE2B d637955fd2630b3b1f845f392638e14332e2c1155478711ff8d82ef9c3b8cbccee40a2fc5a8785d9a79e6a912db63a5314c550f0abda13698ddc778c4e79a690 SHA512 49dfacdfb64b53b3f503fd9535e0bcc5c69fae30a745e4eb05f517bdfb7df3c5d502ac18a03fe0829beb4f0c5dda359bbcd62db714d7660690cfa6851084b09b
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/image_geometry/image_geometry-1.12.3.ebuild b/dev-ros/image_geometry/image_geometry-1.12.3.ebuild
deleted file mode 100644
index 267350820dff..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.12.4.ebuild b/dev-ros/image_geometry/image_geometry-1.12.4.ebuild
deleted file mode 100644
index 8206600adc38..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.12.5.ebuild b/dev-ros/image_geometry/image_geometry-1.12.5.ebuild
deleted file mode 100644
index 8206600adc38..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.12.7.ebuild b/dev-ros/image_geometry/image_geometry-1.12.7.ebuild
deleted file mode 100644
index 8206600adc38..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.12.8.ebuild b/dev-ros/image_geometry/image_geometry-1.12.8.ebuild
deleted file mode 100644
index 25d882f4b84d..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.13.0.ebuild b/dev-ros/image_geometry/image_geometry-1.13.0.ebuild
deleted file mode 100644
index 25d882f4b84d..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.13.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.15.0.ebuild b/dev-ros/image_geometry/image_geometry-1.15.0.ebuild
new file mode 100644
index 000000000000..e1195646cedd
--- /dev/null
+++ b/dev-ros/image_geometry/image_geometry-1.15.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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}]
+	)"
diff --git a/dev-ros/image_geometry/image_geometry-9999.ebuild b/dev-ros/image_geometry/image_geometry-9999.ebuild
index 4b65c37fb167..e1195646cedd 100644
--- a/dev-ros/image_geometry/image_geometry-9999.ebuild
+++ b/dev-ros/image_geometry/image_geometry-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,7 +15,12 @@ IUSE=""
 
 RDEPEND="
 	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
+	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}]
+	)"
diff --git a/dev-ros/image_proc/Manifest b/dev-ros/image_proc/Manifest
index 5480a59ea12e..b4900cfd16c7 100644
--- a/dev-ros/image_proc/Manifest
+++ b/dev-ros/image_proc/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_proc-1.12.22-r1.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
-EBUILD image_proc-1.12.23.ebuild 651 BLAKE2B d01b42e8fb22054539ad4eb4f55993ddf8887fe1c950eaa8ef6b9264348d73d82d32904984fe65500c2af4c0342e3f70023b8808d8d5a9a09dbafdd11963ffb4 SHA512 4db3b8b9a3ac3dc3e98c9896dceaa8652868bc8818072cb5144749491344dfb8662beb275c4462b5890400217b63c156ebdba9960cbdac0e18000a2a565497bc
-EBUILD image_proc-1.13.0.ebuild 648 BLAKE2B cbb98c94317f93e8b7344a988948d2b8d0eed6e663f9fe97309436f7564d787eecc612ddaae6f7799c028901aa5f44418aef0193cc7a8f6aa14bbc86a4a69e3e SHA512 e5de63d615616bd3ed32106d2118525de6838ac63e30f24cfe66e0b34d98ebbfae5a7c4a1e57b98be24b19665ceae64aa1713b34eac5a4c237e0b4dfe51ed1ac
-EBUILD image_proc-9999.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_proc-1.15.2.ebuild 758 BLAKE2B a543f793a421450b7cd7012091011484195b9ac822c56344643e8866de9cccdd045904a87ead629c0d247b81dccbb1a06c961113f7067c7a4ed503490a471144 SHA512 1a77611d5d36d095927094a6fb97c7663ec0cbf1fca551f60e0df2a434d15afb3b0ddea95ff10d3c71cc41af6aab22d12616011cf6f394d2ca63511744cbaf04
+EBUILD image_proc-9999.ebuild 758 BLAKE2B a543f793a421450b7cd7012091011484195b9ac822c56344643e8866de9cccdd045904a87ead629c0d247b81dccbb1a06c961113f7067c7a4ed503490a471144 SHA512 1a77611d5d36d095927094a6fb97c7663ec0cbf1fca551f60e0df2a434d15afb3b0ddea95ff10d3c71cc41af6aab22d12616011cf6f394d2ca63511744cbaf04
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_proc/image_proc-1.12.22-r1.ebuild b/dev-ros/image_proc/image_proc-1.12.22-r1.ebuild
deleted file mode 100644
index bd66af15e302..000000000000
--- a/dev-ros/image_proc/image_proc-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/image_proc-1.12.23.ebuild b/dev-ros/image_proc/image_proc-1.12.23.ebuild
deleted file mode 100644
index 5f6d762c33e0..000000000000
--- a/dev-ros/image_proc/image_proc-1.12.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/image_proc-1.13.0.ebuild b/dev-ros/image_proc/image_proc-1.13.0.ebuild
deleted file mode 100644
index 9a57f7096740..000000000000
--- a/dev-ros/image_proc/image_proc-1.13.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/image_proc-1.15.2.ebuild b/dev-ros/image_proc/image_proc-1.15.2.ebuild
new file mode 100644
index 000000000000..e38214ace5bb
--- /dev/null
+++ b/dev-ros/image_proc/image_proc-1.15.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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="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:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+		dev-ros/camera_calibration_parsers
+	)
+"
diff --git a/dev-ros/image_proc/image_proc-9999.ebuild b/dev-ros/image_proc/image_proc-9999.ebuild
index bd66af15e302..e38214ace5bb 100644
--- a/dev-ros/image_proc/image_proc-9999.ebuild
+++ b/dev-ros/image_proc/image_proc-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,14 +15,21 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
-	dev-libs/console_bridge:=
+	dev-ros/nodelet_topic_tools
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
 	media-libs/opencv:=
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+		dev-ros/camera_calibration_parsers
+	)
+"
diff --git a/dev-ros/image_publisher/Manifest b/dev-ros/image_publisher/Manifest
index fe1e2186c5bf..865a8f946b8e 100644
--- a/dev-ros/image_publisher/Manifest
+++ b/dev-ros/image_publisher/Manifest
@@ -1,9 +1,4 @@
-AUX ocv4.patch 1826 BLAKE2B 647de2fc507e52734fb9e4c4c13043fd1424c2ab78ddbf2edb876660b5344877b8389ffc1194b20391249fad699c6e50305421f2ce8d58f880953e155de53120 SHA512 ef84c6d0ca37718b025dd570df596f8cd83bf8d5ca6e1bce5ad0725fdf852c55dbae876bea15f3e9534177b13538bfcaef7d6cf693c29e6ca4e99b3276acc7eb
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_publisher-1.12.22-r1.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
-EBUILD image_publisher-1.12.23.ebuild 659 BLAKE2B e0fefc67d3680c3bd1e2cf54d32eedd4d1e997de6707f4b77604d776a5b63ef67a423ed0618b3566f2272f94a2500507c5ad0de1d44858de9d0a81fec9f96e1b SHA512 ffd763e3b47a77022e3ee17b180e629e3297fce8f85d34e40997019e3ee4f0a0cb01fe898b1a16b665d91c3d1a60c9312d97cbe6fdb1391796c4e087726f2155
-EBUILD image_publisher-1.13.0.ebuild 697 BLAKE2B 9c613067b2e7b88e45ad4dbe0df663ea785b1ebffb76d3bf146afab6295cb46ca51e5f2c560b66e0222b2cae572b4dfcf643066f4b49fb96a5dd1346508fbdfc SHA512 5e265bdbed1d7a3b89f4d4c1ebdb967ef7052ef7930dc41c7466d3ce002a6beb23aa6b9d201759deb1421c79194278f9894ec8dec623b823d834eb79f0a51368
-EBUILD image_publisher-9999.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_publisher-1.15.2.ebuild 629 BLAKE2B 9f1a0ad822d5f699a9464052a91d7121584d61c85d971c2e5dd85b642fd04809b8e3cb7a4c26ae36a3441495554347cc5de49229d749bd43f83a01a770c9617f SHA512 48ab3110a492d8bcbbc678bd20425927e43d84d8a722771b7c1c4385a7b6a06b7fb9e9091d02163962f628ec6eea507aeee8d265d235d72f446325333c9a2739
+EBUILD image_publisher-9999.ebuild 629 BLAKE2B 9f1a0ad822d5f699a9464052a91d7121584d61c85d971c2e5dd85b642fd04809b8e3cb7a4c26ae36a3441495554347cc5de49229d749bd43f83a01a770c9617f SHA512 48ab3110a492d8bcbbc678bd20425927e43d84d8a722771b7c1c4385a7b6a06b7fb9e9091d02163962f628ec6eea507aeee8d265d235d72f446325333c9a2739
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_publisher/files/ocv4.patch b/dev-ros/image_publisher/files/ocv4.patch
deleted file mode 100644
index 12baac2d8473..000000000000
--- a/dev-ros/image_publisher/files/ocv4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: image_publisher/CMakeLists.txt
-===================================================================
---- image_publisher.orig/CMakeLists.txt
-+++ image_publisher/CMakeLists.txt
-@@ -10,7 +10,7 @@ message(STATUS "opencv version ${OpenCV_
- if(OpenCV_VERSION VERSION_LESS "3.0.0")
-   find_package(OpenCV 2 REQUIRED COMPONENTS ${opencv_2_components})  
- else()
--  find_package(OpenCV 3 REQUIRED COMPONENTS ${opencv_3_components})  
-+  find_package(OpenCV REQUIRED COMPONENTS ${opencv_3_components})  
- endif()
- 
- # generate the dynamic_reconfigure config file
-Index: image_publisher/src/nodelet/image_publisher_nodelet.cpp
-===================================================================
---- image_publisher.orig/src/nodelet/image_publisher_nodelet.cpp
-+++ image_publisher/src/nodelet/image_publisher_nodelet.cpp
-@@ -95,7 +95,7 @@ class ImagePublisherNodelet : public nod
-     {
-       if ( cap_.isOpened() ) {
-         if ( ! cap_.read(image_) ) {
--          cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
-+          cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
-         }
-       }
-       if (flip_image_)
-@@ -136,7 +136,7 @@ public:
-     nh_.param("filename", filename_, std::string(""));
-     NODELET_INFO("File name for publishing image is : %s", filename_.c_str());
-     try {
--      image_ = cv::imread(filename_, CV_LOAD_IMAGE_COLOR);
-+      image_ = cv::imread(filename_, cv::IMREAD_COLOR);
-       if ( image_.empty() ) { // if filename is motion file or device file
-         try {  // if filename is number
-           int num = boost::lexical_cast<int>(filename_);//num is 1234798797
-@@ -146,7 +146,7 @@ public:
-         }
-         CV_Assert(cap_.isOpened());
-         cap_.read(image_);
--        cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
-+        cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
-       }
-       CV_Assert(!image_.empty());
-     }
diff --git a/dev-ros/image_publisher/image_publisher-1.12.22-r1.ebuild b/dev-ros/image_publisher/image_publisher-1.12.22-r1.ebuild
deleted file mode 100644
index 7a3fea27064f..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_publisher/image_publisher-1.12.23.ebuild b/dev-ros/image_publisher/image_publisher-1.12.23.ebuild
deleted file mode 100644
index 44b01c18391f..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.12.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_publisher/image_publisher-1.13.0.ebuild b/dev-ros/image_publisher/image_publisher-1.13.0.ebuild
deleted file mode 100644
index dd6ff1f0df2e..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish an image stream from single image file or avi file."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	>=media-libs/opencv-4:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/image_publisher/image_publisher-1.15.2.ebuild b/dev-ros/image_publisher/image_publisher-1.15.2.ebuild
new file mode 100644
index 000000000000..34d0c0948d93
--- /dev/null
+++ b/dev-ros/image_publisher/image_publisher-1.15.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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="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
index 7a3fea27064f..34d0c0948d93 100644
--- a/dev-ros/image_publisher/image_publisher-9999.ebuild
+++ b/dev-ros/image_publisher/image_publisher-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -23,7 +22,8 @@ RDEPEND="
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_rotate/Manifest b/dev-ros/image_rotate/Manifest
index a465c719fd51..b91313d7d241 100644
--- a/dev-ros/image_rotate/Manifest
+++ b/dev-ros/image_rotate/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_rotate-1.12.22-r1.ebuild 679 BLAKE2B e69271b3169a0e6ee0734c9c00c465df97b9af950a102024546aa52778293e6aa0edf3b33697ffff4a33b439af4957934e1f6fdfb4bade19b798adff2a48d6b4 SHA512 2760cfc1c6408482a26057a7135f5859d4950c166992b8c4505b91018cb0fad4c9d53771542539d91c57386dc9e43a97fcdb7ed98403bdb4bf71fb429a0ae96e
-EBUILD image_rotate-1.12.23.ebuild 679 BLAKE2B aef3ad1496da9a3d3a536c4c06d3dfb57608d6684f9b741451fe98edc910ce7bb18b36e647604b280db642ee0d564151b8bd8c36def042d2f0a8730c96dc46ea SHA512 a3663e2ec6ce2dbd65547963c62996c55424cae45f94aaa3adc481f59fc11cb70196df22f9ea7c0ac63f226fb6a0a424d7b27915db58796d48f6f16c67b72cbc
-EBUILD image_rotate-1.13.0.ebuild 676 BLAKE2B 2e706671381494a77564ba69608dcd01085b8118df68557aaefb7aec918a5fb110011852d818c145df0825c582bdce1b31eb431740ab58bb7f653b97a2d16ffa SHA512 ba9276de66392cf8389abe68862bf0fd0a7ba80665a51057ac2cf672d38ecc1c01ebe18950995800eebf5206575b770ff8931e13196e7493fc29b774d9b9d629
-EBUILD image_rotate-9999.ebuild 679 BLAKE2B e69271b3169a0e6ee0734c9c00c465df97b9af950a102024546aa52778293e6aa0edf3b33697ffff4a33b439af4957934e1f6fdfb4bade19b798adff2a48d6b4 SHA512 2760cfc1c6408482a26057a7135f5859d4950c166992b8c4505b91018cb0fad4c9d53771542539d91c57386dc9e43a97fcdb7ed98403bdb4bf71fb429a0ae96e
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_rotate-1.15.2.ebuild 630 BLAKE2B 18376c9b73e3fb2b5b7e178dad1369c4e82f8aa644c4fb562d8baf454213f4c05699a432b5972eddd9d486219697c3d4b23a3fcffc0fde791e1ded0c64ddc8f2 SHA512 c7580420cf209e54a04ed643266e532761ce84016d030490df785502ff063d8de70786f2ab2dff808cfbb1c086d8147533eedaeb5cad65858211aff1a540beb8
+EBUILD image_rotate-9999.ebuild 630 BLAKE2B 18376c9b73e3fb2b5b7e178dad1369c4e82f8aa644c4fb562d8baf454213f4c05699a432b5972eddd9d486219697c3d4b23a3fcffc0fde791e1ded0c64ddc8f2 SHA512 c7580420cf209e54a04ed643266e532761ce84016d030490df785502ff063d8de70786f2ab2dff808cfbb1c086d8147533eedaeb5cad65858211aff1a540beb8
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_rotate/image_rotate-1.12.22-r1.ebuild b/dev-ros/image_rotate/image_rotate-1.12.22-r1.ebuild
deleted file mode 100644
index eecbe94dd9f4..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/eigen_conversions
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.12.23.ebuild b/dev-ros/image_rotate/image_rotate-1.12.23.ebuild
deleted file mode 100644
index c501661beb9e..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.12.23.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/eigen_conversions
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.13.0.ebuild b/dev-ros/image_rotate/image_rotate-1.13.0.ebuild
deleted file mode 100644
index 1d31862840cd..000000000000
--- a/dev-ros/image_rotate/image_rotate-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/eigen_conversions
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/image_rotate-1.15.2.ebuild b/dev-ros/image_rotate/image_rotate-1.15.2.ebuild
new file mode 100644
index 000000000000..37756f13089c
--- /dev/null
+++ b/dev-ros/image_rotate/image_rotate-1.15.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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-9999.ebuild b/dev-ros/image_rotate/image_rotate-9999.ebuild
index eecbe94dd9f4..37756f13089c 100644
--- a/dev-ros/image_rotate/image_rotate-9999.ebuild
+++ b/dev-ros/image_rotate/image_rotate-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
+DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/image_transport/Manifest b/dev-ros/image_transport/Manifest
index 0fe3655b1a55..41e43debb2e4 100644
--- a/dev-ros/image_transport/Manifest
+++ b/dev-ros/image_transport/Manifest
@@ -1,4 +1,4 @@
-DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD image_transport-1.11.13-r2.ebuild 635 BLAKE2B 68729bc28c9036f5e3268fc31589f751a8a70d660f8b29bbeb1c2febd18f3b9fb287fb29858c840887bb84b1c3585400c004dd4ababc08b8e276dc9c9dabbb61 SHA512 19ed960a0334557ee9c3cd7b9e79e29d7559ebcad99d3967fb3db9511f23ad24f8d903774f2493e62186d3c659cac0dd5f4356d43ab2283ce38c30785ab1ff45
-EBUILD image_transport-9999.ebuild 635 BLAKE2B 68729bc28c9036f5e3268fc31589f751a8a70d660f8b29bbeb1c2febd18f3b9fb287fb29858c840887bb84b1c3585400c004dd4ababc08b8e276dc9c9dabbb61 SHA512 19ed960a0334557ee9c3cd7b9e79e29d7559ebcad99d3967fb3db9511f23ad24f8d903774f2493e62186d3c659cac0dd5f4356d43ab2283ce38c30785ab1ff45
+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 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/image_transport/image_transport-1.11.13-r2.ebuild b/dev-ros/image_transport/image_transport-1.11.13-r2.ebuild
deleted file mode 100644
index 2be6354ffbb1..000000000000
--- a/dev-ros/image_transport/image_transport-1.11.13-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-ros/class_loader:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_transport/image_transport-1.12.0.ebuild b/dev-ros/image_transport/image_transport-1.12.0.ebuild
new file mode 100644
index 000000000000..4f3b8e6e7e86
--- /dev/null
+++ b/dev-ros/image_transport/image_transport-1.12.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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
index 2be6354ffbb1..4f3b8e6e7e86 100644
--- a/dev-ros/image_transport/image_transport-9999.ebuild
+++ b/dev-ros/image_transport/image_transport-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -20,9 +20,10 @@ RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
 	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 	dev-ros/class_loader:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index ed5c883da3bf..81c9ce4cbde1 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,7 +1,4 @@
-AUX boost170.patch 513 BLAKE2B c78a511ebf9ec506d75ba5ad639932321ff5542d5812db3e7b448765aff92c9b3e75f299c0ef15626cd5bbd6a34acee9efe202dc2f38dc20478b3f8e2f6b2577 SHA512 15c4024d4de848e06b47d845dd33758cac44c1e2c07982749a523a7d8d852921fff1306aa105f65df6d5152a09e974a0cfb8c1f70859cc415f51b1e1ec9e2b79
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_view-1.12.23.ebuild 879 BLAKE2B fa54faf98131e0639ebfb8b375c3e6d09b7765ec108cdba4a91adfbc20a74a6dc9053d4b09f306329d0f97a675c347ef2363480508bee8e84869221b3c60d002 SHA512 f5ae3c9cdd3297cdea49c0a9ad6083e547bfc4327360e362001a044e26b9fed332465ececc8a3f2ff6c1b63092a65b17b6267274db7c55cbdc10bd5ec182754e
-EBUILD image_view-1.13.0.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
-EBUILD image_view-9999.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_view-1.15.2-r1.ebuild 873 BLAKE2B ec5a77c58a5f77cfaa22b285f00d265e882c3f7d375101500951d14f2fce40136714e7ceeeb2a6f2a93d67a7dfec35ed363e61f10c4f27b76d6a02f29b98a336 SHA512 3bf82c2f933fb1538dd7230acb73e96ba80ef395af065555bd6f98208b5f0844afe6a4c384eb2e55b32b1cd661f42e2c582059f3d9850777b97fbdd23cadcbb5
+EBUILD image_view-9999.ebuild 873 BLAKE2B ec5a77c58a5f77cfaa22b285f00d265e882c3f7d375101500951d14f2fce40136714e7ceeeb2a6f2a93d67a7dfec35ed363e61f10c4f27b76d6a02f29b98a336 SHA512 3bf82c2f933fb1538dd7230acb73e96ba80ef395af065555bd6f98208b5f0844afe6a4c384eb2e55b32b1cd661f42e2c582059f3d9850777b97fbdd23cadcbb5
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_view/files/boost170.patch b/dev-ros/image_view/files/boost170.patch
deleted file mode 100644
index ab52d89c5fad..000000000000
--- a/dev-ros/image_view/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: image_view/CMakeLists.txt
-===================================================================
---- image_view.orig/CMakeLists.txt
-+++ image_view/CMakeLists.txt
-@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
- generate_dynamic_reconfigure_options(cfg/ImageView.cfg)
- 
- catkin_package(CATKIN_DEPENDS dynamic_reconfigure)
--find_package(Boost REQUIRED COMPONENTS signals thread)
-+find_package(Boost REQUIRED COMPONENTS thread)
- find_package(OpenCV REQUIRED)
- 
- include_directories(${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/image_view/image_view-1.12.23.ebuild b/dev-ros/image_view/image_view-1.12.23.ebuild
deleted file mode 100644
index b7c4e715c9e9..000000000000
--- a/dev-ros/image_view/image_view-1.12.23.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv:=
-	x11-libs/gtk+:2
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_view/image_view-1.13.0.ebuild b/dev-ros/image_view/image_view-1.13.0.ebuild
deleted file mode 100644
index b9c0dff05bac..000000000000
--- a/dev-ros/image_view/image_view-1.13.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv:=
-	x11-libs/gtk+:2
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/image_view-1.15.2-r1.ebuild b/dev-ros/image_view/image_view-1.15.2-r1.ebuild
new file mode 100644
index 000000000000..59e53eacf1de
--- /dev/null
+++ b/dev-ros/image_view/image_view-1.15.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 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="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:=[threads]
+	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
index b9c0dff05bac..59e53eacf1de 100644
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ b/dev-ros/image_view/image_view-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,9 +14,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv:=
-	x11-libs/gtk+:2
 	dev-ros/camera_calibration_parsers
 	>=dev-ros/cv_bridge-1.11.10
 	dev-ros/image_transport
@@ -26,9 +22,18 @@ RDEPEND="
 	dev-ros/rosconsole
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+
+	dev-libs/boost:=[threads]
+	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}]
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/imu_complementary_filter/Manifest b/dev-ros/imu_complementary_filter/Manifest
index 635ac631d694..62ae38a84fe4 100644
--- a/dev-ros/imu_complementary_filter/Manifest
+++ b/dev-ros/imu_complementary_filter/Manifest
@@ -1,8 +1,4 @@
-DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
-DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
-DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
-EBUILD imu_complementary_filter-1.1.5.ebuild 598 BLAKE2B c16830be1c852c4e99d38535a6b1305478d94da0875f063d4ef3df176bfb072b9b4771bdd919a5b5e9288b4ceb4a91ad8320926f05ac2a30e5d606c1617ad512 SHA512 43ec4e9e3b2100312b3c8a2db4736f7daaedbfad0c05b8206384ef5af02c5b3d0192ddf9c02ec4ffc1cf129edcf72982d740fb23473dc7f67c61d9b92daf4bd7
-EBUILD imu_complementary_filter-1.2.0.ebuild 598 BLAKE2B e58418a4664e2552c8564ed4a411607c3eb2f25d218b12e79fb79345cb9457fb0044eca36eef10aec9a52f1626b7ebccd6bc393cbbe3eac49657fada0d1174f1 SHA512 0e6ad3862755f9d6f8bc73c337831efa885b669036986ebab789d47350851eb35ec00b8b567fd8494303c9c70da93052e2830769fd6366336ee9f9677102b328
-EBUILD imu_complementary_filter-1.2.1.ebuild 595 BLAKE2B 5c4e3b6515a836ad1cc234c520dba54178b7c4c2263886eabe1961b9a0f821a60fc4bca7af3cec0c95adabe967fd9eab29e54b00b02a689c2ee57187fcb6bd7a SHA512 7c7a0554e755b738b860d95ec5abf23c264c56b404a5d86793823352fbdf8e302c8a06814a159fd9e69f3a174ef4dffde5c56c887abbe392e8fda189e63843b4
-EBUILD imu_complementary_filter-9999.ebuild 598 BLAKE2B c16830be1c852c4e99d38535a6b1305478d94da0875f063d4ef3df176bfb072b9b4771bdd919a5b5e9288b4ceb4a91ad8320926f05ac2a30e5d606c1617ad512 SHA512 43ec4e9e3b2100312b3c8a2db4736f7daaedbfad0c05b8206384ef5af02c5b3d0192ddf9c02ec4ffc1cf129edcf72982d740fb23473dc7f67c61d9b92daf4bd7
+DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+EBUILD imu_complementary_filter-1.2.2.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
+EBUILD imu_complementary_filter-9999.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.1.5.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.1.5.ebuild
deleted file mode 100644
index d9eb91e64e14..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild
deleted file mode 100644
index bbbf6e05dd1b..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-"
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild
deleted file mode 100644
index 3990921e748c..000000000000
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-"
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
new file mode 100644
index 000000000000..6c1525c19499
--- /dev/null
+++ b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild
@@ -0,0 +1,29 @@
+# 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-9999.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
index d9eb91e64e14..6c1525c19499 100644
--- a/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
+++ b/dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
 KEYWORDS="~amd64"
@@ -9,7 +9,7 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -17,11 +17,13 @@ IUSE=""
 RDEPEND="
 	dev-ros/message_filters
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	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_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index 04f00fa55599..f9ba818faecb 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,5 +1,4 @@
-AUX boost_signals.patch 617 BLAKE2B f7ee39beda0b22eb154e9ada0ded0d015fe7a926c40d57563f4e1619f8d770a305c035edfd222e8b9da9eec7f7fd27f84340d6f3053de654663510af3691342b SHA512 7e21054ab7ca3594f190211c1d55df9fea02552a104d8f382067c18545eafce4f3b17453b64d687d38d993c7cf54e137cf82113e8ddc9dc3f9ef763b269d8c82
-DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
-EBUILD imu_filter_madgwick-1.2.1.ebuild 798 BLAKE2B 53a0f91afd1285fc0ef66e8e17382acdaf0d9d2526c127d050540b3a86a52bb8205a3eb9c3d37f8449986b9036c56bf7917702909f317e76247b11889cc92c6c SHA512 e10214a59ac79a47b5e739570188f54fb27740f50f6b9e1d3e2e7a997a6712489068f8dc0f38fdaf73b236b6884e8ed61a57e74da9d46ba4c978a581edf077e6
-EBUILD imu_filter_madgwick-9999.ebuild 798 BLAKE2B 53a0f91afd1285fc0ef66e8e17382acdaf0d9d2526c127d050540b3a86a52bb8205a3eb9c3d37f8449986b9036c56bf7917702909f317e76247b11889cc92c6c SHA512 e10214a59ac79a47b5e739570188f54fb27740f50f6b9e1d3e2e7a997a6712489068f8dc0f38fdaf73b236b6884e8ed61a57e74da9d46ba4c978a581edf077e6
+DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+EBUILD imu_filter_madgwick-1.2.2-r1.ebuild 776 BLAKE2B 8d0d1c63c554bed23ecc4ff0f608b54c511368a953b57955d021131a08a70fc239a7feb229f87c68187f9a2a6fe192f7d6487ca01fbfa7acae91b4e21c709b92 SHA512 48364587984cb7a12c3ba18a2373d86478576bf5ddef7ed75a688d13c535ffc79ff917b1a201aef8d29ddc6c406d1fb36d27fdfb5d938c5fa8be670615d83920
+EBUILD imu_filter_madgwick-9999.ebuild 776 BLAKE2B 8d0d1c63c554bed23ecc4ff0f608b54c511368a953b57955d021131a08a70fc239a7feb229f87c68187f9a2a6fe192f7d6487ca01fbfa7acae91b4e21c709b92 SHA512 48364587984cb7a12c3ba18a2373d86478576bf5ddef7ed75a688d13c535ffc79ff917b1a201aef8d29ddc6c406d1fb36d27fdfb5d938c5fa8be670615d83920
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/files/boost_signals.patch b/dev-ros/imu_filter_madgwick/files/boost_signals.patch
deleted file mode 100644
index 75d3130d9765..000000000000
--- a/dev-ros/imu_filter_madgwick/files/boost_signals.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imu_filter_madgwick/CMakeLists.txt
-===================================================================
---- imu_filter_madgwick.orig/CMakeLists.txt
-+++ imu_filter_madgwick/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(imu_filter_madgwick)
- 
- find_package(catkin REQUIRED COMPONENTS roscpp sensor_msgs geometry_msgs tf2 tf2_geometry_msgs tf2_ros nodelet pluginlib message_filters dynamic_reconfigure)
- 
--find_package(Boost REQUIRED COMPONENTS system thread signals)
-+find_package(Boost REQUIRED COMPONENTS system thread)
- 
- # Generate dynamic parameters
- generate_dynamic_reconfigure_options(cfg/ImuFilterMadgwick.cfg)
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
deleted file mode 100644
index 44fb87672c7d..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	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
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosunit )
-"
-PATCHES=( "${FILESDIR}/boost_signals.patch" )
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..e32f92ffa33d
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r1.ebuild
@@ -0,0 +1,36 @@
+# 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="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:=[threads]
+"
+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
index 44fb87672c7d..e32f92ffa33d 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
 KEYWORDS="~amd64"
@@ -9,15 +9,13 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2
 	dev-ros/tf2_geometry_msgs
 	dev-ros/tf2_ros
@@ -25,10 +23,14 @@ RDEPEND="
 	dev-libs/console_bridge:=
 	dev-ros/pluginlib
 	dev-ros/message_filters
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rosunit )
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rosunit
+		dev-cpp/gtest
+	)
 "
-PATCHES=( "${FILESDIR}/boost_signals.patch" )
diff --git a/dev-ros/imu_processors/Manifest b/dev-ros/imu_processors/Manifest
index eb77ede01841..6ed259d7d27b 100644
--- a/dev-ros/imu_processors/Manifest
+++ b/dev-ros/imu_processors/Manifest
@@ -1,8 +1,4 @@
-DIST imu_pipeline-0.2.1.tar.gz 7962 BLAKE2B 4af64db84fe96d70d2c61f8c16375bb28faac9c5630f3cad8c94ef9f87c5b17e302313a2511442b8c810e2ac589a733d6b333b2111b579c06559befaa5e9e1c6 SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4
-DIST imu_pipeline-0.2.2.tar.gz 8080 BLAKE2B cdeeb7b95cca23aa7c30902b3be3daa34af222ff660058c1e57cf02b75008d4840b82cb52dbf7fa9a2968b2e41244fe7f1833429bd04280fdf68fb7fff2d240d SHA512 95913f3edec9af4d981d6034beb8932bba2e8a4d05a72c70c1bf2bcd5b85a9afa490e2916b6e4178e35b6a1967208999bfb697f5925ce12cae7e57fad2721f3f
-DIST imu_pipeline-0.2.3.tar.gz 8143 BLAKE2B 0ec49f17dc3058b5cb70c293d3c36c7f7de4866b8e0b9fe421f90da86f9645fcdf9736f88aef32a982228e1dddce1f968af297beb7386b89e02e134ca3ff1c82 SHA512 db58c71bac9d85b7e3ec5268545dd0281307f012cc9e8a6383d187f4e378395c6f4290e392d97b6fc61464c29e4c4e2d00dc8cbfb659461a1a771fe8f59de575
-EBUILD imu_processors-0.2.1.ebuild 536 BLAKE2B e3fa445ab95374d77e9f11d0b1e1e690bc29698c30ea6431e7d2e3b5242b7a1e023149e3aef2c306ba54472f608e926f0f8ffff78aa0124948c947fb9ccf4949 SHA512 f3b9e557c9f8bfdffa68277b5a809bee86dbbd34420abe9fe70447c54fa3ce385e101904497437dfdf0d14bdca275783cb892b1a069eefe9f396b34b3e569331
-EBUILD imu_processors-0.2.2.ebuild 536 BLAKE2B 52d7f27a6f397075744915a445030425a12e46b284d083b32e934260eee129fa473673d2628d284343bbf78f1a356451f02165603cb238cd2a0074107dd80597 SHA512 619583a316723f8f0f90e5a3191ae221ac21103ff07a8380078a0b256c825d9d3437f5b6481c1a529b3d8410df6fc13eb9d88cb374210d6bb68178cee4909faa
-EBUILD imu_processors-0.2.3.ebuild 533 BLAKE2B 3fbe84ce919506bdce14ff433c573c0599d418001df2dba76a2cc49655234a59a13e8afe259fa95c4612fadd3d7b55c39cf188f1f220b48a200fdbb3b026d03a SHA512 cfb7443161ef3c076d7852061a6a04aaf31cae689034d4f736bb41575554e9f9249c1d1436166f0ec85402548b9ebd63ca27149d014c5faea34c34841980ba9c
-EBUILD imu_processors-9999.ebuild 536 BLAKE2B e3fa445ab95374d77e9f11d0b1e1e690bc29698c30ea6431e7d2e3b5242b7a1e023149e3aef2c306ba54472f608e926f0f8ffff78aa0124948c947fb9ccf4949 SHA512 f3b9e557c9f8bfdffa68277b5a809bee86dbbd34420abe9fe70447c54fa3ce385e101904497437dfdf0d14bdca275783cb892b1a069eefe9f396b34b3e569331
+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 341 BLAKE2B 25a24a32562bee0499af4b1e1a59341a7087ae303f179dc1f83b7b67c16f6fb6d9c835eafeaf6cd006e5ff9bae9d6ccc661ea2319656532436e4b6b093231f20 SHA512 37ef287b9a99e47b966f647c2ec1690bc6339f2f82047a1cefecd138ffe388ac2900c744999385c86dd9819c2664ac89b36ab64dcded0d2358aa703b16115761
diff --git a/dev-ros/imu_processors/imu_processors-0.2.1.ebuild b/dev-ros/imu_processors/imu_processors-0.2.1.ebuild
deleted file mode 100644
index 4848998eaf36..000000000000
--- a/dev-ros/imu_processors/imu_processors-0.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/imu_processors-0.2.2.ebuild b/dev-ros/imu_processors/imu_processors-0.2.2.ebuild
deleted file mode 100644
index 2aa7070db8b7..000000000000
--- a/dev-ros/imu_processors/imu_processors-0.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/imu_processors-0.2.3.ebuild b/dev-ros/imu_processors/imu_processors-0.2.3.ebuild
deleted file mode 100644
index b0d8ecc9d6ba..000000000000
--- a/dev-ros/imu_processors/imu_processors-0.2.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/imu_processors-0.3.0.ebuild b/dev-ros/imu_processors/imu_processors-0.3.0.ebuild
new file mode 100644
index 000000000000..d6a179c9745f
--- /dev/null
+++ b/dev-ros/imu_processors/imu_processors-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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
index 4848998eaf36..d6a179c9745f 100644
--- a/dev-ros/imu_processors/imu_processors-9999.ebuild
+++ b/dev-ros/imu_processors/imu_processors-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,8 +16,9 @@ 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}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/Manifest b/dev-ros/imu_transformer/Manifest
index 060e59fd4d49..c1709ce4ef6c 100644
--- a/dev-ros/imu_transformer/Manifest
+++ b/dev-ros/imu_transformer/Manifest
@@ -1,7 +1,4 @@
-AUX pluginlib.patch 725 BLAKE2B 618e82a15e171459997bf508acad38d577e04fc77188f13dfba7dd3b109c845e96eaf6e7a236944097c822e03261981f571d5cb7ee6399e7df7737e42cbb7ed8 SHA512 5d03d7042fc4cc22a30dd9b39b6e024d0a157dc8370d0d39b19103f7c73d42d75db839f55faca1e2b8bf01caf8cfe3c02ca46a78f87bc9a66e44b2394e87ece8
-DIST imu_pipeline-0.2.2.tar.gz 8080 BLAKE2B cdeeb7b95cca23aa7c30902b3be3daa34af222ff660058c1e57cf02b75008d4840b82cb52dbf7fa9a2968b2e41244fe7f1833429bd04280fdf68fb7fff2d240d SHA512 95913f3edec9af4d981d6034beb8932bba2e8a4d05a72c70c1bf2bcd5b85a9afa490e2916b6e4178e35b6a1967208999bfb697f5925ce12cae7e57fad2721f3f
-DIST imu_pipeline-0.2.3.tar.gz 8143 BLAKE2B 0ec49f17dc3058b5cb70c293d3c36c7f7de4866b8e0b9fe421f90da86f9645fcdf9736f88aef32a982228e1dddce1f968af297beb7386b89e02e134ca3ff1c82 SHA512 db58c71bac9d85b7e3ec5268545dd0281307f012cc9e8a6383d187f4e378395c6f4290e392d97b6fc61464c29e4c4e2d00dc8cbfb659461a1a771fe8f59de575
-EBUILD imu_transformer-0.2.2-r1.ebuild 752 BLAKE2B f7cd1f813ebd7aff89edc3d4f4f2a5261ebf45bd4863b01ea2e1cddfb1c7ca7ed37824b8688942a3082daf412b3c87d13581c307f2ff8af0cb44173c53754450 SHA512 4dde22eeced427c0699cc8f8f9f94367c0492a2b25e0f5b8dd16dbcf032f7539a00f63c8ecd4e25cc8f5ee6134b0c1ae135e4171054bf02a5b39aecfae7e51e9
-EBUILD imu_transformer-0.2.3.ebuild 707 BLAKE2B a9de63ed90980d8d52b5d5263d880e63e149b4a53e18a9f2f5569698d5ea610965518644dc4084d79a8a3a2793cf541b8d5d4e0146410cac31e31302e365201c SHA512 85242fc494d5ca62d8eab9dbedf83a83feadead77135e4e1c5add19e193fa4466622615afdfca59b9a16cbefdd4a9cb0700064b71b5b4bdd0f194e27be9fc4bd
-EBUILD imu_transformer-9999.ebuild 710 BLAKE2B 66bdc536e40b5096f04518ffdcbae045689ba9138c178223589f4c87681c9c98479583433340eca588c5e1aafe7c9b74fa55794cca0a8ad3869108fefd52c7c5 SHA512 29f56b06b288ba78d230172b0baf19f549c80d7c8356a31f7e5c4903d0e6f73766ace85ff8cdf99f045119b0f5f79aa0a77fc8f8819d495d8dcdc747a6fa1112
+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 341 BLAKE2B 25a24a32562bee0499af4b1e1a59341a7087ae303f179dc1f83b7b67c16f6fb6d9c835eafeaf6cd006e5ff9bae9d6ccc661ea2319656532436e4b6b093231f20 SHA512 37ef287b9a99e47b966f647c2ec1690bc6339f2f82047a1cefecd138ffe388ac2900c744999385c86dd9819c2664ac89b36ab64dcded0d2358aa703b16115761
diff --git a/dev-ros/imu_transformer/files/pluginlib.patch b/dev-ros/imu_transformer/files/pluginlib.patch
deleted file mode 100644
index a7f519b1d26b..000000000000
--- a/dev-ros/imu_transformer/files/pluginlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 2c98b4c99b90bf88eabcd1ce071c7194ae05bf2b
-Author: Mikael Arguedas <mikael@osrfoundation.org>
-Date:   Fri Oct 27 15:03:06 2017 -0700
-
-    update to use non deprecated pluginlib macro
-
-diff --git a/imu_transformer/src/imu_transformer_nodelet.cpp b/imu_transformer/src/imu_transformer_nodelet.cpp
-index 7c0a30f..9ad94ec 100644
---- a/imu_transformer/src/imu_transformer_nodelet.cpp
-+++ b/imu_transformer/src/imu_transformer_nodelet.cpp
-@@ -123,4 +123,4 @@ namespace imu_transformer
- 
- }
- 
--PLUGINLIB_DECLARE_CLASS(imu_transformer, ImuTransformerNodelet, imu_transformer::ImuTransformerNodelet, nodelet::Nodelet);
-\ No newline at end of file
-+PLUGINLIB_EXPORT_CLASS(imu_transformer::ImuTransformerNodelet, nodelet::Nodelet)
diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild b/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild
deleted file mode 100644
index 425e2e0e9797..000000000000
--- a/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Node/nodelet combination to transform 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/tf2
-	dev-ros/tf2_ros
-	dev-ros/topic_tools
-	dev-ros/tf2_sensor_msgs
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.3.ebuild b/dev-ros/imu_transformer/imu_transformer-0.2.3.ebuild
deleted file mode 100644
index adf4a3b40001..000000000000
--- a/dev-ros/imu_transformer/imu_transformer-0.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Node/nodelet combination to transform 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/tf2
-	dev-ros/tf2_ros
-	dev-ros/topic_tools
-	dev-ros/tf2_sensor_msgs
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild b/dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild
new file mode 100644
index 000000000000..bd9fa0e9bf63
--- /dev/null
+++ b/dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 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
index b51a391ae5de..bd9fa0e9bf63 100644
--- a/dev-ros/imu_transformer/imu_transformer-9999.ebuild
+++ b/dev-ros/imu_transformer/imu_transformer-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another"
+DESCRIPTION="Transforms sensor_msgs::Imu data from one frame into another"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
@@ -19,12 +19,19 @@ RDEPEND="
 	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}]
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/interactive_marker_tutorials/Manifest b/dev-ros/interactive_marker_tutorials/Manifest
index cde78917176c..bf8b976854f9 100644
--- a/dev-ros/interactive_marker_tutorials/Manifest
+++ b/dev-ros/interactive_marker_tutorials/Manifest
@@ -1,6 +1,4 @@
-DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD interactive_marker_tutorials-0.10.3-r1.ebuild 631 BLAKE2B a35e25dd19e6280ba002ea71274d10105f0ed40b43d2aab2a89db0a6c496b1c04068cebc5874533e2f1c6adb7e7dd711f92d2004d0a7b7abf9fae6b869b4104c SHA512 6ca56c0b03b28cfde6aae740c77481ff3b7c9cf4e21de0753f5e6784af4db43563165e369af15ba3c718d525bcbdf86ada545b80da4597fea557f91abb5e1d94
-EBUILD interactive_marker_tutorials-0.11.0.ebuild 631 BLAKE2B f3497f4d43a9b6fa9e3615115c0c1d185ca35917619f99c0b87e4f0a9b880788c860c067feef3ee5bf732bf9278032a0f21a92bf20b8c0e6cde0c8d4ae47308a SHA512 1326389a84f2a6e4662476b8c6f45cc4cb5c6b8946d6f1282d957613ac08030291ac4238ff2e75690cf1ac1997170e778d4d82155712a5385245054f26f841ff
-EBUILD interactive_marker_tutorials-9999.ebuild 631 BLAKE2B a35e25dd19e6280ba002ea71274d10105f0ed40b43d2aab2a89db0a6c496b1c04068cebc5874533e2f1c6adb7e7dd711f92d2004d0a7b7abf9fae6b869b4104c SHA512 6ca56c0b03b28cfde6aae740c77481ff3b7c9cf4e21de0753f5e6784af4db43563165e369af15ba3c718d525bcbdf86ada545b80da4597fea557f91abb5e1d94
+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 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild
deleted file mode 100644
index 6844281b86eb..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
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
index 19ee9324c9d7..a4442a8e777d 100644
--- 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
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,10 +16,12 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	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}"
+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
index 6844281b86eb..a4442a8e777d 100644
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,10 +16,12 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	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}"
+DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/interactive_markers/Manifest b/dev-ros/interactive_markers/Manifest
index 8648acd0904b..22019e8cfbf6 100644
--- a/dev-ros/interactive_markers/Manifest
+++ b/dev-ros/interactive_markers/Manifest
@@ -1,6 +1,4 @@
-DIST interactive_markers-1.11.3.tar.gz 30201 BLAKE2B 5f0ce32737bf6f61fe26ebbbaddf0222123fee26106eb0726817e6d2112bfa4861b0a2571beb2a94ed8d3fdeab6e8e4e0cf9820721349fddb82a68fe9e4adb5f SHA512 9d4c44b67474aefae33498e03f7dfaafd2b28bef42a780900f3c9b3c7b119e0f899bc9220d449e44f071257dff093f7af745f97cb2e75fc949ed54f53c60d46c
-DIST interactive_markers-1.11.4.tar.gz 29971 BLAKE2B cd260fe0f03fb10322f8c717f3532657123a8298f140db33ae927f054fa373b219fdcba1c4423bb38ed9b3cd5c5f10b4459e3b18e711b6acab5393b3019e4795 SHA512 e78d0ecd8c702aebcdbb28f4f227f1d0baeb71d4af952a2a2d385e2ced0bf5e6afd8e810ef99015bdf3c2284b583b0eb7776705caf30ba5ff3b4a77d16e12e94
-EBUILD interactive_markers-1.11.3.ebuild 737 BLAKE2B 3041406b61442fc95dde102c9c1a1bec3dcacb3705d1a236d9fbf357d92f4cd43f4ef1a2d5e56152aa7bde0bdd65fbc553d11f7cbf8e26d23276e6c639e0c113 SHA512 ff4e4f412fec60cd5a5ab4cf472101218ad230a337fc9bbe53b93473527c91b93ef0c59616e7a7df8e9020f9359e6aafc387058fa8e8644a6a952a254651cac9
-EBUILD interactive_markers-1.11.4.ebuild 737 BLAKE2B 93d435caa72c476bf26f9ca60dc34026ac66aa72de997125220a83d85724025017b1a41193fe9c8adf143e0216f9fa53b4db78c21f8965e42c6a660a9bf04a6a SHA512 1278189984374a320e82effca2039c96876a547afd8c8c52ecbafc3a4f47956a328de34bd53d738c6825f09d1520853dd31c5ddd236bef2caa21c17af83b6551
-EBUILD interactive_markers-9999.ebuild 737 BLAKE2B 3041406b61442fc95dde102c9c1a1bec3dcacb3705d1a236d9fbf357d92f4cd43f4ef1a2d5e56152aa7bde0bdd65fbc553d11f7cbf8e26d23276e6c639e0c113 SHA512 ff4e4f412fec60cd5a5ab4cf472101218ad230a337fc9bbe53b93473527c91b93ef0c59616e7a7df8e9020f9359e6aafc387058fa8e8644a6a952a254651cac9
+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 351 BLAKE2B b177ef1311b10a0939dc8778be7461072e9919a6318acca86e32a36d102698a50e6a77ec30ef99976d5d2b8660be7e658667f7f63ee80c30c8b8319fd618c655 SHA512 901123473444518fc3f02d2496a045d6154e35bce54f9e76d927cfa4cf268556f8479ec2a1f4f60655d7efaef3ee51b175301811012b171244c7667d6b8ecc49
diff --git a/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild b/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild
deleted file mode 100644
index edbf6132aa08..000000000000
--- a/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild b/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
deleted file mode 100644
index c9e821947cd1..000000000000
--- a/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
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
new file mode 100644
index 000000000000..213935ea9d54
--- /dev/null
+++ b/dev-ros/interactive_markers/interactive_markers-1.12.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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
index edbf6132aa08..213935ea9d54 100644
--- a/dev-ros/interactive_markers/interactive_markers-9999.ebuild
+++ b/dev-ros/interactive_markers/interactive_markers-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,14 +14,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
 	dev-ros/rosconsole
-	dev-ros/rostest[${PYTHON_USEDEP}]
+	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/interval_intersection/Manifest b/dev-ros/interval_intersection/Manifest
index 12e87b86a649..9b87b3e03fc5 100644
--- a/dev-ros/interval_intersection/Manifest
+++ b/dev-ros/interval_intersection/Manifest
@@ -1,5 +1,4 @@
-AUX gcc6.patch 1465 BLAKE2B e66648e673f2e80f2033171615a829772ad33c3d382da15ae73195510c1e5f4e5cc11793c87d5619443189d582401d32eaa4e96419b2d678d73b10ff4dffae81 SHA512 b2f5d80bce8c15b9636a57c56a83dc1b7f57463fe398b67436584e9790e6548b600c92b2921c624c3eafb590565db7eb17518b748dfd8d2bb440501e9e2c885d
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD interval_intersection-0.10.14.ebuild 799 BLAKE2B f47aa7e6158befa4e67c3e3e0852f83b1115ba4f9c6ff93f5fde97c2375cc941f40b1f6d6420fb33c999f2ad2979ad03c6d686e3c3167b8598b5becc5607eb92 SHA512 bc7c81d318fc6d7d0c4534721837f8909472c3c0f959c777b612da39af43791688ee3987e69bacb2cef7e8b2484f270e01f21be92baaf23070196aa39892dc0d
-EBUILD interval_intersection-9999.ebuild 762 BLAKE2B 29ee105746802b9b5297a62eec1d51edcd04bf99d459febd1848a81ee83b92bded8e56ca93335f6bc6f83381c40cf55f6750e8022358f36f1e6026a52b7c26fe SHA512 7d677353eeb5f99337aad8f0d8606ffe557d52b08874707bdeb8084fe8ae13fbe3844a21edd06bd39c339ac8ab7354de0b7397cfe07c0d4f1c3924a3941922cb
+EBUILD interval_intersection-0.10.14.ebuild 703 BLAKE2B c09471f568311ab67b002706f066f73cc93bd7cb910f15ea7ca294925697925dddbc194c479a0df64bf97478d940c97a9e6ad4ee188230eae1bbeec5cb68b6cc SHA512 19f72f184ea888a0da8c55a40e7088a74df312ca618c10d1df875f872643aa107ef6e1cff25fdbcadda3627acfc36858dc4590e0a7898198fb6715857cb3b512
+EBUILD interval_intersection-9999.ebuild 703 BLAKE2B c09471f568311ab67b002706f066f73cc93bd7cb910f15ea7ca294925697925dddbc194c479a0df64bf97478d940c97a9e6ad4ee188230eae1bbeec5cb68b6cc SHA512 19f72f184ea888a0da8c55a40e7088a74df312ca618c10d1df875f872643aa107ef6e1cff25fdbcadda3627acfc36858dc4590e0a7898198fb6715857cb3b512
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/interval_intersection/files/gcc6.patch b/dev-ros/interval_intersection/files/gcc6.patch
deleted file mode 100644
index 632383629f66..000000000000
--- a/dev-ros/interval_intersection/files/gcc6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit c23ddb86367fc43c2d15e08a452ad2dc1a62041b
-Author: Hodorgasm <nsane457@gmail.com>
-Date:   Mon Sep 19 19:11:57 2016 -0400
-
-    Fix "stdlib.h: No such file or directory" errors in GCC-6
-    
-    Including '-isystem /usr/include' breaks building with GCC-6.
-    See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
-
-diff --git a/interval_intersection/CMakeLists.txt b/interval_intersection/CMakeLists.txt
-index 9bfd103..73bc0ac 100644
---- a/interval_intersection/CMakeLists.txt
-+++ b/interval_intersection/CMakeLists.txt
-@@ -4,7 +4,7 @@ project(interval_intersection)
- find_package(Boost REQUIRED thread)
- find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs geometry_msgs rosconsole roscpp roscpp_serialization rostime std_msgs)
- 
--include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
-+include_directories(${catkin_INCLUDE_DIRS})
- include_directories(include)
-  
- # generate the messages
-@@ -35,7 +35,7 @@ add_executable(interval_intersection_node src/interval_intersection_node.cpp)
- target_link_libraries(interval_intersection_node ${PROJECT_NAME})
- add_dependencies(interval_intersection_node calibration_msgs_gencpp)
- 
--include_directories(SYSTEM ${BOOST_INCLUDE_DIRS})
-+include_directories(${BOOST_INCLUDE_DIRS})
- add_executable(interval_intersection_action src/interval_intersection_action.cpp)
- target_link_libraries(interval_intersection_action ${Boost_LIBRARIES}
-                                                    ${catkin_LIBRARIES}
diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
index e814990288f3..84f4c391c2e3 100644
--- a/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
+++ b/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 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 coming in on several topics"
+DESCRIPTION="Tools for calculating the intersection of interval messages"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -19,12 +18,11 @@ IUSE=""
 RDEPEND="
 	dev-libs/boost:=[threads]
 	dev-ros/actionlib
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	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 )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/interval_intersection/interval_intersection-9999.ebuild b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
index bf87d040c0f6..84f4c391c2e3 100644
--- a/dev-ros/interval_intersection/interval_intersection-9999.ebuild
+++ b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 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 coming in on several topics"
+DESCRIPTION="Tools for calculating the intersection of interval messages"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -19,11 +18,11 @@ IUSE=""
 RDEPEND="
 	dev-libs/boost:=[threads]
 	dev-ros/actionlib
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	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/ivcon/Manifest b/dev-ros/ivcon/Manifest
index ef8589f78f43..75cdddf95211 100644
--- a/dev-ros/ivcon/Manifest
+++ b/dev-ros/ivcon/Manifest
@@ -1,8 +1,4 @@
-DIST ivcon-0.1.5.tar.gz 137970 BLAKE2B b99fcb17cbc6ba4bb4d076156dbb3dc5e2869b92dd919ec8ae1eec83bf55e58ec8d460c9cd2833f9648d57c9e4476b53658c0cd224d34d3cf794b241e1054c9d SHA512 943f1eecf06e90300ecc0c33f91b076a22adc04ec04414d8deb213fee69b2cf13f41844d4ded7a0befabac15bf51352b61c667fb3fad8478784d0825c7e1a268
-DIST ivcon-0.1.6.tar.gz 137996 BLAKE2B 36d0d785d833263642bf307467cddb7ba224b9ea3e118c345c5d77ced6f2e3af86111203f87cfce7d8f0d767cc47dbdc88fbecd4b1d6dd8646cee576c209e2f6 SHA512 ecfae9eb69f62a70131281e8b1b485a5e95e166b5b24d3c313c220f10e746db15a644a6747debcde5b983f2c743ca8d5b3f8bcd2ef963290f8122bbb66e23aea
 DIST ivcon-0.1.7.tar.gz 139018 BLAKE2B 780a0438bf9d9c14714e91639e8c24624d4a3d7dfc0f4ea8ebfea0d42a4e75cce9559642afdc1cabc9b2fcddfac57fecdcbf350d1947d3ab9bbe93c19736d9d1 SHA512 d533c4ab3a708411283b7bd03e6aefb3337edbf50b15b6be56f1aa5df803a0406b52663eee154007eb8980dcff60794206865f62e1910e0239afbd0d328a7c18
-EBUILD ivcon-0.1.5.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
-EBUILD ivcon-0.1.6.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
-EBUILD ivcon-0.1.7.ebuild 298 BLAKE2B 8e30b7c03c139699c26f81b9a33da0307d5a38316b278be9bec2c61bc091ef928a09afecc0c9a6dbf0b3e4493573d9041e663a5df7761522f77eb621f7f6b204 SHA512 368f36dc19f8b6dc67ae13e3732b7b5b098c5174ac8f2854215395c90b5e9e1795031db71985931b9346fda9a18216f5cb7dc0155c6589a2a20816c691827763
-EBUILD ivcon-9999.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
+EBUILD ivcon-0.1.7.ebuild 298 BLAKE2B 4790c1d51cd58801e494d40bd049e823b3dfde3da4ef83f44256f6be2d20fb4d9e4b50083949ae078c8e6180464bec99f14853ddf3d3acec454a906ef86eb69a SHA512 da31039d263dc20efb02ee0a176bea3798b0992c61b6dbe0b95f6c623e2dfed71f3adc63dfec9e3b42b91640d1fd7189a4b8ce24a53691ac6333ae85ef903ce0
+EBUILD ivcon-9999.ebuild 298 BLAKE2B 4790c1d51cd58801e494d40bd049e823b3dfde3da4ef83f44256f6be2d20fb4d9e4b50083949ae078c8e6180464bec99f14853ddf3d3acec454a906ef86eb69a SHA512 da31039d263dc20efb02ee0a176bea3798b0992c61b6dbe0b95f6c623e2dfed71f3adc63dfec9e3b42b91640d1fd7189a4b8ce24a53691ac6333ae85ef903ce0
 MISC metadata.xml 323 BLAKE2B faf34557869bd07626814c86cfbc6508b774aea2ef8cc89c70462c4bf7071159528a95778ec18131f001168f035fe2c20948612b6a0562573eeba4077aa81b0a SHA512 ace865326c08cdc06844cb56696bb5b3332a196816c9a29329b39adb3d4e864e527fda5729ee1386f44b24eed39f3e131e979dac3dd1370792fb4b6839154d64
diff --git a/dev-ros/ivcon/ivcon-0.1.5.ebuild b/dev-ros/ivcon/ivcon-0.1.5.ebuild
deleted file mode 100644
index 4dedf9a94d13..000000000000
--- a/dev-ros/ivcon/ivcon-0.1.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-0.1.6.ebuild b/dev-ros/ivcon/ivcon-0.1.6.ebuild
deleted file mode 100644
index 4dedf9a94d13..000000000000
--- a/dev-ros/ivcon/ivcon-0.1.6.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-0.1.7.ebuild b/dev-ros/ivcon/ivcon-0.1.7.ebuild
index 2ae89be1b536..3576890e1fa1 100644
--- a/dev-ros/ivcon/ivcon-0.1.7.ebuild
+++ b/dev-ros/ivcon/ivcon-0.1.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/ivcon"
 KEYWORDS="~amd64"
 
diff --git a/dev-ros/ivcon/ivcon-9999.ebuild b/dev-ros/ivcon/ivcon-9999.ebuild
index 4dedf9a94d13..3576890e1fa1 100644
--- a/dev-ros/ivcon/ivcon-9999.ebuild
+++ b/dev-ros/ivcon/ivcon-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/ivcon"
 KEYWORDS="~amd64"
 
diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
index bac26d96391e..f2a290922baf 100644
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD joint_limits_interface-0.14.2.ebuild 490 BLAKE2B 28b4f9b3a31ad18ce69dd4a22115725cda506148bf8e5095ccc3e9bb81a070742245fef113669e98a4b227c14b35ea8e63c94d7f1c303f50518065f9e67ec9aa SHA512 e578f1fc6e23f69746cd3df192d2b28d5e96024fbef7fa9ffd3aaf538516e5ce62c22e0f7bc84473e3daf4f8aaa0d0e65a940994236e4b6bcb726786367ee114
-EBUILD joint_limits_interface-0.15.0.ebuild 490 BLAKE2B 28b4f9b3a31ad18ce69dd4a22115725cda506148bf8e5095ccc3e9bb81a070742245fef113669e98a4b227c14b35ea8e63c94d7f1c303f50518065f9e67ec9aa SHA512 e578f1fc6e23f69746cd3df192d2b28d5e96024fbef7fa9ffd3aaf538516e5ce62c22e0f7bc84473e3daf4f8aaa0d0e65a940994236e4b6bcb726786367ee114
-EBUILD joint_limits_interface-0.15.1.ebuild 487 BLAKE2B f2b06422bdab4950e663c26b8af1c4d28f1d4f61923a36184ce4741389a2e19c6fac576f04b60e17e1dbf4fc90c0b249157f36b32951dc54b94f7e6415610d1f SHA512 56670bed7d830973ad3c565040bc7743800980d78937137df1ccbe0a44a449fa24fca73130dd9965460895341f8b79a2126605e44eaa744ae6bf8e08f2afcd2c
-EBUILD joint_limits_interface-9999.ebuild 490 BLAKE2B a26744ba31855f5d0cd31e84491a137532818a465b22d9df958d0ad94f97a43b11f8a3046ca124f8a4b93a1dc48aabbdd3428cf1c0c50d9fd59ca9b2a4ff9a03 SHA512 41ca8984579c77512c5aa03228b1326482ae9a2a68c64feec168f9bb06e884e802d49c50073777571f955ec19941de6b60129e96f6ebbade73da03d48936518c
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD joint_limits_interface-0.19.1.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
+EBUILD joint_limits_interface-9999.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.14.2.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.14.2.ebuild
deleted file mode 100644
index 9f9f5afce787..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.14.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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 )"
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild
deleted file mode 100644
index 9f9f5afce787..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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 )"
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild
deleted file mode 100644
index af15ec2bb5cc..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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 )"
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
new file mode 100644
index 000000000000..86815d181892
--- /dev/null
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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-9999.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
index c8529d171588..86815d181892 100644
--- a/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -22,3 +21,8 @@ RDEPEND="
 "
 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_state_publisher/Manifest b/dev-ros/joint_state_publisher/Manifest
index 1a3e27cb6568..83d731df5cfa 100644
--- a/dev-ros/joint_state_publisher/Manifest
+++ b/dev-ros/joint_state_publisher/Manifest
@@ -1,6 +1,4 @@
-DIST joint_state_publisher-1.12.13.tar.gz 20658 BLAKE2B 8f0d4b1bbe5e381cb20476461a132510e0eed0cde6564557bbcf4d3c07f9036b55fb1b8ea26ef55e0085dfd2f32705d6d4d25b35c915e349c62da17e755b65c1 SHA512 012e2c4b522c9314169323066e3975d72597783a587192a176cc7f7c4b0d59a1dfd3724a57c80d6d6a628640130d235fb9fc8620f0abcd8ef81776689d05e8f1
-DIST robot_model-1.12.11.tar.gz 277822 BLAKE2B 3bdd2b931ddfd062594ccb2be4ce6d4863a5fa66f538c3ee48c3600b3be249d267f9d03aa9a701bc6ab22c4297d659a24da668fedcd25c75fe128c43cc781be0 SHA512 8dea6fc72e9beaddbf9a82cb177561cb89c69ef8f58f0c4882598f6cc33a0e10564d9696f07b6f4e3e3404d3f1f5236e54eea4b8d249be0a216cd3ce12a03cde
-EBUILD joint_state_publisher-1.12.11.ebuild 532 BLAKE2B a37038eb7f2a6d9a3ac4ea08518b6290d08c0248f470c6884dcf87e4fa3b0c5d1f15d0ca614a3b9436dd15bc397a3f56f7eb3c9ecd5f99e2d8ab0abca9ae64ad SHA512 b0126544edc2e736160a1e1967fb587c48aab8341fbb0fde41aa2adccafb123b19816b6d7d42bc60058835326f6a77677df481daf5328f655516971549357df1
-EBUILD joint_state_publisher-1.12.13.ebuild 606 BLAKE2B c1cf841a267a048cf82380760372b47e8644bc3465df1fe41f1ab501da55de5ce333a1c50a18cd0690aae5e7555df2601ed79ab7e0ed033171e04a40c778bf97 SHA512 842ae750a98a69b4c4bea0912ea37c182f20226cf6d681b32f6cd784440d85d61f4800a97867fbd6b85f4a6cf76605acb74c604d9cf4d07e690308f82c982f1e
-EBUILD joint_state_publisher-9999.ebuild 606 BLAKE2B c1cf841a267a048cf82380760372b47e8644bc3465df1fe41f1ab501da55de5ce333a1c50a18cd0690aae5e7555df2601ed79ab7e0ed033171e04a40c778bf97 SHA512 842ae750a98a69b4c4bea0912ea37c182f20226cf6d681b32f6cd784440d85d61f4800a97867fbd6b85f4a6cf76605acb74c604d9cf4d07e690308f82c982f1e
+DIST joint_state_publisher-1.15.0.tar.gz 27974 BLAKE2B e0293f3c9496dfa47bd07e9825ed399e05b53f80947aecba228c3b153384fe5ceef808fa7a1ff5678448ef263c439bbcdae4e475bee206554f2cdff785175b1a SHA512 58387785f93195ab4b1f6a2d54f8d7765c5cd34df6a2bf5ab00caf032b5b1093fc9ec02e7217cd554cdcc37545295dff5652c295fb3ea91a549d23b83db02dbc
+EBUILD joint_state_publisher-1.15.0.ebuild 633 BLAKE2B c918cfec7c165c216083b0b33a98845448a9fd62e03623bc93df7a2eb5576687b2a8aa953fec368312d7cc984bf90515bfe9a94f7cde3d7b01572f69d68ba91b SHA512 acb9cac232f6297d5bafe5a7ba27e65b62af9f54f4d3ff1f7dbec58cb0e6b70d0715107aa453fe81b2da9f4a8d82a7bc2b1392a9a0c6e298fa156a899c199412
+EBUILD joint_state_publisher-9999.ebuild 633 BLAKE2B c918cfec7c165c216083b0b33a98845448a9fd62e03623bc93df7a2eb5576687b2a8aa953fec368312d7cc984bf90515bfe9a94f7cde3d7b01572f69d68ba91b SHA512 acb9cac232f6297d5bafe5a7ba27e65b62af9f54f4d3ff1f7dbec58cb0e6b70d0715107aa453fe81b2da9f4a8d82a7bc2b1392a9a0c6e298fa156a899c199412
 MISC metadata.xml 339 BLAKE2B b435f6689ab4c75a5dc4850793e70300e465c96c90b6162eaf488a069eb259e282f2534300ae1388036ba77058df57d8d43a4c60bdc1c336e1f3901a4d8bbb4e SHA512 44432f918f72fd087c1747bf5b42743651c6cf5a457c3d9cfc25206dbf24396b09b3565118895c6e1794befd027db1842dc7fd33f3e74031e0ba74be72475df1
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.11.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.11.ebuild
deleted file mode 100644
index 7a7a68e62676..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.13.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.13.ebuild
deleted file mode 100644
index 5f4325158a53..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${DEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild
new file mode 100644
index 000000000000..4124df047534
--- /dev/null
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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/joint_state_publisher-9999.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
index 5f4325158a53..4124df047534 100644
--- a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,9 +15,13 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${DEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+	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_gui/Manifest b/dev-ros/joint_state_publisher_gui/Manifest
new file mode 100644
index 000000000000..df08f64fc57a
--- /dev/null
+++ b/dev-ros/joint_state_publisher_gui/Manifest
@@ -0,0 +1,4 @@
+DIST joint_state_publisher-1.15.0.tar.gz 27974 BLAKE2B e0293f3c9496dfa47bd07e9825ed399e05b53f80947aecba228c3b153384fe5ceef808fa7a1ff5678448ef263c439bbcdae4e475bee206554f2cdff785175b1a SHA512 58387785f93195ab4b1f6a2d54f8d7765c5cd34df6a2bf5ab00caf032b5b1093fc9ec02e7217cd554cdcc37545295dff5652c295fb3ea91a549d23b83db02dbc
+EBUILD joint_state_publisher_gui-1.15.0.ebuild 597 BLAKE2B f70d3a73e74ce21a96fc8919d0e87054be04f6d540cf11b43f096619fa833377679780f5af916279a35c37fd80494d9061a30d884470a7db01cc5bbcd922a181 SHA512 77fb12dc9f70ecd8a1dfdff9caf75e762e2ec80e1732784315d0bf83f01083ea2a8be82ee167d6b6a25e0b7a023f4767fb2f76fccb05e48d9c246ed2755d621d
+EBUILD joint_state_publisher_gui-9999.ebuild 597 BLAKE2B f70d3a73e74ce21a96fc8919d0e87054be04f6d540cf11b43f096619fa833377679780f5af916279a35c37fd80494d9061a30d884470a7db01cc5bbcd922a181 SHA512 77fb12dc9f70ecd8a1dfdff9caf75e762e2ec80e1732784315d0bf83f01083ea2a8be82ee167d6b6a25e0b7a023f4767fb2f76fccb05e48d9c246ed2755d621d
+MISC metadata.xml 339 BLAKE2B b435f6689ab4c75a5dc4850793e70300e465c96c90b6162eaf488a069eb259e282f2534300ae1388036ba77058df57d8d43a4c60bdc1c336e1f3901a4d8bbb4e SHA512 44432f918f72fd087c1747bf5b42743651c6cf5a457c3d9cfc25206dbf24396b09b3565118895c6e1794befd027db1842dc7fd33f3e74031e0ba74be72475df1
diff --git a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.0.ebuild b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.0.ebuild
new file mode 100644
index 000000000000..4a20aa38a90b
--- /dev/null
+++ b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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/joint_state_publisher_gui-9999.ebuild b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild
new file mode 100644
index 000000000000..4a20aa38a90b
--- /dev/null
+++ b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
new file mode 100644
index 000000000000..b74086ddd5fa
--- /dev/null
+++ b/dev-ros/joint_state_publisher_gui/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros/joint_state_publisher</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/joint_states_settler/Manifest b/dev-ros/joint_states_settler/Manifest
index b7bd2e9ecb2e..84a9bca1acf8 100644
--- a/dev-ros/joint_states_settler/Manifest
+++ b/dev-ros/joint_states_settler/Manifest
@@ -1,5 +1,5 @@
 AUX gcc6.patch 459 BLAKE2B eadc7eb78eb79bff30535776516bed691354706192fe196107efd319b357f8b0c361bbd70492f37525137c78399954681e4ab8eaf48cfe71903785b5f889765a SHA512 dca02dec9e53395941bcb263d88b3a96ef1437315431d242ffcfa7768a2b0c4d5ec394db5c7e7d2dbe46750264adce5e7032caa207e912ec7dedbcad9c345519
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD joint_states_settler-0.10.14.ebuild 718 BLAKE2B e90530b8f4dfda9d1bf58c4cbd0607ccaca091185295b2621b663ebe935091ee3eecf57a1e09b793270a277dce9c43fcddfa2a6a01aa854adefbbf0bb838f46a SHA512 c9c98be65b64f19dd98f41008226d442333be2cf1fe6d118c7813b6fb77b5aeb3832a50c6f45ab12057cc0a8d324c3b0ae6ca8d05704f88e1007bddf13ff637a
-EBUILD joint_states_settler-9999.ebuild 718 BLAKE2B e90530b8f4dfda9d1bf58c4cbd0607ccaca091185295b2621b663ebe935091ee3eecf57a1e09b793270a277dce9c43fcddfa2a6a01aa854adefbbf0bb838f46a SHA512 c9c98be65b64f19dd98f41008226d442333be2cf1fe6d118c7813b6fb77b5aeb3832a50c6f45ab12057cc0a8d324c3b0ae6ca8d05704f88e1007bddf13ff637a
+EBUILD joint_states_settler-0.10.14.ebuild 687 BLAKE2B ca49fdac8f22a82f488be34d395b5241744a081de3b355ee4f1e5489a4b8cffb73666e5a6a96013e83a0af7fe04cb97f513551255bab56e7d69a9af337b90dba SHA512 d6caff6e951ffc4f5fa424e7f2ed702172ce20d502b9d45c52052bfea92d29ff8c1588a69aed46bc2aec999d4a54a305fddbbb6b05d5e95621f91c62b4123173
+EBUILD joint_states_settler-9999.ebuild 687 BLAKE2B ca49fdac8f22a82f488be34d395b5241744a081de3b355ee4f1e5489a4b8cffb73666e5a6a96013e83a0af7fe04cb97f513551255bab56e7d69a9af337b90dba SHA512 d6caff6e951ffc4f5fa424e7f2ed702172ce20d502b9d45c52052bfea92d29ff8c1588a69aed46bc2aec999d4a54a305fddbbb6b05d5e95621f91c62b4123173
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/joint_states_settler/joint_states_settler-0.10.14.ebuild b/dev-ros/joint_states_settler/joint_states_settler-0.10.14.ebuild
index f0900cf7e7c1..e7359f7341dc 100644
--- a/dev-ros/joint_states_settler/joint_states_settler-0.10.14.ebuild
+++ b/dev-ros/joint_states_settler/joint_states_settler-0.10.14.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -22,9 +21,9 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/roscpp_serialization
 	dev-ros/settlerlib
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 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
index f0900cf7e7c1..e7359f7341dc 100644
--- a/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
+++ b/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -22,9 +21,9 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/roscpp_serialization
 	dev-ros/settlerlib
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 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/kdl_conversions/Manifest b/dev-ros/kdl_conversions/Manifest
index bcac5e098854..c2c1aeea8249 100644
--- a/dev-ros/kdl_conversions/Manifest
+++ b/dev-ros/kdl_conversions/Manifest
@@ -1,6 +1,4 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD kdl_conversions-1.11.9-r1.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
-EBUILD kdl_conversions-1.12.0.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
-EBUILD kdl_conversions-9999.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
+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 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.11.9-r1.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.11.9-r1.ebuild
deleted file mode 100644
index 0f4679e87a71..000000000000
--- a/dev-ros/kdl_conversions/kdl_conversions-1.11.9-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-libs/orocos_kdl:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild
deleted file mode 100644
index 0f4679e87a71..000000000000
--- a/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-libs/orocos_kdl:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild
new file mode 100644
index 000000000000..3c146229a0cd
--- /dev/null
+++ b/dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild
@@ -0,0 +1,22 @@
+# 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
index 0f4679e87a71..3c146229a0cd 100644
--- a/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
+++ b/dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/geometry"
 KEYWORDS="~amd64 ~arm"
@@ -15,7 +15,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	sci-libs/orocos_kdl:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/kdl_parser/Manifest b/dev-ros/kdl_parser/Manifest
index 253eaab82ebb..0c0c4e6e3f0a 100644
--- a/dev-ros/kdl_parser/Manifest
+++ b/dev-ros/kdl_parser/Manifest
@@ -1,8 +1,4 @@
-DIST kdl_parser-1.12.10.tar.gz 950156 BLAKE2B 5e125c236888459e7ea4cdb6a556961e4f9008a99b9f76ec9cd243bdcc85994d07dc8d2a004b101bdab99f4b62e5a004793956d44edd5f8a2cd2fdfbbd56dc4a SHA512 a0d8046c65cc575cbf6ca5ab926997a4faae2f5fc0ecb7c8ab16c8145b655a1d2b516bfb6b834740fff758f76e2afc0d2aa1b3f612f7345d84a8e87cd5693ddb
-DIST kdl_parser-1.13.0.tar.gz 950647 BLAKE2B 7a87cc5f4b2c1bd870bee1b19a7be55e52c4d7c7ca44d1e3f3ef68419f7f775fef0fbec0a19651d37c479af6f8b41b085e86a9666211a7e030442854adbec7fd SHA512 f9b962ecc6e0f3c408619bc9c57f278a2e95228e735f452b9a45ce970752f6df37cbb5f331914412f04ebf31cf2862a056893d302fc2dad8af31cf538d717a9a
-DIST kdl_parser-1.13.1.tar.gz 29933 BLAKE2B 3668b95df9d7bd06dc4d95098828d1d84f740f8e16e69f09bc09fb245ccd03c4ccf0e73e23860f19fc8949ced94415f7fb9effa3bc7215c7146c3ebcccbfcb4a SHA512 007d46978fd21608ced51d0261069d496e6ea64bf11960e46abf5da5b9a968d5ccbbafd6620044f98e441ff44c2b943f9ba5b9ee060243d80a975c140e6e36fb
-EBUILD kdl_parser-1.12.10.ebuild 546 BLAKE2B 35355c01ebb0532857ffc40bf69784f5053783acab720fb229f5ee9efd9616a14893d31f00b360901a72cf67768ed4567d89288ed7ddccca7a47e08c5ac6ab2a SHA512 b00bbdeffda23138d4ee226e8da7e9899c92836e4bc3aebd9bc7a11b25fe12b50bf718e62bd63ed8c34ea2a04dd0f497e4556cf5a3cfb8f3841fddbafc1896ff
-EBUILD kdl_parser-1.13.0.ebuild 558 BLAKE2B fae314c5f15145311de27b8acde5eb489a116358f4a640364d6c1a3a6b0b9a013742e10ea3c4c5045f83ecd95ff5a95c26f863d03d5f428a6a9bbc2f5790f09b SHA512 bd94febc969bc2f005d5848ceb03e4277bb450f585cd90fabb2d5fe6e4d88e06fdf451f849829cf46e5f0a153b19b362e355b9a0fb3547cb2ae1e005d0b194c6
-EBUILD kdl_parser-1.13.1.ebuild 558 BLAKE2B fae314c5f15145311de27b8acde5eb489a116358f4a640364d6c1a3a6b0b9a013742e10ea3c4c5045f83ecd95ff5a95c26f863d03d5f428a6a9bbc2f5790f09b SHA512 bd94febc969bc2f005d5848ceb03e4277bb450f585cd90fabb2d5fe6e4d88e06fdf451f849829cf46e5f0a153b19b362e355b9a0fb3547cb2ae1e005d0b194c6
-EBUILD kdl_parser-9999.ebuild 558 BLAKE2B fae314c5f15145311de27b8acde5eb489a116358f4a640364d6c1a3a6b0b9a013742e10ea3c4c5045f83ecd95ff5a95c26f863d03d5f428a6a9bbc2f5790f09b SHA512 bd94febc969bc2f005d5848ceb03e4277bb450f585cd90fabb2d5fe6e4d88e06fdf451f849829cf46e5f0a153b19b362e355b9a0fb3547cb2ae1e005d0b194c6
+DIST kdl_parser-1.14.0.tar.gz 31861 BLAKE2B dc4ad1ebafd4435156e39f38cec0b8b0dc4368195ff0b17009577511645ea6f1eae01edaeaba49bf50da3ca498a992b7e5d5f804ad9ccc020f398fe85bd26da8 SHA512 9661c4b4d1d3839d64c7b5579a751f6d02bbfe07c562f2b63919563470b255a6934ef57ed240105238bd8034388d910c2933f359d68b988d3106fc182b7c2600
+EBUILD kdl_parser-1.14.0-r1.ebuild 670 BLAKE2B ffad840daf6431928709eb8773d40b423818cb0264eab9770e843659fb5a787d548384482a830a94c4771b6e6e5dd072ad8c6c63e2bc369c43fc91af3a7ff638 SHA512 96c350a835e0fcd93001f8c4ea2c622024e5ccb37f97e59410962d1275f459cfa6e0f05ad58713834e5e3ceb5a1d2b6d5eaa689b5ff5e22eea35ae60d49bd192
+EBUILD kdl_parser-9999.ebuild 670 BLAKE2B ffad840daf6431928709eb8773d40b423818cb0264eab9770e843659fb5a787d548384482a830a94c4771b6e6e5dd072ad8c6c63e2bc369c43fc91af3a7ff638 SHA512 96c350a835e0fcd93001f8c4ea2c622024e5ccb37f97e59410962d1275f459cfa6e0f05ad58713834e5e3ceb5a1d2b6d5eaa689b5ff5e22eea35ae60d49bd192
 MISC metadata.xml 328 BLAKE2B a679a99d8839aa27a1cf8d33b125750c3ad1ccc76886d5b95b0a4dff0303e424c3b032f32c308ea5df9c10ca3f8686b2236d773b1a21d91eed45bbda8f71498b SHA512 c42cdb9f390f16b0e8cb2f0bad63d9b256ec01bf8cb1a49476bf7383678140debb1f5cca9682458205a4756e1917ce46feb93a99420444a52fed7faba6ccdcc8
diff --git a/dev-ros/kdl_parser/kdl_parser-1.12.10.ebuild b/dev-ros/kdl_parser/kdl_parser-1.12.10.ebuild
deleted file mode 100644
index 5944ea9f2179..000000000000
--- a/dev-ros/kdl_parser/kdl_parser-1.12.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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-ros/urdf
-	sci-libs/orocos_kdl
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser/kdl_parser-1.13.0.ebuild b/dev-ros/kdl_parser/kdl_parser-1.13.0.ebuild
deleted file mode 100644
index c135325db1b6..000000000000
--- a/dev-ros/kdl_parser/kdl_parser-1.13.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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-ros/urdf-1.13
-	sci-libs/orocos_kdl:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser/kdl_parser-1.13.1.ebuild b/dev-ros/kdl_parser/kdl_parser-1.13.1.ebuild
deleted file mode 100644
index c135325db1b6..000000000000
--- a/dev-ros/kdl_parser/kdl_parser-1.13.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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-ros/urdf-1.13
-	sci-libs/orocos_kdl:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser/kdl_parser-1.14.0-r1.ebuild b/dev-ros/kdl_parser/kdl_parser-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..fa520608c0bb
--- /dev/null
+++ b/dev-ros/kdl_parser/kdl_parser-1.14.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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/kdl_parser-9999.ebuild b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
index c135325db1b6..fa520608c0bb 100644
--- a/dev-ros/kdl_parser/kdl_parser-9999.ebuild
+++ b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/kdl_parser"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -18,9 +17,18 @@ 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_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/kdl_parser_py/Manifest b/dev-ros/kdl_parser_py/Manifest
index f81beee4f464..cb58df1eecf6 100644
--- a/dev-ros/kdl_parser_py/Manifest
+++ b/dev-ros/kdl_parser_py/Manifest
@@ -1,8 +1,4 @@
-DIST kdl_parser-1.12.10.tar.gz 950156 BLAKE2B 5e125c236888459e7ea4cdb6a556961e4f9008a99b9f76ec9cd243bdcc85994d07dc8d2a004b101bdab99f4b62e5a004793956d44edd5f8a2cd2fdfbbd56dc4a SHA512 a0d8046c65cc575cbf6ca5ab926997a4faae2f5fc0ecb7c8ab16c8145b655a1d2b516bfb6b834740fff758f76e2afc0d2aa1b3f612f7345d84a8e87cd5693ddb
-DIST kdl_parser-1.13.0.tar.gz 950647 BLAKE2B 7a87cc5f4b2c1bd870bee1b19a7be55e52c4d7c7ca44d1e3f3ef68419f7f775fef0fbec0a19651d37c479af6f8b41b085e86a9666211a7e030442854adbec7fd SHA512 f9b962ecc6e0f3c408619bc9c57f278a2e95228e735f452b9a45ce970752f6df37cbb5f331914412f04ebf31cf2862a056893d302fc2dad8af31cf538d717a9a
-DIST kdl_parser-1.13.1.tar.gz 29933 BLAKE2B 3668b95df9d7bd06dc4d95098828d1d84f740f8e16e69f09bc09fb245ccd03c4ccf0e73e23860f19fc8949ced94415f7fb9effa3bc7215c7146c3ebcccbfcb4a SHA512 007d46978fd21608ced51d0261069d496e6ea64bf11960e46abf5da5b9a968d5ccbbafd6620044f98e441ff44c2b943f9ba5b9ee060243d80a975c140e6e36fb
-EBUILD kdl_parser_py-1.12.10.ebuild 486 BLAKE2B 760fdde881f695a6527a0abe22906e019c249314b82bffd739f6950fdcb9b5ef82a82a87307ed8eb32764c5f8097686540b4ab1b49745ce2a6575646d071cff0 SHA512 01e944dfe2cd014dc46713226d9b0a26616a71524249a20899c02b5819c3311821d8b238eb3be50f5a214b465c9b68df208f0fbc70d00ab83aefbd49127235bf
-EBUILD kdl_parser_py-1.13.0.ebuild 493 BLAKE2B d3f26a858bdd822cfbaa0e66d3b8ca3566317dabbbc8f9e804ff3e91106196072830aa95f906aeb6827de40698b01a232952117d38f9c13810d666c9ec156738 SHA512 3a3aa3d1d18b39e88f27635f6a4522c0500bbbbcd3236ab036714eed826a44fd26a23db3b55c83d8f32aa1bdd529aec85951b8c20e181084bee1f2c4aecf95b6
-EBUILD kdl_parser_py-1.13.1.ebuild 493 BLAKE2B d3f26a858bdd822cfbaa0e66d3b8ca3566317dabbbc8f9e804ff3e91106196072830aa95f906aeb6827de40698b01a232952117d38f9c13810d666c9ec156738 SHA512 3a3aa3d1d18b39e88f27635f6a4522c0500bbbbcd3236ab036714eed826a44fd26a23db3b55c83d8f32aa1bdd529aec85951b8c20e181084bee1f2c4aecf95b6
-EBUILD kdl_parser_py-9999.ebuild 493 BLAKE2B d3f26a858bdd822cfbaa0e66d3b8ca3566317dabbbc8f9e804ff3e91106196072830aa95f906aeb6827de40698b01a232952117d38f9c13810d666c9ec156738 SHA512 3a3aa3d1d18b39e88f27635f6a4522c0500bbbbcd3236ab036714eed826a44fd26a23db3b55c83d8f32aa1bdd529aec85951b8c20e181084bee1f2c4aecf95b6
+DIST kdl_parser-1.14.0.tar.gz 31861 BLAKE2B dc4ad1ebafd4435156e39f38cec0b8b0dc4368195ff0b17009577511645ea6f1eae01edaeaba49bf50da3ca498a992b7e5d5f804ad9ccc020f398fe85bd26da8 SHA512 9661c4b4d1d3839d64c7b5579a751f6d02bbfe07c562f2b63919563470b255a6934ef57ed240105238bd8034388d910c2933f359d68b988d3106fc182b7c2600
+EBUILD kdl_parser_py-1.14.0.ebuild 742 BLAKE2B c3aefcadd2cc3e5cf2002dd046faa6747fba589f58be8c0a4e67e14a6a14a96dca16db6e4025e01d1c7a93d162803764cc654622660241e18b8e7d34dd19ca9a SHA512 4d9e64f584dd184532f64c700c775e1b1c1f57970dfb0ce6063ef8fd84d0bef9b2ea234c751b38378df8f9827f0b57e54c4700c9e8a7b78a03d590deb2d7fe42
+EBUILD kdl_parser_py-9999.ebuild 742 BLAKE2B c3aefcadd2cc3e5cf2002dd046faa6747fba589f58be8c0a4e67e14a6a14a96dca16db6e4025e01d1c7a93d162803764cc654622660241e18b8e7d34dd19ca9a SHA512 4d9e64f584dd184532f64c700c775e1b1c1f57970dfb0ce6063ef8fd84d0bef9b2ea234c751b38378df8f9827f0b57e54c4700c9e8a7b78a03d590deb2d7fe42
 MISC metadata.xml 328 BLAKE2B a679a99d8839aa27a1cf8d33b125750c3ad1ccc76886d5b95b0a4dff0303e424c3b032f32c308ea5df9c10ca3f8686b2236d773b1a21d91eed45bbda8f71498b SHA512 c42cdb9f390f16b0e8cb2f0bad63d9b256ec01bf8cb1a49476bf7383678140debb1f5cca9682458205a4756e1917ce46feb93a99420444a52fed7faba6ccdcc8
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.12.10.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.12.10.ebuild
deleted file mode 100644
index 94dd3f304a65..000000000000
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.12.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.13.0.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.13.0.ebuild
deleted file mode 100644
index def1545942d3..000000000000
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.13.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.13.1.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.13.1.ebuild
deleted file mode 100644
index def1545942d3..000000000000
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.13.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
new file mode 100644
index 000000000000..5ee3c5b1f3a3
--- /dev/null
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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}"
+	rm -f "${S}/CATKIN_IGNORE"
+	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
index def1545942d3..5ee3c5b1f3a3 100644
--- a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/kdl_parser"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-ros/urdf-1.13[${PYTHON_USEDEP}]
+	>=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_USEDEP}] )"
+	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}"
+	rm -f "${S}/CATKIN_IGNORE"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/laser_assembler/Manifest b/dev-ros/laser_assembler/Manifest
index b4ffa268ad19..0ba0b8bb82a6 100644
--- a/dev-ros/laser_assembler/Manifest
+++ b/dev-ros/laser_assembler/Manifest
@@ -1,6 +1,5 @@
-DIST laser_assembler-1.7.6.tar.gz 22185 BLAKE2B 068c4d64e6de313a1609738880d1fa95b9d6e710e55c7c8d669d7d809955f7cd33a7b50d94abd05a18f5783d8a8b3287df21c7bc9310a6219c42a8c2db0d0561 SHA512 b3df050473a598569a9df796f3e23437604fd24b9bd1500d632c8f2a7fc0c2604063bdf28e5f5bfa5c79efa4f35abf5fb85602769d95935ef262b357e0af2dbb
-DIST laser_assembler-1.7.7.tar.gz 22199 BLAKE2B 5ae26ef567149e6f3015cd3188bcc1adb72c09a33f6594658a20f954a500a76ca44f0f87e47dd9ae9a195df120752c4b35564264a1530b75808d8544f9b9162b SHA512 b7eb6f875209f4a692d1a16934196548a607730dd861806cda8a2f4c6a46722a56590148267b635e2bd5ee31e5490d6c533868bed7328a22a365cb1b8c63ddef
-EBUILD laser_assembler-1.7.6.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
-EBUILD laser_assembler-1.7.7.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
-EBUILD laser_assembler-9999.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e
+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 344 BLAKE2B 9f0a0af9b8ec8ea7a0e261981de8219df856a612762a2dc6986240610e76d0c1578b071cea0a25aa56e3462d0d871a9f8a117a0902971b6e5640e2511dfc9a8a SHA512 c9746c67ccaf314fa717cdde076e8094d48c7832e8d6e5402ffbaf7829c0205d8bfe281ffbafb4ee5933af5b49a2210d6b1645c07cf0dc2a78b9900230118d45
diff --git a/dev-ros/laser_assembler/files/eigen.patch b/dev-ros/laser_assembler/files/eigen.patch
new file mode 100644
index 000000000000..95c8c58bcdb3
--- /dev/null
+++ b/dev-ros/laser_assembler/files/eigen.patch
@@ -0,0 +1,15 @@
+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.6.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild
deleted file mode 100644
index 903bdb286b20..000000000000
--- a/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/pluginlib
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/filters
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
-"
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild
deleted file mode 100644
index 903bdb286b20..000000000000
--- a/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/pluginlib
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/filters
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
-"
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
new file mode 100644
index 000000000000..799f5939b8ef
--- /dev/null
+++ b/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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
index b81ead0f3d81..799f5939b8ef 100644
--- a/dev-ros/laser_assembler/laser_assembler-9999.ebuild
+++ b/dev-ros/laser_assembler/laser_assembler-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
@@ -19,13 +18,15 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-libs/boost:=
 	dev-ros/tf
-	dev-ros/laser_geometry[${PYTHON_USEDEP}]
+	dev-ros/laser_geometry[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/pluginlib
 	dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_USEDEP}]
+	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/filters
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
+	dev-cpp/eigen:3
+	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] dev-cpp/gtest )
 "
+PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index a73b200b3d34..a9ad4fb9fbc3 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -1,7 +1,8 @@
 AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0ae90ec7604c7c08c3f8b9eebdbb4d9bf26f81011f996148db3fd0243b56ad77be7533282f9ecc0b SHA512 d2185960b22b9539f318c452e5bb95612e21156380183ed795142d87c9d1f8ca74c6bb08a2039138729767800cf6592b6bb64bf12db62166c8c3ee2176aec65d
 AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
+AUX ocv4-2.patch 1116 BLAKE2B 2de5c0aaf13b30ef81094fe70ca5634de8575817125e36217d3cf1944112b8944231dcef9b075990d113ec6e06b281a14d018328492693007a3ad581621d42ea SHA512 e1f93dcbd8b829bb0ad99d45295f13f4f791c9c92962aa39ef436b6b81b014fb52b022a231a942a28b266763e8374d80543c7c606a4cf7fecbc539930b630077
 AUX ocv4.patch 597 BLAKE2B 0b87de52c3a2fed94c32c47500a69f79d6d6861b5881d5ba357aeb9924be8356b204ceaf7ae9e14055048e7ddc6fb74751cadfd7a6e275b4115e793c5723f007 SHA512 711c26a8539facf376686e619c4a90cc77ae26480f3754edf5b04f0a14aaa861f14d58b19172e37fb4e501eb92883ff4173ae93d8ec5b31379eefb4a0fb2c1a1
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14.ebuild 779 BLAKE2B 9a79d3cc8112ff1d5d6d3eb4e41f5a38c494a60270aa44957667dc9f2673d72aaa3003a55643b8d7a56032f496a118c7575395458a5802baa5cc6d06cb7a2bf1 SHA512 34593b76cbf879b9c04ec3d14be9e7f6467302a7d19d347cb2e2d21c6977ae2bd9a635bff5012b35c0ac2b5ee6c996b75d9652c2322969d0d777147837f09d6f
-EBUILD laser_cb_detector-9999.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
+EBUILD laser_cb_detector-0.10.14.ebuild 943 BLAKE2B d58ada10a565399e33d5f800d08a597985a26197a92e6f55fe11dd1586834c920a1b4a9f01b16b0e5157af11fe5d4f06387467693688a747bd9614c3b35b0c37 SHA512 2e8b5d31591bd7a0c2ab26eda7d7a99a5d37e98ef968e46c4dba1ad947de1d49b1fcf4a305b1339fa3727bab3114af5bf80a2b4346aae0edf72473a7f5bdaaba
+EBUILD laser_cb_detector-9999.ebuild 943 BLAKE2B d58ada10a565399e33d5f800d08a597985a26197a92e6f55fe11dd1586834c920a1b4a9f01b16b0e5157af11fe5d4f06387467693688a747bd9614c3b35b0c37 SHA512 2e8b5d31591bd7a0c2ab26eda7d7a99a5d37e98ef968e46c4dba1ad947de1d49b1fcf4a305b1339fa3727bab3114af5bf80a2b4346aae0edf72473a7f5bdaaba
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/files/ocv4-2.patch b/dev-ros/laser_cb_detector/files/ocv4-2.patch
new file mode 100644
index 000000000000..3cc51c45d7dd
--- /dev/null
+++ b/dev-ros/laser_cb_detector/files/ocv4-2.patch
@@ -0,0 +1,34 @@
+Index: laser_cb_detector/test/laser_cb_detector_unittest.cpp
+===================================================================
+--- laser_cb_detector.orig/test/laser_cb_detector_unittest.cpp
++++ laser_cb_detector/test/laser_cb_detector_unittest.cpp
+@@ -37,7 +37,7 @@
+ 
+ #include <laser_cb_detector/ConfigGoal.h>
+ #include <laser_cb_detector/laser_cb_detector.h>
+-#include <opencv/highgui.h>
++#include <opencv2/highgui.hpp>
+ 
+ using namespace laser_cb_detector;
+ using namespace std;
+@@ -55,8 +55,9 @@ static const string test_path = xstr(TES
+ 
+ calibration_msgs::DenseLaserSnapshot getSnapshot(const string& filename)
+ {
+-  IplImage* image;
+-  image = cvLoadImage(filename.c_str(), 0);         // 0 -> Force image to grayscale
++  cv::Mat mat = cv::imread(filename.c_str(), 0);
++  IplImage  image_v = cvIplImage(mat);
++  IplImage* image = &image_v;
+   EXPECT_TRUE(image) << "could not open image file [" << filename << "]" << endl;
+ 
+ 
+@@ -92,7 +93,7 @@ calibration_msgs::DenseLaserSnapshot get
+   }
+ 
+   cvReleaseImage(&float_image);
+-  cvReleaseImage(&image);
++  //cvReleaseImage(&image);
+ 
+   return snapshot;
+ }
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
index 6a7531529b40..5cfe8cc43d4b 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/std_msgs"
 
@@ -18,7 +17,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads]
-	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/cv_bridge
 	media-libs/opencv:=
 	dev-ros/image_cb_detector
@@ -26,5 +25,12 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/settlerlib
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
+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]
+	)
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" )
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
index 605a596b776e..5cfe8cc43d4b 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/std_msgs"
 
@@ -18,7 +17,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads]
-	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/cv_bridge
 	media-libs/opencv:=
 	dev-ros/image_cb_detector
@@ -26,5 +25,12 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/settlerlib
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+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]
+	)
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" )
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index d3ceaa8035e6..032c774334a2 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1,6 +1,5 @@
-DIST laser_filters-1.8.6.tar.gz 29484 BLAKE2B b436a6715421940b55e15ab2393f06f988d1ab6d8756d3bbe90b4a189c7e5e669e2ddbd0926b8d6d149159cffe70a6c64aa600b47d6bf730ccbfc14b3e8e69ce SHA512 43662fb9a006730c34a37cd50425d54de2141294b5f271761d9e63416fa6633c3a505e637248dc4192606653d7d8083da1a42826e29495726b4744fc98ff9943
-DIST laser_filters-1.8.7.tar.gz 31072 BLAKE2B 296dd26e92e3d2e4ebe6e6c08d62224f684306bd4fdf198ca84a98801ddf884d85b7888a6d1d51e96b90403ae484c3d6d48a08c9218c1d7c118cf4518c70202a SHA512 8ea1af3af17c3d7870822230760dc8201ec7403db8246cb82f912ca6eb6bcd634df64ae757128dfa82d8fd2d297e3c2dfb066ca612d11933a4074379b35113bb
-EBUILD laser_filters-1.8.6.ebuild 641 BLAKE2B 9292584fd3190275f5ca6d2d2cbe28047f7e76d5135079f7b24945c063c95196356bb45c1b7b5ad92797509a2f17ca6169e242266c833d2ee87fd2bd1321313d SHA512 a333b0a64a0210fa160b68fce4851e2d7c5a2d75f61ae01aa8c5871bb3845f22801921644cc2ee9e48ce62bc98f3dc81bbfd16380ee439d8d78dc3766d6cd799
-EBUILD laser_filters-1.8.7.ebuild 638 BLAKE2B 19cd66c471e64e87e69614903d3fdd152d304adb797d2fe68e658b0a581a4aeeadf7c0d563526a19f7fa363545600b51a2aa08914d26f35234a92be517ef67cf SHA512 638ad97d98d29ae469075f3b52b3f06acf99f4e4325c428ba8e008e83778388a1bd91a8200fb923405cc85274524ec5ae0b569740f4230bbb646d71c9bfd98e5
-EBUILD laser_filters-9999.ebuild 641 BLAKE2B 72e5ce055e7dcfe13864e5d11c401d90e6c511ecc1ae9fc9001f1551278a4fcc48006edb1f9cc21035c079b150e9cfc192103da4745fae0a78cd92ad94b2cb1d SHA512 8dbfa82eaad2684ff480f4c966cb64e8ddac779f6ac5a2792bab38c2b7a43f1b15cc234e5dab991fe2f699cba72949225a33f3da8d81b8f690f26a76f301e314
+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.ebuild 765 BLAKE2B c4208b0d5fcd0df3a66525007e8d33cd3c0bccccf61a29eeb6ee884e12f7b136ea16409f49155f67b84f6e7884e669b78463e23fa3706eb4b5642201bacdf177 SHA512 c55f5f9a74ef2c9384e0e95bba7d7fe72afd08165072270d94672f2a70545de9c826965e97daa87e9815589a88dcb56a6560899a4091c6f1b60bf6d3387fdaf4
+EBUILD laser_filters-9999.ebuild 765 BLAKE2B c4208b0d5fcd0df3a66525007e8d33cd3c0bccccf61a29eeb6ee884e12f7b136ea16409f49155f67b84f6e7884e669b78463e23fa3706eb4b5642201bacdf177 SHA512 c55f5f9a74ef2c9384e0e95bba7d7fe72afd08165072270d94672f2a70545de9c826965e97daa87e9815589a88dcb56a6560899a4091c6f1b60bf6d3387fdaf4
 MISC metadata.xml 342 BLAKE2B 92f4937b0999d701af2eb4810e3d0d9d713fd0238fa57500e7bfdbfc1d602afdd51252b796c3a27c2eb8ea398330b04c3d1f78ca8f5c307bf5adfb4570c3db6b SHA512 4ab282060abc14838675f8d99f245894bec67f8e824191e666671bfc6134383c23853137cff023f59b81141aae204f282d3b40e779627c375609fc4223af8ec5
diff --git a/dev-ros/laser_filters/files/eigen.patch b/dev-ros/laser_filters/files/eigen.patch
new file mode 100644
index 000000000000..1ad02504218b
--- /dev/null
+++ b/dev-ros/laser_filters/files/eigen.patch
@@ -0,0 +1,15 @@
+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.ebuild b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
new file mode 100644
index 000000000000..6d0bb2a716e2
--- /dev/null
+++ b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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_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
+	dev-ros/dynamic_reconfigure
+
+	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-1.8.6.ebuild b/dev-ros/laser_filters/laser_filters-1.8.6.ebuild
deleted file mode 100644
index e85e0b8f46a1..000000000000
--- a/dev-ros/laser_filters/laser_filters-1.8.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/filters
-	dev-ros/laser_geometry
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/laser_filters/laser_filters-1.8.7.ebuild b/dev-ros/laser_filters/laser_filters-1.8.7.ebuild
deleted file mode 100644
index 3f17816b445d..000000000000
--- a/dev-ros/laser_filters/laser_filters-1.8.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/filters
-	dev-ros/laser_geometry
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/laser_filters/laser_filters-9999.ebuild b/dev-ros/laser_filters/laser_filters-9999.ebuild
index 0dd0c51fad51..6d0bb2a716e2 100644
--- a/dev-ros/laser_filters/laser_filters-9999.ebuild
+++ b/dev-ros/laser_filters/laser_filters-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,14 +14,23 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
-	dev-ros/angles
 	dev-ros/filters
+	dev-ros/message_filters
 	dev-ros/laser_geometry
+	dev-ros/pluginlib
+	dev-ros/angles
+	dev-ros/dynamic_reconfigure
+
 	dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+	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_geometry/Manifest b/dev-ros/laser_geometry/Manifest
index 97717f991e41..f660a8b02d97 100644
--- a/dev-ros/laser_geometry/Manifest
+++ b/dev-ros/laser_geometry/Manifest
@@ -1,4 +1,4 @@
-DIST laser_geometry-1.6.4.tar.gz 16251 BLAKE2B ca19bde86a1669d6981651d81ff4c62ad0467e262065113612ee4dd30a05c40ddbddfb84800ea3411697e21a61d84daf7a2cd97c712833b44d7fe8183286c24b SHA512 5c490a30696c0b0a30b826a605b5f09849a971792d60b273491e1deb66b399dfb4c9a37c114c38294799064b2f4532bb6b0119664cd064a4ce9045f18ebd2736
-EBUILD laser_geometry-1.6.4.ebuild 735 BLAKE2B 0f25948dc9e8bad2cea0161794a9c46c14b3d5cad24d90756e9695e10edcc8ea2eec7f6c2c75cf722e4c3a4c114d84e0bb8e7d11993778871c107853a8ec2182 SHA512 1e57c2d28abee27463292c2ba4d61e49798eb061d7a1966d1a12a54319c07912de68cbac934d1abcab858785ca374355910a24e9ed8b20f53c4a5c694babf7bf
-EBUILD laser_geometry-9999.ebuild 735 BLAKE2B 0f25948dc9e8bad2cea0161794a9c46c14b3d5cad24d90756e9695e10edcc8ea2eec7f6c2c75cf722e4c3a4c114d84e0bb8e7d11993778871c107853a8ec2182 SHA512 1e57c2d28abee27463292c2ba4d61e49798eb061d7a1966d1a12a54319c07912de68cbac934d1abcab858785ca374355910a24e9ed8b20f53c4a5c694babf7bf
+DIST laser_geometry-1.6.5.tar.gz 17057 BLAKE2B 3894410f84d2aa76e57e894b6b601acf7d06d5603fbf8ccaaec8db28d9744b2435809ed1eb566b5e7e085be5c300b2cef3e718c1d551bd18e73e5310da232c4c SHA512 324391386d29a1599965e66b95cd48f5b1134df3d7a8589f528e3f476b897530f823bc32c02d4e02d89ce20aa0df76c0238b7522d9f7752f296662623de66041
+EBUILD laser_geometry-1.6.5.ebuild 914 BLAKE2B 5a2e5482882ed2f9f1fe5957e2c4fb2aefc0dc991342a154a85130a5d1dd6e3d2156eef1e5ab2ebbf57b15d55a4e247cf558290101a69a6980fd0bc2ebcff540 SHA512 054b59d0692774508359c3b34f26ca11521242f3b30200f196073901d4bdd9d2680a0f16b4fe5cf39263e38c8166f58b86bc7a4866fb514bac6545358e95476e
+EBUILD laser_geometry-9999.ebuild 914 BLAKE2B 5a2e5482882ed2f9f1fe5957e2c4fb2aefc0dc991342a154a85130a5d1dd6e3d2156eef1e5ab2ebbf57b15d55a4e247cf558290101a69a6980fd0bc2ebcff540 SHA512 054b59d0692774508359c3b34f26ca11521242f3b30200f196073901d4bdd9d2680a0f16b4fe5cf39263e38c8166f58b86bc7a4866fb514bac6545358e95476e
 MISC metadata.xml 343 BLAKE2B a797ebc84630a2db52e772c1d06a4df97d824941660a1e3a1709ba0498c20bbd300e794ee550e47727bb6bfb1d836b08ec63729be7ae439696bfd1035e5ae707 SHA512 7d4f2ddb636794d8d0b493ea1ef5a06b2cfac3bb5fb18f6daf174f16d719d9ceea5eca29762596dca085c94d3e1ab7a49047a8410933505521f0dbceb8c50b9f
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild
deleted file mode 100644
index 4fdcc7652d02..000000000000
--- a/dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Class for converting from a 2D laser scan into a point cloud"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/tf
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/angles
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
new file mode 100644
index 000000000000..29bb835d8b1a
--- /dev/null
+++ b/dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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_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
+	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:=[threads]
+	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
index 4fdcc7652d02..29bb835d8b1a 100644
--- a/dev-ros/laser_geometry/laser_geometry-9999.ebuild
+++ b/dev-ros/laser_geometry/laser_geometry-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_geometry"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,16 +13,24 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	dev-ros/angles
 	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
+	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_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads]
 	dev-cpp/eigen:3
-	dev-ros/angles
 "
 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
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+"
diff --git a/dev-ros/laser_proc/Manifest b/dev-ros/laser_proc/Manifest
index 5c498e07e2f6..8938692a9165 100644
--- a/dev-ros/laser_proc/Manifest
+++ b/dev-ros/laser_proc/Manifest
@@ -1,4 +1,4 @@
-DIST laser_proc-0.1.5.tar.gz 6924 BLAKE2B 75b06134a1d4a68ad54447355962959e0ae9ba5f2df889b3740cc3dfed48ea3ae22e3098a7f0973ac4e0c6ec089eddb9fc7784aee96cac3662bef8a873c60735 SHA512 96062485b2ca7467aa5c54b04463fe89eb91a726ad79055831c7dc1dfad19e42b0759703eec5b659475ad1d09f95f3703b30343655e590db29100ee8b0ebaa87
-EBUILD laser_proc-0.1.5.ebuild 551 BLAKE2B 41ddab0ac8a75a39137107962a0a93f75aa6b7dd7113bbc88ec2a4b2062a534a03f49001c05fe5b2a72287e3d87afecc39d23a7e6511c73998ac7de7ddd6d599 SHA512 953e4e22ef895406eb4a5ef9ea691c3adfd06b342fe7fdf4c7569af54b7d93e5e8939536db747eb75ead8341614d6f40c383c97b1565620f83b176b99404c03b
-EBUILD laser_proc-9999.ebuild 551 BLAKE2B b11840887b254f7212d6ddb80267c1ef51fc66c4f7f0817c09b2e00ac207592608285f23a442d5af57a948e0972cd5bc1baf182b47fb8e2191cb45f41027d0b7 SHA512 abfaf7d5f5544b829a93b00dffad30bbd6dd4e8e859ee8d29885f2a921b5c5b97f88c5b9ba12f52ccda0a70bcdb61e4cff82b15b31dfba5515c7455280f951e2
+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 339 BLAKE2B 3cd1bb1057e014c06068a8bbe24e0186d454d11123a6658e1576b04d62283e30a6f9aae45f3d09beb81499f32c5f1af598d1a526e4da1b6ab5ec89f6eb55a1b6 SHA512 78c716d120dc9a894dee02b01757f746407c982097ba048522eae320ba8e5f83632bb81f693549d4440b3ff47f47739b67ad19df0e8f67c24ff414e79dac99eb
diff --git a/dev-ros/laser_proc/laser_proc-0.1.5.ebuild b/dev-ros/laser_proc/laser_proc-0.1.5.ebuild
deleted file mode 100644
index f21077e89fd5..000000000000
--- a/dev-ros/laser_proc/laser_proc-0.1.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_proc"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-	dev-ros/nodelet
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_proc/laser_proc-0.1.6.ebuild b/dev-ros/laser_proc/laser_proc-0.1.6.ebuild
new file mode 100644
index 000000000000..2609d02c2feb
--- /dev/null
+++ b/dev-ros/laser_proc/laser_proc-0.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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
index daae664dcaa5..2609d02c2feb 100644
--- a/dev-ros/laser_proc/laser_proc-9999.ebuild
+++ b/dev-ros/laser_proc/laser_proc-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_proc"
 KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
 
-DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan"
+DESCRIPTION="Converts representations of LaserScan and MultiEchoLaserScan"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -16,9 +16,10 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rosconsole
 	dev-libs/console_bridge:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/pluginlib
 	dev-ros/nodelet
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index c1431707e56c..33579d0fb898 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,6 +1,4 @@
-AUX boost170.patch 3754 BLAKE2B 7e4d5be1898f70f7075cc51b36d143f3fd4feeceab6658926d6b0ba9030b0cc3d5ccbbfe624f914698eda0bcfdc748543e35f8de2cda59133b1d0cfe813bb119 SHA512 f3d0f1bdd19f08077e5650d02997028ad044594c185994e8df08903602199bb9b063d1623a807920b8d07c91b468c1b3ac34a806aec7b40ed15e9b70a0eb60c4
-AUX logging.patch 16008 BLAKE2B ac82381998cfc3b204f745b79cba6128751dd511b0d89d50f5317c82138cd06d51e627706ce533f205a731202e32838a8c7a7b3bb7c85011d6e9c698a4d1f792 SHA512 08e64047cbc613982be4bd34c07916df2e90a96f9f6873969be7dfd265f2d6ce4956669be7c57c38f23314fd4634b5569aec17618d412d0662ae5baf8f590433
-DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD libmavconn-0.19.0-r1.ebuild 499 BLAKE2B 3c0d8430aa3e771ad35d32d4d4970e950a82d3390129d3f17853d5f39c1479f72483d8f9311ff6229c4becc587e865304aff22374e85b54bf90c339f45be7979 SHA512 cf6f5d7ed4972f115f374993a04bdb5e2c855a592133e47ba684bd2c54ce7e6d5cf0678093a34e5a81475c55ca8d95be838c86718862107d502d9fd08af6ab92
-EBUILD libmavconn-9999.ebuild 431 BLAKE2B a98c07058726ca23ea9c93d4d072b51d94dbe9472f78caccd72b3e857250f18737981a4cfa2fc48c1c1c75db9313a4b129cd66320b9e82ccee04dc28616b905f SHA512 5d0ade0e7b70ff32b9fb2fed6041e2e9610a03deac57205a5e7136bc8ef9f27aa5a98a07e76e5d362784f37b4d5eb98a03184ededbd6dd39bd50f93531ace235
+DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+EBUILD libmavconn-1.2.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
+EBUILD libmavconn-9999.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/libmavconn/files/boost170.patch b/dev-ros/libmavconn/files/boost170.patch
deleted file mode 100644
index 357025d90af5..000000000000
--- a/dev-ros/libmavconn/files/boost170.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: libmavconn/src/tcp.cpp
-===================================================================
---- libmavconn.orig/src/tcp.cpp
-+++ libmavconn/src/tcp.cpp
-@@ -41,13 +41,19 @@ static bool resolve_address_tcp(io_servi
- 	error_code ec;
- 
- 	tcp::resolver::query query(host, "");
--	std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(),
--			[&](const tcp::endpoint & q_ep) {
--				ep = q_ep;
--				ep.port(port);
--				result = true;
--				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
--			});
-+
-+	auto fn = [&](const tcp::endpoint & q_ep) {
-+		ep = q_ep;
-+		ep.port(port);
-+		result = true;
-+		CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
-+	};
-+
-+#if BOOST_ASIO_VERSION >= 101200
-+	for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
-+#else
-+	std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(), fn);
-+#endif
- 
- 	if (ec) {
- 		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
-@@ -112,7 +118,7 @@ void MAVConnTCPClient::client_connected(
- 			server_channel, conn_id, to_string_ss(server_ep).c_str());
- 
- 	// start recv
--	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
-+	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
- }
- 
- MAVConnTCPClient::~MAVConnTCPClient()
-@@ -152,7 +158,7 @@ void MAVConnTCPClient::send_bytes(const
- 
- 		tx_q.emplace_back(bytes, length);
- 	}
--	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
-+	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
- }
- 
- void MAVConnTCPClient::send_message(const mavlink_message_t *message)
-@@ -174,7 +180,7 @@ void MAVConnTCPClient::send_message(cons
- 
- 		tx_q.emplace_back(message);
- 	}
--	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
-+	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
- }
- 
- void MAVConnTCPClient::send_message(const mavlink::Message &message)
-@@ -194,7 +200,7 @@ void MAVConnTCPClient::send_message(cons
- 
- 		tx_q.emplace_back(message, get_status_p(), sys_id, comp_id);
- 	}
--	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
-+	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
- }
- 
- void MAVConnTCPClient::do_recv()
-Index: libmavconn/src/udp.cpp
-===================================================================
---- libmavconn.orig/src/udp.cpp
-+++ libmavconn/src/udp.cpp
-@@ -41,13 +41,19 @@ static bool resolve_address_udp(io_servi
- 	error_code ec;
- 
- 	udp::resolver::query query(host, "");
--	std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(),
--			[&](const udp::endpoint & q_ep) {
--				ep = q_ep;
--				ep.port(port);
--				result = true;
--				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
--			});
-+
-+	auto fn = [&](const udp::endpoint & q_ep) {
-+		ep = q_ep;
-+		ep.port(port);
-+		result = true;
-+		CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
-+	};
-+
-+#if BOOST_ASIO_VERSION >= 101200
-+	for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
-+#else
-+	std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(), fn);
-+#endif
- 
- 	if (ec) {
- 		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
diff --git a/dev-ros/libmavconn/files/logging.patch b/dev-ros/libmavconn/files/logging.patch
deleted file mode 100644
index 3396a23c04df..000000000000
--- a/dev-ros/libmavconn/files/logging.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-Index: libmavconn/src/interface.cpp
-===================================================================
---- libmavconn.orig/src/interface.cpp
-+++ libmavconn/src/interface.cpp
-@@ -133,7 +133,7 @@ void MAVConnInterface::log_recv(const ch
- 
- 	const char *proto_version_str = (msg.magic == MAVLINK_STX) ? "v2.0" : "v1.0";
- 
--	logDebug("%s%zu: recv: %s %4s Message-Id: %u [%u bytes] IDs: %u.%u Seq: %u",
-+	CONSOLE_BRIDGE_logDebug("%s%zu: recv: %s %4s Message-Id: %u [%u bytes] IDs: %u.%u Seq: %u",
- 			pfx, conn_id,
- 			proto_version_str,
- 			framing_str,
-@@ -144,7 +144,7 @@ void MAVConnInterface::log_send(const ch
- {
- 	const char *proto_version_str = (msg->magic == MAVLINK_STX) ? "v2.0" : "v1.0";
- 
--	logDebug("%s%zu: send: %s Message-Id: %u [%u bytes] IDs: %u.%u Seq: %u",
-+	CONSOLE_BRIDGE_logDebug("%s%zu: send: %s Message-Id: %u [%u bytes] IDs: %u.%u Seq: %u",
- 			pfx, conn_id,
- 			proto_version_str,
- 			msg->msgid, msg->len, msg->sysid, msg->compid, msg->seq);
-@@ -152,7 +152,7 @@ void MAVConnInterface::log_send(const ch
- 
- void MAVConnInterface::log_send_obj(const char *pfx, const mavlink::Message &msg)
- {
--	logDebug("%s%zu: send: %s", pfx, conn_id, msg.to_yaml().c_str());
-+	CONSOLE_BRIDGE_logDebug("%s%zu: send: %s", pfx, conn_id, msg.to_yaml().c_str());
- }
- 
- void MAVConnInterface::send_message_ignore_drop(const mavlink::mavlink_message_t *msg)
-@@ -161,7 +161,7 @@ void MAVConnInterface::send_message_igno
- 		send_message(msg);
- 	}
- 	catch (std::length_error &e) {
--		logError(PFX "%zu: DROPPED Message-Id %u [%u bytes] IDs: %u.%u Seq: %u: %s",
-+		CONSOLE_BRIDGE_logError(PFX "%zu: DROPPED Message-Id %u [%u bytes] IDs: %u.%u Seq: %u: %s",
- 				conn_id,
- 				msg->msgid, msg->len, msg->sysid, msg->compid, msg->seq,
- 				e.what());
-@@ -174,7 +174,7 @@ void MAVConnInterface::send_message_igno
- 		send_message(msg);
- 	}
- 	catch (std::length_error &e) {
--		logError(PFX "%zu: DROPPED Message %s: %s",
-+		CONSOLE_BRIDGE_logError(PFX "%zu: DROPPED Message %s: %s",
- 				conn_id,
- 				msg.get_name().c_str(),
- 				e.what());
-@@ -247,14 +247,14 @@ static void url_parse_query(std::string
- 	auto ids_it = std::search(query.begin(), query.end(),
- 			ids_end.begin(), ids_end.end());
- 	if (ids_it == query.end()) {
--		logWarn(PFX "URL: unknown query arguments");
-+		CONSOLE_BRIDGE_logWarn(PFX "URL: unknown query arguments");
- 		return;
- 	}
- 
- 	std::advance(ids_it, ids_end.length());
- 	auto comma_it = std::find(ids_it, query.end(), ',');
- 	if (comma_it == query.end()) {
--		logError(PFX "URL: no comma in ids= query");
-+		CONSOLE_BRIDGE_logError(PFX "URL: no comma in ids= query");
- 		return;
- 	}
- 
-@@ -264,7 +264,7 @@ static void url_parse_query(std::string
- 	sysid = std::stoi(sys);
- 	compid = std::stoi(comp);
- 
--	logDebug(PFX "URL: found system/component id = [%u, %u]", sysid, compid);
-+	CONSOLE_BRIDGE_logDebug(PFX "URL: found system/component id = [%u, %u]", sysid, compid);
- }
- 
- static MAVConnInterface::Ptr url_parse_serial(
-@@ -292,7 +292,7 @@ static MAVConnInterface::Ptr url_parse_u
- 
- 	auto sep_it = std::find(hosts.begin(), hosts.end(), '@');
- 	if (sep_it == hosts.end()) {
--		logError(PFX "UDP URL should contain @!");
-+		CONSOLE_BRIDGE_logError(PFX "UDP URL should contain @!");
- 		throw DeviceError("url", "UDP separator not found");
- 	}
- 
-@@ -360,7 +360,7 @@ MAVConnInterface::Ptr MAVConnInterface::
- 			proto_end.begin(), proto_end.end());
- 	if (proto_it == url.end()) {
- 		// looks like file path
--		logDebug(PFX "URL: %s: looks like file path", url.c_str());
-+		CONSOLE_BRIDGE_logDebug(PFX "URL: %s: looks like file path", url.c_str());
- 		return url_parse_serial(url, "", system_id, component_id, false);
- 	}
- 
-@@ -384,7 +384,7 @@ MAVConnInterface::Ptr MAVConnInterface::
- 		++query_it;
- 	query.assign(query_it, url.end());
- 
--	logDebug(PFX "URL: %s: proto: %s, host: %s, path: %s, query: %s",
-+	CONSOLE_BRIDGE_logDebug(PFX "URL: %s: proto: %s, host: %s, path: %s, query: %s",
- 			url.c_str(), proto.c_str(), host.c_str(),
- 			path.c_str(), query.c_str());
- 
-Index: libmavconn/src/mavlink_helpers.cpp.em
-===================================================================
---- libmavconn.orig/src/mavlink_helpers.cpp.em
-+++ libmavconn/src/mavlink_helpers.cpp.em
-@@ -27,20 +27,20 @@ using mavconn::MAVConnInterface;
- 
- void MAVConnInterface::init_msg_entry()
- {
--	logDebug("mavconn: Initialize message_entries map");
-+	CONSOLE_BRIDGE_logDebug("mavconn: Initialize message_entries map");
- 
- 	auto load = [&](const char *dialect, const mavlink::mavlink_msg_entry_t & e) {
- 		auto it = message_entries.find(e.msgid);
- 		if (it != message_entries.end()) {
- 			if (memcmp(&e, it->second, sizeof(e)) != 0) {
--				logWarn("mavconn: init: message from %s, MSG-ID %d ignored! Table has different entry.", dialect, e.msgid);
-+				CONSOLE_BRIDGE_logWarn("mavconn: init: message from %s, MSG-ID %d ignored! Table has different entry.", dialect, e.msgid);
- 			}
- 			else {
--				logDebug("mavconn: init: message from %s, MSG-ID %d in table.", dialect, e.msgid);
-+				CONSOLE_BRIDGE_logDebug("mavconn: init: message from %s, MSG-ID %d in table.", dialect, e.msgid);
- 			}
- 		}
- 		else {
--			logDebug("mavconn: init: add message entry for %s, MSG-ID %d", dialect, e.msgid);
-+			CONSOLE_BRIDGE_logDebug("mavconn: init: add message entry for %s, MSG-ID %d", dialect, e.msgid);
- 			message_entries[e.msgid] = &e;
- 		}
- 	};
-Index: libmavconn/src/serial.cpp
-===================================================================
---- libmavconn.orig/src/serial.cpp
-+++ libmavconn/src/serial.cpp
-@@ -43,7 +43,7 @@ MAVConnSerial::MAVConnSerial(uint8_t sys
- {
- 	using SPB = boost::asio::serial_port_base;
- 
--	logInform(PFXd "device: %s @ %d bps", conn_id, device.c_str(), baudrate);
-+	CONSOLE_BRIDGE_logInform(PFXd "device: %s @ %d bps", conn_id, device.c_str(), baudrate);
- 
- 	try {
- 		serial_dev.open(device);
-@@ -95,7 +95,7 @@ void MAVConnSerial::close()
- void MAVConnSerial::send_bytes(const uint8_t *bytes, size_t length)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -115,7 +115,7 @@ void MAVConnSerial::send_message(const m
- 	assert(message != nullptr);
- 
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -135,7 +135,7 @@ void MAVConnSerial::send_message(const m
- void MAVConnSerial::send_message(const mavlink::Message &message)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -159,7 +159,7 @@ void MAVConnSerial::do_read(void)
- 			buffer(rx_buf),
- 			[sthis] (error_code error, size_t bytes_transferred) {
- 				if (error) {
--					logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-@@ -187,7 +187,7 @@ void MAVConnSerial::do_write(bool check_
- 				assert(bytes_transferred <= buf_ref.len);
- 
- 				if (error) {
--					logError(PFXd "write: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "write: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-Index: libmavconn/src/tcp.cpp
-===================================================================
---- libmavconn.orig/src/tcp.cpp
-+++ libmavconn/src/tcp.cpp
-@@ -46,11 +46,11 @@ static bool resolve_address_tcp(io_servi
- 				ep = q_ep;
- 				ep.port(port);
- 				result = true;
--				logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
-+				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
- 			});
- 
- 	if (ec) {
--		logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
-+		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
- 		result = false;
- 	}
- 
-@@ -73,7 +73,7 @@ MAVConnTCPClient::MAVConnTCPClient(uint8
- 	if (!resolve_address_tcp(io_service, conn_id, server_host, server_port, server_ep))
- 		throw DeviceError("tcp: resolve", "Bind address resolve failed");
- 
--	logInform(PFXd "Server address: %s", conn_id, to_string_ss(server_ep).c_str());
-+	CONSOLE_BRIDGE_logInform(PFXd "Server address: %s", conn_id, to_string_ss(server_ep).c_str());
- 
- 	try {
- 		socket.open(tcp::v4());
-@@ -108,7 +108,7 @@ MAVConnTCPClient::MAVConnTCPClient(uint8
- 
- void MAVConnTCPClient::client_connected(size_t server_channel)
- {
--	logInform(PFXd "Got client, id: %zu, address: %s",
-+	CONSOLE_BRIDGE_logInform(PFXd "Got client, id: %zu, address: %s",
- 			server_channel, conn_id, to_string_ss(server_ep).c_str());
- 
- 	// start recv
-@@ -140,7 +140,7 @@ void MAVConnTCPClient::close()
- void MAVConnTCPClient::send_bytes(const uint8_t *bytes, size_t length)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -160,7 +160,7 @@ void MAVConnTCPClient::send_message(cons
- 	assert(message != nullptr);
- 
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -180,7 +180,7 @@ void MAVConnTCPClient::send_message(cons
- void MAVConnTCPClient::send_message(const mavlink::Message &message)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -204,7 +204,7 @@ void MAVConnTCPClient::do_recv()
- 			buffer(rx_buf),
- 			[sthis] (error_code error, size_t bytes_transferred) {
- 				if (error) {
--					logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-@@ -232,7 +232,7 @@ void MAVConnTCPClient::do_send(bool chec
- 				assert(bytes_transferred <= buf_ref.len);
- 
- 				if (error) {
--					logError(PFXd "send: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "send: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-@@ -269,7 +269,7 @@ MAVConnTCPServer::MAVConnTCPServer(uint8
- 	if (!resolve_address_tcp(io_service, conn_id, server_host, server_port, bind_ep))
- 		throw DeviceError("tcp-l: resolve", "Bind address resolve failed");
- 
--	logInform(PFXd "Bind address: %s", conn_id, to_string_ss(bind_ep).c_str());
-+	CONSOLE_BRIDGE_logInform(PFXd "Bind address: %s", conn_id, to_string_ss(bind_ep).c_str());
- 
- 	try {
- 		acceptor.open(tcp::v4());
-@@ -302,7 +302,7 @@ void MAVConnTCPServer::close()
- 	if (!is_open())
- 		return;
- 
--	logInform(PFXd "Terminating server. "
-+	CONSOLE_BRIDGE_logInform(PFXd "Terminating server. "
- 			"All connections will be closed.", conn_id);
- 
- 	io_service.stop();
-@@ -395,7 +395,7 @@ void MAVConnTCPServer::do_accept()
- 			acceptor_client->server_ep,
- 			[sthis, acceptor_client] (error_code error) {
- 				if (error) {
--					logError(PFXd "accept: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "accept: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-@@ -416,7 +416,7 @@ void MAVConnTCPServer::client_closed(std
- {
- 	if (auto instp = weak_instp.lock()) {
- 		bool locked = mutex.try_lock();
--		logInform(PFXd "Client connection closed, id: %p, address: %s",
-+		CONSOLE_BRIDGE_logInform(PFXd "Client connection closed, id: %p, address: %s",
- 				conn_id, instp.get(), to_string_ss(instp->server_ep).c_str());
- 
- 		client_list.remove(instp);
-Index: libmavconn/src/udp.cpp
-===================================================================
---- libmavconn.orig/src/udp.cpp
-+++ libmavconn/src/udp.cpp
-@@ -46,11 +46,11 @@ static bool resolve_address_udp(io_servi
- 				ep = q_ep;
- 				ep.port(port);
- 				result = true;
--				logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
-+				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
- 			});
- 
- 	if (ec) {
--		logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
-+		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
- 		result = false;
- 	}
- 
-@@ -75,7 +75,7 @@ MAVConnUDP::MAVConnUDP(uint8_t system_id
- 	if (!resolve_address_udp(io_service, conn_id, bind_host, bind_port, bind_ep))
- 		throw DeviceError("udp: resolve", "Bind address resolve failed");
- 
--	logInform(PFXd "Bind address: %s", conn_id, to_string_ss(bind_ep).c_str());
-+	CONSOLE_BRIDGE_logInform(PFXd "Bind address: %s", conn_id, to_string_ss(bind_ep).c_str());
- 
- 	if (remote_host != "") {
- 		if (remote_host != BROADCAST_REMOTE_HOST)
-@@ -86,9 +86,9 @@ MAVConnUDP::MAVConnUDP(uint8_t system_id
- 		}
- 
- 		if (remote_exists)
--			logInform(PFXd "Remote address: %s", conn_id, to_string_ss(remote_ep).c_str());
-+			CONSOLE_BRIDGE_logInform(PFXd "Remote address: %s", conn_id, to_string_ss(remote_ep).c_str());
- 		else
--			logWarn(PFXd "Remote address resolve failed.", conn_id);
-+			CONSOLE_BRIDGE_logWarn(PFXd "Remote address resolve failed.", conn_id);
- 	}
- 
- 	try {
-@@ -144,12 +144,12 @@ void MAVConnUDP::close()
- void MAVConnUDP::send_bytes(const uint8_t *bytes, size_t length)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
- 	if (!remote_exists) {
--		logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
-+		CONSOLE_BRIDGE_logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
- 		return;
- 	}
- 
-@@ -169,12 +169,12 @@ void MAVConnUDP::send_message(const mavl
- 	assert(message != nullptr);
- 
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
- 	if (!remote_exists) {
--		logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
-+		CONSOLE_BRIDGE_logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
- 		return;
- 	}
- 
-@@ -194,12 +194,12 @@ void MAVConnUDP::send_message(const mavl
- void MAVConnUDP::send_message(const mavlink::Message &message)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
- 	if (!remote_exists) {
--		logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
-+		CONSOLE_BRIDGE_logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
- 		return;
- 	}
- 
-@@ -224,13 +224,13 @@ void MAVConnUDP::do_recvfrom()
- 			remote_ep,
- 			[sthis] (error_code error, size_t bytes_transferred) {
- 				if (error) {
--					logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
- 
- 				if (sthis->remote_ep != sthis->last_remote_ep) {
--					logInform(PFXd "Remote address: %s", sthis->conn_id, to_string_ss(sthis->remote_ep).c_str());
-+					CONSOLE_BRIDGE_logInform(PFXd "Remote address: %s", sthis->conn_id, to_string_ss(sthis->remote_ep).c_str());
- 					sthis->remote_exists = true;
- 					sthis->last_remote_ep = sthis->remote_ep;
- 				}
-@@ -259,11 +259,11 @@ void MAVConnUDP::do_sendto(bool check_tx
- 				assert(bytes_transferred <= buf_ref.len);
- 
- 				if (error == boost::asio::error::network_unreachable) {
--					logWarn(PFXd "sendto: %s, retrying", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logWarn(PFXd "sendto: %s, retrying", sthis->conn_id, error.message().c_str());
- 					// do not return, try to resend
- 				}
- 				else if (error) {
--					logError(PFXd "sendto: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "sendto: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
diff --git a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild b/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
deleted file mode 100644
index d42a92fd0e64..000000000000
--- a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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}"
-PATCHES=(
-	"${FILESDIR}/logging.patch"
-	"${FILESDIR}/boost170.patch"
-)
diff --git a/dev-ros/libmavconn/libmavconn-1.2.0.ebuild b/dev-ros/libmavconn/libmavconn-1.2.0.ebuild
new file mode 100644
index 000000000000..9a943481d549
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# 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-9999.ebuild b/dev-ros/libmavconn/libmavconn-9999.ebuild
index 9eb27fcc7ea7..9a943481d549 100644
--- a/dev-ros/libmavconn/libmavconn-9999.ebuild
+++ b/dev-ros/libmavconn/libmavconn-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -18,4 +18,6 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/librviz_tutorial/Manifest b/dev-ros/librviz_tutorial/Manifest
index 883e60956253..8b8a801d34fe 100644
--- a/dev-ros/librviz_tutorial/Manifest
+++ b/dev-ros/librviz_tutorial/Manifest
@@ -1,10 +1,4 @@
-DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
-DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
-DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD librviz_tutorial-0.10.1.ebuild 458 BLAKE2B 1e6cba7a4fece4d4c82e809a51b93ad1f10aa073d006c1f7df851d2d1343d9b47de412d96f18b65ef25cfaca5985fa50c5f12d21dc253d74e0625cc8b8a7c420 SHA512 c93eedc30fade27d4d85dda547b49566227517b729ede7503b5334b549ba549cccfc700249cd2da6636ad1413765a5a491f0348e39c5649985e152162adc48a8
-EBUILD librviz_tutorial-0.10.2.ebuild 458 BLAKE2B 3ee42f59d025c0fb9a8adaf3b1355f78aa8c7ba82f5f779691a4c15f2362791e15d88f3271d902bad059eb3ee59619e496a1f7dc12745cf1f3926840f33436a1 SHA512 b86dbc8b4d38f91faad5771afd1f769af6123e83258c56a5c6502f1a6259194ad9c3c61d219499fa4df4ac79c61fddd5d4155a4ce941d0548b86e15f075168c8
-EBUILD librviz_tutorial-0.10.3.ebuild 458 BLAKE2B 3ee42f59d025c0fb9a8adaf3b1355f78aa8c7ba82f5f779691a4c15f2362791e15d88f3271d902bad059eb3ee59619e496a1f7dc12745cf1f3926840f33436a1 SHA512 b86dbc8b4d38f91faad5771afd1f769af6123e83258c56a5c6502f1a6259194ad9c3c61d219499fa4df4ac79c61fddd5d4155a4ce941d0548b86e15f075168c8
-EBUILD librviz_tutorial-0.11.0.ebuild 455 BLAKE2B 0a8624b7b7f0b31d40c2de264f5cb703108ca1ed87d619664ee0da880f95a1edf41d9e50a83178eb633d15256655d647169026b3d6344cacb6eae0bb2a8a85c0 SHA512 5579cc9ae941d0845ab42153c95b0376c065a1e2be5fc62b4c93b48389b6dbf94f5fd3c6320bccddd6c4428b11cacfc028d8db74287e8ef283c2e58da3c085fe
-EBUILD librviz_tutorial-9999.ebuild 458 BLAKE2B 1e6cba7a4fece4d4c82e809a51b93ad1f10aa073d006c1f7df851d2d1343d9b47de412d96f18b65ef25cfaca5985fa50c5f12d21dc253d74e0625cc8b8a7c420 SHA512 c93eedc30fade27d4d85dda547b49566227517b729ede7503b5334b549ba549cccfc700249cd2da6636ad1413765a5a491f0348e39c5649985e152162adc48a8
+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 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.1.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.1.ebuild
deleted file mode 100644
index a87a8ddccb99..000000000000
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorial showing how to compile your own 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-0.10.2.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.2.ebuild
deleted file mode 100644
index dbb62ffac134..000000000000
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorial showing how to compile your own 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-0.10.3.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.3.ebuild
deleted file mode 100644
index dbb62ffac134..000000000000
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorial showing how to compile your own 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-0.11.0.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
index b8d5a83d3174..fa17abc3aed7 100644
--- a/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
+++ b/dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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 compile your own C++ program with RViz displays and features"
+DESCRIPTION="Tutorial showing how to build a C++ program with RViz displays and features"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
index a87a8ddccb99..fa17abc3aed7 100644
--- a/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
+++ b/dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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 compile your own C++ program with RViz displays and features"
+DESCRIPTION="Tutorial showing how to build a C++ program with RViz displays and features"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/map_msgs/Manifest b/dev-ros/map_msgs/Manifest
index 38be61967c4c..913b8fdbc830 100644
--- a/dev-ros/map_msgs/Manifest
+++ b/dev-ros/map_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST navigation_msgs-1.13.0.tar.gz 2251 BLAKE2B b70ade2d296f8a94ae89286caa4f23adba5ac5c058ccfcdf6a35a9bac03e5238a37bcd91bbf99f62d3fe806639e8a655c5fcc9391e637e37238f0421805903dd SHA512 e7b4a83bbbd5384f72d1a9d7e3544cde718728ba2a2562b3c0da5b5fd7db146faf8c717d4af2509eaf1ff545ac85da121f7e37cb7b6b53c8a5b8d683c6b4e66c
-EBUILD map_msgs-1.13.0.ebuild 508 BLAKE2B 69b5d31089f072be9c18c671701eeef472f43e0d97ebf1caea117eaf5de8a0e1f0d451eb578b359e8f781443d7dee15218505bb6614f3348c346700df0a6546c SHA512 f37b7b01edae26afe2cce58072781a50e0ebb6c8dee75df6c5d82a3e602aef98edc23895f25e87e21d7f661491292b59878be32cca7586134f664b64e8fae18e
-EBUILD map_msgs-9999.ebuild 508 BLAKE2B 69b5d31089f072be9c18c671701eeef472f43e0d97ebf1caea117eaf5de8a0e1f0d451eb578b359e8f781443d7dee15218505bb6614f3348c346700df0a6546c SHA512 f37b7b01edae26afe2cce58072781a50e0ebb6c8dee75df6c5d82a3e602aef98edc23895f25e87e21d7f661491292b59878be32cca7586134f664b64e8fae18e
+DIST navigation_msgs-1.14.0.tar.gz 2329 BLAKE2B 7414a4b67fde26223cdf81a14b1c3e56f2bf5519d46455234de75bf79b10c8fa0f1a04a2865703723c0a975bde77e22754e751c07edc73fddd10bae9ac5b0feb SHA512 0354856b8964547cb96d59717d1d1e8b4c261b79bd451a25755303d295aecf3f0011a825307e0fc6ccd5179f4ea921a8debd8be79b5e4d2bdab0f0d57b54e56d
+EBUILD map_msgs-1.14.0.ebuild 468 BLAKE2B 5850756a4875bb5f53df0dd6b8f173a49e638e857414d1bcd7454ac7d614a4f575a7c6c6bd37777ebc7cb598a189ebb6dd6b0db7ff9df6411329814c08baf573 SHA512 2df227ee9518bfbe271a84767bf7aabf959e5216d2344a36f2e2876feb60bd93e36984d9ba3d4f0a18023d991da49bdfe035adcdc13054feb7e39df57812fb4c
+EBUILD map_msgs-9999.ebuild 468 BLAKE2B 5850756a4875bb5f53df0dd6b8f173a49e638e857414d1bcd7454ac7d614a4f575a7c6c6bd37777ebc7cb598a189ebb6dd6b0db7ff9df6411329814c08baf573 SHA512 2df227ee9518bfbe271a84767bf7aabf959e5216d2344a36f2e2876feb60bd93e36984d9ba3d4f0a18023d991da49bdfe035adcdc13054feb7e39df57812fb4c
 MISC metadata.xml 342 BLAKE2B c278231941f53347e7457813d64fc0bf8b32bcacbfddc955c8d90538c9ae9c23504c51747c32ef7f8c5555c22d25bd34c1a5185df6d864b6f0509fdccedbcdd0 SHA512 6b28c6c3ff5f68ebfe8ba768c80ebc61c054453fde126fc64aa406e69fdf2f3174031930b8830144ba25401354df016f8179ab3d16c50d339b486a13421dd684
diff --git a/dev-ros/map_msgs/map_msgs-1.13.0.ebuild b/dev-ros/map_msgs/map_msgs-1.13.0.ebuild
deleted file mode 100644
index c6857178b651..000000000000
--- a/dev-ros/map_msgs/map_msgs-1.13.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=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-1.14.0.ebuild b/dev-ros/map_msgs/map_msgs-1.14.0.ebuild
new file mode 100644
index 000000000000..b8edba6c29a9
--- /dev/null
+++ b/dev-ros/map_msgs/map_msgs-1.14.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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/map_msgs-9999.ebuild b/dev-ros/map_msgs/map_msgs-9999.ebuild
index c6857178b651..b8edba6c29a9 100644
--- a/dev-ros/map_msgs/map_msgs-9999.ebuild
+++ b/dev-ros/map_msgs/map_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs dev-ros/nav_msgs"
 
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index 408e8818e751..599df222a5fa 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -1,14 +1,4 @@
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD map_server-1.15.2-r1.ebuild 570 BLAKE2B 105eb30a5c157083a2811379144364e93cacf7a8de44c132e0712a708edb646a4779464c76bc4f59f7844ea0875e5851950eba733c2b032c8635369b1e8c6575 SHA512 a846dba6800fa08ee1ddaed6543a0632404b02bb3d105a21c9f7a4bc159520e85b6d5578aa7c8945ed3e84cce125474045c2d415e9fc25afc77b3d6a3e63377b
-EBUILD map_server-1.16.0.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
-EBUILD map_server-1.16.1.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
-EBUILD map_server-1.16.2.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
-EBUILD map_server-1.16.3.ebuild 585 BLAKE2B 6bf9a6201ef8cb77f08af1b246f4b2253eb13bab620cfa70255ce9f744faf45762cb377d714ca095d1f6a6ae4a7c94b64951a3081df01c56ef2f443233cae5c6 SHA512 3789e3cb40b87379bddd3c52f3c8771a5b43f1a110a9411637567756cee53b068bec7f1ddeea5c8844cc1f57064e15ea74aac7f7006737ce520ed8bb683f2b71
-EBUILD map_server-1.16.6.ebuild 585 BLAKE2B 04b2cff89ef41c0fbf6747f225fd9ec35bbe2c180eba6fd1d346d2c5d7cae5c6381bde2745f3a996281a2739884b79d66ea2056491efd4955bf333dccb958251 SHA512 eeb926390fd9b2f7ad865571ce8a215108b76f63bf9f956cebc8cdae97685f1c44ed1fc782acc4a644ee466eb7b4c6df8006b787c10fb4cc9cb78283936f17df
-EBUILD map_server-9999.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD map_server-1.17.0.ebuild 714 BLAKE2B ea65db38fc750fd7d5a431f386d82c052e12307b266a7969f18f8e5c56aefa28055197b3a99f49c7c6c1200d9aebe356111590e116941b924194148cc6ffe49f SHA512 c86a6ad4e1be82c74af966c81d8164b60cdd3b6f68de7c2970c824b857c060e37f6cf74ad2d0377f96193f0901982ede8fa5b296d14b070486db6c87f2e00dd1
+EBUILD map_server-9999.ebuild 714 BLAKE2B ea65db38fc750fd7d5a431f386d82c052e12307b266a7969f18f8e5c56aefa28055197b3a99f49c7c6c1200d9aebe356111590e116941b924194148cc6ffe49f SHA512 c86a6ad4e1be82c74af966c81d8164b60cdd3b6f68de7c2970c824b857c060e37f6cf74ad2d0377f96193f0901982ede8fa5b296d14b070486db6c87f2e00dd1
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/map_server/map_server-1.15.2-r1.ebuild b/dev-ros/map_server/map_server-1.15.2-r1.ebuild
deleted file mode 100644
index 989e42b78ece..000000000000
--- a/dev-ros/map_server/map_server-1.15.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5:=
-	sci-physics/bullet:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.16.0.ebuild b/dev-ros/map_server/map_server-1.16.0.ebuild
deleted file mode 100644
index 429845481287..000000000000
--- a/dev-ros/map_server/map_server-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-physics/bullet:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	media-libs/sdl-image
-	dev-ros/tf2
-	>=dev-cpp/yaml-cpp-0.5:=
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.16.1.ebuild b/dev-ros/map_server/map_server-1.16.1.ebuild
deleted file mode 100644
index 429845481287..000000000000
--- a/dev-ros/map_server/map_server-1.16.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-physics/bullet:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	media-libs/sdl-image
-	dev-ros/tf2
-	>=dev-cpp/yaml-cpp-0.5:=
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.16.2.ebuild b/dev-ros/map_server/map_server-1.16.2.ebuild
deleted file mode 100644
index 429845481287..000000000000
--- a/dev-ros/map_server/map_server-1.16.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-physics/bullet:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	media-libs/sdl-image
-	dev-ros/tf2
-	>=dev-cpp/yaml-cpp-0.5:=
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.16.3.ebuild b/dev-ros/map_server/map_server-1.16.3.ebuild
deleted file mode 100644
index 79bc5cdfa6e3..000000000000
--- a/dev-ros/map_server/map_server-1.16.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-physics/bullet:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	media-libs/sdl-image
-	dev-ros/tf2
-	>=dev-cpp/yaml-cpp-0.5:=
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.16.6.ebuild b/dev-ros/map_server/map_server-1.16.6.ebuild
deleted file mode 100644
index f48934a6d4ff..000000000000
--- a/dev-ros/map_server/map_server-1.16.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=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-physics/bullet:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	media-libs/sdl-image
-	dev-ros/tf2
-	>=dev-cpp/yaml-cpp-0.5:=
-
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.17.0.ebuild b/dev-ros/map_server/map_server-1.17.0.ebuild
new file mode 100644
index 000000000000..01d98e8306e2
--- /dev/null
+++ b/dev-ros/map_server/map_server-1.17.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 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
index 429845481287..01d98e8306e2 100644
--- a/dev-ros/map_server/map_server-9999.ebuild
+++ b/dev-ros/map_server/map_server-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
@@ -15,14 +15,26 @@ IUSE=""
 
 RDEPEND="
 	sci-physics/bullet:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
-	media-libs/sdl-image
+	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 )
+	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/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index acdd00cc93e9..9917d119a24d 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,8 +1,4 @@
 AUX gentoo.patch 708 BLAKE2B ad41a87474f0c542dcab2189e08f744c37ebc0a5993c9ca46633d3f02b3c13b002cd1b1644123694bd0bea756168d29d121eca9cd8071a548ae592f6e81431f1 SHA512 2ab7861c421e630a87924ae4b5f282493be043d1d0a53188ed6ec2938250ac4fb1e402072d4f10afc747271c94cad424bd84ca15d49d38e871b245b5068de698
-DIST mavlink-gbp-release-2017.2.7.tar.gz 460082 BLAKE2B 3274be8d0ed28f996d1cb521bdca63c3671b913ef9fb3c4aed98c76a040d2eab719a48da6eea042b7dc59322c05c3a8fe4d193236e49c75d0fc90c8fd2b39501 SHA512 07c21a4d80f1d67657cc824bbd46279620008374af48dfa92547e6373cee5a48509fabf269b55911bdb1d63660c5581cb362b7ea469f0ca00317e5d32084b73c
-DIST mavlink-gbp-release-2017.5.5.tar.gz 3943384 BLAKE2B 839ec17ad02b880b392a50a3171da2f8fc6159830ccfa6f383c5535f00599f094a4ee277d3e860bb430462e4df94fc749421ef34989056589676b360f7356165 SHA512 8c4a746187ee3c18cb9f236d77e942fb96ee8fc4ad561f0391290a9113cf0cb018f13916e67030a8ca60bfbc163cb54315747f78230057bc41154afe62c66859
-DIST mavlink-gbp-release-2019.11.11.tar.gz 4101019 BLAKE2B aa2e09fab46d82bbe463b637bc02551ba512c011892663ecc7e187070f2591ec7f7aa249d1b294fadbea86c82a8f02a3a3219e16662f92508c399fd9251df391 SHA512 112a6c0055c68eaaa289237a3d94b89a632ccbe22344a1e923e3ded2273fb32a54515febba8a9e97590af10402cec3e414f286c012ed7605ced98822509eedad
-EBUILD mavlink-gbp-release-2017.2.7-r1.ebuild 576 BLAKE2B c3d6a95973c6d07aac79c6bad1a441cff91d690d66e2e29034260f1a84ae3b824a4f0e12171758619985d81f39b475de233410584536ab650ed6dda55b28a295 SHA512 baa6c811db6e77da2a6b1ae92be6414c6bacc853adec848c1788270f3d7f730fa0a9b2581be801c25dfa5a4b5365a6ab9b1fd076aa60f4df2900d96541730eb3
-EBUILD mavlink-gbp-release-2017.5.5.ebuild 576 BLAKE2B c3d6a95973c6d07aac79c6bad1a441cff91d690d66e2e29034260f1a84ae3b824a4f0e12171758619985d81f39b475de233410584536ab650ed6dda55b28a295 SHA512 baa6c811db6e77da2a6b1ae92be6414c6bacc853adec848c1788270f3d7f730fa0a9b2581be801c25dfa5a4b5365a6ab9b1fd076aa60f4df2900d96541730eb3
-EBUILD mavlink-gbp-release-2019.11.11.ebuild 573 BLAKE2B d5d788a838d60fed8a941509a923d7a34e388bdf9a3df6aa536e7b9bf47d6920a646db08f168530684ee2e2fe343d7b48773ef0b21c418bd63dbb26b02215c8a SHA512 8c1d6792aa4ffd6ec0b3d532dd33d8d9e9350cccb2d4df5656b58d173cf4ad38ff78deb46e4b0dd00ab6bdc4957f2c762cc5cbef5a89e95a450cabb7f6e0cd3a
+DIST mavlink-gbp-release-2020.7.7.tar.gz 4130271 BLAKE2B e9e6759da3734fe918e1c9441ca823a62d8629f08e3b049a1817103ddd7dca14098f69842b4d38f3fda991f7c9020e9cde84315eb1c8b47ae9785c7c26957420 SHA512 bd23f9f4cfba941ef928e79d5c26d6c310189eefbd1c29f019b688c5d2a07cccf1bcf6212d516cccff28fdcfbc3cff0f585eb5e7640fc011eab252e0222cee46
+EBUILD mavlink-gbp-release-2020.7.7-r1.ebuild 563 BLAKE2B 75b26d4d4d13d45a52cb31a6603a84679093b32b6161d3d03009ea8057a773edd0bcb18ec4d6d21681bf45d793e8d7f7bcff965f9d27829f258fa660e8cfae73 SHA512 36b7e697a6db198c8477a4997d51361c4d5fa3deb826907ab61239c373efdfe0249e0a5d3a1f4c17277e3ebfca739d7788dadf6ca93adb6a36ea9cc5397ceb9a
 MISC metadata.xml 341 BLAKE2B 1292ea0319edc3c3597165f59f246829e6954b5582e623e92227de5503f35d0f61150a0516998dd1d99942c371291ed623a38112210abac7dd0a050cc810b34c SHA512 0b545da2a0f2d6372e63db33fd5f50497c0de04a69fdb3b94e57418ff617fcebaeed515241c474995efc38bbdf1c099ec67ad6a56dd3ae94b2e24be9f1f72d36
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild
deleted file mode 100644
index de8d9845ba24..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/kinetic/mavlink/
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-EGIT_BRANCH="release/kinetic/mavlink"
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild
deleted file mode 100644
index de8d9845ba24..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/kinetic/mavlink/
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-EGIT_BRANCH="release/kinetic/mavlink"
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild
deleted file mode 100644
index a8c6412274a2..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/melodic/mavlink/
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-EGIT_BRANCH="release/melodic/mavlink"
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild
new file mode 100644
index 000000000000..86036c60a87e
--- /dev/null
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild
@@ -0,0 +1,21 @@
+# 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/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/mavros/Manifest b/dev-ros/mavros/Manifest
index 1ae83a421715..5934b8e39813 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -1,4 +1,4 @@
-DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD mavros-0.19.0-r1.ebuild 1042 BLAKE2B 3969b7264ab87b0fdce3c3be44bf8af2608597d3a74f5f1331f807dc2a5d6f796a91b3c6f58164a060c66ba9dc89b0c4788dbc1b70d8eb91515c08e6aff43fff SHA512 b5ffc141f3c8fdf563b1bf60afedbad476fa334776ef065eda3be1233f7e52090e74bf3b45c128b0b19bec58cf8916ccecf459457ebdda545ee2cca3da18c488
-EBUILD mavros-9999.ebuild 1042 BLAKE2B 3969b7264ab87b0fdce3c3be44bf8af2608597d3a74f5f1331f807dc2a5d6f796a91b3c6f58164a060c66ba9dc89b0c4788dbc1b70d8eb91515c08e6aff43fff SHA512 b5ffc141f3c8fdf563b1bf60afedbad476fa334776ef065eda3be1233f7e52090e74bf3b45c128b0b19bec58cf8916ccecf459457ebdda545ee2cca3da18c488
+DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+EBUILD mavros-1.2.0.ebuild 1034 BLAKE2B 4d613cae01fcbc82955bfd139a7d35800f33cd6fe42dfb8c500b52d4bd214d8a6baa23db8c7a64afcd90165dc13e53b6259f91a235e403cf6e571baf6ae771a2 SHA512 fa742657088ad5275af8161b4fd795bd6d9e102fd745299117ae0c8b67b77932abd62445798a1870f6d4273cea660458006b98fcccd5112ecf310423fcfbd3fa
+EBUILD mavros-9999.ebuild 1034 BLAKE2B 4d613cae01fcbc82955bfd139a7d35800f33cd6fe42dfb8c500b52d4bd214d8a6baa23db8c7a64afcd90165dc13e53b6259f91a235e403cf6e571baf6ae771a2 SHA512 fa742657088ad5275af8161b4fd795bd6d9e102fd745299117ae0c8b67b77932abd62445798a1870f6d4273cea660458006b98fcccd5112ecf310423fcfbd3fa
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros/mavros-0.19.0-r1.ebuild b/dev-ros/mavros/mavros-0.19.0-r1.ebuild
deleted file mode 100644
index 06d13ec84a26..000000000000
--- a/dev-ros/mavros/mavros-0.19.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/eigen_conversions
-	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/mavlink-gbp-release-2016.11.11
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-1.2.0.ebuild b/dev-ros/mavros/mavros-1.2.0.ebuild
new file mode 100644
index 000000000000..74118adcd502
--- /dev/null
+++ b/dev-ros/mavros/mavros-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# 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 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
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/eigen_conversions
+	sci-geosciences/GeographicLib
+	>=dev-ros/mavlink-gbp-release-2016.11.11
+	dev-libs/console_bridge:=
+"
+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}]
+"
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
index 06d13ec84a26..74118adcd502 100644
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -25,6 +24,11 @@ RDEPEND="
 	dev-ros/rosconsole_bridge
 	dev-libs/boost:=
 	dev-ros/eigen_conversions
+	sci-geosciences/GeographicLib
+	>=dev-ros/mavlink-gbp-release-2016.11.11
+	dev-libs/console_bridge:=
+"
+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}]
@@ -32,7 +36,4 @@ RDEPEND="
 	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/mavlink-gbp-release-2016.11.11
-	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index ef65aeae7635..cb74006a9d42 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -1,4 +1,4 @@
-DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD mavros_extras-0.19.0-r1.ebuild 908 BLAKE2B 379c7e36603dce144c5357d81e872d27daf67b8436e1d14bc124874b567322c08f9ca081af62f4e87744d23c91f4c85d69368623ebb46e7f42ded6e3df608815 SHA512 9656ed5574c064ead98cc237b4f65774e00a4324bc3a7b6e377c5d750d9fb488140a9715997bb2a8b607098ab584121e4650648586126e05a4f35d4bc9fd09d5
-EBUILD mavros_extras-9999.ebuild 908 BLAKE2B 379c7e36603dce144c5357d81e872d27daf67b8436e1d14bc124874b567322c08f9ca081af62f4e87744d23c91f4c85d69368623ebb46e7f42ded6e3df608815 SHA512 9656ed5574c064ead98cc237b4f65774e00a4324bc3a7b6e377c5d750d9fb488140a9715997bb2a8b607098ab584121e4650648586126e05a4f35d4bc9fd09d5
+DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+EBUILD mavros_extras-1.2.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
+EBUILD mavros_extras-9999.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_extras/mavros_extras-0.19.0-r1.ebuild b/dev-ros/mavros_extras/mavros_extras-0.19.0-r1.ebuild
deleted file mode 100644
index 38a5b7343d0b..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-0.19.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=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
new file mode 100644
index 000000000000..e7290bdf87be
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
@@ -0,0 +1,35 @@
+# 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-9999.ebuild b/dev-ros/mavros_extras/mavros_extras-9999.ebuild
index 38a5b7343d0b..e7290bdf87be 100644
--- a/dev-ros/mavros_extras/mavros_extras-9999.ebuild
+++ b/dev-ros/mavros_extras/mavros_extras-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -19,14 +18,18 @@ RDEPEND="
 	dev-ros/cv_bridge
 	dev-ros/mavros
 	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	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/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/urdf
-	dev-cpp/eigen:3
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+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_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
index 1df5c49ca7fb..e2e7e88055ce 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST mavros-0.18.7.tar.gz 213566 BLAKE2B 447e1c0e060e134d7246adbbc2d8174c97fa5f3b79f16626e9b8dfae9a5502c42a036f11573696cc0e705fec959c62aadaad6094fb430da5c4f8b21a7572d390 SHA512 8ab17de7b9892d8eb7141d998460814d572d359b6ab5a3d2fe6a854506eedd784b936f9630a917b3de9ef5db7ac1375ff8374e816e9d0262f3d6b926b86f68ec
-DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD mavros_msgs-0.18.7.ebuild 456 BLAKE2B 6e9716c784522a40135d9c0c24455a79c6096bcc53d2e30ad58833ac129d0897310010c1713ee32eb5aec06dc7332445c8577a8c63d63552e009a489110f9e2f SHA512 41a1b3c3fac761261ea84a0382f74e2116a207b59bf4a856d5e38f21e1d89af06758b2b47aab113b97b10003f49e679e9ef1cdd061ab409b139ccc90e567311d
-EBUILD mavros_msgs-0.19.0.ebuild 456 BLAKE2B 6e9716c784522a40135d9c0c24455a79c6096bcc53d2e30ad58833ac129d0897310010c1713ee32eb5aec06dc7332445c8577a8c63d63552e009a489110f9e2f SHA512 41a1b3c3fac761261ea84a0382f74e2116a207b59bf4a856d5e38f21e1d89af06758b2b47aab113b97b10003f49e679e9ef1cdd061ab409b139ccc90e567311d
-EBUILD mavros_msgs-9999.ebuild 456 BLAKE2B 6e9716c784522a40135d9c0c24455a79c6096bcc53d2e30ad58833ac129d0897310010c1713ee32eb5aec06dc7332445c8577a8c63d63552e009a489110f9e2f SHA512 41a1b3c3fac761261ea84a0382f74e2116a207b59bf4a856d5e38f21e1d89af06758b2b47aab113b97b10003f49e679e9ef1cdd061ab409b139ccc90e567311d
+DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+EBUILD mavros_msgs-1.2.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
+EBUILD mavros_msgs-9999.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.18.7.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.18.7.ebuild
deleted file mode 100644
index c1a4b0685200..000000000000
--- a/dev-ros/mavros_msgs/mavros_msgs-0.18.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_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-0.19.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.19.0.ebuild
deleted file mode 100644
index c1a4b0685200..000000000000
--- a/dev-ros/mavros_msgs/mavros_msgs-0.19.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_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.2.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
new file mode 100644
index 000000000000..04710e1afb12
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
index c1a4b0685200..04710e1afb12 100644
--- a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
+++ b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
 
diff --git a/dev-ros/media_export/Manifest b/dev-ros/media_export/Manifest
index d5196f687b72..1fbdb6cebca5 100644
--- a/dev-ros/media_export/Manifest
+++ b/dev-ros/media_export/Manifest
@@ -1,4 +1,4 @@
-DIST media_export-0.2.0.tar.gz 1350 BLAKE2B dd5bce1ab1ae77e5a5050a734bfabb208b907af1a18ea889ab7cdc4a0b8aca9ee0f9aad44f0b99e5ad91ad9e03664e7c833cc646460434edac5daca77d4939ed SHA512 3710c028972ba9d431cd1f450fa867131607a657478e8316acb48065420e42f0f7da82af58135be995648c4ecd31952c196d36196f9f28da87a40409de3f6520
-EBUILD media_export-0.2.0.ebuild 328 BLAKE2B 3d27c0732c9abbc9ab7417e38187af9a3ff6e594a5eadee12b9e3672f719131b49fb0f80b62d1c05bfc9670690623ecf62e54d5784569e20295487acf2026518 SHA512 3381f8ec84806586d7f70f448110b74e505a7ea4271b1112082c19177f1b30466815238daf1129bd799f692749ef6b1b46d4507ee951d814ec297b7829e9f892
-EBUILD media_export-9999.ebuild 328 BLAKE2B 3d27c0732c9abbc9ab7417e38187af9a3ff6e594a5eadee12b9e3672f719131b49fb0f80b62d1c05bfc9670690623ecf62e54d5784569e20295487acf2026518 SHA512 3381f8ec84806586d7f70f448110b74e505a7ea4271b1112082c19177f1b30466815238daf1129bd799f692749ef6b1b46d4507ee951d814ec297b7829e9f892
+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 330 BLAKE2B 445bb40599e2c212c5902bb97879d555e5e182ac00f21261b8e4729b2677e2667e9b4b1a285f5f3295f69cef01f481d7f2f1f542fabba7ac7c16977800b03fa3 SHA512 2bb631abc39b4004389cdf1838234d0334faece28d1bd02e9afd2e5e5021969fecf4415c14ef86df2d11fdc02c1dbe4c9ab6b21ae68a4a5229ea08b25f2e9c6a
diff --git a/dev-ros/media_export/media_export-0.2.0.ebuild b/dev-ros/media_export/media_export-0.2.0.ebuild
deleted file mode 100644
index 9140f6143732..000000000000
--- a/dev-ros/media_export/media_export-0.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/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-0.3.0.ebuild b/dev-ros/media_export/media_export-0.3.0.ebuild
new file mode 100644
index 000000000000..6d904cb88330
--- /dev/null
+++ b/dev-ros/media_export/media_export-0.3.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 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
index 9140f6143732..6d904cb88330 100644
--- a/dev-ros/media_export/media_export-9999.ebuild
+++ b/dev-ros/media_export/media_export-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/media_export"
 KEYWORDS="~amd64"
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 91ac651af1dd..e5c9a82f15c7 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,8 +1,5 @@
-AUX boost.patch 1066 BLAKE2B 955d62df23d3165df5cf2645967755bf8dbd993779ddba0c6db4cbd77c6456d536421d428475ef521f3b961e4e9dd9f93a78066f10ed961fddb6a8528ea29648 SHA512 a78c61c54c7389647fa7001ce0d453b0d2b74324877da1275edc487c18cd6208a640678575887f84bcab0a742618efe69bd209855a4f57f58ede98f0a3cd7600
 AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD message_filters-1.14.3-r1.ebuild 795 BLAKE2B 294a8f9f9f3d3b47a8a692c86b88badd8370ef38f680e6fb2ed1fbfb027ffe8e20cfdfea63564478488e2b583d5588478330535c458ce7b45383d2e979e3d5cf SHA512 e159086871167df2de97ad0912162f4ac2c94a4e43796d41f8b4a338d1cc8783a094de87497c719d9608d62a2cfa1f31f17fa946a96cb1b01203a8ed47039055
-EBUILD message_filters-1.15.4.ebuild 769 BLAKE2B 1d022886a2dc5110f40e8eec6458687855690d2c5f073a96e936c16172bd20c656d127bf2a76d636dffda664a4431ac943dc4f97a52b9aed0544ff267a721bc5 SHA512 9d9f9dfcc87fa07dd7473710a059d88267ebf55ba84b00d709b0aec7959049a3f0de7cf490fa46d19c330403a168e1114cd99e2a2425bea406228878d1d41cf0
-EBUILD message_filters-9999.ebuild 769 BLAKE2B 1d022886a2dc5110f40e8eec6458687855690d2c5f073a96e936c16172bd20c656d127bf2a76d636dffda664a4431ac943dc4f97a52b9aed0544ff267a721bc5 SHA512 9d9f9dfcc87fa07dd7473710a059d88267ebf55ba84b00d709b0aec7959049a3f0de7cf490fa46d19c330403a168e1114cd99e2a2425bea406228878d1d41cf0
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD message_filters-1.15.8.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
+EBUILD message_filters-9999.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/files/boost.patch b/dev-ros/message_filters/files/boost.patch
deleted file mode 100644
index 1acc778756a8..000000000000
--- a/dev-ros/message_filters/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
-Author: Maarten de Vries <maarten@de-vri.es>
-Date:   Thu Jan 31 00:58:29 2019 +0100
-
-    Remove signals from find_package(Boost COMPONENTS ...) (#1580)
-    
-    The packages use signals2, not signals. Only boost libraries with
-    compiled code should be passed to find_package(Boost COMPONENTS ...),
-    and the signals2 library has always been header only.
-    
-    Boost 1.69 has removed the deprecated signals library, so the otherwise
-    useless but harmless `signals` component now breaks the build.
-
-diff --git a/utilities/message_filters/CMakeLists.txt b/utilities/message_filters/CMakeLists.txt
-index 5694ac57e..d2b1477ad 100644
---- a/utilities/message_filters/CMakeLists.txt
-+++ b/utilities/message_filters/CMakeLists.txt
-@@ -13,7 +13,7 @@ catkin_package(
- )
- catkin_python_setup()
- 
--find_package(Boost REQUIRED COMPONENTS signals thread)
-+find_package(Boost REQUIRED COMPONENTS thread)
- 
- include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
- link_directories(${catkin_LIBRARY_DIRS})
diff --git a/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild b/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild
deleted file mode 100644
index c2ab8b9cdbe7..000000000000
--- a/dev-ros/message_filters/message_filters-1.14.3-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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.15.4.ebuild b/dev-ros/message_filters/message_filters-1.15.4.ebuild
deleted file mode 100644
index ec6cbf8434ad..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.15.8.ebuild b/dev-ros/message_filters/message_filters-1.15.8.ebuild
new file mode 100644
index 000000000000..2bbb5486cfc4
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 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="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:=[threads]
+	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
index ec6cbf8434ad..2bbb5486cfc4 100644
--- a/dev-ros/message_filters/message_filters-9999.ebuild
+++ b/dev-ros/message_filters/message_filters-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -19,14 +18,20 @@ RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
 	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
+	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_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(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_generation/Manifest b/dev-ros/message_generation/Manifest
index 74987fd887ff..909139e62031 100644
--- a/dev-ros/message_generation/Manifest
+++ b/dev-ros/message_generation/Manifest
@@ -1,6 +1,4 @@
-DIST message_generation-0.3.0.tar.gz 709 BLAKE2B 952b16c024aaf223e7677f5f1eaee242a969ae53195e83019c10221e1ce47cea87ffa8a99f5c7a133d8094cf2f0fa34a828a2c6a8ac1104f9617e970de40a689 SHA512 45dc0584f07f5bf3f1562eef8488aae27eaaf8e43f1a7b003d973fccf79a3006e54d544b2e8392c4a2eb12fcfec0d40fc60a6f914177573d0de167e48aef8efa
-DIST message_generation-0.4.0.tar.gz 719 BLAKE2B 9343fe47ce17da81c5c236c073ed7a92a20a962ea101c49daca88fc410c1a0b1ebad804fa40abefe47bfd8a909a45484d2623a50cd1c2281e51e8f1c5570885a SHA512 585d71d6ff208dbeea8402df5c82f41f05508392974c58a91b2ebda301b1d8ce93dc59376bace04778e34fe9dc124a70d5ddef967251e6c05896adea5a6b82ad
-EBUILD message_generation-0.3.0.ebuild 444 BLAKE2B 4ed080d9d7b8486e3311d9cde17d8c77dc020575c1d5d972d61bfa910baf829d6e2daa0a1843e2ed0abbd36d71db62caa9c77315eb04e369b7eddc64e35cc697 SHA512 98532f33393b528b7089b6af016332868923fbd2519267ec2a5198caf517604515c213aebd9b91e18077499b0232ec131667f72c3c2e98c43a6da0314cda1215
-EBUILD message_generation-0.4.0.ebuild 463 BLAKE2B 5e0c2adb38d832c96a594a911e91728600ddeaaea2d62d55203880302930ef5d9165590b3c2a089aafd2a192531623524fd9ee512cc30820d888aea1dcd05f6a SHA512 d985841cf90fc9e43428619ae0e20fdbc944e958f950fceb5da34bad7b37d84e2de4785ced2c62cf7feeebb52f34778ddc753898918ea86efe065f004d5c2fb3
-EBUILD message_generation-9999.ebuild 463 BLAKE2B 5e0c2adb38d832c96a594a911e91728600ddeaaea2d62d55203880302930ef5d9165590b3c2a089aafd2a192531623524fd9ee512cc30820d888aea1dcd05f6a SHA512 d985841cf90fc9e43428619ae0e20fdbc944e958f950fceb5da34bad7b37d84e2de4785ced2c62cf7feeebb52f34778ddc753898918ea86efe065f004d5c2fb3
+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 336 BLAKE2B 4fa96804363c713faccfb1c1f1839e10fca19a5bc4e274969d0046789b866dfa77f78785e64a44ca6e70742bb34162b4ca9a64f4cf2759bd78699c86b17e3f15 SHA512 171bec3cd05ff014e864d68e57d32df3165b969f2d40d2ab02021f94dc965d13ef76a1a7bf74ce12a5f01d6d54eebbbcb1e5fc170beb468e4e63facd20ca157b
diff --git a/dev-ros/message_generation/message_generation-0.3.0.ebuild b/dev-ros/message_generation/message_generation-0.3.0.ebuild
deleted file mode 100644
index 0c8a789f3a60..000000000000
--- a/dev-ros/message_generation/message_generation-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_generation/message_generation-0.4.0.ebuild b/dev-ros/message_generation/message_generation-0.4.0.ebuild
deleted file mode 100644
index 86130e2ca8c8..000000000000
--- a/dev-ros/message_generation/message_generation-0.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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-0.4.1.ebuild b/dev-ros/message_generation/message_generation-0.4.1.ebuild
new file mode 100644
index 000000000000..1ea158d9fce0
--- /dev/null
+++ b/dev-ros/message_generation/message_generation-0.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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
index 86130e2ca8c8..1ea158d9fce0 100644
--- a/dev-ros/message_generation/message_generation-9999.ebuild
+++ b/dev-ros/message_generation/message_generation-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/message_generation"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/message_runtime/Manifest b/dev-ros/message_runtime/Manifest
index 666044b5f0ba..00088e282ed2 100644
--- a/dev-ros/message_runtime/Manifest
+++ b/dev-ros/message_runtime/Manifest
@@ -1,4 +1,4 @@
-DIST message_runtime-0.4.12.tar.gz 781 BLAKE2B a66e955de34af6edf2f373425f19fbaf97ef3a0d4869f0daecf475af7f9f1fe664298a01b7da064a13f0cc462e93b7a37d552ee0d81fab1198f7c34ad19027d9 SHA512 d4554b3f38d9712b5b81ae40e9e0f8249aefc97b2dede475609ff6e41c1e8b9f0efe86d0fdbbca030f2af3be969a950a101d0aba1d68a088752caf0e8caf6650
-EBUILD message_runtime-0.4.12.ebuild 447 BLAKE2B 16005cc4ad71b170911c1e1329bac3669c3902f449ac747615d0db820ab6eb118cc543b6b0af10f4409b130d96e248c24125e5821becefe0b9b7d13a970aabaa SHA512 cc12bccf913a07fd1ea90d286e9ce53a3ce958676f008e4dfc3c8a7eb8c5e88d11a5980702d8ab25a10c0bdfe74b97bd9350ec164d52f6ea09038c44460c770e
-EBUILD message_runtime-9999.ebuild 447 BLAKE2B 16005cc4ad71b170911c1e1329bac3669c3902f449ac747615d0db820ab6eb118cc543b6b0af10f4409b130d96e248c24125e5821becefe0b9b7d13a970aabaa SHA512 cc12bccf913a07fd1ea90d286e9ce53a3ce958676f008e4dfc3c8a7eb8c5e88d11a5980702d8ab25a10c0bdfe74b97bd9350ec164d52f6ea09038c44460c770e
+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 333 BLAKE2B 503d6faa6fed6e6cccdca69dd8a7c51623022f49baf2e69f26b5ecf7556bb0c5cf9eb80d3c20f32353664ce4c15b3375d633794d0d29f963455b18dd5dd7540a SHA512 e24bac62efb6ebc5a6974085b881492d8e35ff059a9fb10593af4d4ca457f7ef4bd70fc257e59a8817dd210f05378d00f4bf732e987fe877b561c4fefe812f31
diff --git a/dev-ros/message_runtime/message_runtime-0.4.12.ebuild b/dev-ros/message_runtime/message_runtime-0.4.12.ebuild
deleted file mode 100644
index 169716e72670..000000000000
--- a/dev-ros/message_runtime/message_runtime-0.4.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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-0.4.13.ebuild b/dev-ros/message_runtime/message_runtime-0.4.13.ebuild
new file mode 100644
index 000000000000..0168d5fac070
--- /dev/null
+++ b/dev-ros/message_runtime/message_runtime-0.4.13.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
index 169716e72670..0168d5fac070 100644
--- a/dev-ros/message_runtime/message_runtime-9999.ebuild
+++ b/dev-ros/message_runtime/message_runtime-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/message_runtime"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/dev-ros/message_to_tf/Manifest b/dev-ros/message_to_tf/Manifest
index 92e8ded9fa7b..eba36875515c 100644
--- a/dev-ros/message_to_tf/Manifest
+++ b/dev-ros/message_to_tf/Manifest
@@ -1,4 +1,4 @@
 DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
-EBUILD message_to_tf-0.3.0.ebuild 618 BLAKE2B 186b7388b25bf2dae7144a79d0f57b38c6bcc7da12cc95ff774a6fb307f63975289e828c2ea93f5688d388e14e4a1f679097f215e4621b5c49611e9b7be67efd SHA512 f5a23da8ea1d7c371554b7b459497098ba42be625291773824729a046c4903c4d2bb97f8417d9d3267effa6774dfa4ab60c148d440e0b7b0ba16d9ca97823e25
-EBUILD message_to_tf-9999.ebuild 618 BLAKE2B 186b7388b25bf2dae7144a79d0f57b38c6bcc7da12cc95ff774a6fb307f63975289e828c2ea93f5688d388e14e4a1f679097f215e4621b5c49611e9b7be67efd SHA512 f5a23da8ea1d7c371554b7b459497098ba42be625291773824729a046c4903c4d2bb97f8417d9d3267effa6774dfa4ab60c148d440e0b7b0ba16d9ca97823e25
+EBUILD message_to_tf-0.3.0.ebuild 611 BLAKE2B 5c7534594ca539dfc4722359537a546859e0815e4b460eadcead11cd1074654c7a4be9480074b70528a3f4cf429dda0d6c80bb34143ef17943ed18bbdb252060 SHA512 b20087191da892d03baad6aef63f653599c2c26e3475507888a1b2f44eeb36e76c920a77dd79b4a3060da6713aba157ff124510c1332b2645f84f7c1e5c9cdc6
+EBUILD message_to_tf-9999.ebuild 611 BLAKE2B 5c7534594ca539dfc4722359537a546859e0815e4b460eadcead11cd1074654c7a4be9480074b70528a3f4cf429dda0d6c80bb34143ef17943ed18bbdb252060 SHA512 b20087191da892d03baad6aef63f653599c2c26e3475507888a1b2f44eeb36e76c920a77dd79b4a3060da6713aba157ff124510c1332b2645f84f7c1e5c9cdc6
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
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
index 5b2da944b6a4..1c31dc9a9a66 100644
--- 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
@@ -1,24 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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_msgs message types to tf"
+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}]
-	dev-ros/topic_tools
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_to_tf/message_to_tf-9999.ebuild b/dev-ros/message_to_tf/message_to_tf-9999.ebuild
index 5b2da944b6a4..1c31dc9a9a66 100644
--- a/dev-ros/message_to_tf/message_to_tf-9999.ebuild
+++ b/dev-ros/message_to_tf/message_to_tf-9999.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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_msgs message types to tf"
+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}]
-	dev-ros/topic_tools
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
index 6d37d33a7f71..2dc6ce2cbf39 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -1,8 +1,6 @@
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD mk-1.14.4.ebuild 375 BLAKE2B dc9107f8b68fd4c40998b1e25d4d2efb3645a8263dea46f047b2cfb970d811cd5289212a61dbb3d00112f750644b6d6bea7179666807b7a9d2477fc8af9dfc6c SHA512 699f235d01cdc1168d163bf885feba22845f1db03d34a194ea58ff4cb3f3dd414ce3b4111fd672a00d8dc3f0e4fd74ff8e2c572085dbcccddee2e24a344dc539
-EBUILD mk-1.14.6.ebuild 427 BLAKE2B 51528c8d113387d5e3b6153c56cab2cad0ad46eea4ef1bec804e575b22e7eae01724ac9948c97024b81246eca8dc56c1b3f8c386f58ffc93d4132cfb0296ae4f SHA512 ad3743209af1ab60d244a8ca3318112c43cce683fea6f056f9e2311f29badd9790fb5ded2f84d3ae2c131c33a063684401b12105e8ace66051ba4fb6f1f0bdcb
-EBUILD mk-1.14.7.ebuild 427 BLAKE2B 51528c8d113387d5e3b6153c56cab2cad0ad46eea4ef1bec804e575b22e7eae01724ac9948c97024b81246eca8dc56c1b3f8c386f58ffc93d4132cfb0296ae4f SHA512 ad3743209af1ab60d244a8ca3318112c43cce683fea6f056f9e2311f29badd9790fb5ded2f84d3ae2c131c33a063684401b12105e8ace66051ba4fb6f1f0bdcb
-EBUILD mk-9999.ebuild 427 BLAKE2B 51528c8d113387d5e3b6153c56cab2cad0ad46eea4ef1bec804e575b22e7eae01724ac9948c97024b81246eca8dc56c1b3f8c386f58ffc93d4132cfb0296ae4f SHA512 ad3743209af1ab60d244a8ca3318112c43cce683fea6f056f9e2311f29badd9790fb5ded2f84d3ae2c131c33a063684401b12105e8ace66051ba4fb6f1f0bdcb
+DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD mk-1.15.5.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
+EBUILD mk-1.15.6.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
+EBUILD mk-9999.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/mk/mk-1.14.4.ebuild b/dev-ros/mk/mk-1.14.4.ebuild
deleted file mode 100644
index 158d271ee738..000000000000
--- a/dev-ros/mk/mk-1.14.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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}"
diff --git a/dev-ros/mk/mk-1.14.6.ebuild b/dev-ros/mk/mk-1.14.6.ebuild
deleted file mode 100644
index 16db9adc7027..000000000000
--- a/dev-ros/mk/mk-1.14.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-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.14.7.ebuild b/dev-ros/mk/mk-1.14.7.ebuild
deleted file mode 100644
index 16db9adc7027..000000000000
--- a/dev-ros/mk/mk-1.14.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-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.5.ebuild b/dev-ros/mk/mk-1.15.5.ebuild
new file mode 100644
index 000000000000..12bbf7f7952f
--- /dev/null
+++ b/dev-ros/mk/mk-1.15.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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
new file mode 100644
index 000000000000..12bbf7f7952f
--- /dev/null
+++ b/dev-ros/mk/mk-1.15.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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-9999.ebuild b/dev-ros/mk/mk-9999.ebuild
index 16db9adc7027..12bbf7f7952f 100644
--- a/dev-ros/mk/mk-9999.ebuild
+++ b/dev-ros/mk/mk-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/monocam_settler/Manifest b/dev-ros/monocam_settler/Manifest
index 568924fbc509..b38f27e6e07a 100644
--- a/dev-ros/monocam_settler/Manifest
+++ b/dev-ros/monocam_settler/Manifest
@@ -1,7 +1,4 @@
-AUX gcc6.patch 781 BLAKE2B 1228e588391a8f3d0eff4725c9158ad10378216e7c6df0ba27a270c0e7382352c573901a25014d92e21523f3e31745f59cfea247039d6bb27e45e17ea7caa59b SHA512 c11a41b34f4b0616c3f3aeb68e763f9f10010c0a54a456ff76b3601f2d2608c63a73df069dfe2462a17e4988d9c7913618e4510aa6bec9e2d88a5038840a36f3
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD monocam_settler-0.10.13.ebuild 667 BLAKE2B 788a7a39fc5e2453f45b68a573399826e15e29f864d292eae9e71efa4f6b9726b1f52ffd777cb303c11d9bb989fc4506a5146c76e625ea3af3af569fd301c14f SHA512 ed1e0f9639533e50001fed716861a242cfedade9aa5fb1de7742915619a09680afe4df2b021c6c915a93753a63fa72b6607b3dbc7ae7aba59d108e132bb270fa
-EBUILD monocam_settler-0.10.14.ebuild 704 BLAKE2B 379c17f9f5830dde3c8a54914a111462bdd5d2cdb6ee1d6fb3843ffb77eb793da57880c9271e8c19b26eb4e632ca67d3f0a9f850e6c7d79d441b876e0f4568e5 SHA512 8223f50cc033ec063f19a405f442378ea1fef9ba0a340104a2be87cbd0e03a63e99e7ebb636fbcb9d97ec9db21be3f1a05d9e756fe58b1786b6fecf76ec370c3
-EBUILD monocam_settler-9999.ebuild 667 BLAKE2B 788a7a39fc5e2453f45b68a573399826e15e29f864d292eae9e71efa4f6b9726b1f52ffd777cb303c11d9bb989fc4506a5146c76e625ea3af3af569fd301c14f SHA512 ed1e0f9639533e50001fed716861a242cfedade9aa5fb1de7742915619a09680afe4df2b021c6c915a93753a63fa72b6607b3dbc7ae7aba59d108e132bb270fa
+EBUILD monocam_settler-0.10.14.ebuild 643 BLAKE2B 559ecc5d7dc35d002865a207a397b579f38b54fbced8a7a9a586482a2128e929349bb12878166501560b492de0e1a721579e21503cb2a83ed41f57ef9b625e15 SHA512 66198721eb874555c683a9a782271f717f1474072e855ecf097bf75d95f3941250eae16f130d1153044a2587569ba64f4299b2e496b0638820e6f0a22737907c
+EBUILD monocam_settler-9999.ebuild 643 BLAKE2B 559ecc5d7dc35d002865a207a397b579f38b54fbced8a7a9a586482a2128e929349bb12878166501560b492de0e1a721579e21503cb2a83ed41f57ef9b625e15 SHA512 66198721eb874555c683a9a782271f717f1474072e855ecf097bf75d95f3941250eae16f130d1153044a2587569ba64f4299b2e496b0638820e6f0a22737907c
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/monocam_settler/files/gcc6.patch b/dev-ros/monocam_settler/files/gcc6.patch
deleted file mode 100644
index 35c84d1fa40f..000000000000
--- a/dev-ros/monocam_settler/files/gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: monocam_settler/CMakeLists.txt
-===================================================================
---- monocam_settler.orig/CMakeLists.txt
-+++ monocam_settler/CMakeLists.txt
-@@ -16,7 +16,7 @@ catkin_package(DEPENDS actionlib actionl
- )
- 
- 
--include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
-+include_directories(${catkin_INCLUDE_DIRS})
- include_directories(include)
- 
- # deal with the include
-@@ -33,7 +33,7 @@ install(TARGETS ${PROJECT_NAME}
- )
- 
- # deal with the executable
--include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-+include_directories(${Boost_INCLUDE_DIRS})
- add_executable(monocam_settler_action src/monocam_settler_action.cpp)
- target_link_libraries(monocam_settler_action ${Boost_LIBRARIES}
-                                              ${catkin_LIBRARIES}
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
deleted file mode 100644
index 66f2b9941697..000000000000
--- a/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/settlerlib
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
index d95482f22246..3fc56b91a447 100644
--- a/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
+++ b/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
 
@@ -17,7 +16,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosconsole
 	dev-ros/roscpp_serialization
 	dev-ros/settlerlib
@@ -25,4 +24,3 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/monocam_settler/monocam_settler-9999.ebuild b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
index 66f2b9941697..3fc56b91a447 100644
--- a/dev-ros/monocam_settler/monocam_settler-9999.ebuild
+++ b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
 
@@ -17,7 +16,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosconsole
 	dev-ros/roscpp_serialization
 	dev-ros/settlerlib
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index 0230cd03a945..0d5f6649c3b4 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -1,16 +1,4 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD move_base-1.15.1-r2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
-EBUILD move_base-1.15.2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
-EBUILD move_base-1.16.0.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
-EBUILD move_base-1.16.1.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
-EBUILD move_base-1.16.2.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
-EBUILD move_base-1.16.3.ebuild 1091 BLAKE2B ca50db0e50f888dcdfe8b4bcf238a3f9f6d98102c048177369e1f8851ac6970e1c05777cf68a0086e9601bd6bcb3c5b817fe87c216c4f1d60e63911640f03f95 SHA512 4d1bb8f0dbcd9b1605815b13a0a6e8a352640f4f464d6a811725578da1be1d2f1d4c87f2cec5492ceecb42ddbd9820cde1f50e80b34e9d1193cecb97a1528f9f
-EBUILD move_base-1.16.6.ebuild 1091 BLAKE2B 072c89d0ae5020d84a3676c9a1a684964ef5583c734240ceed0cd9ff504f5a28e7b244142ebb4b5e40f6c4d0dc88778459a28300b57d022608a198ae890ce9d1 SHA512 f7bb5b7ea10b50bb93519ad099663b09b3daeace47c71fd5e665cd91d3278a66ff53047d4db10c0c9d834e53ae6c8f03706186a7684ddf5cf223644586650bc2
-EBUILD move_base-9999.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD move_base-1.17.0.ebuild 1076 BLAKE2B 71de96487c5236d19e6178a91142a56336b56ef10be127c785fd5d6c92166e7cb311bbf678cae703921c7d8d272b5c1ee0645342a895556d7d2d38ffb194f959 SHA512 ca79a18498f16740a29d765b483639f0267945e0162c59c41a62079297ce6bcb0f73e9a0baf37a472c455e7ee8d617a3f1664df914a7ccb9ba9c14cd01b98a65
+EBUILD move_base-9999.ebuild 1076 BLAKE2B 71de96487c5236d19e6178a91142a56336b56ef10be127c785fd5d6c92166e7cb311bbf678cae703921c7d8d272b5c1ee0645342a895556d7d2d38ffb194f959 SHA512 ca79a18498f16740a29d765b483639f0267945e0162c59c41a62079297ce6bcb0f73e9a0baf37a472c455e7ee8d617a3f1664df914a7ccb9ba9c14cd01b98a65
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_base/move_base-1.15.1-r2.ebuild b/dev-ros/move_base/move_base-1.15.1-r2.ebuild
deleted file mode 100644
index 2905e24c89be..000000000000
--- a/dev-ros/move_base/move_base-1.15.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/roscpp
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/actionlib
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/tf
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.15.2.ebuild b/dev-ros/move_base/move_base-1.15.2.ebuild
deleted file mode 100644
index 2905e24c89be..000000000000
--- a/dev-ros/move_base/move_base-1.15.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/roscpp
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/actionlib
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/tf
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.16.0.ebuild b/dev-ros/move_base/move_base-1.16.0.ebuild
deleted file mode 100644
index e3dca8f3bbf9..000000000000
--- a/dev-ros/move_base/move_base-1.16.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.16.1.ebuild b/dev-ros/move_base/move_base-1.16.1.ebuild
deleted file mode 100644
index e3dca8f3bbf9..000000000000
--- a/dev-ros/move_base/move_base-1.16.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.16.2.ebuild b/dev-ros/move_base/move_base-1.16.2.ebuild
deleted file mode 100644
index e3dca8f3bbf9..000000000000
--- a/dev-ros/move_base/move_base-1.16.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.16.3.ebuild b/dev-ros/move_base/move_base-1.16.3.ebuild
deleted file mode 100644
index 12cfc2825c13..000000000000
--- a/dev-ros/move_base/move_base-1.16.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.16.6.ebuild b/dev-ros/move_base/move_base-1.16.6.ebuild
deleted file mode 100644
index 2002b63e31ff..000000000000
--- a/dev-ros/move_base/move_base-1.16.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-ros/base_local_planner
-	dev-ros/clear_costmap_recovery
-	dev-ros/navfn
-	dev-ros/rotate_recovery
-
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.17.0.ebuild b/dev-ros/move_base/move_base-1.17.0.ebuild
new file mode 100644
index 000000000000..eaf209fa0834
--- /dev/null
+++ b/dev-ros/move_base/move_base-1.17.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 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
index e3dca8f3bbf9..eaf209fa0834 100644
--- a/dev-ros/move_base/move_base-9999.ebuild
+++ b/dev-ros/move_base/move_base-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,17 +16,13 @@ IUSE=""
 RDEPEND="
 	dev-ros/actionlib
 	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/nav_core
 	dev-ros/pluginlib
 		dev-libs/tinyxml2:=
 	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 
 	dev-ros/base_local_planner
 	dev-ros/clear_costmap_recovery
@@ -37,8 +32,11 @@ RDEPEND="
 	dev-cpp/eigen:3
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
-
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 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
index 13c982b1b929..471c1676b74e 100644
--- a/dev-ros/move_base_msgs/Manifest
+++ b/dev-ros/move_base_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST navigation_msgs-1.13.0.tar.gz 2251 BLAKE2B b70ade2d296f8a94ae89286caa4f23adba5ac5c058ccfcdf6a35a9bac03e5238a37bcd91bbf99f62d3fe806639e8a655c5fcc9391e637e37238f0421805903dd SHA512 e7b4a83bbbd5384f72d1a9d7e3544cde718728ba2a2562b3c0da5b5fd7db146faf8c717d4af2509eaf1ff545ac85da121f7e37cb7b6b53c8a5b8d683c6b4e66c
-EBUILD move_base_msgs-1.13.0.ebuild 533 BLAKE2B 6d3c03c439cf065903dd4fa99f7a0f5a8a6aff52499edcdb35b83118bd2ffc00df407dd52cbf8bbb5b32cd512e85bfa12a52155043538ec33a333f3e0ad81b5e SHA512 10f0a3ab821b9d46789b8a4fd2f02ebc86ba741a205d4823b8b348d16e372ceb5eb8ec19b329727967404f53aef4c84cb7bcafce9a683d7f4cc4ea9549f5090f
-EBUILD move_base_msgs-9999.ebuild 533 BLAKE2B 6d3c03c439cf065903dd4fa99f7a0f5a8a6aff52499edcdb35b83118bd2ffc00df407dd52cbf8bbb5b32cd512e85bfa12a52155043538ec33a333f3e0ad81b5e SHA512 10f0a3ab821b9d46789b8a4fd2f02ebc86ba741a205d4823b8b348d16e372ceb5eb8ec19b329727967404f53aef4c84cb7bcafce9a683d7f4cc4ea9549f5090f
+DIST navigation_msgs-1.14.0.tar.gz 2329 BLAKE2B 7414a4b67fde26223cdf81a14b1c3e56f2bf5519d46455234de75bf79b10c8fa0f1a04a2865703723c0a975bde77e22754e751c07edc73fddd10bae9ac5b0feb SHA512 0354856b8964547cb96d59717d1d1e8b4c261b79bd451a25755303d295aecf3f0011a825307e0fc6ccd5179f4ea921a8debd8be79b5e4d2bdab0f0d57b54e56d
+EBUILD move_base_msgs-1.14.0.ebuild 493 BLAKE2B 52d5450b37242e3433f95ac5db7c51b33405428a807e0c964f5c43a75517ccf783096c23bacf023aeff348fb1303019bc890a4dfc96ad46c52877b6190651380 SHA512 69a1f51dd0802aa7c862304af5ed1adf80436d15e36021b6acbdcf8d4f306fb821c026a01b3c98c9a0d759c144fbaa4ee1f722d26c9bd3e9c45d0fb59063b773
+EBUILD move_base_msgs-9999.ebuild 493 BLAKE2B 52d5450b37242e3433f95ac5db7c51b33405428a807e0c964f5c43a75517ccf783096c23bacf023aeff348fb1303019bc890a4dfc96ad46c52877b6190651380 SHA512 69a1f51dd0802aa7c862304af5ed1adf80436d15e36021b6acbdcf8d4f306fb821c026a01b3c98c9a0d759c144fbaa4ee1f722d26c9bd3e9c45d0fb59063b773
 MISC metadata.xml 342 BLAKE2B c278231941f53347e7457813d64fc0bf8b32bcacbfddc955c8d90538c9ae9c23504c51747c32ef7f8c5555c22d25bd34c1a5185df6d864b6f0509fdccedbcdd0 SHA512 6b28c6c3ff5f68ebfe8ba768c80ebc61c054453fde126fc64aa406e69fdf2f3174031930b8830144ba25401354df016f8179ab3d16c50d339b486a13421dd684
diff --git a/dev-ros/move_base_msgs/move_base_msgs-1.13.0.ebuild b/dev-ros/move_base_msgs/move_base_msgs-1.13.0.ebuild
deleted file mode 100644
index 29432d3e9a38..000000000000
--- a/dev-ros/move_base_msgs/move_base_msgs-1.13.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=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-1.14.0.ebuild b/dev-ros/move_base_msgs/move_base_msgs-1.14.0.ebuild
new file mode 100644
index 000000000000..4ccf99a8e8da
--- /dev/null
+++ b/dev-ros/move_base_msgs/move_base_msgs-1.14.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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_base_msgs/move_base_msgs-9999.ebuild b/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
index 29432d3e9a38..4ccf99a8e8da 100644
--- a/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
+++ b/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/move_slow_and_clear/Manifest b/dev-ros/move_slow_and_clear/Manifest
index 0126368f29b4..367892b58626 100644
--- a/dev-ros/move_slow_and_clear/Manifest
+++ b/dev-ros/move_slow_and_clear/Manifest
@@ -1,10 +1,4 @@
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD move_slow_and_clear-1.16.1.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
-EBUILD move_slow_and_clear-1.16.2.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
-EBUILD move_slow_and_clear-1.16.3.ebuild 560 BLAKE2B 9de7599994db223b27a7595a132394bf9f4b0ce759eabd2bc3dfcfd4bfd0a6d64c94d9b7a7115f2b6f6bd358a55f9cf6e207be2d8b42dca5ec7443fc298deebd SHA512 75057b1ebe9dbb65cc516dd0d1c1525afff0be65c9a9782896f6207c01f8287ab27a5c54c1ae2645368518b64d654149d2d9f66d65e1cb52dd40c4ddbbfd9fde
-EBUILD move_slow_and_clear-1.16.6.ebuild 560 BLAKE2B 0cd52fefc97c0900c8297f58804f588a9ca6c74523255791f306e79f672241b628bbb796aeb0c5b196dcd5526d1a224fe00d25d0dcd90d95ec966bd508fb90a5 SHA512 1f9760e26bee97fb6acec02fd2b74e81a1b953025bcaa7417a1c1054535751c31eb988562711fbc0b038ed4dca86f6ca44458e4009f1faeef5654f2eda98186e
-EBUILD move_slow_and_clear-9999.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD move_slow_and_clear-1.17.0.ebuild 559 BLAKE2B 7cdb316390a123892a22bad332a11b681420b5843d787c0dab6553465350b2f234acbfbe6f1300fa6db7af186449ef7a67c4c7016bba7080507f13b7f1d35160 SHA512 a8df285ad63ad25fc1dee6e902c57c73cb9f98392f5fe62599150450d9615ba4a6e59cc1dee640f2bd36c9c2a1573707efadb069f0e8f2eaf849995e6bca0ddf
+EBUILD move_slow_and_clear-9999.ebuild 559 BLAKE2B 7cdb316390a123892a22bad332a11b681420b5843d787c0dab6553465350b2f234acbfbe6f1300fa6db7af186449ef7a67c4c7016bba7080507f13b7f1d35160 SHA512 a8df285ad63ad25fc1dee6e902c57c73cb9f98392f5fe62599150450d9615ba4a6e59cc1dee640f2bd36c9c2a1573707efadb069f0e8f2eaf849995e6bca0ddf
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.1.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.1.ebuild
deleted file mode 100644
index a70cd2ed0f3d..000000000000
--- a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Move slow and clear"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-
-"
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.2.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.2.ebuild
deleted file mode 100644
index a70cd2ed0f3d..000000000000
--- a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Move slow and clear"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-
-"
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.3.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.3.ebuild
deleted file mode 100644
index bdd963c4a8b5..000000000000
--- a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-
-"
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.6.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.6.ebuild
deleted file mode 100644
index 3990eca3eee6..000000000000
--- a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.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=5
-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/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-
-	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-
-"
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.0.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.0.ebuild
new file mode 100644
index 000000000000..a1ed26ce92da
--- /dev/null
+++ b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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="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:=[threads]
+	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
index a70cd2ed0f3d..a1ed26ce92da 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
@@ -15,7 +15,6 @@ IUSE=""
 
 RDEPEND="
 	>=dev-ros/costmap_2d-1.16
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_core
 	dev-ros/pluginlib
 	dev-ros/roscpp
@@ -26,5 +25,5 @@ RDEPEND="
 "
 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
index a6d209147024..480f195529c0 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST moveit_msgs-0.10.0.tar.gz 17847 BLAKE2B f80d7c267aab47b38e426b88e7a1e5487c738a8aeda143eee3d4c83a5929b66380aff939536d8f587b7acacbe239bfb2d5a8489fa3100a1f9f15cbe0cff310db SHA512 80a7dca2e9bda4bcf191691671ba179a42fb031b9ba2ac64c8e73854a94dc15ffaaedb1dce06da42d994c9c8b3161e6d55a8ef7a9c3c5a1f3629779eac5c1dba
-DIST moveit_msgs-0.9.1.tar.gz 17760 BLAKE2B 1ac7c9c30e5873ecf51db435c66553d3ded4104cfca6a5daaa3396d96380eb41580b3c494b94c002b2829f01c001f947f126935c5dd9f239362da08bc8567ff2 SHA512 af998019a5c1c82a2026c6d2071feb7494616b6eef942450dbb81178f0c393c173ca8b8c17018f6da15b5b0ac438515a762914122ad315572cc5ef25567be758
-EBUILD moveit_msgs-0.10.0.ebuild 625 BLAKE2B fc95849a42a3703937483f3e369fbabd37e0ca7e3a94979331f6eb9600af8af149daf3d0f68187d7adc89038613e28153896cbb74ae7f0fa7e505d3f408e99d2 SHA512 ff25afcb212cdbaed817caa1650506b07943cafb1e10bee2e771ee73e965d978fe3bb95f0ae68b329e10108aba6eb1a166c30140ec2cb72e1358f1acf2a79842
-EBUILD moveit_msgs-0.9.1.ebuild 625 BLAKE2B fc95849a42a3703937483f3e369fbabd37e0ca7e3a94979331f6eb9600af8af149daf3d0f68187d7adc89038613e28153896cbb74ae7f0fa7e505d3f408e99d2 SHA512 ff25afcb212cdbaed817caa1650506b07943cafb1e10bee2e771ee73e965d978fe3bb95f0ae68b329e10108aba6eb1a166c30140ec2cb72e1358f1acf2a79842
-EBUILD moveit_msgs-9999.ebuild 625 BLAKE2B fc95849a42a3703937483f3e369fbabd37e0ca7e3a94979331f6eb9600af8af149daf3d0f68187d7adc89038613e28153896cbb74ae7f0fa7e505d3f408e99d2 SHA512 ff25afcb212cdbaed817caa1650506b07943cafb1e10bee2e771ee73e965d978fe3bb95f0ae68b329e10108aba6eb1a166c30140ec2cb72e1358f1acf2a79842
+DIST moveit_msgs-0.10.1.tar.gz 19163 BLAKE2B b24b9b0330350c42c80588f6bd9273ba467958812f294918f7a4695ef435b6105591aab01f856c008ac0d73679d5bab34249f82b723de954fd66ac461ee9bbb6 SHA512 7b574bcffc7533dba44420b5a965604bc8396cfac7d1d3f3dc8e0ecb8f65c4a7b4692c06286db80ee3e3cf995c79dc52297aa9cd5237a0d87613266f762cb2dd
+EBUILD moveit_msgs-0.10.1.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
+EBUILD moveit_msgs-9999.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
 MISC metadata.xml 338 BLAKE2B f91c4144e8f04fe987c5db67b6ebf539420aa3c07bd50c58394bd489a5d6b41f6122a645dd2c182dc6c14d4755d97b89fe444e2a1b48a6b048a6726c36bd31e9 SHA512 232c4c964a3798a5b5aa26692e74b2f71e1a6f4bf89e618c86824d0a6fd97b4064b68ecb380dc505c4cf492fd45671e89bb419d96377e5fced8a665b864fb1a1
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild
deleted file mode 100644
index 2bc52771c9d3..000000000000
--- a/dev-ros/moveit_msgs/moveit_msgs-0.10.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=5
-
-ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-0.10.1.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild
new file mode 100644
index 000000000000..6490a10393ef
--- /dev/null
+++ b/dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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/moveit_msgs/moveit_msgs-0.9.1.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.9.1.ebuild
deleted file mode 100644
index 2bc52771c9d3..000000000000
--- a/dev-ros/moveit_msgs/moveit_msgs-0.9.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=5
-
-ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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
index 2bc52771c9d3..6490a10393ef 100644
--- a/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
+++ b/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="
 	dev-ros/actionlib_msgs
 	dev-ros/sensor_msgs
diff --git a/dev-ros/nav_core/Manifest b/dev-ros/nav_core/Manifest
index 9723838b29f5..465188bff334 100644
--- a/dev-ros/nav_core/Manifest
+++ b/dev-ros/nav_core/Manifest
@@ -1,14 +1,4 @@
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD nav_core-1.15.2.ebuild 503 BLAKE2B 0d65bb8980f5b01daf85b3b64fe327110859c46da94def8f94b348919b4c23aae46e2705690c8a51548f9f10333271839929595eb2883cf0da1f878dad3813b6 SHA512 e408c2e3a83ab1f1551e387056e4203a14c810c29203528363fdad39a5e9bf30af06351d15075a15b1ce7683f086c31bc82e2bf5f27786f521047768a64736c7
-EBUILD nav_core-1.16.0.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
-EBUILD nav_core-1.16.1.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
-EBUILD nav_core-1.16.2.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
-EBUILD nav_core-1.16.3.ebuild 505 BLAKE2B 5417becf0044ffd379b794a85a2baeb2740a4355708ed73469b93da24309bc21657eccc3e29a9e1e090a123b50f8aef6a0913a854ac2afb2fe293a760f24cc52 SHA512 485966ee93b85a7626bfd3572b668261a9de9f2f322c06334127ec7d17825519baf55c2499f9e44b22015a90f3fbe1fc94eeb11e5a11e6fc514220154da190e2
-EBUILD nav_core-1.16.6.ebuild 505 BLAKE2B 045d34d1f3a5c4e19307aac454ceef377ab33c44475eaab3da17f3b0488942bea41db19ead2cbe716d2593af5f01233b615f71a12d5cb5152c2f551015ffe359 SHA512 a61da6ccddf65b736aa0c3a12ea1b2789483aeb32dc4993e04d029c29cc724d7dafdbdfb9decb3f7b0b91d0d1089651a2aa9d6c2a71907b5a36e9ee50ab796d1
-EBUILD nav_core-9999.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD nav_core-1.17.0.ebuild 505 BLAKE2B 1bc51127b173b23f54ee7a8026190a2d3af1dd57aa945ab587a7ac81bef28ebcbe3d3b6aefe6d2fca92678b64a1a4cd5549ce3493a8547585e5306231668ca31 SHA512 0af0e2eda44cffd84865dc206bd835500c659672da22fa0f1329aed53df6939b55ec97f23fe6ebf3a7052f7b75c15c098c2fdb15dbded3c1aff4ab8d2d6676c6
+EBUILD nav_core-9999.ebuild 505 BLAKE2B 1bc51127b173b23f54ee7a8026190a2d3af1dd57aa945ab587a7ac81bef28ebcbe3d3b6aefe6d2fca92678b64a1a4cd5549ce3493a8547585e5306231668ca31 SHA512 0af0e2eda44cffd84865dc206bd835500c659672da22fa0f1329aed53df6939b55ec97f23fe6ebf3a7052f7b75c15c098c2fdb15dbded3c1aff4ab8d2d6676c6
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/nav_core/nav_core-1.15.2.ebuild b/dev-ros/nav_core/nav_core-1.15.2.ebuild
deleted file mode 100644
index 3461f7166e3d..000000000000
--- a/dev-ros/nav_core/nav_core-1.15.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Common interfaces for navigation specific robot actions"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/costmap_2d
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_core/nav_core-1.16.0.ebuild b/dev-ros/nav_core/nav_core-1.16.0.ebuild
deleted file mode 100644
index 5001237ab345..000000000000
--- a/dev-ros/nav_core/nav_core-1.16.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="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.16.1.ebuild b/dev-ros/nav_core/nav_core-1.16.1.ebuild
deleted file mode 100644
index 5001237ab345..000000000000
--- a/dev-ros/nav_core/nav_core-1.16.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="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.16.2.ebuild b/dev-ros/nav_core/nav_core-1.16.2.ebuild
deleted file mode 100644
index 5001237ab345..000000000000
--- a/dev-ros/nav_core/nav_core-1.16.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="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.16.3.ebuild b/dev-ros/nav_core/nav_core-1.16.3.ebuild
deleted file mode 100644
index eafdab9f4d5e..000000000000
--- a/dev-ros/nav_core/nav_core-1.16.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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.16.6.ebuild b/dev-ros/nav_core/nav_core-1.16.6.ebuild
deleted file mode 100644
index 691a5af7834c..000000000000
--- a/dev-ros/nav_core/nav_core-1.16.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=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Common interfaces for navigation specific robot actions"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_core/nav_core-1.17.0.ebuild b/dev-ros/nav_core/nav_core-1.17.0.ebuild
new file mode 100644
index 000000000000..389fbe3ca74a
--- /dev/null
+++ b/dev-ros/nav_core/nav_core-1.17.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
index 5001237ab345..389fbe3ca74a 100644
--- a/dev-ros/nav_core/nav_core-9999.ebuild
+++ b/dev-ros/nav_core/nav_core-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/nav_msgs/Manifest b/dev-ros/nav_msgs/Manifest
index 728e5c3640b8..5aef4765ba5c 100644
--- a/dev-ros/nav_msgs/Manifest
+++ b/dev-ros/nav_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD nav_msgs-1.12.5.ebuild 519 BLAKE2B 3f116dcc59071f766492d57204944d8d072df3a23f8cdfa6046ee81334523d3048b55be18714ad0d95b31cf35f468091b215a965086e1827e6408ebc06bf2c02 SHA512 46d91ee5e6eb9676c681eef4866ccb468fcd158cd39308349da1371b1fb8a8e859d4969b073b0750f7bfd20a70633b08c3c68e0f390c5e27089e11028356ceb4
-EBUILD nav_msgs-1.12.6.ebuild 519 BLAKE2B 3f116dcc59071f766492d57204944d8d072df3a23f8cdfa6046ee81334523d3048b55be18714ad0d95b31cf35f468091b215a965086e1827e6408ebc06bf2c02 SHA512 46d91ee5e6eb9676c681eef4866ccb468fcd158cd39308349da1371b1fb8a8e859d4969b073b0750f7bfd20a70633b08c3c68e0f390c5e27089e11028356ceb4
-EBUILD nav_msgs-1.12.7.ebuild 519 BLAKE2B 3f116dcc59071f766492d57204944d8d072df3a23f8cdfa6046ee81334523d3048b55be18714ad0d95b31cf35f468091b215a965086e1827e6408ebc06bf2c02 SHA512 46d91ee5e6eb9676c681eef4866ccb468fcd158cd39308349da1371b1fb8a8e859d4969b073b0750f7bfd20a70633b08c3c68e0f390c5e27089e11028356ceb4
-EBUILD nav_msgs-9999.ebuild 519 BLAKE2B 3f116dcc59071f766492d57204944d8d072df3a23f8cdfa6046ee81334523d3048b55be18714ad0d95b31cf35f468091b215a965086e1827e6408ebc06bf2c02 SHA512 46d91ee5e6eb9676c681eef4866ccb468fcd158cd39308349da1371b1fb8a8e859d4969b073b0750f7bfd20a70633b08c3c68e0f390c5e27089e11028356ceb4
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD nav_msgs-1.13.0.ebuild 479 BLAKE2B bee4790d3894f25cf7b5e1026d95a31851766e57369239c43dc55cfd2d5009ce96bf77eafc213b9f8a914040283c495b8f658d94fdf7e10d36fd71a634eb0816 SHA512 392c9f97623ce089b99a16eb3c99e1fb9ac3911f67dcb2f7e8aaeddb515718dc9cf3381e2c8d8062efbfa3a537492a9fb82e384d443df61c849dcfcc440518bf
+EBUILD nav_msgs-9999.ebuild 479 BLAKE2B bee4790d3894f25cf7b5e1026d95a31851766e57369239c43dc55cfd2d5009ce96bf77eafc213b9f8a914040283c495b8f658d94fdf7e10d36fd71a634eb0816 SHA512 392c9f97623ce089b99a16eb3c99e1fb9ac3911f67dcb2f7e8aaeddb515718dc9cf3381e2c8d8062efbfa3a537492a9fb82e384d443df61c849dcfcc440518bf
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/nav_msgs/nav_msgs-1.12.5.ebuild b/dev-ros/nav_msgs/nav_msgs-1.12.5.ebuild
deleted file mode 100644
index 1113971a55b2..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.6.ebuild b/dev-ros/nav_msgs/nav_msgs-1.12.6.ebuild
deleted file mode 100644
index 1113971a55b2..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.7.ebuild b/dev-ros/nav_msgs/nav_msgs-1.12.7.ebuild
deleted file mode 100644
index 1113971a55b2..000000000000
--- a/dev-ros/nav_msgs/nav_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.0.ebuild b/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..11457f2e0fb4
--- /dev/null
+++ b/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/nav_msgs/nav_msgs-9999.ebuild
index 1113971a55b2..11457f2e0fb4 100644
--- a/dev-ros/nav_msgs/nav_msgs-9999.ebuild
+++ b/dev-ros/nav_msgs/nav_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
 
diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index 180f7aac943e..d7beb0fd0430 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1,8 +1,6 @@
-AUX pgm_h_location.patch 900 BLAKE2B 2816bc6803bce70d14f5fcf10161316961ffd265d94a36e90f7d98bd381a4966bd924e352cda2f859e07ea25547e62e0d6381afa1fa3b488364634b20730830c SHA512 4c3286e18d922d292858e8fc574cc440c344ae182133539efca93cb25e16dc78149efe521499024751a46f2b4d1b63516276f1e0510028114357520d4a560d81
+AUX pgm_h_location.patch 818 BLAKE2B 9e1c0e8210f492423d897f3952e7bdecef3c3db27258308402b1fc3c96938a4b186436e7541af7c8076811b053a37a46c9ca629411dbb3ec4588430c434fc5ae SHA512 a6a0a1474480914d20d6978c52b0a7abbca16b4885be0d8aecb9e47e4ee3900964dee37546f2460a50193daf04431fd1419711a8b2c958b63423d70407117688
 AUX tests.patch 460 BLAKE2B 06814e0e141d4b7b75ef36bcea6dff20aadc324c700e0aa219110efac9b27316829f7faa0b83a99795998428e825568325e87e6ca52fa3696772e6e95b655aa2 SHA512 c02fa62a1446b403a535d028a1b36c1deac8a4cf09f0596ada560e696288412566c5b8e2719fd368e098f9ccfe23dec02c9d6e066cb837ea2cdf5b15523c21a2
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD navfn-1.16.3.ebuild 1130 BLAKE2B a748a50eb55edda7e08aff9f500732246780baf7333df7e8e80e56fe44d6ce5c130095cd069583c9f922c5f43d99834f0f98a85aea46982eddfc847b512e96ec SHA512 f667fac0acb101b32877466ad83b8f84113a2bd3f24e60d298575ecac91ae27fbed39ce1e2a2601c1361c60797fd4347bc43f4721d6f4695f6f420f7e7bbbb3c
-EBUILD navfn-1.16.6.ebuild 1130 BLAKE2B c0d73d91b26ead41ce6cee847c57cecf1304cbb7fbd61fd08eaf80127be1724d9efc5a20bccf45cd459c267a403a6130be481340a736e56fe3589fbaa5f82c88 SHA512 27772bc8af31119d80feaa316ad5f0ab1349ececc3f9e3695ec8b7cd6c897b9ef4ca59f5596167fe6b7d87317dd4ccc97b2173bf0f2132b5943b5a3e9317770a
-EBUILD navfn-9999.ebuild 1130 BLAKE2B a748a50eb55edda7e08aff9f500732246780baf7333df7e8e80e56fe44d6ce5c130095cd069583c9f922c5f43d99834f0f98a85aea46982eddfc847b512e96ec SHA512 f667fac0acb101b32877466ad83b8f84113a2bd3f24e60d298575ecac91ae27fbed39ce1e2a2601c1361c60797fd4347bc43f4721d6f4695f6f420f7e7bbbb3c
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD navfn-1.17.0.ebuild 1088 BLAKE2B eb6fb1965490d7a7662440235522b299cd3ad963d37aa00b15142564909361753c975b1f854f7312ecfed16053dbfa48ca02a8c4399b1689d03a05a5e4eb8345 SHA512 e50176c125e3a802ae49cc31fc9d7c192e856355583d5243577d178c38560152bb0acffbd34640798e14e69984243e2d82f46b55d8ec5fb30a45ec16323a2ca7
+EBUILD navfn-9999.ebuild 1088 BLAKE2B eb6fb1965490d7a7662440235522b299cd3ad963d37aa00b15142564909361753c975b1f854f7312ecfed16053dbfa48ca02a8c4399b1689d03a05a5e4eb8345 SHA512 e50176c125e3a802ae49cc31fc9d7c192e856355583d5243577d178c38560152bb0acffbd34640798e14e69984243e2d82f46b55d8ec5fb30a45ec16323a2ca7
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/navfn/files/pgm_h_location.patch b/dev-ros/navfn/files/pgm_h_location.patch
index 683a9556ddc0..8df1a6f38656 100644
--- a/dev-ros/navfn/files/pgm_h_location.patch
+++ b/dev-ros/navfn/files/pgm_h_location.patch
@@ -1,7 +1,7 @@
 Index: navigation-1.13.0/navfn/src/navtest.cpp
 ===================================================================
---- navigation-1.13.0.orig/navfn/src/navtest.cpp
-+++ 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>
@@ -13,8 +13,8 @@ Index: navigation-1.13.0/navfn/src/navtest.cpp
  }
 Index: navigation-1.13.0/navfn/src/read_pgm_costmap.cpp
 ===================================================================
---- navigation-1.13.0.orig/navfn/src/read_pgm_costmap.cpp
-+++ 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>
diff --git a/dev-ros/navfn/navfn-1.16.3.ebuild b/dev-ros/navfn/navfn-1.16.3.ebuild
deleted file mode 100644
index a65e0eb3f75f..000000000000
--- a/dev-ros/navfn/navfn-1.16.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-cpp/eigen:3
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${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.16.6.ebuild b/dev-ros/navfn/navfn-1.16.6.ebuild
deleted file mode 100644
index fc41aa548c33..000000000000
--- a/dev-ros/navfn/navfn-1.16.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-cpp/eigen:3
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${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.0.ebuild b/dev-ros/navfn/navfn-1.17.0.ebuild
new file mode 100644
index 000000000000..a504b8149f82
--- /dev/null
+++ b/dev-ros/navfn/navfn-1.17.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 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"
+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:=[threads]
+	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
index a65e0eb3f75f..a504b8149f82 100644
--- a/dev-ros/navfn/navfn-9999.ebuild
+++ b/dev-ros/navfn/navfn-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
+DESCRIPTION="Fast interpolated navigation function for creating plans for a mobile base"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/nmea_msgs/Manifest b/dev-ros/nmea_msgs/Manifest
index 1a0d2e2d4010..fa4446879654 100644
--- a/dev-ros/nmea_msgs/Manifest
+++ b/dev-ros/nmea_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST nmea_msgs-1.0.0.tar.gz 1259 BLAKE2B 116c649a8e56040f27156991ad19ebf1465241c0ce2e243eed3fec5944b536c27f118b1ac8b9b82140758cdebdaf2ed0e8daeed0d4e45544aa3691aadaa16cab SHA512 159c9792390bd68dd64b239c3aee53096f2d86ecce1d0ff33269329899bdd0dfc95d278dbc25326af0ae1e1e6e7ee7bdd2e3936bd45bb048b2d7fc1c6533e7d0
-EBUILD nmea_msgs-1.0.0.ebuild 462 BLAKE2B 92fa0df58fa95337dec2156317e0d5c75651a8626920c3c12b988bc99704cfe159032453370c5113f51f45d7bdaffada27c9da3552b61d55648eeaa174ec0c73 SHA512 0ed007fd07a2c226d37976f4d52c31efe06832cfd34be705ac5a8cd10534cab5137a19406fe8c86f3200fe83da7a9c24149f6a70f8ef80ed8aaf9dcbe5937855
-EBUILD nmea_msgs-9999.ebuild 462 BLAKE2B 92fa0df58fa95337dec2156317e0d5c75651a8626920c3c12b988bc99704cfe159032453370c5113f51f45d7bdaffada27c9da3552b61d55648eeaa174ec0c73 SHA512 0ed007fd07a2c226d37976f4d52c31efe06832cfd34be705ac5a8cd10534cab5137a19406fe8c86f3200fe83da7a9c24149f6a70f8ef80ed8aaf9dcbe5937855
+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 335 BLAKE2B 6f3566b11c9f6b3acb6821cbd74d9dc41db35bffcaaec7f0aecaf9ed5083a8a6936483d380f00b145873243490962e73097e387a84bd3636385a2666339bada2 SHA512 7a6144c3e15356968de437fa861ae2327e810e0fd546f00832a844f10208e421fddf270fd00be6de24395c62620bc89c27b9d68d37adac4be2a3c734336adc71
diff --git a/dev-ros/nmea_msgs/nmea_msgs-1.0.0.ebuild b/dev-ros/nmea_msgs/nmea_msgs-1.0.0.ebuild
deleted file mode 100644
index 3e401f9fe3ac..000000000000
--- a/dev-ros/nmea_msgs/nmea_msgs-1.0.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=5
-
-ROS_REPO_URI="https://github.com/ros-drivers/nmea_msgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-VER_PREFIX=${PN}-
-
-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-1.1.0.ebuild b/dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild
new file mode 100644
index 000000000000..685e1a5323d0
--- /dev/null
+++ b/dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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
index 3e401f9fe3ac..685e1a5323d0 100644
--- a/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
+++ b/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-drivers/nmea_msgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-VER_PREFIX=${PN}-
 
 inherit ros-catkin
 
diff --git a/dev-ros/nodelet/Manifest b/dev-ros/nodelet/Manifest
index da24bb288ccd..7e0b0a100d59 100644
--- a/dev-ros/nodelet/Manifest
+++ b/dev-ros/nodelet/Manifest
@@ -1,4 +1,4 @@
-DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD nodelet-1.9.16-r1.ebuild 783 BLAKE2B f259a4292f97a1cba4f4f49659535113fece49b65d23f9775ddbfd741db2e83a84f79ed4ec1e943bcf53e460251d2871dc329621abb597600390395daa02144b SHA512 4e442fcdb62f77ec6128e8af482bbbfb1400d565e03759783ce185fa76c2267e359beadac78aec371214a33d595b288e80d0e61fe0df1007c0c27a04ffe71947
-EBUILD nodelet-9999.ebuild 783 BLAKE2B f259a4292f97a1cba4f4f49659535113fece49b65d23f9775ddbfd741db2e83a84f79ed4ec1e943bcf53e460251d2871dc329621abb597600390395daa02144b SHA512 4e442fcdb62f77ec6128e8af482bbbfb1400d565e03759783ce185fa76c2267e359beadac78aec371214a33d595b288e80d0e61fe0df1007c0c27a04ffe71947
+DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+EBUILD nodelet-1.10.0-r1.ebuild 761 BLAKE2B 8b1355c7f26e48fb093fd2b7309e0a947fbc697f819e3ce77628590d52c4198c37c8aab73c7c4e67d5230e90e8f81cc5d16f02fb4abeb8edb83d66b7b88f29f9 SHA512 b3d54bc11a4e8527fdb8cc4ef02a1efa7a98e6c13d0e6cd4c9e9ec0b090a9fb4ef16cc8809b6fa0d95f5f284634152a212888764e016ae0240018eaf73282236
+EBUILD nodelet-9999.ebuild 761 BLAKE2B 8b1355c7f26e48fb093fd2b7309e0a947fbc697f819e3ce77628590d52c4198c37c8aab73c7c4e67d5230e90e8f81cc5d16f02fb4abeb8edb83d66b7b88f29f9 SHA512 b3d54bc11a4e8527fdb8cc4ef02a1efa7a98e6c13d0e6cd4c9e9ec0b090a9fb4ef16cc8809b6fa0d95f5f284634152a212888764e016ae0240018eaf73282236
 MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
diff --git a/dev-ros/nodelet/nodelet-1.10.0-r1.ebuild b/dev-ros/nodelet/nodelet-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..23f7d1d005e9
--- /dev/null
+++ b/dev-ros/nodelet/nodelet-1.10.0-r1.ebuild
@@ -0,0 +1,32 @@
+# 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.9.16-r1.ebuild b/dev-ros/nodelet/nodelet-1.9.16-r1.ebuild
deleted file mode 100644
index be2fa68eb177..000000000000
--- a/dev-ros/nodelet/nodelet-1.9.16-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=5
-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"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a way to run 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_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet/nodelet-9999.ebuild b/dev-ros/nodelet/nodelet-9999.ebuild
index be2fa68eb177..23f7d1d005e9 100644
--- a/dev-ros/nodelet/nodelet-9999.ebuild
+++ b/dev-ros/nodelet/nodelet-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a way to run multiple algorithms in the same process with zero copy transport"
+DESCRIPTION="Runs multiple algorithms in the same process with zero copy transport"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -19,7 +18,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/bondcpp
 	dev-ros/cmake_modules
-	dev-ros/pluginlib
+	dev-ros/pluginlib:=
 		dev-libs/tinyxml2:=
 	dev-ros/rosconsole
 		dev-libs/console_bridge:=
@@ -27,7 +26,7 @@ RDEPEND="
 	dev-libs/boost:=
 	sys-apps/util-linux
 	dev-ros/class_loader:=
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
+	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
index 8c33748815fb..bd6b04546ef5 100644
--- a/dev-ros/nodelet_topic_tools/Manifest
+++ b/dev-ros/nodelet_topic_tools/Manifest
@@ -1,4 +1,4 @@
-DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD nodelet_topic_tools-1.9.16.ebuild 539 BLAKE2B baee5ba417a62e438eb88149e83adeefd134752fff2588a7c736461d0f4fcd07452e0f88f72c8389c62933f54185a000798a7be0eea58896a637e5335ae89c5e SHA512 d11016dc1ec26bbf7a96cacfd2073fe4791a1e9c6d7580363b72759be9ed05f57e65db8b1058685f05bef2b1f282183e09043da91d3b025d29630c55e816fa01
-EBUILD nodelet_topic_tools-9999.ebuild 539 BLAKE2B a22dcd706e26edd3ae6b0dc1884c9a955bdf76c7e501e13024ca1d0e524a07490ba42dae8a5b5ff94c84fa82ac45e6115b659db144c41c4559dede12b4c888d5 SHA512 185df28ec9286caa2e7f95abcb6f729712dd69f305b637ed7753086735ba73e069d2bbd962123154d6c359e17fe48de7dd9ac1ee7b3ba51b043637d4e68b85e9
+DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+EBUILD nodelet_topic_tools-1.10.0.ebuild 515 BLAKE2B 94e39412eb1297f821b47219a5d114ea43691e98e4c0f9f7bfb6c39fb3ddb990d93824773e6e27578de2bf1b8b174238020e2d7e5d36348075dc77beb6165fd7 SHA512 e0517b6d88e4104f5f935b17e75eb32339fe76edf5e98f6ae46894dc04f5c2600e75c3dd1abc13487fa26896d32d4ce90998c8b03f55e0795da181c31ea62d05
+EBUILD nodelet_topic_tools-9999.ebuild 515 BLAKE2B 94e39412eb1297f821b47219a5d114ea43691e98e4c0f9f7bfb6c39fb3ddb990d93824773e6e27578de2bf1b8b174238020e2d7e5d36348075dc77beb6165fd7 SHA512 e0517b6d88e4104f5f935b17e75eb32339fe76edf5e98f6ae46894dc04f5c2600e75c3dd1abc13487fa26896d32d4ce90998c8b03f55e0795da181c31ea62d05
 MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0.ebuild
new file mode 100644
index 000000000000..4951c0fa8174
--- /dev/null
+++ b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 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:=[threads]
+	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.9.16.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.9.16.ebuild
deleted file mode 100644
index 4a1844edbbaa..000000000000
--- a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.9.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/nodelet_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Common nodelet tools such as a mux, demux and throttle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/dynamic_reconfigure[${PYTHON_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
index 493a9fc07580..4951c0fa8174 100644
--- a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild
+++ b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/nodelet_core"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads]
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/message_filters
 	dev-ros/nodelet
 	dev-ros/pluginlib
diff --git a/dev-ros/nodelet_tutorial_math/Manifest b/dev-ros/nodelet_tutorial_math/Manifest
index ec86d63f6f83..fe24ca876b0e 100644
--- a/dev-ros/nodelet_tutorial_math/Manifest
+++ b/dev-ros/nodelet_tutorial_math/Manifest
@@ -1,6 +1,6 @@
-DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
-DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
-EBUILD nodelet_tutorial_math-0.1.10-r1.ebuild 448 BLAKE2B d6c16e8f2a00d7ea2236a37ccd43aed770dc14bdcfb64f5e3cad61dd6367949d25d7fce02e0a44e4dcf5640d1281549258c892ff44077ac552e51c6a811ed85f SHA512 f14ea87995d783070c17e453f2deeaeffb5ee6fd73cc6d0bffedef17c5e29c0bc5a2fe0f8acd249d56b53238119cfb5de2af21e3d525852141589e7643ac557c
-EBUILD nodelet_tutorial_math-0.1.11.ebuild 448 BLAKE2B 4316d0a15fc1c88f0b262ac23763cb46a77f6b6b9e7541d234ca6145ebbec470b4af221b38e39c1ebccf3caa9392b8d2e28ce0982740cd49e0dabc92a65fea74 SHA512 86d106c5368e526982747e5418b95fc8eb43eb476fd9e2046216f7ee375600865043c966947bcc955f61dd0bedb6eea57f21df471c18609a884abaf8e0503536
-EBUILD nodelet_tutorial_math-9999.ebuild 448 BLAKE2B d6c16e8f2a00d7ea2236a37ccd43aed770dc14bdcfb64f5e3cad61dd6367949d25d7fce02e0a44e4dcf5640d1281549258c892ff44077ac552e51c6a811ed85f SHA512 f14ea87995d783070c17e453f2deeaeffb5ee6fd73cc6d0bffedef17c5e29c0bc5a2fe0f8acd249d56b53238119cfb5de2af21e3d525852141589e7643ac557c
+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 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.10-r1.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.10-r1.ebuild
deleted file mode 100644
index de79698d1cf3..000000000000
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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.1.11.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.11.ebuild
deleted file mode 100644
index 53cd8355481a..000000000000
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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.1.12.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild
new file mode 100644
index 000000000000..b0642c31d40f
--- /dev/null
+++ b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
new file mode 100644
index 000000000000..b0642c31d40f
--- /dev/null
+++ b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
index de79698d1cf3..b0642c31d40f 100644
--- a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild
+++ b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/common_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/object_recognition_msgs/Manifest b/dev-ros/object_recognition_msgs/Manifest
index 954caae85e44..9b3419badf22 100644
--- a/dev-ros/object_recognition_msgs/Manifest
+++ b/dev-ros/object_recognition_msgs/Manifest
@@ -1,4 +1,4 @@
 DIST object_recognition_msgs-0.4.1.tar.gz 4756 BLAKE2B 9d6c919b82d4e9300eebc9ba36498414f62a9a6392649adb7db011e315eb64d2810b1c8eab6f647a58d8ab60dfa1dfae77d98164b9f97d9f4a9c47716a0d3cc4 SHA512 4e2d48795b0376640dbb6eb82ca3d0cdf5e2d4a2e7ec8d723ce7613c678fc2dc037fceafe8b37a905d9bb2f0a283e84e4adbf986dd6e5322ae96d43de120a3cf
-EBUILD object_recognition_msgs-0.4.1.ebuild 585 BLAKE2B bb9443a665ef1fee85e610c1c2f5c25d6436aa9324a6a970efc811941687f29d6643495afda81ff069b5a1bc5e181498b838596cacc67a479361709ce6419d26 SHA512 273649f7f5c1274ec6a18eff29fde601568acda20dc074fea970e72470f49f2a6f8320c48c69bd18a78c5d8f1df1c752d0c26e552763b29457fe055ade82a869
-EBUILD object_recognition_msgs-9999.ebuild 585 BLAKE2B bb9443a665ef1fee85e610c1c2f5c25d6436aa9324a6a970efc811941687f29d6643495afda81ff069b5a1bc5e181498b838596cacc67a479361709ce6419d26 SHA512 273649f7f5c1274ec6a18eff29fde601568acda20dc074fea970e72470f49f2a6f8320c48c69bd18a78c5d8f1df1c752d0c26e552763b29457fe055ade82a869
+EBUILD object_recognition_msgs-0.4.1.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
+EBUILD object_recognition_msgs-9999.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
 MISC metadata.xml 351 BLAKE2B 08c11c3e85e64d6bfad30f493bf14be8f672c8482edd9ff90c8e4d7686e9cb031f955b01bb4c8e35030e8dadc37ae299811d84da692ecaf8badcd9cc4041e8bf SHA512 84326325a832b3a3029f36b758aad22fc18b13bbfdcfd64cd25ed7f4e4e88a578788d34fe6ae9fe3e765ddf20c754448ca138753ab5ca4e881eaae36094fda2c
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
index b816408304e8..9af6f1bdaa76 100644
--- a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
+++ b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/wg-perception/object_recognition_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="
 	dev-ros/actionlib_msgs
 	dev-ros/geometry_msgs
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
index b816408304e8..9af6f1bdaa76 100644
--- a/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
+++ b/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/wg-perception/object_recognition_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="
 	dev-ros/actionlib_msgs
 	dev-ros/geometry_msgs
diff --git a/dev-ros/octomap_msgs/Manifest b/dev-ros/octomap_msgs/Manifest
index 21ea3eff0ee2..1e36571b3173 100644
--- a/dev-ros/octomap_msgs/Manifest
+++ b/dev-ros/octomap_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST octomap_msgs-0.3.3.tar.gz 4566 BLAKE2B f0f2d7591b203b05d40722e7a9b52ca831af63e36c5026004e5c727baea0ffe4d5b6206ded90aaa6893b48fa2a493b880b00c28afdf449f906e8ca1e2c786660 SHA512 b88d708e981cdac0c1180013305cee8a107e7019aacb74152c70be828cb0d581fac0e6525c0599328dd8dd5b0e3df9880773752f36d94d35b3435c38584ddbe1
-EBUILD octomap_msgs-0.3.3.ebuild 490 BLAKE2B 4992af4f5d9fd1d1ebf2a1e3e9b56d669742ab0b52cacbe983197b32b65398fcb826f6284e35acc87cab056fcb9e57ac3edb3201b003974d6d2e3afad1494eaa SHA512 bba6828290c6934f9ef4e86671cec05b6cee5526aa94760fa887566881eb6b5f53a5647d8b28b3d450cc676aa5b0bcbe565b4182b87462cd45a787f659115870
-EBUILD octomap_msgs-9999.ebuild 490 BLAKE2B 4992af4f5d9fd1d1ebf2a1e3e9b56d669742ab0b52cacbe983197b32b65398fcb826f6284e35acc87cab056fcb9e57ac3edb3201b003974d6d2e3afad1494eaa SHA512 bba6828290c6934f9ef4e86671cec05b6cee5526aa94760fa887566881eb6b5f53a5647d8b28b3d450cc676aa5b0bcbe565b4182b87462cd45a787f659115870
+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 334 BLAKE2B d259b147c66e00b0efa297c0491593ffd4873606e0adad96742c146d46c785a3a4757d3b369dd98582a7c9ed00909a9bfec6ef360afef9cd5f4f628a4071e9fc SHA512 0c7997d8652614b7b37d6bb9126d1cf89b0b9aebb72cee36ab8229894725e6d0d10002340e664b5a3d05e4b9536f7d5984fdabfd0df1a53f6026d97508231205
diff --git a/dev-ros/octomap_msgs/octomap_msgs-0.3.3.ebuild b/dev-ros/octomap_msgs/octomap_msgs-0.3.3.ebuild
deleted file mode 100644
index 855713abc478..000000000000
--- a/dev-ros/octomap_msgs/octomap_msgs-0.3.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=5
-ROS_REPO_URI="https://github.com/OctoMap/octomap_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-0.3.5.ebuild b/dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild
new file mode 100644
index 000000000000..fb5758dfad35
--- /dev/null
+++ b/dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild
@@ -0,0 +1,18 @@
+# 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
index 855713abc478..fb5758dfad35 100644
--- a/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
+++ b/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/OctoMap/octomap_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/octomap_ros/Manifest b/dev-ros/octomap_ros/Manifest
index 36333bfd3c10..e7aa7ee96028 100644
--- a/dev-ros/octomap_ros/Manifest
+++ b/dev-ros/octomap_ros/Manifest
@@ -1,4 +1,4 @@
-DIST octomap_ros-0.4.0.tar.gz 5076 BLAKE2B 4c1431d139e7025cae3ac9fa41fa86c71690be58d3177a3a4694f62affc2d61a73eeb456ab78b17c6b63ece8cf9582cff179c4f73ba3520e792a1e819e5ee69b SHA512 41910879d042dcbd969544e89fe40c1da8be75118ef1b813e3cb0319b83529a9c759fe99ed430b275d10d5df987bed7e2b4d7300ed561d159b6007de306bc8ce
-EBUILD octomap_ros-0.4.0-r1.ebuild 509 BLAKE2B 358e20cbdfa9c9662bd7de637aba0660dacee5e233896ddf9c476ea0b8dd3ab4a120e6295a71d1628d2ce01f5adc74dda4d7104219ea8ed421b53dcc284eeebf SHA512 2db338b29533ed7103a0eaa23289d5744d55909ff246a867d7369b1eedfb4fed647ef169400306ffd377192695333b80a6352be3c8d78ea8a2c4e1eda97c4c8c
-EBUILD octomap_ros-9999.ebuild 509 BLAKE2B 358e20cbdfa9c9662bd7de637aba0660dacee5e233896ddf9c476ea0b8dd3ab4a120e6295a71d1628d2ce01f5adc74dda4d7104219ea8ed421b53dcc284eeebf SHA512 2db338b29533ed7103a0eaa23289d5744d55909ff246a867d7369b1eedfb4fed647ef169400306ffd377192695333b80a6352be3c8d78ea8a2c4e1eda97c4c8c
+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 333 BLAKE2B 0997902e45c25ffbdac0d4a065c63a5adf108ffc126c133ce6e5e8776ad7319d6458dfa19ce1aac238d9b522abbab9ab60d29a29c0d5cafa53322cc481fa0964 SHA512 6ae210514f0405e56fdefc8db22fc196de2648d687163e3d55bec4c0fa8d950bf60b7d7b4220f56d545ccbd88ac1b5e6075673a01ab4c6b69f7febde8bf33362
diff --git a/dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild b/dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild
deleted file mode 100644
index b73677241874..000000000000
--- a/dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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
-	dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild b/dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
new file mode 100644
index 000000000000..a45d9828a875
--- /dev/null
+++ b/dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# 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
index b73677241874..a45d9828a875 100644
--- a/dev-ros/octomap_ros/octomap_ros-9999.ebuild
+++ b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
 KEYWORDS="~amd64 ~arm"
 
@@ -16,7 +16,8 @@ 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}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index 63c2973bd22a..6f0ed28d6198 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1,5 +1,5 @@
 AUX ocv4.patch 5101 BLAKE2B 1f298695f9c0dd46dad07c6495975043e9031ee5e19fdb886a512861a04bfa3029427213db00af9f6e68ef678c1a172e6ffdaf671bfa9a108f17d58204dd5bf9 SHA512 a24a4a510a501caafaa78a9a856724e3bdf8b9ea70cbf41da7b6b96e18a013b08f01660289e4cb0e77567c9ae6fbabf751cbbefef6ba391a37ecb6b09cb1c373
 DIST opencv_apps-2.0.1.tar.gz 83497 BLAKE2B 31d0447696716ba623e64e69dc269491c4a943125c90c33ac2e495ce2a64f417758e0a142f36c5dde9032475abee516fecf9e227bbe977706f1a89ea02a3daad SHA512 db263bb49f1b083cfd84f325911da804c3a2c8b3db7f3a2ce697a4fe2dde2b692a2b1921bd32aecb19d67c93f7bf6809340c418b6bf4619ebd7beed1469838da
-EBUILD opencv_apps-2.0.1.ebuild 718 BLAKE2B ed7aac7cf21fac146d6128c05699646ed4290e425146fbb85e398368155d799581a0e46ef55d6b462a8e626cad8486f773224dd7c1b763495df77dc9fe821061 SHA512 0a17c17195a8bbe8dd61b52f4135413374536f1cf1c271a47623bc2da940a273842e836d0cacba183efa50d1891ee3ad2767393a0090440422a2eb80a8dad679
-EBUILD opencv_apps-9999.ebuild 684 BLAKE2B 137307ff871a7f5aa7003692e977c6957beb772f0c8f8dfdc43f6c44849b951f4ef434e8063d6130b881b313a2f4f9f07b51112fd77d732b9a2c71438d0988af SHA512 1314179ad9e8f67931fe1f38585a52cb3799436b2f245bbb48b746b154cf8a4ae9eeceb3e174e25f7617ebb5e47ceea6593b48f38b3789c26386e23a273c10d0
+EBUILD opencv_apps-2.0.1.ebuild 885 BLAKE2B a407bfde56c9c1f14df21623f73e75a3225bdd9e44afbcb5dbcc461645932fcaaff9e24922f3a15ab4e85f11a0998458fc37d89321d3f6c4df2f8bc550a759ce SHA512 6f9a098724e48f781856621cc83fc656ad61c05176699fbd4c85fbd9a32c2930368bb955761a5147c35f4972bda574d1118137426661f221c206bd6be87c0165
+EBUILD opencv_apps-9999.ebuild 848 BLAKE2B a1a94c4a4af7f7a8ce07913ecc7bf98fb75d1e5fc7ad68159050d318e4f2edcd61f3764dc02210c1cdb8858bbe34b25e6c155ea44feb8acc8a6d4a83c5d4ba57 SHA512 c973ba5d50e0f7c175b96e1fdd959960add08504eaecf6e3b84087e09ec195ba09b4a01344844c86cf675cfad7c1073ca2be9784f58d38225bd5aaf37dc36ec0
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
index 74105169c2d5..e6864994ac92 100644
--- a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/opencv_apps"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
@@ -17,14 +16,25 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_transport
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	>=media-libs/opencv-3.3:0=[contrib]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+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
+	)
+"
 PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
index ddf09bbd814e..bb49ddbddb1e 100644
--- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/opencv_apps"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
@@ -17,13 +16,24 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_transport
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	>=media-libs/opencv-3.3:0=[contrib]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+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
+	)
+"
diff --git a/dev-ros/opencv_tests/Manifest b/dev-ros/opencv_tests/Manifest
index de909d7af7cc..1758331cdd48 100644
--- a/dev-ros/opencv_tests/Manifest
+++ b/dev-ros/opencv_tests/Manifest
@@ -1,18 +1,4 @@
-DIST vision_opencv-1.12.1.tar.gz 79203 BLAKE2B 55453f3ebdd26fbebf6cc527ca7029bf7ac8c1ee343b05f9a1fbf5a0dae284d7b1e29879ee0e23fd8b6a6a8317ce916147a368535075eb6bdf3bdfb40f0e3662 SHA512 f95b3247eed1d5f4403b1a123a033a5178d3491cf5deee27bf8386a9dab66475ef7889d0787483a03545ba9fc11e039b4ab0beedfa09121562cabd1bd33b5f88
-DIST vision_opencv-1.12.2.tar.gz 79771 BLAKE2B adc102d23eccdaca8c39fc0ef27510c32c36568a0deb242519392d454054d56e695f0d7b2ae006d99e2557f7209054d724cbba2b3fed742ac229e30ff773a753 SHA512 823e7e122d351e615e95093f6962b38ff76c01a876f71f4810fa2014ee9c71ec0c1e63d3d5a01a0297d6c58012e6b6a14ee850f57feda83d4d7125b9e0bd12c0
-DIST vision_opencv-1.12.3.tar.gz 80497 BLAKE2B 97e9c6d623108307216ae88dd5a4c6231b61d64826907c130233bab7c1590a50adf4e6bfdca3f6130365848a98ff1d2f58228c7f2dbc256aff6bbe04f164161b SHA512 2f732c7f9d9b5aa68b775fa08c8836bfb01cd3fe0fee9bd9bf862fecb26a23a58d754a96e723b420663b48b590f24e454e5a1871b6f4dcd4219d3c3e413ade3c
-DIST vision_opencv-1.12.4.tar.gz 80675 BLAKE2B e07f89942f471e25ec76ae43b07dee79eaf4637e5f5775151e066cc92a92f8993a6bc047ddc35adbb77745e6070797111d78add690ee7bb54cc8179cf2f7cfa5 SHA512 9ed426ddae7af343eed01d6ebf2769d654476bb28b095d67394e75feeec8440859aca34f62c9faff81018cf98fe58b731b96f3f7ffeaa459d14e6a3c59ad02e5
-DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
-DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
-DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
-DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD opencv_tests-1.12.1-r1.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
-EBUILD opencv_tests-1.12.2.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
-EBUILD opencv_tests-1.12.3.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
-EBUILD opencv_tests-1.12.4.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
-EBUILD opencv_tests-1.12.5.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
-EBUILD opencv_tests-1.12.7.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
-EBUILD opencv_tests-1.12.8.ebuild 751 BLAKE2B c63cc3f23dc5546cd60ccf055a67cb8203e2963f05c8b4b51b122dd99755ee30d8c477bf1c8fa049e802b8e0df3424afbe340193f171f3cd3a316d424cfffc4b SHA512 ab5a16d3034f13aaf7b8dbb15eee3f686cde42b69617e8ee852fd1cfd1f401a96754ce794b6354b6fe273f1311da20a84d5e00d44b299b377b459dc19e1263c2
-EBUILD opencv_tests-1.13.0.ebuild 751 BLAKE2B c63cc3f23dc5546cd60ccf055a67cb8203e2963f05c8b4b51b122dd99755ee30d8c477bf1c8fa049e802b8e0df3424afbe340193f171f3cd3a316d424cfffc4b SHA512 ab5a16d3034f13aaf7b8dbb15eee3f686cde42b69617e8ee852fd1cfd1f401a96754ce794b6354b6fe273f1311da20a84d5e00d44b299b377b459dc19e1263c2
-EBUILD opencv_tests-9999.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
+DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
+EBUILD opencv_tests-1.15.0.ebuild 705 BLAKE2B 02c1f88b34b75de6d24cc2b6a1b0ab7b271c6485fb4288ca4df27f0d7cf34acaa7e01c6565fa8592d995b797131f75635fed360c9c627fa1600ddedc7397e4cf SHA512 fdeb7b53f1884286480b2f5898c3bbba5deba6d9867f0f14b0db5f01368cc841b0982fc69222ffe6f36f5d6d0f7ee9c425c318a0064100d8a846b524a11ee048
+EBUILD opencv_tests-9999.ebuild 705 BLAKE2B 02c1f88b34b75de6d24cc2b6a1b0ab7b271c6485fb4288ca4df27f0d7cf34acaa7e01c6565fa8592d995b797131f75635fed360c9c627fa1600ddedc7397e4cf SHA512 fdeb7b53f1884286480b2f5898c3bbba5deba6d9867f0f14b0db5f01368cc841b0982fc69222ffe6f36f5d6d0f7ee9c425c318a0064100d8a846b524a11ee048
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild
deleted file mode 100644
index 6a888f82993b..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	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.12.2.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.2.ebuild
deleted file mode 100644
index 6a888f82993b..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	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.12.3.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.3.ebuild
deleted file mode 100644
index 6a888f82993b..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	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.12.4.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.4.ebuild
deleted file mode 100644
index 96b12009c607..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	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.12.5.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.5.ebuild
deleted file mode 100644
index 96b12009c607..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	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.12.7.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.7.ebuild
deleted file mode 100644
index 96b12009c607..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	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.12.8.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.8.ebuild
deleted file mode 100644
index 83b23217853e..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	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.13.0.ebuild b/dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild
deleted file mode 100644
index 83b23217853e..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	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.15.0.ebuild b/dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
new file mode 100644
index 000000000000..7047774c56b1
--- /dev/null
+++ b/dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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-9999.ebuild b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
index 6a888f82993b..7047774c56b1 100644
--- a/dev-ros/opencv_tests/opencv_tests-9999.ebuild
+++ b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,10 +14,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	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}"
 
diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest
index 6eccb08b0f2c..8ba7f28faf92 100644
--- a/dev-ros/openni2_camera/Manifest
+++ b/dev-ros/openni2_camera/Manifest
@@ -1,8 +1,4 @@
-DIST openni2_camera-0.3.0.tar.gz 36450 BLAKE2B 3b292a4012371d8020f945828a61dd6757eda0d4df51ad72eb3a7930142f6e9d5821c5c838296fdf8f291c0f4c9c878c1c5878ce2c731a2efc3ba2e47375bcd3 SHA512 0e5737e8ea06fb0c73b2a99905e472f6634f024f5a50de9b94761ae3ca9879cf47a029b1906d01b31cb8081b73292af871eff581aeddb56584951824edd0007c
-DIST openni2_camera-0.4.0.tar.gz 39472 BLAKE2B 9d8944ffe12ac0b6c75039cb6cff5c3026afa565ca30997f4f121e3c0de8298d64ea1b6176a7bcd9cdba8863bf52624207a5c99f11c7d17f0c30bc313a9563c2 SHA512 6c200e7fe9cb440286b2b8afbbc357e7db1eb2ae02d9a97fbd994d4960b356155f91c09bd8cb66757704422c9693c1fe7048c21635f8dca0602158d0795be71e
-DIST openni2_camera-0.4.2.tar.gz 39732 BLAKE2B 1203a298f859c2e29b6ff6e5f4f9261f7bc981566a3df15fbed3f5ec094256adc63ccd82b4961efd87ce1e798f80b7e48553ccccf5ea8c8909f61931a2e2df8d SHA512 5c40d5edf767688726ede4da0e9ed1401da2a50977ed609c6c7e286dcb1bb84f73fd7072a0e044b15e5575d62851d1b025d5facb993de33c6304f12846cdac10
-EBUILD openni2_camera-0.3.0-r1.ebuild 679 BLAKE2B 1b609e9a97f2836ab830d3e97f3f8a6a2c3f0735b14f975370d104587547617f0db2c3896288bdf3c487a0ffee27d4fe4df64e6f3f9efa1aab0a10e4f8811981 SHA512 7a4053931badcc154dae80826a8fbfebdafe18ce660463fa1e72345ef0ed028ede6902777bfa575b2b1d37cb4e676197dd858b2c22a1f8cdc2120c54170f4447
-EBUILD openni2_camera-0.4.0.ebuild 679 BLAKE2B dc18fceea88e2f73fbf9eaaf3e9fbab14064d7004eb4dd3874c9262b48830c2c2ec635cfb26b9e3032b32838d6747451a6afafdb46b25cfea3799855d6e80992 SHA512 876b7948f602672931f8eeabd98cbe7527dbecd54761acdc8664e14ad10fdc7ce8b3a5c14ee7ddf38337082aa5c82945a7e09890650c1a1571d73123bc65ea06
-EBUILD openni2_camera-0.4.2.ebuild 676 BLAKE2B 8a299680aa6489137d149b708dd2a3e9227515e3928e9165e638ebfbe6312ae1dcfd64c64937eee45dfd1e7313dc3008a9b72aeee1e2f01dab4a776ff00bae4f SHA512 d6ffdfe0a8ef5809be0bbd6d1bebb31c64b6c438475a79e1157ec621d5930b3740f581e6c99e6728e80ba3cf6b69b53fddf3e3db5413db5f6394ee42324d4ea5
-EBUILD openni2_camera-9999.ebuild 679 BLAKE2B 1b609e9a97f2836ab830d3e97f3f8a6a2c3f0735b14f975370d104587547617f0db2c3896288bdf3c487a0ffee27d4fe4df64e6f3f9efa1aab0a10e4f8811981 SHA512 7a4053931badcc154dae80826a8fbfebdafe18ce660463fa1e72345ef0ed028ede6902777bfa575b2b1d37cb4e676197dd858b2c22a1f8cdc2120c54170f4447
+DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
+EBUILD openni2_camera-1.4.2.ebuild 656 BLAKE2B 2a5773b8e24106c77f90611bc5da3a7d3d32461b53f37ca663d70b4db430fd4466b8ca54493d2f7119b8788d1bc4bb410013a9eb3d55007f36a689102ac7918b SHA512 e11b7141dba2af65bfe24b46f4001031313c9cd0e857d08f1060e0957c226114b9ad8744adf172e2e5de9aec05790d8fac5ba1c652ea499f4f50b9c8f713ef71
+EBUILD openni2_camera-9999.ebuild 656 BLAKE2B 2a5773b8e24106c77f90611bc5da3a7d3d32461b53f37ca663d70b4db430fd4466b8ca54493d2f7119b8788d1bc4bb410013a9eb3d55007f36a689102ac7918b SHA512 e11b7141dba2af65bfe24b46f4001031313c9cd0e857d08f1060e0957c226114b9ad8744adf172e2e5de9aec05790d8fac5ba1c652ea499f4f50b9c8f713ef71
 MISC metadata.xml 340 BLAKE2B a66fd18f61874c90197221e853b05c28502cf38118807b51616c9feb0db670945ffe31bd325aa9092dc22c226f214ec2259276c7bc11ee731a694fa200cdfd03 SHA512 c8b9dc967e3e6de3bcae15894d39b3701e4bd223565660284c0b2a41d4b7e475935b9342296644e620b63a8c99098c8bf65363aa4899e7e5de3ad92059a4b064
diff --git a/dev-ros/openni2_camera/openni2_camera-0.3.0-r1.ebuild b/dev-ros/openni2_camera/openni2_camera-0.3.0-r1.ebuild
deleted file mode 100644
index 4c4df556466d..000000000000
--- a/dev-ros/openni2_camera/openni2_camera-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/OpenNI2
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_camera/openni2_camera-0.4.0.ebuild b/dev-ros/openni2_camera/openni2_camera-0.4.0.ebuild
deleted file mode 100644
index 2ec2b60c34db..000000000000
--- a/dev-ros/openni2_camera/openni2_camera-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/OpenNI2
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild b/dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild
deleted file mode 100644
index 73dbd592b198..000000000000
--- a/dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/OpenNI2
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_camera/openni2_camera-1.4.2.ebuild b/dev-ros/openni2_camera/openni2_camera-1.4.2.ebuild
new file mode 100644
index 000000000000..53fb4e7fb0d0
--- /dev/null
+++ b/dev-ros/openni2_camera/openni2_camera-1.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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"
+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:=[threads]
+"
+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
index 4c4df556466d..53fb4e7fb0d0 100644
--- a/dev-ros/openni2_camera/openni2_camera-9999.ebuild
+++ b/dev-ros/openni2_camera/openni2_camera-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -18,12 +17,13 @@ IUSE=""
 RDEPEND="
 	dev-ros/image_transport
 	dev-ros/camera_info_manager
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/OpenNI2
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
index 18b57fd39b2d..0736e40c490b 100644
--- a/dev-ros/openni2_launch/Manifest
+++ b/dev-ros/openni2_launch/Manifest
@@ -1,6 +1,4 @@
-DIST openni2_camera-0.4.0.tar.gz 39472 BLAKE2B 9d8944ffe12ac0b6c75039cb6cff5c3026afa565ca30997f4f121e3c0de8298d64ea1b6176a7bcd9cdba8863bf52624207a5c99f11c7d17f0c30bc313a9563c2 SHA512 6c200e7fe9cb440286b2b8afbbc357e7db1eb2ae02d9a97fbd994d4960b356155f91c09bd8cb66757704422c9693c1fe7048c21635f8dca0602158d0795be71e
-DIST openni2_camera-0.4.2.tar.gz 39732 BLAKE2B 1203a298f859c2e29b6ff6e5f4f9261f7bc981566a3df15fbed3f5ec094256adc63ccd82b4961efd87ce1e798f80b7e48553ccccf5ea8c8909f61931a2e2df8d SHA512 5c40d5edf767688726ede4da0e9ed1401da2a50977ed609c6c7e286dcb1bb84f73fd7072a0e044b15e5575d62851d1b025d5facb993de33c6304f12846cdac10
-EBUILD openni2_launch-0.4.0.ebuild 502 BLAKE2B 1697ab43d42574d640ee7e11fc322b23a59cea09744cf3bfa9abdbf5d754789a589c5a7a7ac8434d4d11ed8a2b25f3332fac670d3386447d22347d6c43dfa394 SHA512 8eaca9a985a54e894ca848861f21cf119d17d08b13d43b152a7da009415c30d6b783057ed45c7f0b628d4b46944ad2287a1980635188b609113c02e990f6cc33
-EBUILD openni2_launch-0.4.2.ebuild 558 BLAKE2B 4489104a815e6cb62e006ed962f97d62ea876507ba61e55a99dc34228711773f88ffd15f5aaf53ff3288c255c8762c1e790538696628a054243c9df60d7c5c75 SHA512 c767584883d82df27f63e75a0bf350312369884e20d46131011febc3b2e9aab5f85184bc6ec4e8c4dd6870159def0d45f4e07054243d30d6188d3867f2feadf9
-EBUILD openni2_launch-9999.ebuild 558 BLAKE2B 4489104a815e6cb62e006ed962f97d62ea876507ba61e55a99dc34228711773f88ffd15f5aaf53ff3288c255c8762c1e790538696628a054243c9df60d7c5c75 SHA512 c767584883d82df27f63e75a0bf350312369884e20d46131011febc3b2e9aab5f85184bc6ec4e8c4dd6870159def0d45f4e07054243d30d6188d3867f2feadf9
+DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
+EBUILD openni2_launch-1.4.2.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
+EBUILD openni2_launch-9999.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
 MISC metadata.xml 340 BLAKE2B 666c2530cabfb6d86f6fb1e45072133c9a3826254a42b7713ca3b0506b09adb38be616e281a8e19fab3f6540133a9eee6c9605accbc7b7444715faf38e199b97 SHA512 5fdcf4ac865e7456967ef7e20b7694a7dd04eed9658eab3dbaa1754538a843e499ca1671189d444730b47ff85267d643518c6f1faa708f374fabfeb4d7af7caa
diff --git a/dev-ros/openni2_launch/openni2_launch-0.4.0.ebuild b/dev-ros/openni2_launch/openni2_launch-0.4.0.ebuild
deleted file mode 100644
index 0fe985c1db94..000000000000
--- a/dev-ros/openni2_launch/openni2_launch-0.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild b/dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild
deleted file mode 100644
index 491eb3e16541..000000000000
--- a/dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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-1.4.2.ebuild b/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
new file mode 100644
index 000000000000..227a922039f1
--- /dev/null
+++ b/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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/openni2_launch/openni2_launch-9999.ebuild b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
index 491eb3e16541..227a922039f1 100644
--- a/dev-ros/openni2_launch/openni2_launch-9999.ebuild
+++ b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/openslam_gmapping/Manifest b/dev-ros/openslam_gmapping/Manifest
index 8c8e62e62e9e..fcf0214351dc 100644
--- a/dev-ros/openslam_gmapping/Manifest
+++ b/dev-ros/openslam_gmapping/Manifest
@@ -1,6 +1,4 @@
-DIST openslam_gmapping-0.1.1.tar.gz 96997 BLAKE2B e9ed4ff602d179f321bc6d94f7adfea2aef94933aa98ee207f1c52d3290db6d9f7d79111195580d8b51c89221be6b4307496fe165101f2017102237c314f23a9 SHA512 37d8c343bfb817323f0f74b2db397c34629032699d3e503baa3067d38fe2400caa11cf2dbf40c745a9030ee70bd2d4f19c18d88e01fda162ada9c2075381421e
-DIST openslam_gmapping-0.1.2.tar.gz 97427 BLAKE2B 3e1b0534d783e5205bd199bc572958f00d35769636ebf4860d50fb46c2f7827b1d46f2fe9f289422a514d9c746a6021bfbe222e74d8ce72840425062dd66ef6f SHA512 0932849d9f35a5edf582bdeee17bfeb791b30694553909ba4f54279e1b4fac1af041a5d2f340203cbdb5161155c074c4f74db472bbc4884c10447621be13e1a9
-EBUILD openslam_gmapping-0.1.1.ebuild 350 BLAKE2B ef7dbf38d8d296d1340fca14ea51cf6194aae7c42aa3fdde44b2d40b98387196e2d99881a6e5178ac7a22e5bde82cd311f7370b238c2ce88bfe6de6f5a783176 SHA512 5f339926d4be01a3dfd641be7fe0ce02f41ed505fc8e2ebb4a640447822b9f1c4da475b2fb1b20fafda6f306bf6af770133ee21a661bd64160722c55685c306d
-EBUILD openslam_gmapping-0.1.2.ebuild 350 BLAKE2B ad116d98c3ae1f37219c54377f90d31a408f6cec87184ce42bcf06710ab6b2646eb76f33db0c2ee2f970a39ed63b30769673231599a39a6ec78c416a59334e72 SHA512 6566944250729836dba94da9b539cb33b889b2500ad42609d7abdc87396d93cd3cd05dccd95e6e026d1ea0310611109f4cde6fd1e8cfc105b926cd8b8360e7b2
-EBUILD openslam_gmapping-9999.ebuild 350 BLAKE2B ef7dbf38d8d296d1340fca14ea51cf6194aae7c42aa3fdde44b2d40b98387196e2d99881a6e5178ac7a22e5bde82cd311f7370b238c2ce88bfe6de6f5a783176 SHA512 5f339926d4be01a3dfd641be7fe0ce02f41ed505fc8e2ebb4a640447822b9f1c4da475b2fb1b20fafda6f306bf6af770133ee21a661bd64160722c55685c306d
+DIST openslam_gmapping-0.2.1.tar.gz 104933 BLAKE2B fbd31e66849ee28b63ac24ec059ebca368f31c8796b229f59fda56af7aceec12d45673651ad05c690da268e8a0fc7ae581b7911ea6e773af833c6374fb83843e SHA512 bb3b1a634ded258f526dd65b1b70c7a0f284810eedb5cfafbc2012a4997793c1e7aeacdca2afeea4ddec13cadb445b994cac07cb0763117c5fa478b3def1cbe6
+EBUILD openslam_gmapping-0.2.1.ebuild 347 BLAKE2B 44a24715b9bf4de958cd1280e2971ae23735f01539e9b7aa69b85fad56276332f40e588c344ea28c4c9a410d34461f17aa045deb5432282054969e5fb22b12a2 SHA512 db0d7d6dcf78291e8670f7a174606f36268f528a1be9788cbdc8b79fe73683ad8c501fc606ec138707fe82ec8ebe3156a18c12dfeb664fd5016b099ef0f4e632
+EBUILD openslam_gmapping-9999.ebuild 347 BLAKE2B 44a24715b9bf4de958cd1280e2971ae23735f01539e9b7aa69b85fad56276332f40e588c344ea28c4c9a410d34461f17aa045deb5432282054969e5fb22b12a2 SHA512 db0d7d6dcf78291e8670f7a174606f36268f528a1be9788cbdc8b79fe73683ad8c501fc606ec138707fe82ec8ebe3156a18c12dfeb664fd5016b099ef0f4e632
 MISC metadata.xml 346 BLAKE2B c0c8566bd6db8866d91cd1bbdaec66a954eed369e9601a222d5604947d12caca4703b5460e872b9d07cde549c338179b52b391d05172915221d18d49aafdee28 SHA512 74324f6ba9d2217018fb1194b620e3d48c07d8a89654b20c9e08f7aae3c3820fc9a624f2e9c12239ab0a951792270c08b04edae6f8cda4c3edc6c720aa442c22
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-0.1.1.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-0.1.1.ebuild
deleted file mode 100644
index c65802afc06a..000000000000
--- a/dev-ros/openslam_gmapping/openslam_gmapping-0.1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/openslam_gmapping"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-ified version of gmapping SLAM"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-0.1.2.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-0.1.2.ebuild
deleted file mode 100644
index 596615e2a06f..000000000000
--- a/dev-ros/openslam_gmapping/openslam_gmapping-0.1.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/openslam_gmapping"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-ified version of gmapping SLAM"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
new file mode 100644
index 000000000000..972294be7c44
--- /dev/null
+++ b/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 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/openslam_gmapping"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS-ified version of gmapping SLAM"
+LICENSE="CC-BY-NC-SA-2.5"
+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
index c65802afc06a..972294be7c44 100644
--- a/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
+++ b/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/openslam_gmapping"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
index a6c5d55fa250..53cd7f16ca8a 100644
--- a/dev-ros/pcl_conversions/Manifest
+++ b/dev-ros/pcl_conversions/Manifest
@@ -1,4 +1,4 @@
 DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
-EBUILD pcl_conversions-1.7.1.ebuild 602 BLAKE2B d8b3c17adfd1c5d19e1ea556dddeb049cbb4dcd58626d2bbad06a6d69002f665564b4839435334c418e6a0e71df2e45efbedb83acb0c91ca964939de01260cd6 SHA512 e5196ab80aa43164808e6dae8dffc2fd9ad88440a237e34daa1affc383ca2655e8c164b4f82034abbf2c256590d4e2091af52e327fe0f1a1de7e202b01bd8bf6
-EBUILD pcl_conversions-9999.ebuild 605 BLAKE2B 874aa3d03575a1d1496cf8d2ae4b66e23c9ce5c419cac0fe73e1514e39adc460bf81d331331f290d5b3a9caaae31fd505b080b5be4d94814b4057fc5797c129c SHA512 57f71a5744712cbeecb98dc3b55cec7731d5f516c9db9596b48757948d28c37bd43db769921e7217f48453c61df5ebd60c0479e7f49bf1fc2fb714daff9ecd70
+EBUILD pcl_conversions-1.7.1.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
+EBUILD pcl_conversions-9999.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
index 2d924e7a3445..2aa2de1919aa 100644
--- a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
+++ b/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
@@ -16,10 +16,10 @@ 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
-"
-DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild b/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
index 79f1ab5d1922..2aa2de1919aa 100644
--- a/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
+++ b/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
@@ -16,10 +16,10 @@ 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
-"
-DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_msgs/Manifest b/dev-ros/pcl_msgs/Manifest
index 931ee0b3ea94..2aa310b108b8 100644
--- a/dev-ros/pcl_msgs/Manifest
+++ b/dev-ros/pcl_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST pcl_msgs-0.2.0.tar.gz 1596 BLAKE2B 2cf1e05f5006bcf0fe6d7b763f62a61c494b4f5404122493a7728bd886bf6538a1fad5f8a627b2ba7fdd8c5d03e9791d1de5a3beb13bf21cedf05118f12b1c9e SHA512 e132ad068683829d4f73b451584ce7e67a75b8ded9397b50c6bd92f5cb8a862303e766b5d3e0d7c1430e8241993166493167e2c3d2010a600dfbb66db0e87eae
-EBUILD pcl_msgs-0.2.0.ebuild 473 BLAKE2B 5fbbf9c4a26f792809a7bb34ca098c74e65836fc53815d1b167db2810d7acc43e8a6da260937adcda75a5ff4c051153694ababd794bef07505cf7c7913543f12 SHA512 b7703550a2db05a4e956d3c982bd581317fdf8c29e65b3d2f747d4cac68ed9bd7a1e705b85e03a6efb671b3d8731f289813a11614e981a967c844e5ceff607bb
-EBUILD pcl_msgs-9999.ebuild 473 BLAKE2B 5fbbf9c4a26f792809a7bb34ca098c74e65836fc53815d1b167db2810d7acc43e8a6da260937adcda75a5ff4c051153694ababd794bef07505cf7c7913543f12 SHA512 b7703550a2db05a4e956d3c982bd581317fdf8c29e65b3d2f747d4cac68ed9bd7a1e705b85e03a6efb671b3d8731f289813a11614e981a967c844e5ceff607bb
+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 337 BLAKE2B 5abc57673f2e3d509979857bccb367754f28e09b0028e4288d2a9952faacc5b296cffd83a8709bf39215eb46a97d9d030f04f88b4d9f62e6e09d6c0ca139342c SHA512 3620fefbf7715755498f9e14ccb1778cc657e73a12fefd354946e38d9b31b1714ab3b3240fe0796d8b0a4fdc8e9483a9ab8f1f38273078aa2798c87d7d4145e8
diff --git a/dev-ros/pcl_msgs/pcl_msgs-0.2.0.ebuild b/dev-ros/pcl_msgs/pcl_msgs-0.2.0.ebuild
deleted file mode 100644
index ac478e34fe4c..000000000000
--- a/dev-ros/pcl_msgs/pcl_msgs-0.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros-perception/pcl_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-0.3.0.ebuild b/dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
new file mode 100644
index 000000000000..b19fe487df07
--- /dev/null
+++ b/dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
@@ -0,0 +1,18 @@
+# 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
index ac478e34fe4c..b19fe487df07 100644
--- a/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
+++ b/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros-perception/pcl_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 99bc2088146a..d2a51cf3e105 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,5 @@
-AUX pcl111.patch 39097 BLAKE2B c9612c7a10f9bf92d4aa3b1d053035f13c682ecdd3cabfdb23cc0152a31fa7b1da0f9d0e18a22242a76ab7e8601b0fb3c52d300baf3839e84c6b127c58daf39b SHA512 fe8330ca9c1991a274310918a0f575cbb5b83e48969cb8cb285032f7a5e8d571c9dae131837aeaf1edbec18baaedf27ece82e428d4d960d73f5b0aa86e5861f3
+AUX pcl111.patch 38649 BLAKE2B 8895cde34c315ba81f522d55fd6b692725ded70f7dbfd38d7e502b2303dd48041cd1e0bef1a685f204d82c9d42f76f3bf4b957c2859a97b761ee4b2790224ff0 SHA512 b745640d86c9b01a0c7d2777ac8c6a8ce81c9544ae7f74ea0aff7d31823c66eca47ac82ad150980b009d702113412501deed7c700d55a44d2307f4dce444be03
 DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
-EBUILD pcl_ros-1.7.1.ebuild 954 BLAKE2B baa8161e13c24fb884917b21f9d6d5cc80f69d345bdb6903a1775f7bc4f0eb49d1675381ff86eb9d5595005496d829f273f09f1422839958e6ad4c5963277c86 SHA512 ff793a450e3b1e9891a433291b9ca2957a18e17f63bc7a9d9b0ec818a8af039cc902148d6cb172d1f7450673ebbd72dabd03533e7be134b2abb4cd22cee6eccc
-EBUILD pcl_ros-9999.ebuild 915 BLAKE2B e15107eeae1fa3524c5f217a4bb58d07e90ff54a04557081d3792dfdd98d8f508175b43b11ef17da4f59946c64c627b103cdebaad1b79b4bb8f32be2867015c7 SHA512 8e3fa2c8ddb14638e2995b2bc857fb4dc8ffa0342f45be94ce59fc1887fed001fc1ce89792d4094a07a1553a43d73d38cb99e65c27d27cdb9fa4e91b2fd0700c
+EBUILD pcl_ros-1.7.1.ebuild 1033 BLAKE2B ef5a8708cf349a21b0956f8bcb8cab54955efb6ff57298979eb9c903534dbced365b2349e6694df0149871126583c78815c942d6d8459f76f8bb7c67d2977be4 SHA512 5e160e32e0d85079a670ed4d34a982a728cc0ad58245e6cfe1df5a827327551d7396f9f0e02f020ccbf414dd7b35da697c5d23b95c50de7f96640d0d2c2b7d78
+EBUILD pcl_ros-9999.ebuild 994 BLAKE2B 1c511a19b65338b27ecbe38ed5dc2301b0571271b56dc5d9b873ae6b43cdd6d385dae70fa7b4f33ddfb96aa40c3d42e30bb6fc8d74d047a0138b85f5cf8ce6f6 SHA512 8e642915515fd6b7016f8e23306f1cb95b6f753c80d7aebdd6531f398f9b1b2168ef932f00b717fbce5192f3c55039a53f7a8ee5f17d1115cc1346471050ebd4
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/files/pcl111.patch b/dev-ros/pcl_ros/files/pcl111.patch
index 8f3433ffccaa..839e87dcf0a1 100644
--- a/dev-ros/pcl_ros/files/pcl111.patch
+++ b/dev-ros/pcl_ros/files/pcl111.patch
@@ -45,8 +45,8 @@ Subject: [PATCH] Changes in preparation for PCL 1.11 (#273)
 
 diff --git a/pcl_ros/include/pcl_ros/features/feature.h b/pcl_ros/include/pcl_ros/features/feature.h
 index 26bcfe6b..098c20bc 100644
---- a/pcl_ros/include/pcl_ros/features/feature.h
-+++ b/pcl_ros/include/pcl_ros/features/feature.h
+--- a/include/pcl_ros/features/feature.h
++++ b/include/pcl_ros/features/feature.h
 @@ -69,11 +69,11 @@ namespace pcl_ros
        typedef pcl::KdTree<pcl::PointXYZ>::Ptr KdTreePtr;
  
@@ -85,8 +85,8 @@ index 26bcfe6b..098c20bc 100644
  
 diff --git a/pcl_ros/include/pcl_ros/filters/filter.h b/pcl_ros/include/pcl_ros/filters/filter.h
 index 94c1e883..b4e79538 100644
---- a/pcl_ros/include/pcl_ros/filters/filter.h
-+++ b/pcl_ros/include/pcl_ros/filters/filter.h
+--- a/include/pcl_ros/filters/filter.h
++++ b/include/pcl_ros/filters/filter.h
 @@ -58,8 +58,8 @@ namespace pcl_ros
      public:
        typedef sensor_msgs::PointCloud2 PointCloud2;
@@ -100,8 +100,8 @@ index 94c1e883..b4e79538 100644
  
 diff --git a/pcl_ros/include/pcl_ros/pcl_nodelet.h b/pcl_ros/include/pcl_ros/pcl_nodelet.h
 index f12e62d7..279d6730 100644
---- a/pcl_ros/include/pcl_ros/pcl_nodelet.h
-+++ b/pcl_ros/include/pcl_ros/pcl_nodelet.h
+--- a/include/pcl_ros/pcl_nodelet.h
++++ b/include/pcl_ros/pcl_nodelet.h
 @@ -48,6 +48,7 @@
  // PCL includes
  #include <pcl_msgs/PointIndices.h>
@@ -134,8 +134,8 @@ index f12e62d7..279d6730 100644
        PCLNodelet () : use_indices_ (false), latched_indices_ (false),
 diff --git a/pcl_ros/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.h
 index bbf30ad1..93df7365 100644
---- a/pcl_ros/include/pcl_ros/point_cloud.h
-+++ b/pcl_ros/include/pcl_ros/point_cloud.h
+--- a/include/pcl_ros/point_cloud.h
++++ b/include/pcl_ros/point_cloud.h
 @@ -270,4 +270,125 @@ namespace ros
  
  } // namespace ros
@@ -264,8 +264,8 @@ index bbf30ad1..93df7365 100644
  #endif
 diff --git a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
 index 7134f905..13b85316 100644
---- a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
+--- a/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
++++ b/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
 @@ -64,8 +64,8 @@ namespace pcl_ros
    class ExtractPolygonalPrismData : public PCLNodelet
    {
@@ -279,8 +279,8 @@ index 7134f905..13b85316 100644
         /** \brief The output PointIndices publisher. */
 diff --git a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
 index af2c9126..9243e363 100644
---- a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
+--- a/include/pcl_ros/segmentation/sac_segmentation.h
++++ b/include/pcl_ros/segmentation/sac_segmentation.h
 @@ -61,8 +61,8 @@ namespace pcl_ros
    class SACSegmentation : public PCLNodelet
    {
@@ -311,8 +311,8 @@ index af2c9126..9243e363 100644
        /** \brief Set the input TF frame the data should be transformed into before processing, if input.header.frame_id is different.
 diff --git a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h b/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
 index 4914bc86..da767ab3 100644
---- a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
+--- a/include/pcl_ros/segmentation/segment_differences.h
++++ b/include/pcl_ros/segmentation/segment_differences.h
 @@ -60,8 +60,8 @@ namespace pcl_ros
    class SegmentDifferences : public PCLNodelet
    {
@@ -326,8 +326,8 @@ index 4914bc86..da767ab3 100644
        /** \brief Empty constructor. */
 diff --git a/pcl_ros/include/pcl_ros/surface/convex_hull.h b/pcl_ros/include/pcl_ros/surface/convex_hull.h
 index e419c0f8..54a1f367 100644
---- a/pcl_ros/include/pcl_ros/surface/convex_hull.h
-+++ b/pcl_ros/include/pcl_ros/surface/convex_hull.h
+--- a/include/pcl_ros/surface/convex_hull.h
++++ b/include/pcl_ros/surface/convex_hull.h
 @@ -53,8 +53,8 @@ namespace pcl_ros
    class ConvexHull2D : public PCLNodelet
    {
@@ -341,8 +341,8 @@ index e419c0f8..54a1f367 100644
        /** \brief Nodelet initialization routine. */
 diff --git a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h b/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
 index b909edf8..e90f562a 100644
---- a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
-+++ b/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
+--- a/include/pcl_ros/surface/moving_least_squares.h
++++ b/include/pcl_ros/surface/moving_least_squares.h
 @@ -62,8 +62,8 @@ namespace pcl_ros
      typedef pcl::PointNormal NormalOut;
  
@@ -356,8 +356,8 @@ index b909edf8..e90f562a 100644
      typedef pcl::KdTree<PointIn> KdTree;
 diff --git a/pcl_ros/src/pcl_ros/features/boundary.cpp b/pcl_ros/src/pcl_ros/features/boundary.cpp
 index 9334641a..26ee07c1 100644
---- a/pcl_ros/src/pcl_ros/features/boundary.cpp
-+++ b/pcl_ros/src/pcl_ros/features/boundary.cpp
+--- a/src/pcl_ros/features/boundary.cpp
++++ b/src/pcl_ros/features/boundary.cpp
 @@ -43,7 +43,7 @@ pcl_ros::BoundaryEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -391,8 +391,8 @@ index 9334641a..26ee07c1 100644
  typedef pcl_ros::BoundaryEstimation BoundaryEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/fpfh.cpp b/pcl_ros/src/pcl_ros/features/fpfh.cpp
 index 3f698aad..53be549c 100644
---- a/pcl_ros/src/pcl_ros/features/fpfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/fpfh.cpp
+--- a/src/pcl_ros/features/fpfh.cpp
++++ b/src/pcl_ros/features/fpfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::FPFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -427,8 +427,8 @@ index 3f698aad..53be549c 100644
  typedef pcl_ros::FPFHEstimation FPFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
 index 58dd911f..e4adcabb 100644
---- a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
+--- a/src/pcl_ros/features/fpfh_omp.cpp
++++ b/src/pcl_ros/features/fpfh_omp.cpp
 @@ -43,7 +43,7 @@ pcl_ros::FPFHEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -463,8 +463,8 @@ index 58dd911f..e4adcabb 100644
  typedef pcl_ros::FPFHEstimationOMP FPFHEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
 index d0ec3441..a6e2249a 100644
---- a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
-+++ b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
+--- a/src/pcl_ros/features/moment_invariants.cpp
++++ b/src/pcl_ros/features/moment_invariants.cpp
 @@ -43,7 +43,7 @@ pcl_ros::MomentInvariantsEstimation::emptyPublish (const PointCloudInConstPtr &c
  {
    PointCloudOut output;
@@ -497,8 +497,8 @@ index d0ec3441..a6e2249a 100644
  typedef pcl_ros::MomentInvariantsEstimation MomentInvariantsEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d.cpp b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
 index 9e700f78..042186a9 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
+--- a/src/pcl_ros/features/normal_3d.cpp
++++ b/src/pcl_ros/features/normal_3d.cpp
 @@ -43,7 +43,7 @@ pcl_ros::NormalEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -531,8 +531,8 @@ index 9e700f78..042186a9 100644
  typedef pcl_ros::NormalEstimation NormalEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
 index a741c052..3e92d2f2 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
+--- a/src/pcl_ros/features/normal_3d_omp.cpp
++++ b/src/pcl_ros/features/normal_3d_omp.cpp
 @@ -43,7 +43,7 @@ pcl_ros::NormalEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -565,8 +565,8 @@ index a741c052..3e92d2f2 100644
  typedef pcl_ros::NormalEstimationOMP NormalEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
 index a4a8581e..680a4a02 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
+--- a/src/pcl_ros/features/normal_3d_tbb.cpp
++++ b/src/pcl_ros/features/normal_3d_tbb.cpp
 @@ -45,7 +45,7 @@ pcl_ros::NormalEstimationTBB::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloud output;
@@ -587,8 +587,8 @@ index a4a8581e..680a4a02 100644
  typedef pcl_ros::NormalEstimationTBB NormalEstimationTBB;
 diff --git a/pcl_ros/src/pcl_ros/features/pfh.cpp b/pcl_ros/src/pcl_ros/features/pfh.cpp
 index 38b4d19c..dd8409e2 100644
---- a/pcl_ros/src/pcl_ros/features/pfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/pfh.cpp
+--- a/src/pcl_ros/features/pfh.cpp
++++ b/src/pcl_ros/features/pfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::PFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -623,8 +623,8 @@ index 38b4d19c..dd8409e2 100644
  typedef pcl_ros::PFHEstimation PFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
 index 113124dc..501d686e 100644
---- a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
-+++ b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
+--- a/src/pcl_ros/features/principal_curvatures.cpp
++++ b/src/pcl_ros/features/principal_curvatures.cpp
 @@ -43,7 +43,7 @@ pcl_ros::PrincipalCurvaturesEstimation::emptyPublish (const PointCloudInConstPtr
  {
    PointCloudOut output;
@@ -659,8 +659,8 @@ index 113124dc..501d686e 100644
  typedef pcl_ros::PrincipalCurvaturesEstimation PrincipalCurvaturesEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/shot.cpp b/pcl_ros/src/pcl_ros/features/shot.cpp
 index d051ab0f..ed6ba44b 100644
---- a/pcl_ros/src/pcl_ros/features/shot.cpp
-+++ b/pcl_ros/src/pcl_ros/features/shot.cpp
+--- a/src/pcl_ros/features/shot.cpp
++++ b/src/pcl_ros/features/shot.cpp
 @@ -42,7 +42,7 @@ pcl_ros::SHOTEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -695,8 +695,8 @@ index d051ab0f..ed6ba44b 100644
  typedef pcl_ros::SHOTEstimation SHOTEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/shot_omp.cpp b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
 index 1ac1b065..4563f123 100644
---- a/pcl_ros/src/pcl_ros/features/shot_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
+--- a/src/pcl_ros/features/shot_omp.cpp
++++ b/src/pcl_ros/features/shot_omp.cpp
 @@ -42,7 +42,7 @@ pcl_ros::SHOTEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -731,8 +731,8 @@ index 1ac1b065..4563f123 100644
  typedef pcl_ros::SHOTEstimationOMP SHOTEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/vfh.cpp b/pcl_ros/src/pcl_ros/features/vfh.cpp
 index 9d0fe361..ece448fd 100644
---- a/pcl_ros/src/pcl_ros/features/vfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/vfh.cpp
+--- a/src/pcl_ros/features/vfh.cpp
++++ b/src/pcl_ros/features/vfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::VFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -767,8 +767,8 @@ index 9d0fe361..ece448fd 100644
  typedef pcl_ros::VFHEstimation VFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
 index 17adec46..5599b408 100644
---- a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
+--- a/src/pcl_ros/segmentation/extract_clusters.cpp
++++ b/src/pcl_ros/segmentation/extract_clusters.cpp
 @@ -202,7 +202,7 @@ pcl_ros::EuclideanClusterExtraction::input_indices_callback (
    if (indices)
      indices_ptr.reset (new std::vector<int> (indices->indices));
@@ -789,8 +789,8 @@ index 17adec46..5599b408 100644
      }
 diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
 index 0185bfbe..ff823b19 100644
---- a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
+--- a/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
++++ b/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
 @@ -189,16 +189,16 @@ pcl_ros::ExtractPolygonalPrismData::input_hull_indices_callback (
        pub_output_.publish (inliers);
        return;
@@ -813,8 +813,8 @@ index 0185bfbe..ff823b19 100644
    // Final check if the data is empty (remember that indices are set to the size of the data -- if indices* = NULL)
 diff --git a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
 index b73dd3fd..bc7b97e7 100644
---- a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
+--- a/src/pcl_ros/segmentation/sac_segmentation.cpp
++++ b/src/pcl_ros/segmentation/sac_segmentation.cpp
 @@ -324,7 +324,7 @@ pcl_ros::SACSegmentation::input_indices_callback (const PointCloudConstPtr &clou
    if (indices && !indices->header.frame_id.empty ())
      indices_ptr.reset (new std::vector<int> (indices->indices));
@@ -837,8 +837,8 @@ index b73dd3fd..bc7b97e7 100644
    if (indices && !indices->header.frame_id.empty ())
 diff --git a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
 index 4c934152..e3979549 100644
---- a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
+--- a/src/pcl_ros/segmentation/segment_differences.cpp
++++ b/src/pcl_ros/segmentation/segment_differences.cpp
 @@ -115,7 +115,7 @@ pcl_ros::SegmentDifferences::input_target_callback (const PointCloudConstPtr &cl
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
      PointCloud output;
@@ -867,8 +867,8 @@ index 4c934152..e3979549 100644
  }
 diff --git a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
 index 4b7eeaf5..75903889 100644
---- a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
-+++ b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
+--- a/src/pcl_ros/surface/convex_hull.cpp
++++ b/src/pcl_ros/surface/convex_hull.cpp
 @@ -121,7 +121,7 @@ void
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
      // Publish an empty message
@@ -907,8 +907,8 @@ index 4b7eeaf5..75903889 100644
  typedef pcl_ros::ConvexHull2D ConvexHull2D;
 diff --git a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
 index b9a01e64..99e5d481 100644
---- a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
-+++ b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
+--- a/src/pcl_ros/surface/moving_least_squares.cpp
++++ b/src/pcl_ros/surface/moving_least_squares.cpp
 @@ -141,7 +141,7 @@ pcl_ros::MovingLeastSquares::input_indices_callback (const PointCloudInConstPtr
    {
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
@@ -950,8 +950,8 @@ index b9a01e64..99e5d481 100644
  //////////////////////////////////////////////////////////////////////////////////////////////
 diff --git a/pcl_ros/tools/pointcloud_to_pcd.cpp b/pcl_ros/tools/pointcloud_to_pcd.cpp
 index 484113da..fb149b46 100644
---- a/pcl_ros/tools/pointcloud_to_pcd.cpp
-+++ b/pcl_ros/tools/pointcloud_to_pcd.cpp
+--- a/tools/pointcloud_to_pcd.cpp
++++ b/tools/pointcloud_to_pcd.cpp
 @@ -78,7 +78,7 @@ class PointCloudToPCD
      ////////////////////////////////////////////////////////////////////////////////
      // Callback
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
index 0ffd456d66af..5d3ff3e64a29 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-ros/rosbag
 	dev-ros/rosconsole
 	dev-ros/roslib
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/message_filters
 	>=dev-cpp/eigen-3.2.5:3
 	dev-ros/pluginlib
@@ -32,9 +32,14 @@ RDEPEND="
 	sci-libs/pcl:=[qhull]
 	>=dev-ros/pcl_conversions-0.2.1-r1
 	dev-libs/boost:=[threads]
+"
+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
+	)
 "
-DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/pcl111.patch" )
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index 2101a7b6837e..95393ac0ab86 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-ros/rosbag
 	dev-ros/rosconsole
 	dev-ros/roslib
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/message_filters
 	>=dev-cpp/eigen-3.2.5:3
 	dev-ros/pluginlib
@@ -32,8 +32,13 @@ RDEPEND="
 	sci-libs/pcl:=[qhull]
 	>=dev-ros/pcl_conversions-0.2.1-r1
 	dev-libs/boost:=[threads]
+"
+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
+	)
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index 1e2c20f515c0..ce29164c96b1 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,7 +1,6 @@
 AUX catkin_prefix_path2.patch 678 BLAKE2B c494700f8d2cfce884b65ef87963cbf414dc4af1a9c9390978e7f458ad7f93b28c54bcd9831ff3edf4d6a421c4ec9ad1859bafff5f8ed209662ea1d14a70c299 SHA512 3b91fac26a2e48087fc70a773f5416e6cc3f7758adcddea6d50ba97a2d1ff8ae2f14fd5b74ba043a5546a8809def8b2154c70a97b10c451ba3773a82eda67100
-DIST pluginlib-1.12.0.tar.gz 20298 BLAKE2B 9d6e5adb6bd64f02d237fa1992402cb016266071c0fa0447709880f90550f36f9e280163a3e054594235d0102f7fb22f4b98a56216b0db9ebaa200b99d018570 SHA512 fcd51908c6c7223bbe50eb43733ba6d00e11419b26d2b9a05aaaf6498020fcd44bacc19313c3a4dd7524bf69d4f54aec27e05b1f88ee578191484c53c1e3f767
-DIST pluginlib-1.12.1.tar.gz 19619 BLAKE2B e91fb15b4857fae10012a71df606f5040d5a62bdee596695c873808790eea02cd380eedda6c438388264003d7ac930ebc2c649a421411580dd095365c93d3c8e SHA512 1a15cd934c4f93fecf32d7d3cab1ee6caae61d59aa65d1f796ab2ba63d5204a6fe28744c28eac80d304bd802b184afe79ead621b3c370c6d3526a944c144d724
-EBUILD pluginlib-1.12.0-r1.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
-EBUILD pluginlib-1.12.1.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
-EBUILD pluginlib-9999.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
+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 327 BLAKE2B f94cb82ca7e89f9c45d423a4b56a573d7d220a5bf218838163659dc027554338b845539ae4090df944e0053ce3e0264c0323a442732619147116a583926fc405 SHA512 cf53258133948a2b0d201af3f0d439f5dcfc9c43691ae4d2b175a70258dd26ffd0fd99511aa02df57cfafb8fc4a1a8185759de0b23f7a1496a227f706900b7a2
diff --git a/dev-ros/pluginlib/files/libdir.patch b/dev-ros/pluginlib/files/libdir.patch
new file mode 100644
index 000000000000..5152705f0196
--- /dev/null
+++ b/dev-ros/pluginlib/files/libdir.patch
@@ -0,0 +1,19 @@
+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/pluginlib-1.12.0-r1.ebuild b/dev-ros/pluginlib/pluginlib-1.12.0-r1.ebuild
deleted file mode 100644
index 8b802f6e3618..000000000000
--- a/dev-ros/pluginlib/pluginlib-1.12.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=5
-
-ROS_REPO_URI="https://github.com/ros/pluginlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR="${PN}"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5:=
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-1.12.1.ebuild b/dev-ros/pluginlib/pluginlib-1.12.1.ebuild
deleted file mode 100644
index 8b802f6e3618..000000000000
--- a/dev-ros/pluginlib/pluginlib-1.12.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/pluginlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR="${PN}"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5:=
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild b/dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild
new file mode 100644
index 000000000000..7dc414eb606d
--- /dev/null
+++ b/dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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
index 8b802f6e3618..7dc414eb606d 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -1,27 +1,34 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/pluginlib"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR="${PN}"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
+DESCRIPTION="Tools for writing and dynamically loading plugins using the ROS infrastructure"
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE=""
 
 RDEPEND="
 	>=dev-ros/class_loader-0.3.5:=
 	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/tinyxml2:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
+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
index 680ba28c61b5..b6af326fc6aa 100644
--- a/dev-ros/pluginlib_tutorials/Manifest
+++ b/dev-ros/pluginlib_tutorials/Manifest
@@ -1,6 +1,6 @@
-DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
-DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
-EBUILD pluginlib_tutorials-0.1.10-r1.ebuild 427 BLAKE2B 9034636d57edc8b2cf501cd86a074e5f1975c7b1298926e7758384bcf471a4b61f0185204131e3aedb003e4db87ee3cfd7eeb8b36b044f24cdfd2844569ac1a5 SHA512 5105134c0ac368dde546a0de13202501f73c9d7f538c04f834f89ea858da5dac2b0a04f4df2f292cf198106256d57bea0e9d8ced7324cbe559a6356b34098cb5
-EBUILD pluginlib_tutorials-0.1.11.ebuild 427 BLAKE2B 180959bb51bdd65436cc3e727788d16d58e096aebffe0c16f852385f30f996adf7a72800f370c0e43090bc3f9831c773afc8ded727aab4320fb7c814cfa75f3d SHA512 ef29b01d5524e9c69680a1fad1eb49a514d05fe98d39219439ab3cc36318d1301404235992c2312a635505cd677c513308a7996539fdde2f98b2d1a89812bc70
-EBUILD pluginlib_tutorials-9999.ebuild 427 BLAKE2B 9034636d57edc8b2cf501cd86a074e5f1975c7b1298926e7758384bcf471a4b61f0185204131e3aedb003e4db87ee3cfd7eeb8b36b044f24cdfd2844569ac1a5 SHA512 5105134c0ac368dde546a0de13202501f73c9d7f538c04f834f89ea858da5dac2b0a04f4df2f292cf198106256d57bea0e9d8ced7324cbe559a6356b34098cb5
+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 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.10-r1.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.10-r1.ebuild
deleted file mode 100644
index 96884ccfd465..000000000000
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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.1.11.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.11.ebuild
deleted file mode 100644
index 6814fa431ca0..000000000000
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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.1.12.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild
new file mode 100644
index 000000000000..1bb6261afa2a
--- /dev/null
+++ b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
new file mode 100644
index 000000000000..1bb6261afa2a
--- /dev/null
+++ b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
index 96884ccfd465..1bb6261afa2a 100644
--- a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild
+++ b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/common_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/poco_vendor/Manifest b/dev-ros/poco_vendor/Manifest
index 8305f840fa36..be15247d20b1 100644
--- a/dev-ros/poco_vendor/Manifest
+++ b/dev-ros/poco_vendor/Manifest
@@ -1,4 +1,4 @@
 DIST poco_vendor-1.2.0.tar.gz 3145 BLAKE2B 6143f73ec9f741ff72147ac43d4876cb17553d8a4ba33d54b60f546cd2988389de4cbc1b3fcb0300f507f91610ba64284515a3d736417f611c3ffa6eb32d5aba SHA512 f38f00028ad1b6b236305761f53748597f1203e267488ba2a08b8c06ad155338a2c413b3e5e5501becdb09aec4600ae700d95765a5b4d0861b163e4f2a9ee413
-EBUILD poco_vendor-1.2.0.ebuild 749 BLAKE2B 740f8b6ee10ae7f50d9dd14d3847cbf3d1ce24d6079f5886f8aeeb1948b0ac9f01dde14bce7c865b0496a24720e2795d0a886cf426642f5353ad6e84b34fa6ff SHA512 180212b1ca13f214c51c20417a27d5fcc930ea5bbece30092c05c031a53ada75bee8dc677f5e8eed1d0664100313266fd4dc5b7069efbb266848db04ad03c5d3
-EBUILD poco_vendor-9999.ebuild 749 BLAKE2B 740f8b6ee10ae7f50d9dd14d3847cbf3d1ce24d6079f5886f8aeeb1948b0ac9f01dde14bce7c865b0496a24720e2795d0a886cf426642f5353ad6e84b34fa6ff SHA512 180212b1ca13f214c51c20417a27d5fcc930ea5bbece30092c05c031a53ada75bee8dc677f5e8eed1d0664100313266fd4dc5b7069efbb266848db04ad03c5d3
+EBUILD poco_vendor-1.2.0.ebuild 868 BLAKE2B 6e5fba1480ed1be7aa0c6314202b8edcff8dcc899e3bbe11b19bfdc04bff2a23232b5a3c6d7926565b3dcbd30c6b6e2a78ad234efc5a8e719374e566dc3a831c SHA512 baeff776af0c8118d0928585a296c9df445a245dfbd1955b139cf6c85bdce9ef6c5c7ea9501b529eeadd10d9b8c68337b580d2926e71d44b4299d0bdc30cf7e9
+EBUILD poco_vendor-9999.ebuild 1110 BLAKE2B b3394a2e92b59b062b8eb2201fb256cea08b82d2614aefb4ea7b34bc9d2ce36ecb46db01f29c74924272f8493497374e0e0c40adaf2754133d29b85043f19193 SHA512 5f4ea0b3fe50e3ded110e3b60cd2ea82a5d6eb4cebaf81fcb8188284647cc0eb124165ae475df2d184de648591e4d2ce1a697e88f47b51dc1458334ef695a33f
 MISC metadata.xml 330 BLAKE2B 7880b16541c752a5d4fb5e729d4305ca3f6430a4fddb36ced24cbf6f2c75964cfbbc34ea8a16cd306b8d49412c822a17d4cf44639f1e2cb7218c437aa2500830 SHA512 b9af45457315c529a21cf6d3ca9711513aa662cf21b9de1eba6a4a0498c28525cd6175878836d5c90c72afcef201bea2ef54e50a2103d4c7c07156b6bbfbc908
diff --git a/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild b/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild
index b6214810f35f..5e44119b2a2b 100644
--- a/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
@@ -28,10 +28,16 @@ fi
 IUSE=""
 
 DEPEND="
-	dev-libs/poco
+	>=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() {
+	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
index b6214810f35f..c6061e692b31 100644
--- a/dev-ros/poco_vendor/poco_vendor-9999.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_7,3_8} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
@@ -25,13 +25,32 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
+IUSE="test"
 
 DEPEND="
-	dev-libs/poco
+	>=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() {
+	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
index d15b16ee2218..5ab76e9374d9 100644
--- a/dev-ros/pointcloud_to_laserscan/Manifest
+++ b/dev-ros/pointcloud_to_laserscan/Manifest
@@ -1,4 +1,4 @@
-DIST pointcloud_to_laserscan-1.4.0.tar.gz 6502 BLAKE2B 02614ce3e046f4b6c828df7121dcd5a2d033e8fefa979a8541127684d5ea6bb40d74412ea9c1ccffc934aa7172343968f75198f444b2ca38391318f584e40901 SHA512 f54d65edc4eda2e97d75ed26b1d374a669f188c4ef2426730312ae479e051a0834abb782cdd00febbd8dc97cb6a0723b6a735d2cbf07e2f8260ad0e54e79376f
-EBUILD pointcloud_to_laserscan-1.4.0-r1.ebuild 567 BLAKE2B 3943a2ee24ad44c920abbd54409a7250c1b76893009efdba5da8e3ff31d97efe6d684aea131ae6c1ac1a4dd817d767398b72d4e977afda785c970f967307f008 SHA512 17be604706279edb4a20b0c1b7024be4123038e415c4d52c41c328ac4c427a3ba72367267c20d99f10872850264ea3eda12f38eaeacd071c399c5eefd2c6256b
-EBUILD pointcloud_to_laserscan-9999.ebuild 567 BLAKE2B 3943a2ee24ad44c920abbd54409a7250c1b76893009efdba5da8e3ff31d97efe6d684aea131ae6c1ac1a4dd817d767398b72d4e977afda785c970f967307f008 SHA512 17be604706279edb4a20b0c1b7024be4123038e415c4d52c41c328ac4c427a3ba72367267c20d99f10872850264ea3eda12f38eaeacd071c399c5eefd2c6256b
+DIST pointcloud_to_laserscan-1.4.1.tar.gz 7645 BLAKE2B b3b32213920679e3b0f76d1401658b5dce5057f9556f442e96e79719f083910454aa42e85869628c6713f0dfb858e10e16fc089a92c0e2233b810b9b698334a5 SHA512 c81fdb38affe6cf7da76db9de2b1c17f60a0c464fbd25278d013a601e8474a528a72ec981c3e2e8d257239c398f266960f9adc41e46e5d09bae81d9da8c05c84
+EBUILD pointcloud_to_laserscan-1.4.1.ebuild 565 BLAKE2B 7bc0225159ec843cf3beb332651cf117ea7d3f488e90a727e16a35732f9a75b9d230d6d544d7c0d8d24ea9eea848a0dabeed1c5029d400d7fa19da5f6c35359d SHA512 464596df424565c4480301ae8003ddad363759b6937293b2b667e25de998bbbfe50146f784a8fbe200cd9ec011dd9b8ef3dac6afdafcb5d8a071249c1537d909
+EBUILD pointcloud_to_laserscan-9999.ebuild 565 BLAKE2B 7bc0225159ec843cf3beb332651cf117ea7d3f488e90a727e16a35732f9a75b9d230d6d544d7c0d8d24ea9eea848a0dabeed1c5029d400d7fa19da5f6c35359d SHA512 464596df424565c4480301ae8003ddad363759b6937293b2b667e25de998bbbfe50146f784a8fbe200cd9ec011dd9b8ef3dac6afdafcb5d8a071249c1537d909
 MISC metadata.xml 352 BLAKE2B e6e84324ce9e250cbcbbc842560bd902aec079b7be5cfa60ba2a3b1e19d7e998f21fdc1bacff7addb2325f99d0b9f6fb0d6b928f7111a99c591174da8db34eab SHA512 d25a2c3b70b16e29ba73ea87630bfc1b82ecbde5235a02b02d6ee98b8bbc50fd5899f8ff99c46fb392f4c84841a5ae2781bec9afd89cf53bdd8631eea02ee0e9
diff --git a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.0-r1.ebuild b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.0-r1.ebuild
deleted file mode 100644
index 36c5cfc0838d..000000000000
--- a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/tf2_sensor_msgs
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..e6427082f109
--- /dev/null
+++ b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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/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:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
index 36c5cfc0838d..e6427082f109 100644
--- a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
+++ b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/pointcloud_to_laserscan"
 KEYWORDS="~amd64 ~arm"
 
@@ -16,11 +16,12 @@ RDEPEND="
 	dev-ros/message_filters
 	dev-ros/nodelet
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2
 	dev-ros/tf2_ros
 	dev-ros/tf2_sensor_msgs
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/polled_camera/Manifest b/dev-ros/polled_camera/Manifest
index e5662b7573be..22b30f619e81 100644
--- a/dev-ros/polled_camera/Manifest
+++ b/dev-ros/polled_camera/Manifest
@@ -1,6 +1,4 @@
-DIST image_common-1.11.12.tar.gz 53920 BLAKE2B 296601a14b0e18e6685924ae4557ead446a95ac91ddffb791f9b0b4d643b8f9e40c17f8ace1a705bb5193647bb07444ac81513c888864b0cdd9b45464c14916c SHA512 cd64edd658092c88060a99bbf2cd501cd27441123c34914fc4c8d8c8a8a1fe6d4a929211e71d813b6eb72e1d844842ee3e12567bc40d32981db9ee430e61fb10
-DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD polled_camera-1.11.12.ebuild 603 BLAKE2B c4f3830256b8765936b4e3b6c2dac3639ac6ba89bb374f13d14fc3b76b5026771f44d9985b8fce0e5acef094e65302a61673628f5b684af2f6884e3f2a13d053 SHA512 1b535ce5aec064661bde77bdfad4d0f927d371fc6fc662a42278757873a803a31322663db07df6c2d8cdd8fa9a7ee0bd6eaa04627aae2d368bb532c18d306654
-EBUILD polled_camera-1.11.13.ebuild 603 BLAKE2B c4f3830256b8765936b4e3b6c2dac3639ac6ba89bb374f13d14fc3b76b5026771f44d9985b8fce0e5acef094e65302a61673628f5b684af2f6884e3f2a13d053 SHA512 1b535ce5aec064661bde77bdfad4d0f927d371fc6fc662a42278757873a803a31322663db07df6c2d8cdd8fa9a7ee0bd6eaa04627aae2d368bb532c18d306654
-EBUILD polled_camera-9999.ebuild 603 BLAKE2B c4f3830256b8765936b4e3b6c2dac3639ac6ba89bb374f13d14fc3b76b5026771f44d9985b8fce0e5acef094e65302a61673628f5b684af2f6884e3f2a13d053 SHA512 1b535ce5aec064661bde77bdfad4d0f927d371fc6fc662a42278757873a803a31322663db07df6c2d8cdd8fa9a7ee0bd6eaa04627aae2d368bb532c18d306654
+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 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/polled_camera/polled_camera-1.11.12.ebuild b/dev-ros/polled_camera/polled_camera-1.11.12.ebuild
deleted file mode 100644
index bab2c157f20a..000000000000
--- a/dev-ros/polled_camera/polled_camera-1.11.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=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="C++ helper classes for implementing a polled camera driver node and requesting images from it"
-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-1.11.13.ebuild b/dev-ros/polled_camera/polled_camera-1.11.13.ebuild
deleted file mode 100644
index bab2c157f20a..000000000000
--- a/dev-ros/polled_camera/polled_camera-1.11.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="C++ helper classes for implementing a polled camera driver node and requesting images from it"
-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-1.12.0.ebuild b/dev-ros/polled_camera/polled_camera-1.12.0.ebuild
new file mode 100644
index 000000000000..b2ad5f93c137
--- /dev/null
+++ b/dev-ros/polled_camera/polled_camera-1.12.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
index bab2c157f20a..b2ad5f93c137 100644
--- a/dev-ros/polled_camera/polled_camera-9999.ebuild
+++ b/dev-ros/polled_camera/polled_camera-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="C++ helper classes for implementing a polled camera driver node and requesting images from it"
+DESCRIPTION="C++ classes for implementing a polled camera driver node"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 113d65d64424..4dc222cba52b 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -1,22 +1,4 @@
-DIST pr2_common-1.11.10.tar.gz 33338874 BLAKE2B 8f504aaf9ba2fc3d2d07f3e93b30c54e22fc68f8702f3f214fb52e5ad137add256a2e991c86cd1d140bb0f8e98613fdfaf93998d093c0e1a2185cfa82d544f60 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748
-DIST pr2_common-1.11.11.tar.gz 33597551 BLAKE2B 87667f3011e3cf8a786fb1c045647cb5f454832ccc8bad22cadc33eaf67c7b5d7562e653b1d42ae5344521118f85857c3afb0603f250e3ee9588e1ba583ab673 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b
-DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd566b8bd70eee3134b5a28bae8eb93d101bc388c0d01066572a532562b06a05661f2e1f2da205414e772ccdbfef76a5f4 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987
-DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
-DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_dashboard_aggregator-1.11.10.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.11.11.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.11.13.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.11.14.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.11.9.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.12.0.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.12.1.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
-EBUILD pr2_dashboard_aggregator-1.12.2.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
-EBUILD pr2_dashboard_aggregator-1.12.3.ebuild 539 BLAKE2B e42f74b6dff1ad6118836842d37f6d1f8d31591d17c2114d0828df47de870faf013f1e471128f25412c806296f325f5bd8cccc0866d9ccbaac46a897d47c5ff0 SHA512 2467e53e347b739fd7e114238b584f737ec40da4b778c37ff75cf257bd408069f8a7254e4eb8fa05a4f561c68f0a5353f4383201da5ee2430bee0899b9d19344
-EBUILD pr2_dashboard_aggregator-1.12.4.ebuild 539 BLAKE2B 76822cdad8be58da8ec9b79eca386ac6d72c47f059a4184076b68450ae654ad54f9fbb581c93f1829c2312c4f29f09f26eea2f1891510ff00689c32b3e79ed73 SHA512 2094e653b0b8ba12040b6e15e4ef28310283a362da77830f9014ec9f1243824364398bb75d277743957218dae95fa0c87d0b0afa03188cda468281658d724370
-EBUILD pr2_dashboard_aggregator-9999.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
+EBUILD pr2_dashboard_aggregator-1.12.4.ebuild 518 BLAKE2B 391535aefd882495e7b0cae7e8c1ee74b8abfafedbeff96491fd343ef24cae9028d81e8974c2407b41405b2dad410a1098c341da0e678e21fe52335e3162112b SHA512 3c551b8194ce339137985b0bc32216a1ba31bb75924a436032a62fe9b4839515c3b434308f230cf8fb7cfdb75840326e046d10d447d16983b0686289f2ffdd70
+EBUILD pr2_dashboard_aggregator-9999.ebuild 518 BLAKE2B 391535aefd882495e7b0cae7e8c1ee74b8abfafedbeff96491fd343ef24cae9028d81e8974c2407b41405b2dad410a1098c341da0e678e21fe52335e3162112b SHA512 3c551b8194ce339137985b0bc32216a1ba31bb75924a436032a62fe9b4839515c3b434308f230cf8fb7cfdb75840326e046d10d447d16983b0686289f2ffdd70
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.10.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.10.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.11.11.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.11.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.11.13.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.13.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.11.14.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.11.9.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.9.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.12.0.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.0.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.12.1.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild
deleted file mode 100644
index 52c01cd2ea3e..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.12.2.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.2.ebuild
deleted file mode 100644
index 52c01cd2ea3e..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.12.3.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild
deleted file mode 100644
index dc803c9232fa..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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.12.4.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
index 73ac3ae71814..bc9b14b580de 100644
--- 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
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
index 3c97dd3043db..bc9b14b580de 100644
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 036f45848a29..5b92752dccee 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,13 +1,4 @@
-AUX tests.patch 582 BLAKE2B 33a4ebdb4e3cb56f3dda7d16d8d952bfb72ec883e2ebabd2a19a98bdc0fe3aee995654b9a0463ef551ad4343b77feb5719fe24489b220928162e81c1ac5eeee2 SHA512 435c0f6b38ffd49282971d563f4e68daa482b63da3b44ff2599ff68f08be404b7921e125463494970a2c70ce938871c7d7bbea00d06c0ce61a76ff8117dcea8b
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_description-1.12.0.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
-EBUILD pr2_description-1.12.1.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
-EBUILD pr2_description-1.12.2.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
-EBUILD pr2_description-1.12.3.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
-EBUILD pr2_description-1.12.4.ebuild 508 BLAKE2B fffaec46e8683f1ec5482fe208638c7c40cd4d132db71610a28ccc896bf87981a809873781343e09d3a808730c1ea2eeb4fe2eebc4d23599c91f19088e1e0679 SHA512 ac1c97ed6fdd930bb0addd0f9f4f6e3247e6bec7209cfec0ee7707d52ebd2c6d4be6052d3de9051bf3f741c0b769d3be900f4b7475047d5beff4b96ac074b3a0
-EBUILD pr2_description-9999.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
+EBUILD pr2_description-1.12.4.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
+EBUILD pr2_description-9999.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/files/tests.patch b/dev-ros/pr2_description/files/tests.patch
deleted file mode 100644
index 40c3a378d45d..000000000000
--- a/dev-ros/pr2_description/files/tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pr2_common-1.12.0/pr2_description/test/test_urdf.cpp
-===================================================================
---- pr2_common-1.12.0.orig/pr2_description/test/test_urdf.cpp
-+++ pr2_common-1.12.0/pr2_description/test/test_urdf.cpp
-@@ -100,7 +100,7 @@ int walker( std::string & result, int& t
-         }
-         xml_file.close();
- 
--        boost::shared_ptr<urdf::ModelInterface> robot = urdf::parseURDF(xml_string);
-+        std::shared_ptr<urdf::ModelInterface> robot = urdf::parseURDF(xml_string);
-         if (!robot) test_result = test_result || 1;
- 
-       }
diff --git a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild b/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
deleted file mode 100644
index 1a73af70cf05..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.1.ebuild b/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
deleted file mode 100644
index afdbbe676ffc..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.2.ebuild b/dev-ros/pr2_description/pr2_description-1.12.2.ebuild
deleted file mode 100644
index afdbbe676ffc..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.3.ebuild b/dev-ros/pr2_description/pr2_description-1.12.3.ebuild
deleted file mode 100644
index 3f2d184f517e..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
diff --git a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
index ab216d560b19..6b8e630a5696 100644
--- a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
+++ b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,8 +13,20 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+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
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
+"
+
+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
index 3f2d184f517e..6b8e630a5696 100644
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ b/dev-ros/pr2_description/pr2_description-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,8 +13,20 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+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
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
+"
+
+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
index 5d5bd3d94fc0..1927c46f9cb0 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -1,22 +1,4 @@
-DIST pr2_common-1.11.10.tar.gz 33338874 BLAKE2B 8f504aaf9ba2fc3d2d07f3e93b30c54e22fc68f8702f3f214fb52e5ad137add256a2e991c86cd1d140bb0f8e98613fdfaf93998d093c0e1a2185cfa82d544f60 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748
-DIST pr2_common-1.11.11.tar.gz 33597551 BLAKE2B 87667f3011e3cf8a786fb1c045647cb5f454832ccc8bad22cadc33eaf67c7b5d7562e653b1d42ae5344521118f85857c3afb0603f250e3ee9588e1ba583ab673 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b
-DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd566b8bd70eee3134b5a28bae8eb93d101bc388c0d01066572a532562b06a05661f2e1f2da205414e772ccdbfef76a5f4 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987
-DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
-DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_machine-1.11.10.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.11.11.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.11.13.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.11.14.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.11.9.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.12.0.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.12.1.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
-EBUILD pr2_machine-1.12.2.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
-EBUILD pr2_machine-1.12.3.ebuild 371 BLAKE2B 890080c116eee84c9b928748f20a59362b4c45ad07ceeb3a5f517c30c184d649ef5cbdf43266dee43cd1c5b218c732e7b3be8d7193e25799dc0072f8f4a251b8 SHA512 250bb1143f90cb18517ae4bcc9ad2386b8c256dea0edb40d513bc865366d67ac54928a0a9bc415ed99a14c4cfe9a72fc22e1bde63d37475195b090e20131c802
-EBUILD pr2_machine-1.12.4.ebuild 371 BLAKE2B 173d0a389e8c5df687bfc93bb6b41a867349fd4e8be048c87036521f314910fb3d554011fd902e2e6cbbbf8e81764149843965628eca7d6a92fb5ab6a2a025b0 SHA512 89e84bdd762bc760e912a82eb826ecc7a44a0652f9b3a02b8de0f0a7f071da7c49f64e337029cd218426807d6cfc478e65853b49efeecac887148d992e0b55d0
-EBUILD pr2_machine-9999.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
+EBUILD pr2_machine-1.12.4.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
+EBUILD pr2_machine-9999.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_machine/pr2_machine-1.11.10.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.10.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.10.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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.11.11.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.11.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.11.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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.11.13.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.13.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.13.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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.11.14.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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.11.9.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.9.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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.12.0.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.0.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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.12.1.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
deleted file mode 100644
index 3a8a32077d50..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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.12.2.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.2.ebuild
deleted file mode 100644
index 3a8a32077d50..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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.12.3.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild
deleted file mode 100644
index ba2219be56f3..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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.12.4.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
index f3906878327d..258bc46816a7 100644
--- a/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
+++ b/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/pr2_machine/pr2_machine-9999.ebuild b/dev-ros/pr2_machine/pr2_machine-9999.ebuild
index 44fd194d9870..258bc46816a7 100644
--- a/dev-ros/pr2_machine/pr2_machine-9999.ebuild
+++ b/dev-ros/pr2_machine/pr2_machine-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index 260e61f6af42..a43761f2560e 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -1,12 +1,4 @@
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_msgs-1.12.0.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-1.12.1.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-1.12.2.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-1.12.3.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-1.12.4.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-9999.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
+EBUILD pr2_msgs-1.12.4.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
+EBUILD pr2_msgs-9999.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.0.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.0.ebuild
deleted file mode 100644
index 98b0538ad185..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.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=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild
deleted file mode 100644
index 98b0538ad185..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.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=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.2.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.2.ebuild
deleted file mode 100644
index 98b0538ad185..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.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=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.3.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.3.ebuild
deleted file mode 100644
index 98b0538ad185..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.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=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
index 98b0538ad185..cbbb022aa76a 100644
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+DESCRIPTION="Messages for representing PR2 state"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild b/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
index 98b0538ad185..cbbb022aa76a 100644
--- a/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
+++ b/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+DESCRIPTION="Messages for representing PR2 state"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/python_cmake_module/Manifest b/dev-ros/python_cmake_module/Manifest
new file mode 100644
index 000000000000..4345175ee119
--- /dev/null
+++ b/dev-ros/python_cmake_module/Manifest
@@ -0,0 +1,4 @@
+DIST python_cmake_module-0.8.0.tar.gz 7026 BLAKE2B 38946d2499ee2d2d6bbdc261453ca9b1d3d3743a5e7b5facd88ce6fc1cd310a475b9a388039ef3a1c6f1990d987b1e7e121bab8b2c993b6cd2034835f4430671 SHA512 8c19ea65c6848c5df1efdbb4134e410af00ffdc9e980f761b448eaee04259fd6faa511c2b7fa8ee1ba2a8c5e3bd0c4a20cc7cdeba534512592a2809cf64f3ab7
+EBUILD python_cmake_module-0.8.0.ebuild 1111 BLAKE2B d3db30003ddc6e0e41164e9788f6c17800950ac8d5e7c8fdda02c24cbe0586f4780c17ea3fcaeb9ae7234e48efd0830f128acc01a4d0d3b2146e650792e1ee51 SHA512 5afccb346a4bb4f5384983cb3e40e573a6301ef07616f283a50a4562601d02caca197386036b994fd956284e2d150d7b2491921c40a6d8506f7f75b47e620d61
+EBUILD python_cmake_module-9999.ebuild 1111 BLAKE2B d3db30003ddc6e0e41164e9788f6c17800950ac8d5e7c8fdda02c24cbe0586f4780c17ea3fcaeb9ae7234e48efd0830f128acc01a4d0d3b2146e650792e1ee51 SHA512 5afccb346a4bb4f5384983cb3e40e573a6301ef07616f283a50a4562601d02caca197386036b994fd956284e2d150d7b2491921c40a6d8506f7f75b47e620d61
+MISC metadata.xml 338 BLAKE2B 09f1c53f00178afd4738a502187b87c5df6d08de21ed2495715cbab52073b307ce335fa2b29e5c4d77d84def4edaa04efa37add566b8d9a7d40a122d44b0e769 SHA512 b1de856f11f458954837430045b05058912bde28badc8c7e9082a66d72e5ded51a5914acbb50adbada11ee123137d25dec76132b17d2ced01d4cea1e67ea30e0
diff --git a/dev-ros/python_cmake_module/metadata.xml b/dev-ros/python_cmake_module/metadata.xml
new file mode 100644
index 000000000000..d627aa8ccfee
--- /dev/null
+++ b/dev-ros/python_cmake_module/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros2/python_cmake_module</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/python_cmake_module/python_cmake_module-0.8.0.ebuild b/dev-ros/python_cmake_module/python_cmake_module-0.8.0.ebuild
new file mode 100644
index 000000000000..7dc30fbf51a0
--- /dev/null
+++ b/dev-ros/python_cmake_module/python_cmake_module-0.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}
+else
+	SRC_URI="https://github.com/ros2/python_cmake_module/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}"
+fi
+
+DESCRIPTION="CMake module with extra functionality for Python"
+HOMEPAGE="https://github.com/ros2/python_cmake_module"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
+	test? (
+		dev-ros/ament_lint_auto
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	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
new file mode 100644
index 000000000000..7dc30fbf51a0
--- /dev/null
+++ b/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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"
+	SRC_URI=""
+	S=${WORKDIR}/${P}
+else
+	SRC_URI="https://github.com/ros2/python_cmake_module/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}"
+fi
+
+DESCRIPTION="CMake module with extra functionality for Python"
+HOMEPAGE="https://github.com/ros2/python_cmake_module"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
+	test? (
+		dev-ros/ament_lint_auto
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	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
index fb568ce93ff9..de1c096f7b48 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,7 +1,4 @@
-AUX var.patch 961 BLAKE2B 5bbf8db95f689cc7d2c0358d0dcccc8856a4318137eeda2f56458d145654bc20b6ed3a6d6df40d89f4f2a654762415776aa0bf8410dafddce5606e3d515e554f SHA512 4b774ae419f56094bb0d059fca1944043c9d8b176195dd6df970407ba7e4e71239fd2ad155c4cfaeb50bad585fea175f08ad7d6911cace5a8a21b0a03c483f52
-DIST python_qt_binding-0.3.4.tar.gz 12255 BLAKE2B bc72aa806098d460e5b884bde7664f295399555d96e10b66791e59a26d1e61dd22aabecf9b40b5d14f61c2c906c18ff3fe2cd03de6108d7d9c2c649d553ab09d SHA512 df5fc2c6a744e66d0c03089e15ce4cfb3890d8fd67d826a3832d22cf99de235e18720c59f737c3ddacefb02dac5571d64042dd862c10ea4c44835063037eb533
-DIST python_qt_binding-0.3.5.tar.gz 12412 BLAKE2B ee2f2537bb1ddceb5cce0ca1963e042d10e5d011cffac25caba1a714c992d975413b7e1c4a23d5472567d4e214f482414dcfc56d499fcbcb0bd5559d7670b484 SHA512 a54ce90008d0893f236533cdda7d3520db264ba3e66b6edf18bac0d6e97975823e3900d1f265a7459813c823c9fc0bce7bb12570de1f8101b588954adeb073b4
-EBUILD python_qt_binding-0.3.4.ebuild 451 BLAKE2B 6b5d59a029849455e72d8e9c684f08ac8eb22eb14f9e391ed61a5e51804890c094aeb454d7dbe1743ddb99bd601f80b9e1a5b8034b183c9a9e81c3a93bf91d44 SHA512 c31c9520e1f7cfb8432be6adeba7694449f7974517d331237ea3c4e48b813895c8a8c2b24440c723fe5d9863385ce69868e16b052c01cbb5e7dc993cead37ab1
-EBUILD python_qt_binding-0.3.5-r1.ebuild 487 BLAKE2B d45bf248919d443956a3bf24e8bfaf7caa60c22d4c492e362b8520384c4c918ec6aa9522d3d071e1ff78c93fae48cdaf9db61cc1ec36479bd3a45566e4380e26 SHA512 3a54046c4fa155820ebc9253f0a708cf2c9b827f033f115a8dbfe96762ae7cbd60fa781d5f3d41c40a58c4009c7eb5f2c401e03880f57ff411c3af5239c6cfc4
-EBUILD python_qt_binding-9999.ebuild 451 BLAKE2B 6b5d59a029849455e72d8e9c684f08ac8eb22eb14f9e391ed61a5e51804890c094aeb454d7dbe1743ddb99bd601f80b9e1a5b8034b183c9a9e81c3a93bf91d44 SHA512 c31c9520e1f7cfb8432be6adeba7694449f7974517d331237ea3c4e48b813895c8a8c2b24440c723fe5d9863385ce69868e16b052c01cbb5e7dc993cead37ab1
+DIST python_qt_binding-0.4.3.tar.gz 12632 BLAKE2B 1403602262a18ce359d153234bb01ff3a6a90e91f9f4a84ddcd0551723c04c493526f51b81f750c90f78005d2c5b78cf77396ecd3132f1c505038bad8639b63d SHA512 103f791a27f8e8dad668a63c0bfc96facd93cbb043541bd036355d62c787759724fe0d66788c587c3cb68486e6d2732039d7c27f567ed48f2ecf21ce98d275af
+EBUILD python_qt_binding-0.4.3.ebuild 449 BLAKE2B f800f81ae45225fa9cb5232862b57d133541e3876296f8f9c089248ec9402279c57d8d45ad9d76052de15888e0bab60839e9ec40a64b3073384535550a6a0579 SHA512 759e21d2aa3400608590ac9f6de37d6c70a545ba122ecd3de5e195e73d402487de1368503d33b56906b028164df38ee4bab4745471386d0f4321e9e1e695e417
+EBUILD python_qt_binding-9999.ebuild 449 BLAKE2B f800f81ae45225fa9cb5232862b57d133541e3876296f8f9c089248ec9402279c57d8d45ad9d76052de15888e0bab60839e9ec40a64b3073384535550a6a0579 SHA512 759e21d2aa3400608590ac9f6de37d6c70a545ba122ecd3de5e195e73d402487de1368503d33b56906b028164df38ee4bab4745471386d0f4321e9e1e695e417
 MISC metadata.xml 349 BLAKE2B bc205c9c90eab1ea292d3e90f9f4a1d769c5202af60c57371152eaf80a50bdf6257cb2bb0ad6070a8443f0d19cc64e8493d5ec43e2701085f96c90ec6187a705 SHA512 f388f612a53c2de0a6cdece5a03d08e583f848592da6763b7995ff80e60756caca49da4318ded57ba09141facf717442141066142ed0691172f4e6b98a5ee266
diff --git a/dev-ros/python_qt_binding/files/var.patch b/dev-ros/python_qt_binding/files/var.patch
deleted file mode 100644
index f0cd56d10a7e..000000000000
--- a/dev-ros/python_qt_binding/files/var.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1b3000d2eccfad651b427de20028a4ca552e9ea7 Mon Sep 17 00:00:00 2001
-From: Hans Gaiser <h.gaiser@fizyr.com>
-Date: Mon, 29 Jul 2019 15:17:39 -0700
-Subject: [PATCH] Replace Qt variable in generated Makefile. (#64)
-
-* Replace Qt variable in generated Makefile.
-
-* use single quotes
----
- cmake/sip_configure.py | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/cmake/sip_configure.py b/cmake/sip_configure.py
-index 49eb866..ce084dd 100644
---- a/cmake/sip_configure.py
-+++ b/cmake/sip_configure.py
-@@ -145,5 +145,14 @@ def split_paths(paths):
- else:
-     makefile.extra_cxxflags.append('-std=c++14')
- 
-+# Finalise the Makefile, preparing it to be saved to disk
-+makefile.finalise()
-+
-+# Replace Qt variables from libraries
-+libs = makefile.LIBS.as_list()
-+for i in range(len(libs)):
-+    libs[i] = libs[i].replace('$$[QT_INSTALL_LIBS]', config.build_macros()['LIBDIR_QT'])
-+makefile.LIBS.set(libs)
-+
- # Generate the Makefile itself
- makefile.generate()
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild
deleted file mode 100644
index 6aed5cfe415e..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
deleted file mode 100644
index c4bda1c59580..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/var.patch" )
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild
new file mode 100644
index 000000000000..1c72ba45c00c
--- /dev/null
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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,\${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
index 6aed5cfe415e..1c72ba45c00c 100644
--- a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
+++ b/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,6 +14,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/PyQt5[gui,widgets,\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_dotgraph/Manifest b/dev-ros/qt_dotgraph/Manifest
index 6c276ece205a..fdcde1e9962e 100644
--- a/dev-ros/qt_dotgraph/Manifest
+++ b/dev-ros/qt_dotgraph/Manifest
@@ -1,30 +1,6 @@
-DIST qt_gui_core-0.2.29.tar.gz 85881 BLAKE2B f88853320237b410fa9231c85ad44f930d0e457f738214132a964f1c925048d3c31d73cf0a12573a9cafc3ea9304e1efe25144d168b88a120b64b3ccecbb57ed SHA512 958526a3bd76070e121d75a82c589894aef980870091cb853802fcb60328b54cbc95ee0c9eececa18e24608808cca2c722c5699b662c2a578f150995171d71db
-DIST qt_gui_core-0.2.30.tar.gz 86567 BLAKE2B a40e15ba1925db8afee2daffed2f2fbb3c242ecf84bc01d561b582ec561960e74e362d1ff0337e3100c3e050d63d3b9e5437ad0579f5580329f9af5e42cfd13d SHA512 4a9671c8814f16a371e77840d6df268e763ce5932d6e85842af34ee5322701ffa19d97d4d75b4fb6d4d272497281462296dc9cfc25d4efd96246a88a8ee08978
-DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5600adafef2d5ac59963222f0cfeda6bcc2aaaf18dcfc75fd6ed03771203503b1c44817c83f32c5cbb8d5a06d51e4 SHA512 6b14dafdc087f3fccfeacf2aedd438b069cd3592d6f834ba0d277107da936bbf0d3a40d0cd18468615fd9c508fb1fc5109ef83c4970031a7dca923b85270b385
-DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
-DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
-DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
-DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
-DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
-DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
-DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
-DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
-DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
-DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
-EBUILD qt_dotgraph-0.2.29.ebuild 545 BLAKE2B 6c79468a06604ee7ce7827ef7004cc0a70c90f387110a5664843e54ae9def5c75b4cfe97887e036b2511cbc4ae98ce88d3d076553bf29b21990f98007b471195 SHA512 27cfe95c5cae2fbf2add6c10ef15399b5808871438cf08cc21b1426089995833a2f516accef28041247e98e5127d463e792e66f728e69a07e455e18fe388414c
-EBUILD qt_dotgraph-0.2.30.ebuild 545 BLAKE2B 6c79468a06604ee7ce7827ef7004cc0a70c90f387110a5664843e54ae9def5c75b4cfe97887e036b2511cbc4ae98ce88d3d076553bf29b21990f98007b471195 SHA512 27cfe95c5cae2fbf2add6c10ef15399b5808871438cf08cc21b1426089995833a2f516accef28041247e98e5127d463e792e66f728e69a07e455e18fe388414c
-EBUILD qt_dotgraph-0.3.0.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
-EBUILD qt_dotgraph-0.3.1.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
-EBUILD qt_dotgraph-0.3.10.ebuild 553 BLAKE2B d05e4dc3e31ff1773fb74855149781ef396c36e59e1ff5322475ae7fe8bf4b8530473731a9ddfaaa9b69dab8958ef5c483e896cc61562c53180430cd0280e93e SHA512 74b31226705f4dabdfae9565713ecec395a37a18631a7cebb166d7acc04e299ee58eddebe29f09d54b743f82b8283adef3b4dfac0e10ccf5d37a5433916f33e7
-EBUILD qt_dotgraph-0.3.11.ebuild 553 BLAKE2B d05e4dc3e31ff1773fb74855149781ef396c36e59e1ff5322475ae7fe8bf4b8530473731a9ddfaaa9b69dab8958ef5c483e896cc61562c53180430cd0280e93e SHA512 74b31226705f4dabdfae9565713ecec395a37a18631a7cebb166d7acc04e299ee58eddebe29f09d54b743f82b8283adef3b4dfac0e10ccf5d37a5433916f33e7
-EBUILD qt_dotgraph-0.3.16.ebuild 550 BLAKE2B 6ceaf06cf9e4618ab8168c1129866c3a0f4fdb7a4f3cb72c52ad0cfde00ff6577549c1ec78cb92498571207c4689c570bbc986b3c7b1c26a375895bd37da6ee7 SHA512 286ead177c5165d1b3d97ad13495c25f76cfe67edf8a70046f1e05f2ec0a55da1e73e9e0e2eeeb83885a0356ea6e061c2bb64be20397cd129df5bd982cc34716
-EBUILD qt_dotgraph-0.3.2.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
-EBUILD qt_dotgraph-0.3.3.ebuild 553 BLAKE2B 49b8d54ee7048bbeca3bc612e0cc55dbbcb6f1ffc69e0054f6dac39e5efc875f3af8729351afbe469904d5c0d3ad6e3523310d55fa9de0fef727d21d8d9fd7b4 SHA512 7cc3b353b875b38382df6164d8d94f233c023c3bf2c85871cba156332e508ed4f05b2f485812deeadcb574e0dcf99465bdc2078eb8c415c077d18ff9556163cc
-EBUILD qt_dotgraph-0.3.4.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
-EBUILD qt_dotgraph-0.3.5.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
-EBUILD qt_dotgraph-0.3.6.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
-EBUILD qt_dotgraph-0.3.8.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
-EBUILD qt_dotgraph-0.3.9.ebuild 553 BLAKE2B d05e4dc3e31ff1773fb74855149781ef396c36e59e1ff5322475ae7fe8bf4b8530473731a9ddfaaa9b69dab8958ef5c483e896cc61562c53180430cd0280e93e SHA512 74b31226705f4dabdfae9565713ecec395a37a18631a7cebb166d7acc04e299ee58eddebe29f09d54b743f82b8283adef3b4dfac0e10ccf5d37a5433916f33e7
-EBUILD qt_dotgraph-9999.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
+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 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.2.29.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.2.29.ebuild
deleted file mode 100644
index 20f5bf17eb49..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.2.29.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.2.30.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.2.30.ebuild
deleted file mode 100644
index 20f5bf17eb49..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.2.30.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.0.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.0.ebuild
deleted file mode 100644
index 742b7c8cb20d..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.1.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.1.ebuild
deleted file mode 100644
index 742b7c8cb20d..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.10.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.10.ebuild
deleted file mode 100644
index e833e27d3446..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.11.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.11.ebuild
deleted file mode 100644
index e833e27d3446..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.16.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.16.ebuild
deleted file mode 100644
index 84ed9c280cf1..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.2.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.2.ebuild
deleted file mode 100644
index 742b7c8cb20d..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.3.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.3.ebuild
deleted file mode 100644
index be2b95520f75..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.4.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.4.ebuild
deleted file mode 100644
index baaafdccdb45..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.5.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.5.ebuild
deleted file mode 100644
index baaafdccdb45..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.6.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.6.ebuild
deleted file mode 100644
index baaafdccdb45..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.8.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.8.ebuild
deleted file mode 100644
index baaafdccdb45..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.9.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.9.ebuild
deleted file mode 100644
index e833e27d3446..000000000000
--- a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Helpers to work with dot graphs"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.4.1.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.4.1.ebuild
new file mode 100644
index 000000000000..5dd8cebe50df
--- /dev/null
+++ b/dev-ros/qt_dotgraph/qt_dotgraph-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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
new file mode 100644
index 000000000000..5dd8cebe50df
--- /dev/null
+++ b/dev-ros/qt_dotgraph/qt_dotgraph-0.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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
index 742b7c8cb20d..5dd8cebe50df 100644
--- a/dev-ros/qt_dotgraph/qt_dotgraph-9999.ebuild
+++ b/dev-ros/qt_dotgraph/qt_dotgraph-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,11 +15,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pydot[\${PYTHON_USEDEP}]")
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		$(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
index 7c7fde29e8ad..a5cd6bd220b8 100644
--- a/dev-ros/qt_gui/Manifest
+++ b/dev-ros/qt_gui/Manifest
@@ -1,18 +1,6 @@
-DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
-DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
-DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
-DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
-DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
-DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
-DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
-EBUILD qt_gui-0.3.10.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
-EBUILD qt_gui-0.3.11.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
-EBUILD qt_gui-0.3.16.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
-EBUILD qt_gui-0.3.4-r1.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
-EBUILD qt_gui-0.3.5.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
-EBUILD qt_gui-0.3.6.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
-EBUILD qt_gui-0.3.8.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
-EBUILD qt_gui-0.3.9.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
-EBUILD qt_gui-9999.ebuild 520 BLAKE2B a83c11ddf4ad14b8523bd2a2f90bf3b0e43cd43876f4f00e0c849211ea1f95a7fa365b6a01c036550d6123fd4c14ea395af1520b5bf53931b74853d21bfb4eaf SHA512 602648c86b3f815ea662c6e950bce02fb0e03f8d5bdbd8519214125c698e2906b2c1d64c2a2a2e92647929ec307a68a228111c36d742f75eaaf940257f42f35d
+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 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui/qt_gui-0.3.10.ebuild b/dev-ros/qt_gui/qt_gui-0.3.10.ebuild
deleted file mode 100644
index 37de1e211723..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.3.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.3.11.ebuild b/dev-ros/qt_gui/qt_gui-0.3.11.ebuild
deleted file mode 100644
index 37de1e211723..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.3.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.3.16.ebuild b/dev-ros/qt_gui/qt_gui-0.3.16.ebuild
deleted file mode 100644
index 37de1e211723..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.3.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.3.4-r1.ebuild b/dev-ros/qt_gui/qt_gui-0.3.4-r1.ebuild
deleted file mode 100644
index 37de1e211723..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.3.4-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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.3.5.ebuild b/dev-ros/qt_gui/qt_gui-0.3.5.ebuild
deleted file mode 100644
index 37de1e211723..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.3.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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.3.6.ebuild b/dev-ros/qt_gui/qt_gui-0.3.6.ebuild
deleted file mode 100644
index 37de1e211723..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.3.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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.3.8.ebuild b/dev-ros/qt_gui/qt_gui-0.3.8.ebuild
deleted file mode 100644
index 37de1e211723..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.3.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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.3.9.ebuild b/dev-ros/qt_gui/qt_gui-0.3.9.ebuild
deleted file mode 100644
index 37de1e211723..000000000000
--- a/dev-ros/qt_gui/qt_gui-0.3.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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui/qt_gui-0.4.1.ebuild b/dev-ros/qt_gui/qt_gui-0.4.1.ebuild
new file mode 100644
index 000000000000..13d36a028a20
--- /dev/null
+++ b/dev-ros/qt_gui/qt_gui-0.4.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
new file mode 100644
index 000000000000..13d36a028a20
--- /dev/null
+++ b/dev-ros/qt_gui/qt_gui-0.4.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
index 37de1e211723..13d36a028a20 100644
--- a/dev-ros/qt_gui/qt_gui-9999.ebuild
+++ b/dev-ros/qt_gui/qt_gui-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -17,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-qt/qtcore:5
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	$(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
index 85e3bff2fd2e..fda00a2d46e7 100644
--- a/dev-ros/qt_gui_app/Manifest
+++ b/dev-ros/qt_gui_app/Manifest
@@ -1,30 +1,6 @@
-DIST qt_gui_core-0.2.29.tar.gz 85881 BLAKE2B f88853320237b410fa9231c85ad44f930d0e457f738214132a964f1c925048d3c31d73cf0a12573a9cafc3ea9304e1efe25144d168b88a120b64b3ccecbb57ed SHA512 958526a3bd76070e121d75a82c589894aef980870091cb853802fcb60328b54cbc95ee0c9eececa18e24608808cca2c722c5699b662c2a578f150995171d71db
-DIST qt_gui_core-0.2.30.tar.gz 86567 BLAKE2B a40e15ba1925db8afee2daffed2f2fbb3c242ecf84bc01d561b582ec561960e74e362d1ff0337e3100c3e050d63d3b9e5437ad0579f5580329f9af5e42cfd13d SHA512 4a9671c8814f16a371e77840d6df268e763ce5932d6e85842af34ee5322701ffa19d97d4d75b4fb6d4d272497281462296dc9cfc25d4efd96246a88a8ee08978
-DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5600adafef2d5ac59963222f0cfeda6bcc2aaaf18dcfc75fd6ed03771203503b1c44817c83f32c5cbb8d5a06d51e4 SHA512 6b14dafdc087f3fccfeacf2aedd438b069cd3592d6f834ba0d277107da936bbf0d3a40d0cd18468615fd9c508fb1fc5109ef83c4970031a7dca923b85270b385
-DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
-DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
-DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
-DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
-DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
-DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
-DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
-DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
-DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
-DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
-EBUILD qt_gui_app-0.2.29.ebuild 464 BLAKE2B 5531374910a3174eebb0e2f5a7aacf45cc8cc8620274554c01366e080edc010c2b86c2217428a8455bddb0db1e16c632f17f7d8dbb91cc89d16be40f5e2172c0 SHA512 03673f5a04840269b565b004b13d159f6e5792c3b1954cfe1debb7eff6179fd318d87ec4f2f864720374789f147e4e4a9f39d0ab2d96835e24167c7a3a0e71ca
-EBUILD qt_gui_app-0.2.30.ebuild 464 BLAKE2B 5531374910a3174eebb0e2f5a7aacf45cc8cc8620274554c01366e080edc010c2b86c2217428a8455bddb0db1e16c632f17f7d8dbb91cc89d16be40f5e2172c0 SHA512 03673f5a04840269b565b004b13d159f6e5792c3b1954cfe1debb7eff6179fd318d87ec4f2f864720374789f147e4e4a9f39d0ab2d96835e24167c7a3a0e71ca
-EBUILD qt_gui_app-0.3.0.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
-EBUILD qt_gui_app-0.3.1.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
-EBUILD qt_gui_app-0.3.10.ebuild 472 BLAKE2B 10e1f7ed5ad94b8a36a1e8b07a417863968c97dc1429978bdf5559a2bfc23bb40ad077901366866806491bf376d3703f5003a6c29e85e6e7e6b8b1c3c9207206 SHA512 f147ce42b400b464cf7e6cab0be3fccf3eba04330cd270a16595ed31d75fbf77d8625e9f225d5ab24992e64a72a20deecfb2237fe6ee1082043180234990e90e
-EBUILD qt_gui_app-0.3.11.ebuild 472 BLAKE2B 10e1f7ed5ad94b8a36a1e8b07a417863968c97dc1429978bdf5559a2bfc23bb40ad077901366866806491bf376d3703f5003a6c29e85e6e7e6b8b1c3c9207206 SHA512 f147ce42b400b464cf7e6cab0be3fccf3eba04330cd270a16595ed31d75fbf77d8625e9f225d5ab24992e64a72a20deecfb2237fe6ee1082043180234990e90e
-EBUILD qt_gui_app-0.3.16.ebuild 469 BLAKE2B 1721c6c097e508af94dcb4dbdb2cf6bb2858a730c63a02a820b64345a76f921efb44c59e135491be7bd99393bd64e9a642598550bfcd2e775fdf850c09ac6037 SHA512 5ba34cee59bc3df2951cd49adb7cf6917e0fdfc7deba729712313b791ac375c4a468c9cd506ea87aba507f770f8fb8c7eaff9b3df6745199e09211419e8287f1
-EBUILD qt_gui_app-0.3.2.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
-EBUILD qt_gui_app-0.3.3.ebuild 472 BLAKE2B 976f77da58f76de0c76f2304b6a58cbcd2a2ecf9d4ba87bc1f0c196da66ab990215e4f3a4cbfb8a89a0e332b2f73f2eaabba2c5c4a283c4d912002fe5cf30393 SHA512 dc52f8080944b02eaadcb1367fb257e1409ac4f491a168dab8d99c0b077da13503fcaa5035d4c4631ef4f0ad3d65d4a55d977e1fb3d3a29a3fe605458cec156d
-EBUILD qt_gui_app-0.3.4.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
-EBUILD qt_gui_app-0.3.5.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
-EBUILD qt_gui_app-0.3.6.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
-EBUILD qt_gui_app-0.3.8.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
-EBUILD qt_gui_app-0.3.9.ebuild 472 BLAKE2B 10e1f7ed5ad94b8a36a1e8b07a417863968c97dc1429978bdf5559a2bfc23bb40ad077901366866806491bf376d3703f5003a6c29e85e6e7e6b8b1c3c9207206 SHA512 f147ce42b400b464cf7e6cab0be3fccf3eba04330cd270a16595ed31d75fbf77d8625e9f225d5ab24992e64a72a20deecfb2237fe6ee1082043180234990e90e
-EBUILD qt_gui_app-9999.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
+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 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.2.29.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.2.29.ebuild
deleted file mode 100644
index acfba92f8cf0..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.2.29.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.2.30.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.2.30.ebuild
deleted file mode 100644
index acfba92f8cf0..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.2.30.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.0.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.0.ebuild
deleted file mode 100644
index bca6c4fa19d8..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.1.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.1.ebuild
deleted file mode 100644
index bca6c4fa19d8..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.10.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.10.ebuild
deleted file mode 100644
index 636659bf583e..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.11.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.11.ebuild
deleted file mode 100644
index 636659bf583e..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.11.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.16.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.16.ebuild
deleted file mode 100644
index ac649ae4f0f2..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.16.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.2.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.2.ebuild
deleted file mode 100644
index bca6c4fa19d8..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.3.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.3.ebuild
deleted file mode 100644
index 1393799340a7..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.4.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.4.ebuild
deleted file mode 100644
index f157b289188e..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.5.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.5.ebuild
deleted file mode 100644
index f157b289188e..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.6.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.6.ebuild
deleted file mode 100644
index f157b289188e..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.8.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.8.ebuild
deleted file mode 100644
index f157b289188e..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.9.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.9.ebuild
deleted file mode 100644
index 636659bf583e..000000000000
--- a/dev-ros/qt_gui_app/qt_gui_app-0.3.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.4.1.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.4.1.ebuild
new file mode 100644
index 000000000000..da15e6be0295
--- /dev/null
+++ b/dev-ros/qt_gui_app/qt_gui_app-0.4.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
new file mode 100644
index 000000000000..da15e6be0295
--- /dev/null
+++ b/dev-ros/qt_gui_app/qt_gui_app-0.4.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
index bca6c4fa19d8..da15e6be0295 100644
--- a/dev-ros/qt_gui_app/qt_gui_app-9999.ebuild
+++ b/dev-ros/qt_gui_app/qt_gui_app-9999.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
+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_USEDEP}]
+	>=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
index c9871715b844..06bd956ecd99 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,5 +1,8 @@
 AUX libdir.patch 864 BLAKE2B c104517d108824d13455565cecbeac0886c60cc042bcab4ffd9961be7096117342157a0da0bb4912e18179bca5c40d8391be8d162ac9f07a7b4a5c8a3d65f4c5 SHA512 16960a3224f982cf3b55904d5c5370a715aed2a7dfd6f98ecc21af1f70fd527e84b1ee10f127e45251a149abb165aed06e595c73f7deda88f84548fb4c7cb717
-DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
-EBUILD qt_gui_cpp-0.3.16.ebuild 742 BLAKE2B 1fa243ce03487123a5a13af0887b7431da00461c8f658760c2844b646b2c841d9da83d5ffdcc33ae30c62cfebf2084a65d8a8aba69b746ae8adad94bd8b807d7 SHA512 f48f4e4038f50bcc0e3c5786808898fd228b6ff13624c11d49b465434290faf71cc16c431e65de4e5cec65da5b604efb7dd01ff445c79975bb0f3cce10993e9a
-EBUILD qt_gui_cpp-9999.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
+AUX sip.patch 703 BLAKE2B 8ab944d7ebad99070a8f3b9f3f327e5c763a48fe34303771655e498e112d05ae6855a81438e14ead305b6f8818abc996a2d52f1ad24433cfe21cc9f6cec8fd75 SHA512 045f3801407dc59ae50593e6d481afe2ed45abc86845a515d8ade4543710ccc0fa39f6564ea3ad150a06a0d0076647839a15c783da063179c6dc9072e07e2f99
+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_cpp-0.4.1.ebuild 797 BLAKE2B c0e7aa99b7438690b5f1d52891705362a10daf64673a44f48fc5bc184125dd65c9fb194acc9bd85013070d80514899f05b17e2693fde7f8c0d62f39f8907752b SHA512 6f6d444d0fa41294a7fb5956deac1f2242be17c197d40f169cf17bdbd6b0902d4dfd49d56ced102e468357a5201752fd445427a69f779a9b857031988f06d877
+EBUILD qt_gui_cpp-0.4.2.ebuild 772 BLAKE2B 5af95a34039ac353072b20e9b5f7b655a4287113fa88fdb6ce8bb9fe50b6ba4e1e98333ca5ef09c9c4f8acc6896df4ac9df98577526af7e5fe834ff8c18ab58b SHA512 57a1de4d91e349cca601b2b1b88de828ecbfd66475521d124acbf02f2246cca66b15940a84b0e9a28014c732ad0e253d45e919c1a61a85306abcddcd3fd4dc60
+EBUILD qt_gui_cpp-9999.ebuild 772 BLAKE2B 5af95a34039ac353072b20e9b5f7b655a4287113fa88fdb6ce8bb9fe50b6ba4e1e98333ca5ef09c9c4f8acc6896df4ac9df98577526af7e5fe834ff8c18ab58b SHA512 57a1de4d91e349cca601b2b1b88de828ecbfd66475521d124acbf02f2246cca66b15940a84b0e9a28014c732ad0e253d45e919c1a61a85306abcddcd3fd4dc60
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_cpp/files/sip.patch b/dev-ros/qt_gui_cpp/files/sip.patch
new file mode 100644
index 000000000000..8157a9bc68d7
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/files/sip.patch
@@ -0,0 +1,25 @@
+From 5ecb3a219146816916c4a94e32664850548a2085 Mon Sep 17 00:00:00 2001
+From: Johannes Meyer <johannes@intermodalics.eu>
+Date: Tue, 7 Jul 2020 01:20:51 +0200
+Subject: [PATCH] qt_gui_cpp_sip: declare private assignment operator for SIP
+ (#226)
+
+---
+ qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip b/qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip
+index 286d52e6..1d37a37d 100644
+--- a/src/qt_gui_cpp_sip/plugin_context.sip
++++ b/src/qt_gui_cpp_sip/plugin_context.sip
+@@ -25,6 +25,10 @@ public:
+ 
+   void reloadPlugin();
+ 
++private:
++
++  PluginContext& operator=(const PluginContext&);
++
+ };
+ 
+ };
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild
deleted file mode 100644
index 359593ee4556..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Foundation for C++-bindings for dev-ros/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_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild
new file mode 100644
index 000000000000..c4d73b4fc0d7
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 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="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}/sip.patch"
+)
+
+# FIXME: fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild
new file mode 100644
index 000000000000..1f52f6afc836
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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="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"
+)
+
+# FIXME: fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
index 0216c3788c0b..1f52f6afc836 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
+DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -20,9 +19,9 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	>=dev-ros/pluginlib-1.9.23
 		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
+	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
@@ -32,3 +31,6 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/libdir.patch"
 )
+
+# FIXME: fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/qt_gui_py_common/Manifest b/dev-ros/qt_gui_py_common/Manifest
index fefdbacf0e6e..81bb6146ecff 100644
--- a/dev-ros/qt_gui_py_common/Manifest
+++ b/dev-ros/qt_gui_py_common/Manifest
@@ -1,30 +1,6 @@
-DIST qt_gui_core-0.2.29.tar.gz 85881 BLAKE2B f88853320237b410fa9231c85ad44f930d0e457f738214132a964f1c925048d3c31d73cf0a12573a9cafc3ea9304e1efe25144d168b88a120b64b3ccecbb57ed SHA512 958526a3bd76070e121d75a82c589894aef980870091cb853802fcb60328b54cbc95ee0c9eececa18e24608808cca2c722c5699b662c2a578f150995171d71db
-DIST qt_gui_core-0.2.30.tar.gz 86567 BLAKE2B a40e15ba1925db8afee2daffed2f2fbb3c242ecf84bc01d561b582ec561960e74e362d1ff0337e3100c3e050d63d3b9e5437ad0579f5580329f9af5e42cfd13d SHA512 4a9671c8814f16a371e77840d6df268e763ce5932d6e85842af34ee5322701ffa19d97d4d75b4fb6d4d272497281462296dc9cfc25d4efd96246a88a8ee08978
-DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5600adafef2d5ac59963222f0cfeda6bcc2aaaf18dcfc75fd6ed03771203503b1c44817c83f32c5cbb8d5a06d51e4 SHA512 6b14dafdc087f3fccfeacf2aedd438b069cd3592d6f834ba0d277107da936bbf0d3a40d0cd18468615fd9c508fb1fc5109ef83c4970031a7dca923b85270b385
-DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
-DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
-DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
-DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
-DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
-DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
-DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
-DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
-DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
-DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
-EBUILD qt_gui_py_common-0.2.29.ebuild 487 BLAKE2B dd04f9e94dd975d7d0a7f8b91d26bc321504690ac81abf43f03dc82c994d8299243eb0a7f81121c2857af6152eed84f95d119a8dcedb80bffe0c2f84b9fc4ac0 SHA512 869826c0dddce1a231bf9ce36379ac578eb4f957b5ed5e769e81ddc88e45819b2be08e660c1ccf369131c672c1b2bea2ce9332a5abbf6a58a855d2657bf6a2a6
-EBUILD qt_gui_py_common-0.2.30.ebuild 487 BLAKE2B dd04f9e94dd975d7d0a7f8b91d26bc321504690ac81abf43f03dc82c994d8299243eb0a7f81121c2857af6152eed84f95d119a8dcedb80bffe0c2f84b9fc4ac0 SHA512 869826c0dddce1a231bf9ce36379ac578eb4f957b5ed5e769e81ddc88e45819b2be08e660c1ccf369131c672c1b2bea2ce9332a5abbf6a58a855d2657bf6a2a6
-EBUILD qt_gui_py_common-0.3.0.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
-EBUILD qt_gui_py_common-0.3.1.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
-EBUILD qt_gui_py_common-0.3.10.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
-EBUILD qt_gui_py_common-0.3.11.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
-EBUILD qt_gui_py_common-0.3.16.ebuild 492 BLAKE2B c3f64ebe4c95427f8143091675d9cc2387d07261ccf657ff16960ba150d0c4b307766ff82b510162c66143288fdf089c83701f5b74b3d8114fa7ff7f667fc323 SHA512 4b57439a27235c4bfaffc8507eaee9b3fc337045c4c030868c26a93b32957591960512c67df8c266df0f247b733b0c14b4b1145932c6c3a1fcac2378fe27d603
-EBUILD qt_gui_py_common-0.3.2.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
-EBUILD qt_gui_py_common-0.3.3.ebuild 495 BLAKE2B c73ccdb054e9a6e657eefe7471a983f8c7b6907b90c61ccab41a07e04647b57b1c8724e974de394caa76460953023783fa68382a683472fad1c986d18880fe4b SHA512 8413e1bf77163b55a3caa9dcf760576db4de7953a2b44aeb20c0940b6ffff103da58fd6fa5f0c57383c566d419ce26076864095507ca4568ebbfe16ac0d942fe
-EBUILD qt_gui_py_common-0.3.4.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
-EBUILD qt_gui_py_common-0.3.5.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
-EBUILD qt_gui_py_common-0.3.6.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
-EBUILD qt_gui_py_common-0.3.8.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
-EBUILD qt_gui_py_common-0.3.9.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
-EBUILD qt_gui_py_common-9999.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
+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 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.29.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.29.ebuild
deleted file mode 100644
index 5f2edfe5895d..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.29.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.30.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.30.ebuild
deleted file mode 100644
index 5f2edfe5895d..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.30.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.0.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.0.ebuild
deleted file mode 100644
index 9af608795a0d..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.1.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.1.ebuild
deleted file mode 100644
index 9af608795a0d..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild
deleted file mode 100644
index 249bfcd6004e..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.11.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.11.ebuild
deleted file mode 100644
index 249bfcd6004e..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild
deleted file mode 100644
index 7933e8e1843c..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.2.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.2.ebuild
deleted file mode 100644
index 9af608795a0d..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.3.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.3.ebuild
deleted file mode 100644
index 81b2407af430..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.4.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.4.ebuild
deleted file mode 100644
index 87a1c621b8d2..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.5.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.5.ebuild
deleted file mode 100644
index 87a1c621b8d2..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.6.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.6.ebuild
deleted file mode 100644
index 87a1c621b8d2..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.8.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.8.ebuild
deleted file mode 100644
index 87a1c621b8d2..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild
deleted file mode 100644
index 249bfcd6004e..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/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
new file mode 100644
index 000000000000..a642b1ac2af7
--- /dev/null
+++ b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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
new file mode 100644
index 000000000000..a642b1ac2af7
--- /dev/null
+++ b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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
index 9af608795a0d..a642b1ac2af7 100644
--- 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
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	$(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
index 0f300ff50743..4ca958e7a987 100644
--- a/dev-ros/random_numbers/Manifest
+++ b/dev-ros/random_numbers/Manifest
@@ -1,6 +1,4 @@
-DIST random_numbers-0.3.1.tar.gz 6862 BLAKE2B 8713551632d0842457011b9186ddc2fe1fe6ef6c6b9805b46f7e466ec356685e055d7f499036082173db3dfa32d2c46636dc9bcd1cd2006c04ded531f8cef6bc SHA512 d563fceb9398a4456bda378d01fc24bf0c80e5c2cd36c9d9692bcf6c49aef2da02644cf2c4b2bc1e6c805e93957c4bf5234dc0294fa89ca31f893efa676ad29b
 DIST random_numbers-0.3.2.tar.gz 6952 BLAKE2B ed2be18d8e6cc036689d413335030fe501aeecdb95ac5c12d5ebaf21759d8fd45af6d7c34cb6ae903e2002cf791ab823f8f65552fd8a58eeb5838829ffe6060f SHA512 13145f91b846c97f3dc0d9dc290e237060968251a78f1648acb5aefcdea0569586daa3531f2840829ac8261ca046e20e03c39ded6dcd060cf4917375ac6bd918
-EBUILD random_numbers-0.3.1.ebuild 415 BLAKE2B 6c2edf51c3829d7b8ca2b3ab1461faebdca49eb72bc65be1b09e1407504eaac12fd8f0cb48aee17e5259c7f50ea6bd308621a4417b519a1cd830b1a271e713a4 SHA512 bec0c6f62c73377affd9457a7ccf039b1e3819afafeefe5fb6928dcf677cd2162563ef1b2fb8610a98650e708fede8d226cb981cf03ef735b0037a2f0338d213
-EBUILD random_numbers-0.3.2.ebuild 415 BLAKE2B 2fd8da6ab1de80a5512984f1f9203228522b03a3ec0f65174cc136e4226a3a8153716098b3d37cf6b82417a3c8fa964ce63d0cb0432a139dddfeb438efb1e67f SHA512 ee4050ed244d798b3f8d7ecad5ebefb8f8b1261a4c20d3312f7ae0c44558448272a08bab02c35e86426895453167d3a57009fc728a75357a275113a29e3228a4
-EBUILD random_numbers-9999.ebuild 415 BLAKE2B 6c2edf51c3829d7b8ca2b3ab1461faebdca49eb72bc65be1b09e1407504eaac12fd8f0cb48aee17e5259c7f50ea6bd308621a4417b519a1cd830b1a271e713a4 SHA512 bec0c6f62c73377affd9457a7ccf039b1e3819afafeefe5fb6928dcf677cd2162563ef1b2fb8610a98650e708fede8d226cb981cf03ef735b0037a2f0338d213
+EBUILD random_numbers-0.3.2.ebuild 393 BLAKE2B 8c916ed6dd170d93a28da87d2fb227a05eb4259fe560bb036fdfb4fb24eb34bd0649f82a952a35baac54b20317154b4ddc972b205de568660276a92c1e7eb471 SHA512 2854ba951fb34e4fc6c040f99ba61c8bc40dc31bf50dc9277447d125563698feb3ce7da0ab770c4f70163c8f9d270b3af004d7e90c83bf13044dc0bfc8d2a8fc
+EBUILD random_numbers-9999.ebuild 393 BLAKE2B 8c916ed6dd170d93a28da87d2fb227a05eb4259fe560bb036fdfb4fb24eb34bd0649f82a952a35baac54b20317154b4ddc972b205de568660276a92c1e7eb471 SHA512 2854ba951fb34e4fc6c040f99ba61c8bc40dc31bf50dc9277447d125563698feb3ce7da0ab770c4f70163c8f9d270b3af004d7e90c83bf13044dc0bfc8d2a8fc
 MISC metadata.xml 341 BLAKE2B b52749228c01eeb9445d367b44e60b0c10d61bb0ce0eb7e2d31537f947495e82d38acef93a27cd526373b764fcf0e2a5041145efc405a2406676f5080cf6604e SHA512 a6f35054eae994571e997e56a7b89cfe7aca8494545692e74cd051cc4255040b69380eeef460b419d59e9dccc9b1b4b320a8760075cb1f47c2b17032db55a8ad
diff --git a/dev-ros/random_numbers/random_numbers-0.3.1.ebuild b/dev-ros/random_numbers/random_numbers-0.3.1.ebuild
deleted file mode 100644
index d22e04fe0118..000000000000
--- a/dev-ros/random_numbers/random_numbers-0.3.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-planning/random_numbers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Wrappers for generating floating point values, integers, quaternions using boost libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/random_numbers/random_numbers-0.3.2.ebuild b/dev-ros/random_numbers/random_numbers-0.3.2.ebuild
index fb9faa3f46bd..9501f20a103b 100644
--- a/dev-ros/random_numbers/random_numbers-0.3.2.ebuild
+++ b/dev-ros/random_numbers/random_numbers-0.3.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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, quaternions using boost libraries"
+DESCRIPTION="Wrappers for generating floating point values, integers and quaternions"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/random_numbers/random_numbers-9999.ebuild b/dev-ros/random_numbers/random_numbers-9999.ebuild
index d22e04fe0118..9501f20a103b 100644
--- a/dev-ros/random_numbers/random_numbers-9999.ebuild
+++ b/dev-ros/random_numbers/random_numbers-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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, quaternions using boost libraries"
+DESCRIPTION="Wrappers for generating floating point values, integers and quaternions"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/realtime_tools/Manifest b/dev-ros/realtime_tools/Manifest
index c9719d3e4ff6..a491449e9ad9 100644
--- a/dev-ros/realtime_tools/Manifest
+++ b/dev-ros/realtime_tools/Manifest
@@ -1,8 +1,5 @@
-DIST realtime_tools-1.10.0.tar.gz 9069 BLAKE2B dba6070ec3fec4e04b9f5c7a4b7eab79acbf9293445ad8c8c985adf0ae09d0b1c213c161c4384e0372eb58742ff59a3c7ac29a65c2bd33c2aa1457bcfe461987 SHA512 e9e87813249078f9dc0375eac61432d14f54a572060b99bdf312a7c06cc7b8b562dd1bb541b7636ab3c68aeafc87a74e084b1719e661eb48bb74e5f778a3eff4
-DIST realtime_tools-1.11.0.tar.gz 8770 BLAKE2B 0947bc0f0fde21a40457af12d549ae561398dbd36f3dcc943347e52276acd5ed13ee5de0af304832a18261180cf29b884cbcf4d1825b64635649b79d0769a88e SHA512 93f17646587a1094bf10d94539d727d5da56656b60041544006c5ad520f454adb98440f9cf2c1fa3f95027a3d296b13594117bcb111766e85fe60d1363fd98f5
-DIST realtime_tools-1.12.0.tar.gz 9302 BLAKE2B 3f8c6092cef3250e654102c201638e354e8cb744a5b7bc67f28767c1bf358b72ba1027d730121a029ae64aa67be29643898f2753b874a22d78d1f1267102e95d SHA512 703d0e0714a5e8c3ee7e37bb286a7796d95157e82ce84f952585903d26093ab708f3ddbb032befe2a981df28e6eeb6120f204811830b4c337fae438c2ba11ef5
-EBUILD realtime_tools-1.10.0.ebuild 487 BLAKE2B 8ad93db686c9db15ed0bea141a58a3135f008634b3ca2b05fdec4a140ddd4e8b6253e2136ed4cd6eb8fe72534fd7acfa04b077ac6911cbf6c452a796898c7908 SHA512 fed10f9d157a403f0d76cb7179cb8dadc92ef0a1f955619d8dc15ddfbb1ca5e3a3bd1dfe6ce6302a2ab1ca7a78bb17d36f7ca495c7c745bf4786f03f827dfa1e
-EBUILD realtime_tools-1.11.0.ebuild 487 BLAKE2B 8ad93db686c9db15ed0bea141a58a3135f008634b3ca2b05fdec4a140ddd4e8b6253e2136ed4cd6eb8fe72534fd7acfa04b077ac6911cbf6c452a796898c7908 SHA512 fed10f9d157a403f0d76cb7179cb8dadc92ef0a1f955619d8dc15ddfbb1ca5e3a3bd1dfe6ce6302a2ab1ca7a78bb17d36f7ca495c7c745bf4786f03f827dfa1e
-EBUILD realtime_tools-1.12.0.ebuild 487 BLAKE2B 3e8afa35f9add7da33d890e216328c847270e03be5c8459c284a1203a74640a61c06451f3274dda55198a189e772439017747061a92c8f88a4553e6cfab95146 SHA512 ff35230e9e9ed13937950e8cc6a21f788e966615659f460484cef04bcc495137c77235bf2e1dafce5f43dddddc2436803e8f45a9a334c82c92ffbabf7cd21746
-EBUILD realtime_tools-9999.ebuild 487 BLAKE2B 9dd874bf6d032eb8ed785ac42aeaf8fe47552d95ab47a00da57cf5927e78fa817935f8caf7387809878ea3c5135086fbeaba27c557203d89d78282d4e52e7cc8 SHA512 c75750ff1e6244181c685d886d9ffffdc8e3ed2cab285908b4d972d6f46c107b222b15994ec4e5ec43082e30ea5c5ddd07ed58b8c7da98f9c85cd3a11860ac94
+AUX atomic.patch 411 BLAKE2B 2af7ae6e0f7b91cbc80188ede62098bd700e556dad07c24d681c19d1b84efe3bfa9f06b3d1b0cd9f83437c160ccbf1494f684e76421a4d19a79defadc6d10832 SHA512 f58cb21ee24f7615c37cb5a4fb86547d0c1458f075d93039dab1ab3a5c35b90a5964587326b5331b331867eeaa13a218838941f100851b3605b2ac193d85870a
+DIST realtime_tools-1.16.0.tar.gz 12046 BLAKE2B 673cd87573b7db87573e345f7cd916b246894da8ab2f720b56b81cd276c25fdc50e70bfff021b9f88d2699a36f00abe5a90aec55963ea3f4a20cb6345474bc52 SHA512 65037a3fffdfb81a6020dbedd0155cb1ebd6ca64a5bff46ae9c705327a458883412bee7885e5d91073c55b77611cd8492254ca68d185827be87598a4f0015718
+EBUILD realtime_tools-1.16.0-r1.ebuild 604 BLAKE2B 3dcfe4ab7a5988cf7f0ffda2ac976e24ae7f51340b9cd8e7e136eb95c57daff6b70c598dbf3e5a19a64af9fbd07225c1b19d5af4bfc6b2905b06ea7dbd6dbd9b SHA512 f3b6eeba05b6f2b3b700419676c8be7af0685a86a127d098ac4eda5bc0d59c1aa5113b5c5fc2d9eea011b560d67d3e91ca61c8acf1cf95db97567c4090088adf
+EBUILD realtime_tools-9999.ebuild 604 BLAKE2B 3dcfe4ab7a5988cf7f0ffda2ac976e24ae7f51340b9cd8e7e136eb95c57daff6b70c598dbf3e5a19a64af9fbd07225c1b19d5af4bfc6b2905b06ea7dbd6dbd9b SHA512 f3b6eeba05b6f2b3b700419676c8be7af0685a86a127d098ac4eda5bc0d59c1aa5113b5c5fc2d9eea011b560d67d3e91ca61c8acf1cf95db97567c4090088adf
 MISC metadata.xml 341 BLAKE2B 6a21b434a2b09c8a9475755b58b36647dba03618418887a8a38680406a6cce9019097260edb298f428566dec649bba5dd8dc2878a34227736ce1aee727fa9ad3 SHA512 25b78ddc49681242a2f228d1fa23b40df20e285ece1855c8493d09af6e65615a6f3f89506fc1d89deffb6dd6b8d2b3d8042ec39ba710c59dd4389a44acc38b87
diff --git a/dev-ros/realtime_tools/files/atomic.patch b/dev-ros/realtime_tools/files/atomic.patch
new file mode 100644
index 000000000000..0440900b9c32
--- /dev/null
+++ b/dev-ros/realtime_tools/files/atomic.patch
@@ -0,0 +1,12 @@
+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/realtime_tools-1.10.0.ebuild b/dev-ros/realtime_tools/realtime_tools-1.10.0.ebuild
deleted file mode 100644
index 828df6489858..000000000000
--- a/dev-ros/realtime_tools/realtime_tools-1.10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/realtime_tools"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools that can be used from a hard realtime thread, without breaking the realtime behavior"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/realtime_tools/realtime_tools-1.11.0.ebuild b/dev-ros/realtime_tools/realtime_tools-1.11.0.ebuild
deleted file mode 100644
index 828df6489858..000000000000
--- a/dev-ros/realtime_tools/realtime_tools-1.11.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/realtime_tools"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools that can be used from a hard realtime thread, without breaking the realtime behavior"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/realtime_tools/realtime_tools-1.12.0.ebuild b/dev-ros/realtime_tools/realtime_tools-1.12.0.ebuild
deleted file mode 100644
index 216e47f8341e..000000000000
--- a/dev-ros/realtime_tools/realtime_tools-1.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/realtime_tools"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools that can be used from a hard realtime thread, without breaking the realtime behavior"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/realtime_tools/realtime_tools-1.16.0-r1.ebuild b/dev-ros/realtime_tools/realtime_tools-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..c76733870b90
--- /dev/null
+++ b/dev-ros/realtime_tools/realtime_tools-1.16.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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/realtime_tools/realtime_tools-9999.ebuild b/dev-ros/realtime_tools/realtime_tools-9999.ebuild
index 16cab6b8840c..c76733870b90 100644
--- a/dev-ros/realtime_tools/realtime_tools-9999.ebuild
+++ b/dev-ros/realtime_tools/realtime_tools-9999.ebuild
@@ -1,21 +1,28 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/realtime_tools"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Set of tools that can be used from a hard realtime thread, without breaking the realtime behavior"
+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_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+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
index 28d4c5104d3c..4612847fa54f 100644
--- a/dev-ros/resource_retriever/Manifest
+++ b/dev-ros/resource_retriever/Manifest
@@ -1,6 +1,4 @@
-DIST resource_retriever-1.12.3.tar.gz 6385 BLAKE2B eea0a548976acd6de95da9b1bdc2d108f8c74012d6f8df3ce055444dfcdc41765e020fda6b2894a74cab5f26a0419868ed7da6d62a2655c72c68819c946a452c SHA512 3ca22eafa54019e2763f089bb8072a6af7956e1281ad9aad3a4166c7e0350baa762b2d5127051acf8927d07b3b711e60eaec6349c730f9f656494cef71391862
-DIST resource_retriever-1.12.4.tar.gz 6624 BLAKE2B 16e5dfaf0af3ac02c1c3ad48a4ab2e664235b5e13dbaa5e760fcb5841c57af78184c336f55b18f06b6916657ee69bb1c0304b736869cf008cc8faeaebe53f596 SHA512 b8f584bf21f6744eeacdf169cc0da82e5dcdf902205d4c49784818c203ebdc1f2c9147dbb97353d3d94fd2dd3d1b9a56a36562ed3af6630c1a18f56b8ff89a0f
-EBUILD resource_retriever-1.12.3.ebuild 499 BLAKE2B 63786d9d6f3da33cc9e023e169d29d03ba6d6136485424a1943883ee8a35ca721e71f276fa38ca26853be10788a503f3021a95740bf91495e255521f37bc3b55 SHA512 be3103eb9409a6f009b8df4b672f37c17c3fecfce6e0ae92ca7b0e48e9d29a0eb6edea6d4e780bfbe9ef2bbe023ef23c192b598920830e619be17937d2345386
-EBUILD resource_retriever-1.12.4.ebuild 499 BLAKE2B 63786d9d6f3da33cc9e023e169d29d03ba6d6136485424a1943883ee8a35ca721e71f276fa38ca26853be10788a503f3021a95740bf91495e255521f37bc3b55 SHA512 be3103eb9409a6f009b8df4b672f37c17c3fecfce6e0ae92ca7b0e48e9d29a0eb6edea6d4e780bfbe9ef2bbe023ef23c192b598920830e619be17937d2345386
-EBUILD resource_retriever-9999.ebuild 499 BLAKE2B 63786d9d6f3da33cc9e023e169d29d03ba6d6136485424a1943883ee8a35ca721e71f276fa38ca26853be10788a503f3021a95740bf91495e255521f37bc3b55 SHA512 be3103eb9409a6f009b8df4b672f37c17c3fecfce6e0ae92ca7b0e48e9d29a0eb6edea6d4e780bfbe9ef2bbe023ef23c192b598920830e619be17937d2345386
+DIST resource_retriever-1.12.6.tar.gz 6916 BLAKE2B 11c3cfd06f750e90863ccff2540cc3828cc02929418a1e4c274811fce606e512a3afb45548100f80f56fb58dae00d1ac81f7b152bda1ecc12623584cca1923c3 SHA512 a946cef7e55e2acf01ba605beb36c3ec24f22037bca38d93afcfb36cad579e58ff57efb69311e3cb69ddd9d53d7eab5f9072f3903da539d1fbd001a3a342f7dc
+EBUILD resource_retriever-1.12.6.ebuild 766 BLAKE2B b34eb0342e2a90551c81450443328c3b3701db92579ef9d9734773d105542b670f159ec33155299e1058c34eda9f86f7809eed39a7ddf7d22cdff642ce29cb5c SHA512 65c8702de80b1d9dbfaf6057cb213f61bfe2de4a48722be29e9b391f4155fb529ea47e48123cc5e9c6352144865957e27fb6fb2a0a1071107468881b90e97899
+EBUILD resource_retriever-9999.ebuild 766 BLAKE2B b34eb0342e2a90551c81450443328c3b3701db92579ef9d9734773d105542b670f159ec33155299e1058c34eda9f86f7809eed39a7ddf7d22cdff642ce29cb5c SHA512 65c8702de80b1d9dbfaf6057cb213f61bfe2de4a48722be29e9b391f4155fb529ea47e48123cc5e9c6352144865957e27fb6fb2a0a1071107468881b90e97899
 MISC metadata.xml 336 BLAKE2B eae58f27fd60ea173eaee68e804d9f5924e8aa31fcb21262e12bb73ab3186e29e41402e19117631a0d2a8b4b5715e2ef0e2bb0e1c6d7b06f258e0e128f5d94db SHA512 bcb84806eabff85c76b6f7d9317299f17a017404c512634d6e2d6e275687dd130e6f8cb73d86afb6ef57377dcb34ee997db4d0b099bfeb6649c38930c3f2fb24
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.3.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.3.ebuild
deleted file mode 100644
index 5eb72827b5c6..000000000000
--- a/dev-ros/resource_retriever/resource_retriever-1.12.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=5
-ROS_REPO_URI="https://github.com/ros/resource_retriever"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves data from url-format files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	net-misc/curl
-	dev-python/rospkg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.4.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.4.ebuild
deleted file mode 100644
index 5eb72827b5c6..000000000000
--- a/dev-ros/resource_retriever/resource_retriever-1.12.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/resource_retriever"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves data from url-format files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	net-misc/curl
-	dev-python/rospkg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild
new file mode 100644
index 000000000000..4a7691efbe1e
--- /dev/null
+++ b/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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/resource_retriever/resource_retriever-9999.ebuild b/dev-ros/resource_retriever/resource_retriever-9999.ebuild
index 5eb72827b5c6..4a7691efbe1e 100644
--- a/dev-ros/resource_retriever/resource_retriever-9999.ebuild
+++ b/dev-ros/resource_retriever/resource_retriever-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/resource_retriever"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -15,9 +14,19 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	net-misc/curl
-	dev-python/rospkg[${PYTHON_USEDEP}]
+	$(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
index 076a857e6e7d..4a901068b4c0 100644
--- a/dev-ros/rgbd_launch/Manifest
+++ b/dev-ros/rgbd_launch/Manifest
@@ -1,8 +1,4 @@
-DIST rgbd_launch-2.2.0.tar.gz 5515 BLAKE2B 532e6c31fb3420d2b946686b32fd77650ec028094e59081bee07d79fbf1083028770dd30e9cca77d12ff1189bb280ea19a2e2b36f382c263eaff178b5a00250b SHA512 420920635b42060b0dcc7419589f5ce4b3a1ae56e07c8cf1df4e797685cdf6e230c882b2cae717b47c3c496759f8ddea8c4ce3c3fe6fceb1781d7449b53a52f6
-DIST rgbd_launch-2.2.1.tar.gz 5514 BLAKE2B 7e9a9b2bcc07d963eb9a08c618a1d67a7c055a2754366bf36321d3f2a79f90e47ac06b1a4190a263040bd22e74f7a9587e6028f85c40121567d22bddcae3ed13 SHA512 60873580f17964e6319b53e32719e0702b8ced937a767b94c850b49565de5c5ee806d77968bcfecffebd39dbb4bc81cb1b7674ac90e1184cd9df47c273f352cb
-DIST rgbd_launch-2.2.2.tar.gz 7205 BLAKE2B 50fb20192834c549d752a0fc82afc5ddabc7db064b6b9247d0554441233e6dc0c6c5acc218853dd775e217c5fcf3af6b84a8b0690241ac6e159401ac990c8959 SHA512 300f0d49a9dbffb891492be4cddc0a625233e06a3c8fa608d063b409ab1a51fa31e3ef42e6cdfb9eb232192695d1c23bfaf521d7c190efc83886ad856a135278
-EBUILD rgbd_launch-2.2.0.ebuild 407 BLAKE2B dfb3a12203b0788b5b55352ad9a7a2e11ce21ae116147ebd3c67bc88444e6f97cfec6ad3518ce8fc7c8ff90a0d78f5f5bd2a7cdcf153f1704fc78dc05bf2520c SHA512 29c23f40045220b8a34bf3aafdadb0df027b0402141d2ffb27c23f858daadc8f14c86e0e1fb01f78e5172ff61e00c2bcdf31dccedce83f7dfe8320d8ba76890a
-EBUILD rgbd_launch-2.2.1.ebuild 407 BLAKE2B dfb3a12203b0788b5b55352ad9a7a2e11ce21ae116147ebd3c67bc88444e6f97cfec6ad3518ce8fc7c8ff90a0d78f5f5bd2a7cdcf153f1704fc78dc05bf2520c SHA512 29c23f40045220b8a34bf3aafdadb0df027b0402141d2ffb27c23f858daadc8f14c86e0e1fb01f78e5172ff61e00c2bcdf31dccedce83f7dfe8320d8ba76890a
-EBUILD rgbd_launch-2.2.2.ebuild 435 BLAKE2B be9765d3a072292342b4567719c9a5f2ad76e393577c248d290788919125206b1c600e647ade9bddbc3740eafe977ed3ab50530d280493667a2b0d9882015b3e SHA512 806d46632b95f9d8c0180a20ec0323affc135089c1a1366d75d2fb1d5b9aeba6dfed8751b9db6b488cb0c2fc5b8bc92b49bd6e93082fd0754be23c579710cd94
-EBUILD rgbd_launch-9999.ebuild 435 BLAKE2B be9765d3a072292342b4567719c9a5f2ad76e393577c248d290788919125206b1c600e647ade9bddbc3740eafe977ed3ab50530d280493667a2b0d9882015b3e SHA512 806d46632b95f9d8c0180a20ec0323affc135089c1a1366d75d2fb1d5b9aeba6dfed8751b9db6b488cb0c2fc5b8bc92b49bd6e93082fd0754be23c579710cd94
+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 337 BLAKE2B fabef428b9603f691a6556d0ca0b68ea5c122b8b0bb9bbe0d951773ba2a1bc1a8c596047d6c0539208624226b072c5ce3717d166f0a4ae49b215464e92ad3ee9 SHA512 236501acadb2adf4a8901497970ee1555dc54b6755801af1cc7cb214730fafc80ccd318df5f1d668a7956eb7d4b4238f105f59c7b680c74139068c9a4e68caff
diff --git a/dev-ros/rgbd_launch/rgbd_launch-2.2.0.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.2.0.ebuild
deleted file mode 100644
index 5d6ba49305e8..000000000000
--- a/dev-ros/rgbd_launch/rgbd_launch-2.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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-2.2.1.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.2.1.ebuild
deleted file mode 100644
index 5d6ba49305e8..000000000000
--- a/dev-ros/rgbd_launch/rgbd_launch-2.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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-2.2.2.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.2.2.ebuild
deleted file mode 100644
index 031495e85be4..000000000000
--- a/dev-ros/rgbd_launch/rgbd_launch-2.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_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-2.3.0.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.3.0.ebuild
new file mode 100644
index 000000000000..d7ddf76635c1
--- /dev/null
+++ b/dev-ros/rgbd_launch/rgbd_launch-2.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
index 031495e85be4..d7ddf76635c1 100644
--- a/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild
+++ b/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
 ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/dev-ros/robot_localization/Manifest b/dev-ros/robot_localization/Manifest
index 3f803f17bb42..3cf12cc1842a 100644
--- a/dev-ros/robot_localization/Manifest
+++ b/dev-ros/robot_localization/Manifest
@@ -1,7 +1,5 @@
-AUX nowerror.patch 562 BLAKE2B 15514056a104c3dcb64d8d036cd12dce1326899c64cc200b0db21913bf50efc13f0d622783614707da269a7617e5896fa915ac37226f42ef7e55df8afebc6f2c SHA512 a678efafb0f44e59a56fc9b99b61589209d520372bc63a0383f88e5854c0e876595a75a346d8dda9a7ea1805c7da54ee6da3326b60d1c7fa0441532ed8693067
-DIST robot_localization-2.5.2.tar.gz 6467525 BLAKE2B 68e1eab37c0856f73ef4ef3a1d7c6fb5f7771c98d8a84fad417173c41f8ddb876221d5eb2846bc9965c831fb64b215829d418b315e164f9e39e20ceec6b9da2c SHA512 b5cbc628c5a0fe9684d86d461ab25f494d693fbcbc9ac47ddcf7eb26d61512c078f8fa0747e929c1ae4e2d451770196ff767058036af9246b7e43cc537797e6f
-DIST robot_localization-2.6.2.tar.gz 6468164 BLAKE2B 75d8d8d0ff659868fa3f3d4469381ebcc196b0601e3fcf03739173d8335e9bb7c71418455285f85b8e31748363e8a0b10100d69b74035fe08dd4d138831a9472 SHA512 d8b111a644765fc1301bb8c46437bdd0a05acf76e4ee9e6ded7e4b8ec833020ed70a084697d2bb99a7c0e518f2b690a5e9c79a34f4acf717729fdd0c0fdf1c1a
-EBUILD robot_localization-2.5.2.ebuild 1210 BLAKE2B 1b858c52e92f939f4507cd8c4ee4fac946540f3bcbaa2b31a5b357fdef4a6b4e3c6710a8d20931b6b4672f8614647953d59b35a90354905e038632324a7a95f6 SHA512 af57e2f6c1fa0c45d0e075e215c687e2d42a28c184eaa081db6b8e18ddb18e0f602d34a8ae277cfbe32c9bc8cbb1cc92cfff7d296a15dca5e18048955e68f62f
-EBUILD robot_localization-2.6.2.ebuild 1252 BLAKE2B c2bf46ccefc9451e180fd8565a195489463514656aa52ced38aebccaa5d22e5e1e2218b59783e8fff236c394235f7342c470aeea3ffdba1e38d09a2d7e8744c1 SHA512 8c5959cffb137d82de889d2c0e5578b481f5f077cb0d738db2f52ef716d64381311041d52e7904c2b41d769fa963627854990ddd7321b8c9facc32e345f7d89d
-EBUILD robot_localization-9999.ebuild 1252 BLAKE2B c2bf46ccefc9451e180fd8565a195489463514656aa52ced38aebccaa5d22e5e1e2218b59783e8fff236c394235f7342c470aeea3ffdba1e38d09a2d7e8744c1 SHA512 8c5959cffb137d82de889d2c0e5578b481f5f077cb0d738db2f52ef716d64381311041d52e7904c2b41d769fa963627854990ddd7321b8c9facc32e345f7d89d
+AUX nowerror.patch 478 BLAKE2B 9e2d2079524b14db178bebce4dac0471dee662ffc208d97ba0e4a2327b38800d077dc751db28220079cc274b25738b853f0d0302442a72acf2879ceca3c7d05f SHA512 11543749935449cf98dd92724adedcc0396dddff00a01fed0bf8ea53d53f7e96a7b1824771761137b531cf39fed2aed34c44c4841f2b5f129d34dddbea73ef05
+DIST robot_localization-2.6.8.tar.gz 6473309 BLAKE2B d14fb3a6341c1cea1eeb8aa644e0e6f4d7215b8484270947c29b3151d968cfa50dbde24271759f9b2321a528f5b33f5173e41686300648f8e91f604a70e20a28 SHA512 fefb7553bf10068341b9df0f10cad7be6ea556ce30595e30a5c4e36ecc8a7392e14d99fc266a1cfee5704d76ac0cef227be8f23855b5305c858b2f70fb6f4de3
+EBUILD robot_localization-2.6.8.ebuild 1221 BLAKE2B 036fc4612a88315b4d043d0122090e10c53267396baa8c517110310960aea0006d176686bd936d170ad24129af90d2a0d16caab69c1dc3b166cec159f69b66e2 SHA512 44683bcee159bc7136052e08d67568e9358dd9bd10046b16567cbebf5860d95b293f542e7c0edd892ae353c1207b85158bce872813c4a0610b3c8d75d5a4be15
+EBUILD robot_localization-9999.ebuild 1221 BLAKE2B 036fc4612a88315b4d043d0122090e10c53267396baa8c517110310960aea0006d176686bd936d170ad24129af90d2a0d16caab69c1dc3b166cec159f69b66e2 SHA512 44683bcee159bc7136052e08d67568e9358dd9bd10046b16567cbebf5860d95b293f542e7c0edd892ae353c1207b85158bce872813c4a0610b3c8d75d5a4be15
 MISC metadata.xml 344 BLAKE2B 96e3dfb26e972a619ecd9e986e67272c46186bf0fe88721d42fcce8f94329417a30ddfb0b3b7a5f6b4dee8094bdeb842ba74da67a46db1270c4932dd3548d8d3 SHA512 682ee23502ff9b98b82cc8edb5dffafb1bde520ffa42ce8ab417e9c5dabab929286bb572e0988108201e29363315d12c8a5f55f841324fa339effe82ac1595c1
diff --git a/dev-ros/robot_localization/files/nowerror.patch b/dev-ros/robot_localization/files/nowerror.patch
index 936ad259bc6f..31feb81abecd 100644
--- a/dev-ros/robot_localization/files/nowerror.patch
+++ b/dev-ros/robot_localization/files/nowerror.patch
@@ -1,13 +1,13 @@
-Index: robot_localization-2.6.2/CMakeLists.txt
+Index: robot_localization-2.6.8/CMakeLists.txt
 ===================================================================
---- robot_localization-2.6.2.orig/CMakeLists.txt
-+++ robot_localization-2.6.2/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(NOT EIGEN3_FOUND)
-   set(EIGEN_PACKAGE Eigen)
- endif()
+--- 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)
  
--set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++14;-Wall;-Werror")
-+set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++14;-Wall")
+ 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)
  
- set(ROSLINT_CPP_OPTS "--filter=-build/c++11,-runtime/references")
diff --git a/dev-ros/robot_localization/robot_localization-2.5.2.ebuild b/dev-ros/robot_localization/robot_localization-2.5.2.ebuild
deleted file mode 100644
index b6fbdfbfc907..000000000000
--- a/dev-ros/robot_localization/robot_localization-2.5.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/eigen_conversions
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	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-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-cpp/yaml-cpp:=
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/roslint
-	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit )
-"
diff --git a/dev-ros/robot_localization/robot_localization-2.6.2.ebuild b/dev-ros/robot_localization/robot_localization-2.6.2.ebuild
deleted file mode 100644
index 4c6611fbb910..000000000000
--- a/dev-ros/robot_localization/robot_localization-2.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/eigen_conversions
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	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-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-cpp/yaml-cpp:=
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/roslint
-	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit )
-"
-
-PATCHES=( "${FILESDIR}/nowerror.patch" )
diff --git a/dev-ros/robot_localization/robot_localization-2.6.8.ebuild b/dev-ros/robot_localization/robot_localization-2.6.8.ebuild
new file mode 100644
index 000000000000..285c8158960a
--- /dev/null
+++ b/dev-ros/robot_localization/robot_localization-2.6.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-cpp/yaml-cpp:=
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+"
+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 )
+"
+BDEPEND="dev-ros/roslint"
+
+PATCHES=( "${FILESDIR}/nowerror.patch" )
diff --git a/dev-ros/robot_localization/robot_localization-9999.ebuild b/dev-ros/robot_localization/robot_localization-9999.ebuild
index 4c6611fbb910..285c8158960a 100644
--- a/dev-ros/robot_localization/robot_localization-9999.ebuild
+++ b/dev-ros/robot_localization/robot_localization-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
 KEYWORDS="~amd64"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geographic_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
@@ -17,16 +16,9 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/diagnostic_updater
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/eigen_conversions
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
-	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-ros/tf2
 	dev-ros/tf2_geometry_msgs
 	dev-ros/tf2_ros
@@ -37,9 +29,16 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
-	dev-ros/roslint
+	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 )
 "
+BDEPEND="dev-ros/roslint"
 
 PATCHES=( "${FILESDIR}/nowerror.patch" )
diff --git a/dev-ros/robot_pose_ekf/Manifest b/dev-ros/robot_pose_ekf/Manifest
index 2db0f4c34713..b6ed4cd30a31 100644
--- a/dev-ros/robot_pose_ekf/Manifest
+++ b/dev-ros/robot_pose_ekf/Manifest
@@ -1,10 +1,4 @@
-DIST navigation-1.14.0.tar.gz 340196 BLAKE2B 9338af98d1eb88e6bd79aa4f4c186ac6dc1c52b0f024286264f62e487f8e2236cff81397ccb8b828e4e000c0d05bc93963c979975089220b49cf980f465b643d SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a
-DIST navigation-1.14.2.tar.gz 345166 BLAKE2B 4c54f975088e3f99102f7bb1ef500909b16218e48db97a875f8b980dfe1bfd51d51eccab308ba7a3d5bee444de7d9e9fdf7d6477583739740ad13e7f0c35d1ea SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-EBUILD robot_pose_ekf-1.14.0.ebuild 810 BLAKE2B cbec5daff9b223751d5177004e34afe252d36514ac802ccb8a913382f8886adacf8d2f8cbbcce46a4117efb5341e7f5eb6a25ce39ced90b04275296d8f23a1b1 SHA512 56699009441996b2a9115c10dc9b84bf15425cb97333434a30b0e3b9e5ffed7a959e183e595fcb685d400c8f1ac0cfdb51d39dd4e67a338f96fc1f4e53763181
-EBUILD robot_pose_ekf-1.14.2.ebuild 810 BLAKE2B 88a46cea97ef3dfca272e66601315b857759acd6877575aaeecbc2f287a040b36de915f940dda5750eaf5290939e883112f3cdacaf6c30dafb0bc10c2f885465 SHA512 e33865e5a3e2604ce306b666ab4e5daf19d90f3f50c77a798f980a88c7c7595f4528725240b9834ec6c3593b3804aa819abb99dcd36fecb590f20fc5792bf029
-EBUILD robot_pose_ekf-1.15.1.ebuild 810 BLAKE2B 88a46cea97ef3dfca272e66601315b857759acd6877575aaeecbc2f287a040b36de915f940dda5750eaf5290939e883112f3cdacaf6c30dafb0bc10c2f885465 SHA512 e33865e5a3e2604ce306b666ab4e5daf19d90f3f50c77a798f980a88c7c7595f4528725240b9834ec6c3593b3804aa819abb99dcd36fecb590f20fc5792bf029
-EBUILD robot_pose_ekf-1.15.2.ebuild 810 BLAKE2B b5137c2f505b5b7a600de0a1404f78c7a7f5a0578e3d54557e697e697ba5e6eadf7433640cedcaf068dee07ce51afb3d10e122e7bdc9d43f4ab9029432a98575 SHA512 b4518b01c02e137b8dc1599b63f6294595a412415902437da0efaffcd39eec9d42546c24f409284226a590adb636ab3e92ee3def642b7c9a67c1e4e0a2f3e9cb
-EBUILD robot_pose_ekf-9999.ebuild 810 BLAKE2B cbec5daff9b223751d5177004e34afe252d36514ac802ccb8a913382f8886adacf8d2f8cbbcce46a4117efb5341e7f5eb6a25ce39ced90b04275296d8f23a1b1 SHA512 56699009441996b2a9115c10dc9b84bf15425cb97333434a30b0e3b9e5ffed7a959e183e595fcb685d400c8f1ac0cfdb51d39dd4e67a338f96fc1f4e53763181
-MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
+DIST robot_pose_ekf-1.14.5.tar.gz 18387 BLAKE2B df452daff16b8f6c4ad204acbab12950a5964efa29275aa2b8eb3bce2545ee6f6dc63072f6d4ea16210eacd1cf40a29c1993cebc9b15af9ff4e4f30b212c06b2 SHA512 9d9d19f4a0219634fdafe8d0e44140bddaacd9a3e1855aadf41a4647a957f98203b34fc4641336aaac2cd1f2eb083fced41b74aff96a230adff6f29b7a88884b
+EBUILD robot_pose_ekf-1.14.5.ebuild 768 BLAKE2B d93fead5bcd9cd47c713e629bcf6c83cbbae9a058bdd37391fa1fd42d2f3fb7ed9911b5f457c2cc0c1768e0ec0cb51c59dd12a8ed5a9d1e69fe0dabaf41d8a78 SHA512 1db6719ae3e732699cbf4358b144486795e45e0936bcfd9afa8a36fce367b86596472d9f4bd5ec4f6e586a0b2207b152295d725d482b2c6d659f27d91f25ef5b
+EBUILD robot_pose_ekf-9999.ebuild 768 BLAKE2B d93fead5bcd9cd47c713e629bcf6c83cbbae9a058bdd37391fa1fd42d2f3fb7ed9911b5f457c2cc0c1768e0ec0cb51c59dd12a8ed5a9d1e69fe0dabaf41d8a78 SHA512 1db6719ae3e732699cbf4358b144486795e45e0936bcfd9afa8a36fce367b86596472d9f4bd5ec4f6e586a0b2207b152295d725d482b2c6d659f27d91f25ef5b
+MISC metadata.xml 341 BLAKE2B ad3175983a2b925a9df5b9e05db4a1c59fa3a958ac104ab350fc2010f9d456c3a23e12f203207b03cb9c3621f0ffeb132cdd7c0b6d8f42492d630eb9db2b4358 SHA512 683b7e619115866bac877f7a93d30c11cd75b56e81559aa0be55410b29bd39db007b4246f9324f95ea93e0991f8e50588c91a25911e7ce7f362df4b36565f6d7
diff --git a/dev-ros/robot_pose_ekf/metadata.xml b/dev-ros/robot_pose_ekf/metadata.xml
index 7408fdf7047f..349cddd191c0 100644
--- a/dev-ros/robot_pose_ekf/metadata.xml
+++ b/dev-ros/robot_pose_ekf/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros-planning/navigation</remote-id>
+		<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.14.0.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.0.ebuild
deleted file mode 100644
index 9133c4a8d19d..000000000000
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-libs/orocos-bfl
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	virtual/pkgconfig"
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.2.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.2.ebuild
deleted file mode 100644
index f4df6fa5a493..000000000000
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-libs/orocos-bfl
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	virtual/pkgconfig"
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.5.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.5.ebuild
new file mode 100644
index 000000000000..68b49259d460
--- /dev/null
+++ b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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/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:=[threads]
+"
+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"
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.1.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.1.ebuild
deleted file mode 100644
index f4df6fa5a493..000000000000
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-libs/orocos-bfl
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	virtual/pkgconfig"
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.2.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.2.ebuild
deleted file mode 100644
index bd8c4644ddb8..000000000000
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-libs/orocos-bfl
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	virtual/pkgconfig"
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
index 9133c4a8d19d..68b49259d460 100644
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
+++ b/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/robot_pose_ekf"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
+DESCRIPTION="Estimate the 3D pose of a robot from pose measurements from various sources"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -19,12 +17,15 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	sci-libs/orocos-bfl
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+	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"
diff --git a/dev-ros/robot_pose_publisher/Manifest b/dev-ros/robot_pose_publisher/Manifest
index d39b86474950..719fe38b52c8 100644
--- a/dev-ros/robot_pose_publisher/Manifest
+++ b/dev-ros/robot_pose_publisher/Manifest
@@ -1,4 +1,4 @@
 DIST robot_pose_publisher-0.2.4.tar.gz 4269 BLAKE2B ba91c13f8502d38bbcaccc0adec6ab6b94cb2ee5fda5a05a4f3a9fa3e44e2995ededf58f842889b29fd16d6c1ab5197fe216c93b50ebca87827960c4e8199a27 SHA512 1309c0335dc0375802c3a4c7186d6248dca1307319d4ece6b390643d94bd2887cf5b016669d1b44025f04bd509424b7bee0d029c10f992a1207e2090366ae150
-EBUILD robot_pose_publisher-0.2.4.ebuild 458 BLAKE2B b3e1a8c279a4864cd0050e55c4def3a3947f47815974d05bc5dfc756988b6d57034292b4113229f00af307f3f743abbf89cc3a577ace95fcf601c62f3b7657b5 SHA512 9e34715e82f282879791601f1386961979586ba0c86353a7eb6a5d3dee51019e09e7c681dc7a998dcce273ffbb07a6d9a5bc4cc5c8bc6079d1fd6e54bbe64bb4
-EBUILD robot_pose_publisher-9999.ebuild 458 BLAKE2B b3e1a8c279a4864cd0050e55c4def3a3947f47815974d05bc5dfc756988b6d57034292b4113229f00af307f3f743abbf89cc3a577ace95fcf601c62f3b7657b5 SHA512 9e34715e82f282879791601f1386961979586ba0c86353a7eb6a5d3dee51019e09e7c681dc7a998dcce273ffbb07a6d9a5bc4cc5c8bc6079d1fd6e54bbe64bb4
+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 343 BLAKE2B 02980a3ace39a7ae2376e8f4d14785088a94def1e6f36dafb589c6a463531ce46158c6bb46a0e8a39310fb7e72acf677e2fdc27169ffae3b1c11b13df13047c4 SHA512 265d64db990d07210b235a8c1c34d37496dce50647185c2eb7c62be4d935c31c6eeded6595692be1ace82c3e24414e6289b9cf6d2190b8b85910842cf1d73c45
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
index c8e64900acd6..ea56dc707dea 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/GT-RAIL/robot_pose_publisher"
 KEYWORDS="~amd64 ~arm"
 
@@ -15,6 +15,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
+"
+DEPEND="${RDEPEND}
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
index c8e64900acd6..ea56dc707dea 100644
--- a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
+++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/GT-RAIL/robot_pose_publisher"
 KEYWORDS="~amd64 ~arm"
 
@@ -15,6 +15,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
+"
+DEPEND="${RDEPEND}
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_state_publisher/Manifest b/dev-ros/robot_state_publisher/Manifest
index d4ab37b81f41..800aafe0695a 100644
--- a/dev-ros/robot_state_publisher/Manifest
+++ b/dev-ros/robot_state_publisher/Manifest
@@ -1,6 +1,6 @@
-DIST robot_state_publisher-1.13.5.tar.gz 25346 BLAKE2B bdc7ed15178cdd8a8571796236b5273666f58486b831374254b45b79549d8b224097cb78c4585cb136f74bd4fee8309dfdef6dbaa03038acc126b35a4e2899dc SHA512 2ce97e35a64f9c6f8539780d2dabf416906da8144b579b07214b55e935aec3105f2087c90796ceb896f8766c46c2c2b72aaf9fdc4cfc80dd1b3f06b477acf778
-DIST robot_state_publisher-1.13.6.tar.gz 25885 BLAKE2B 0d673ef6cce53ff66a522de02ddeb93876d168a65cf102de2c0384f69911d9dfedf1cadba67e7251ed0ccdc7bf07b545c2ded5620419a970bbcf6fb63c9fcd15 SHA512 c0dbdd9149a1b308c29de1509641691d488aa0cd6b325d1245cbb16b537bbd3abf0c5e85ecd1c24a78117b6e45a833a45769c6619a22bfc7a1f5f7709071b21a
-EBUILD robot_state_publisher-1.13.5.ebuild 671 BLAKE2B 9bd628fdbb6241568cae65ec421bc0191cfe6e9ad8567203be75c27583b93a36636878b3a964c944f407718522b58bcbd1b68ce330e28b771d48db9b7e861061 SHA512 e2af853e68989e5b0101dd8ec30d919cd72703d6c8a3d42e70fa8da76662af45dacc4f8dea6b0d055d98c6ad3a44e36e747e194cd40f7802b2224cafcd757298
-EBUILD robot_state_publisher-1.13.6-r1.ebuild 672 BLAKE2B d05f35eae1952fd234adbd65b9b5786140abea5d38d6518206f92afc4393b4e74335dccf27081b1fd2f9c9167753cdf6744fc1009f8dd1ee68d81e141da6788c SHA512 54728b5872ed76175adffea5a37a004ee0fb708732c416365ac659b923b0aac725657fdfaa7a52608f6052b3929c7e359136493a3bba1a6097283fc97cc71538
-EBUILD robot_state_publisher-9999.ebuild 672 BLAKE2B d05f35eae1952fd234adbd65b9b5786140abea5d38d6518206f92afc4393b4e74335dccf27081b1fd2f9c9167753cdf6744fc1009f8dd1ee68d81e141da6788c SHA512 54728b5872ed76175adffea5a37a004ee0fb708732c416365ac659b923b0aac725657fdfaa7a52608f6052b3929c7e359136493a3bba1a6097283fc97cc71538
+DIST robot_state_publisher-1.15.1-joint_states_indexed.bag 778888 BLAKE2B 3d117e06712ed20f838be247057645799a8b8501ddc3582a0037d34a2da40b8390367de88bd278f05632f150e88139b34325be3d5a1ce44f7ad3ebfaffd5e0ac SHA512 171e4eb810e12da4af5f9ce4f91bb6967e3895dfa284aa542010b7a7691571051e237ab96b055105f559e8d242099eb41f1429c5afcba13361ee58bdd565a689
+DIST robot_state_publisher-1.15.1.tar.gz 25717 BLAKE2B 87f1e70f80cff01255840e99be9088bc1d91bc25f5b00d1e46b3ebed9b55bf24e5fa698b41cb4c3603ae7147191a3d39ca85b65469edffacfb91d7f913156268 SHA512 f36d07961c27c85b2787cc294ca10a7e1334e699db61926067aa0a9b1dcab0969a799feed6d2fa78d14ff76cf661d29479585d6f9ec660f94832e79d6c88ddf1
+DIST robot_state_publisher-9999-joint_states_indexed.bag 778888 BLAKE2B 3d117e06712ed20f838be247057645799a8b8501ddc3582a0037d34a2da40b8390367de88bd278f05632f150e88139b34325be3d5a1ce44f7ad3ebfaffd5e0ac SHA512 171e4eb810e12da4af5f9ce4f91bb6967e3895dfa284aa542010b7a7691571051e237ab96b055105f559e8d242099eb41f1429c5afcba13361ee58bdd565a689
+EBUILD robot_state_publisher-1.15.1.ebuild 1211 BLAKE2B 3df70e764d45800e04e9d63eacbeffb2cb8b5356f93cc508e43f25b6a9d0d0e59fd7923321b4ad2e3e837d9608fcaf76d3d1da5d2c5dfcb76d65b7218c60d541 SHA512 e8d8ddcc9e033729f78dfbccde1080a9deb2bb2ab579aa7d2764b4ccf038275aab9016201e821babcd2a600fe583016e7b90438e2fd4efa9adbdb7562dbab5d5
+EBUILD robot_state_publisher-9999.ebuild 1211 BLAKE2B 3df70e764d45800e04e9d63eacbeffb2cb8b5356f93cc508e43f25b6a9d0d0e59fd7923321b4ad2e3e837d9608fcaf76d3d1da5d2c5dfcb76d65b7218c60d541 SHA512 e8d8ddcc9e033729f78dfbccde1080a9deb2bb2ab579aa7d2764b4ccf038275aab9016201e821babcd2a600fe583016e7b90438e2fd4efa9adbdb7562dbab5d5
 MISC metadata.xml 339 BLAKE2B c76bafb73ba3f7049a2c6914ffe15e5df15da5f12fb10dd8b2fd6d5b2dba00007a86c35ca2cf9a93cb6d1425d4c87afe3161571b75a0c81754b5d0aa92442bd9 SHA512 c6c382ed3b649d5e464df1c13fb5f6798f4005fc34cb5f8b5c5062fa5885bc2a2ef6c543bc85a734e0f9ebd90adad0177de84c801dafee9e4cffe51e052a86f7
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.13.5.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.13.5.ebuild
deleted file mode 100644
index 508dcb8c0b07..000000000000
--- a/dev-ros/robot_state_publisher/robot_state_publisher-1.13.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Package for publishing the state of a robot to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-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}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.13.6-r1.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.13.6-r1.ebuild
deleted file mode 100644
index 760d6df668f3..000000000000
--- a/dev-ros/robot_state_publisher/robot_state_publisher-1.13.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Package for publishing the state of a robot to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-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_USEDEP}] )
-"
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.15.1.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.15.1.ebuild
new file mode 100644
index 000000000000..8849ecad4f2e
--- /dev/null
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-1.15.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 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/robot_state_publisher/robot_state_publisher-9999.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
index 760d6df668f3..8849ecad4f2e 100644
--- a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -12,6 +11,11 @@ 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
@@ -29,5 +33,22 @@ RDEPEND="
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )
+	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
index 88d83bdaf194..06b1a7cedeb0 100644
--- a/dev-ros/ros_environment/Manifest
+++ b/dev-ros/ros_environment/Manifest
@@ -1,5 +1,5 @@
 AUX catkinprefixpath.patch 1035 BLAKE2B 8054e8f2ae8a7f0060d44558fe32bdf607b81054249a2f7255878801e8abc2fdaa695609fc056b5a4cfc1fdbf7eae9adbd5057bd8f0831820bbb564b4778c8f2 SHA512 ce669139250c78e521e82ea23ca288c0b12cf7da17bbf06cf4cb3c425b3bc61ad182a475af3923fdbdf7c07f574077e2ad935d6c0c133d408ffc0f0d3f2d02ae
-DIST ros_environment-1.2.0.tar.gz 6366 BLAKE2B ff540b9e861d039739253b9effbfe06ec703f47b48d9bb7009b5caed5010ed8219a207bfd363c03b115d018965c2e584abbf58f649ea868e66e79d4dda11d1ae SHA512 1b89e3d6ea88fc0972bbe980bae0b663e9335adece8eb0d517cac76b0a412cbe6b9783a967d4a9b5ca1c3bf2a432bb826d28f6f1d9a33fcc33a75edeef0be20b
-EBUILD ros_environment-1.2.0-r1.ebuild 539 BLAKE2B 6f77782a4dab82a4f86d68f99732de9b5dae705f2489222a9d6f28853d3d1b66544d29ec37763b51bf7c06793c61616335b6cc6c7d3d0e85b27a1fcc0b8b19a6 SHA512 f5dfa8dc33b2a193623cea9b6aa105a7a4b9067aeb5d5e05b5317b3602da0ade7361c2cf25ff592505d062b06222cbe797bed51bd08d5007956dd17533fc3d81
-EBUILD ros_environment-9999.ebuild 539 BLAKE2B 6f77782a4dab82a4f86d68f99732de9b5dae705f2489222a9d6f28853d3d1b66544d29ec37763b51bf7c06793c61616335b6cc6c7d3d0e85b27a1fcc0b8b19a6 SHA512 f5dfa8dc33b2a193623cea9b6aa105a7a4b9067aeb5d5e05b5317b3602da0ade7361c2cf25ff592505d062b06222cbe797bed51bd08d5007956dd17533fc3d81
+DIST ros_environment-1.3.1.tar.gz 6533 BLAKE2B 50b6b24af91c5d96097873c3a05f258b2737053594a888ac5677147160708e192e1662558f33537b9510d206d5f00374ba3bec3b3491e5f51cfac3bcec842c1f SHA512 f47b9a7801ea4aa841b5127714e099c83e60fb42e8eedb726a4d3b23fcfb93c25c6f9bdc042a449399333c3165db1a72b9ebb25424981fe43bcfa5445f4678c5
+EBUILD ros_environment-1.3.1.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
+EBUILD ros_environment-9999.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
 MISC metadata.xml 333 BLAKE2B 87f510ba6f10a5a9473d242879151d307c5357749325c127ccd415d525968f1f4f3ae23e9e11d328f7cdc115f98b4dfc492dced529627229c6f01f133f67a032 SHA512 85ed3e7f2098353f25e0e6fd77afb64a602f828ab76ae6ac3c5a47eb02cfbb884e6b25473b1488ad9746fdba3ed50db47b90a191c5f2ec145587e33f0761406b
diff --git a/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild b/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild
deleted file mode 100644
index 1478d0978ba8..000000000000
--- a/dev-ros/ros_environment/ros_environment-1.2.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_environment"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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-1.3.1.ebuild b/dev-ros/ros_environment/ros_environment-1.3.1.ebuild
new file mode 100644
index 000000000000..9b7f339511b4
--- /dev/null
+++ b/dev-ros/ros_environment/ros_environment-1.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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
index 1478d0978ba8..9b7f339511b4 100644
--- a/dev-ros/ros_environment/ros_environment-9999.ebuild
+++ b/dev-ros/ros_environment/ros_environment-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_environment"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/rosapi/Manifest b/dev-ros/rosapi/Manifest
index df3c1e495b5c..48b0249f1f49 100644
--- a/dev-ros/rosapi/Manifest
+++ b/dev-ros/rosapi/Manifest
@@ -1,12 +1,4 @@
-DIST rosbridge_suite-0.10.1.tar.gz 98010 BLAKE2B d634840a68081e7afaba77cff2b0f435392aa061ef6a4d4e75feccaa26811df92e0cd3c1b83973bd7eab534e66a5d5df880428d82fdd7cf20c7997a3427fdcf5 SHA512 455950eb5aebdccd6f173f2b7d1ea0bdf74421172895ab13e3af698a79e49964cb53354f90c396aad596818ecbb36385a3e1c9c373feb3a15aeff13d9e703443
-DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
-DIST rosbridge_suite-0.11.3.tar.gz 101992 BLAKE2B 122aebcd19daec339cd1f39ddcdbd81c7d5fc7b67020afc835e0e816958c413eeeb922654b1717adb7f1882e1b3287d0ddd6dd23bfd57e6542f21a8fcbb65e14 SHA512 818df696c2d0060af18fa1ee1abe365373c199d41d4dd5b25a9cc799665b1a69e76b3cd6425cd4fd8e11241efdd3acf43c5436a0ade5b45c5e9ce3ea831e4974
-DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
-DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
-EBUILD rosapi-0.10.1.ebuild 663 BLAKE2B 0ad6c396f05a610652b1d3220cfcfa34196dd76af637ec97874b290577c64a9c496fa1f8cf076843af21f881242009edb4f5c3f1896b1f795843f704961f6f76 SHA512 3922668b92fdb9d2a3c21c3d76953cc86d590e5008c15065da7579e35f097166b36aad45bdeecee366fd2849d7cabdc0c69fdf44282bcb89a50243b54b3e238c
-EBUILD rosapi-0.11.1.ebuild 663 BLAKE2B 9f03580ede2b577d9c04c1561396557e992db1111a1ff95de0d7581554496de566103c8e9d1419ac905b4f0d3ba4a11c9a26b5a59f476b9fd54814cd8ae8d497 SHA512 ebf0e04b0e7c445a598dfac234e1965a68999125b76319bd80902da9e07d38127a906076a1046d855b9d6bda8b9b7f122d088724bb32d4d6851f934068b0c3e1
-EBUILD rosapi-0.11.3.ebuild 663 BLAKE2B 9f03580ede2b577d9c04c1561396557e992db1111a1ff95de0d7581554496de566103c8e9d1419ac905b4f0d3ba4a11c9a26b5a59f476b9fd54814cd8ae8d497 SHA512 ebf0e04b0e7c445a598dfac234e1965a68999125b76319bd80902da9e07d38127a906076a1046d855b9d6bda8b9b7f122d088724bb32d4d6851f934068b0c3e1
-EBUILD rosapi-0.8.6.ebuild 666 BLAKE2B 4a5f2c91cbbac4dfd373c467b4c8161c159a20666350d6c498d54fb1cee3b3c9f47ba535b9d9d9d342ffdf473c095c392a806b727da9f51e87a5590196889ddb SHA512 f9d3f52c6681107c6c51af0f18a09c849187d7ba29361fa56bec76792e6eecc1d5d9f5e900405c5dcc2947046bb7bf3c090a90883d9c346d7973a158d16dbbfa
-EBUILD rosapi-0.9.0.ebuild 666 BLAKE2B 510dbf0f6129e666050621d4430f1e7107e51553aed8f4e70f18b611957fbe4c0e0e9ac4ddf301ff160efce8ec2dfef2d9c29e91898eb0a4adc2a526234b2d91 SHA512 b85e31287a3d3a3ef628ec346d125beafcc30023c12127a16aed0192790bc71db425c709e1b6e91d24c50e5492a768b08f5519a7e92f866ba5d3c48ebc275819
-EBUILD rosapi-9999.ebuild 666 BLAKE2B b72ae518fb0e55ae5140173b5798d487958bec6d00c702fda74f9566528eb1cb6a90b280f8ad213020409f85a0d29adc7312edce80b478546774b56a17ede0bd SHA512 08c596717d0acdd3255ddf0908aea6bd3f9ac722a29345e52bc973b26c3c155b6e6118ab03dc6dd8ea55cab2caa13f40a7352da8377d196ffbada60987c015db
+DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
+EBUILD rosapi-0.11.9.ebuild 609 BLAKE2B 76f9c2f3857fbca1091ed148959b768ec2f83f6478687adcb5fa065f1653aeca8940707072d9e4fd8ffbe1ad78135ace9a905a939202c433eb3fc4057c8df972 SHA512 be4a9c00d4a8dd9b4725416596e06030c534c93aaa2b007d1a42389020d3cf2bbdb870f49251d971217b3406c0f4c859257680b59438988c9c1b4f44e5c3889f
+EBUILD rosapi-9999.ebuild 609 BLAKE2B 76f9c2f3857fbca1091ed148959b768ec2f83f6478687adcb5fa065f1653aeca8940707072d9e4fd8ffbe1ad78135ace9a905a939202c433eb3fc4057c8df972 SHA512 be4a9c00d4a8dd9b4725416596e06030c534c93aaa2b007d1a42389020d3cf2bbdb870f49251d971217b3406c0f4c859257680b59438988c9c1b4f44e5c3889f
 MISC metadata.xml 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosapi/rosapi-0.10.1.ebuild b/dev-ros/rosapi/rosapi-0.10.1.ebuild
deleted file mode 100644
index 35d33ef36dbc..000000000000
--- a/dev-ros/rosapi/rosapi-0.10.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.11.1.ebuild b/dev-ros/rosapi/rosapi-0.11.1.ebuild
deleted file mode 100644
index cc23483b1818..000000000000
--- a/dev-ros/rosapi/rosapi-0.11.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.11.3.ebuild b/dev-ros/rosapi/rosapi-0.11.3.ebuild
deleted file mode 100644
index cc23483b1818..000000000000
--- a/dev-ros/rosapi/rosapi-0.11.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.11.9.ebuild b/dev-ros/rosapi/rosapi-0.11.9.ebuild
new file mode 100644
index 000000000000..1f0478a2bcae
--- /dev/null
+++ b/dev-ros/rosapi/rosapi-0.11.9.ebuild
@@ -0,0 +1,24 @@
+# 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.8.6.ebuild b/dev-ros/rosapi/rosapi-0.8.6.ebuild
deleted file mode 100644
index 348d9a4fa5f0..000000000000
--- a/dev-ros/rosapi/rosapi-0.8.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.9.0.ebuild b/dev-ros/rosapi/rosapi-0.9.0.ebuild
deleted file mode 100644
index b157089b594a..000000000000
--- a/dev-ros/rosapi/rosapi-0.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-9999.ebuild b/dev-ros/rosapi/rosapi-9999.ebuild
index c22242d34dcc..1f0478a2bcae 100644
--- a/dev-ros/rosapi/rosapi-9999.ebuild
+++ b/dev-ros/rosapi/rosapi-9999.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
+DESCRIPTION="Service calls for getting ros meta-information"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
+	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
index 2c52a08e8f7e..9630fb6b8375 100644
--- a/dev-ros/rosauth/Manifest
+++ b/dev-ros/rosauth/Manifest
@@ -1,4 +1,4 @@
-DIST rosauth-0.1.7.tar.gz 6060 BLAKE2B 5b53de7f61d66c68ec91e64668dd8009d4c6087795efae8d96540c6db4a34480f8a262fc75f0b3bfc52817650157c5df921f077ffba4c972dca9461aff0dea58 SHA512 c52317cd173ec655b779f96ffe324cd136a54168484f26fff2a0d9fe2da6e25cc5109f1905d7528a9f6a433287873b63c53f96ec425ca6af740d4eea0b3250b5
-EBUILD rosauth-0.1.7.ebuild 521 BLAKE2B e666ba089ef09cc85f3fceead99d2bf9c366b72daade82cb341a6a8056c1749e3139b830384b886fac31e118dbfd900d1e1d22cc57c64d541d3ba11b83cd1214 SHA512 de1fdc087a008c79872a41081061c73d2f5168c8cb07c83874cd1c5d9ae2ad2adbea95daf34b6af611664c133b0d7fb8c733ab28b793a076f69352715c437b42
-EBUILD rosauth-9999.ebuild 521 BLAKE2B e666ba089ef09cc85f3fceead99d2bf9c366b72daade82cb341a6a8056c1749e3139b830384b886fac31e118dbfd900d1e1d22cc57c64d541d3ba11b83cd1214 SHA512 de1fdc087a008c79872a41081061c73d2f5168c8cb07c83874cd1c5d9ae2ad2adbea95daf34b6af611664c133b0d7fb8c733ab28b793a076f69352715c437b42
+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 330 BLAKE2B b7647904cd15b02dd3107c10d156d5dc9ff7dec2dd67014402afe7b2f99ecc127f07bf971ff40a86ae0f414f43750ffda75f1814802c689816da11ed1bd0f6f1 SHA512 de7596aebaeef7ac6d148cb8c88573f98c76b28fa6adbd322260ea28c96ed58315c7e855941f572bf3d10b5351acd545dfcfc92d02fdad5b34e7824e72e29070
diff --git a/dev-ros/rosauth/rosauth-0.1.7.ebuild b/dev-ros/rosauth/rosauth-0.1.7.ebuild
deleted file mode 100644
index 372b30e6a355..000000000000
--- a/dev-ros/rosauth/rosauth-0.1.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/WPI-RAIL/rosauth"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Server Side tools for Authorization and Authentication of ROS Clients"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosauth/rosauth-1.0.1.ebuild b/dev-ros/rosauth/rosauth-1.0.1.ebuild
new file mode 100644
index 000000000000..10f5ea08a15f
--- /dev/null
+++ b/dev-ros/rosauth/rosauth-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# 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
index 372b30e6a355..10f5ea08a15f 100644
--- a/dev-ros/rosauth/rosauth-9999.ebuild
+++ b/dev-ros/rosauth/rosauth-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/WPI-RAIL/rosauth"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,7 +15,15 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/openssl:0="
+	dev-libs/openssl:0=
+"
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_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/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 9bb649c36b40..91b6a01ee254 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,8 +1,7 @@
 AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc5865304d220df7e1e9bea3799743a1f7a2a274423ec3fa4e367773814bd5fbb5cb074acb7252845ba6e94 SHA512 2343aca88929010f76389f31187b913f92f8d510a18a0d81b20c2c9accc2da68d15fd959404f11d363bdbe98f644ff2e76a70fdca4a718b490fa7f812a1b417e
-AUX yaml.patch 2142 BLAKE2B 3b42703dc19179852e53bb98e6b450014bfa21d3f253e912ff6ce970b0904ae700b724e761821fa9b5a880789de8c80a2820e9a64bb2e56fb1783b034f4291ad SHA512 a5c41b8b374b33c577375495e6599daa50685664794ffc0c9dd83118b4ea8d74c68e3831ea426a1a3bce585e35f9039a86fab4266840b4eb3302bb4454ac889a
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosbag-1.14.3-r3.ebuild 877 BLAKE2B 3b9c2e9d89270a5011c8480b791a72ae50b10292766c9eb5a8826e16ebbea61869a72a7b17709bdb1b2c7f422d9e02afee032df3f21b2921630fdb455acd3552 SHA512 09029c964574932beb792fc5008334e4f31e7428c9a098c87484c59fe7995b85d57febea5e3d76c8129ef011764543945b60d31ee358788e6b5ce540ccbc6830
-EBUILD rosbag-1.15.4.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
-EBUILD rosbag-9999.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
+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
+EBUILD rosbag-1.15.7.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
+EBUILD rosbag-1.15.8.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
+EBUILD rosbag-9999.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
 MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/files/yaml.patch b/dev-ros/rosbag/files/yaml.patch
deleted file mode 100644
index aea89788c1ea..000000000000
--- a/dev-ros/rosbag/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosbag/src/rosbag/bag.py b/tools/rosbag/src/rosbag/bag.py
-index 0578aed91..9bdcb693d 100644
---- a/tools/rosbag/src/rosbag/bag.py
-+++ b/tools/rosbag/src/rosbag/bag.py
-@@ -1250,7 +1250,7 @@ def __init__(self, d):
-                         else:
-                            setattr(self, a, DictObject(b) if isinstance(b, dict) else b)
- 
--            obj = DictObject(yaml.load(s))
-+            obj = DictObject(yaml.safe_load(s))
-             try:
-                 val = eval('obj.' + key)
-             except Exception as ex:
diff --git a/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
deleted file mode 100644
index 7249f56e314a..000000000000
--- a/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-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_USEDEP}]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/console_bridge:=
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rosbag/rosbag-1.15.4.ebuild b/dev-ros/rosbag/rosbag-1.15.4.ebuild
deleted file mode 100644
index 572a7bcad9d9..000000000000
--- a/dev-ros/rosbag/rosbag-1.15.4.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_USEDEP}]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/console_bridge:=
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	lz4? ( dev-ros/roslz4[${PYTHON_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
new file mode 100644
index 000000000000..39331484104e
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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
new file mode 100644
index 000000000000..39331484104e
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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
index 572a7bcad9d9..39331484104e 100644
--- a/dev-ros/rosbag/rosbag-9999.ebuild
+++ b/dev-ros/rosbag/rosbag-9999.ebuild
@@ -23,14 +23,14 @@ RDEPEND="
 	dev-libs/boost:=
 	app-arch/bzip2
 	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/console_bridge:=
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
+	$(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_USEDEP}] )"
+	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
index 2d855d955d0e..04ea01036c98 100644
--- a/dev-ros/rosbag_migration_rule/Manifest
+++ b/dev-ros/rosbag_migration_rule/Manifest
@@ -1,4 +1,4 @@
-DIST rosbag_migration_rule-1.0.0.tar.gz 581 BLAKE2B 6007438d1fe762965ba58432519c6e85903302700951174acaead513fae374933cd2eed176a996344aab3ca29be19fbcd231f216e83c61669b69b3dd1af87cb8 SHA512 694e272509384d48277400639614464e8cf0e19766a247c6ad71399fc6b4aabf570e425d61f78bac2b712c569762a25ac3539390b19317109972cfa6768fecd6
-EBUILD rosbag_migration_rule-1.0.0.ebuild 370 BLAKE2B 7664b1e04f5fda1f3d6e0dff26534aa0f4e945e7fbeea3b73a557ab965ba68d796ee6c528181ab4236561f4256b6d35594e00f7f6361fe4759ccf7a9222b9994 SHA512 b404025afb23d7d843d2d27a897151f7d9e03f966ed34708f9dd84cd97682d7fdf8efd4aa87f8d417e2fd952d234d76b62e8bf8ea72710b3f4176f9ba1021ce7
-EBUILD rosbag_migration_rule-9999.ebuild 370 BLAKE2B 7664b1e04f5fda1f3d6e0dff26534aa0f4e945e7fbeea3b73a557ab965ba68d796ee6c528181ab4236561f4256b6d35594e00f7f6361fe4759ccf7a9222b9994 SHA512 b404025afb23d7d843d2d27a897151f7d9e03f966ed34708f9dd84cd97682d7fdf8efd4aa87f8d417e2fd952d234d76b62e8bf8ea72710b3f4176f9ba1021ce7
+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 347 BLAKE2B 3b39c86f64fb8d818b477ac7c1b1dc9426bf27c9e9d97b0a05f10fc03cc78930f59207013dcdd1a1ea2dbb9d64193c1df5e253fada7b68060d5b0c64bf28322f SHA512 917993ce50ecf350a81b7980dfc04d031db7d99ea4a0e829b0119bd9e0e09ce169a3b8a8fdbcbd3daaaf9fcbc525b47af0caa4976931246d570f589d33d53633
diff --git a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.0.ebuild b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.0.ebuild
deleted file mode 100644
index 41c130018493..000000000000
--- a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/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-1.0.1.ebuild b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.1.ebuild
new file mode 100644
index 000000000000..c57c937cf578
--- /dev/null
+++ b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 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
index 41c130018493..c57c937cf578 100644
--- a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild
+++ b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/rosbag_migration_rule"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index ebb6c245341e..85f4d764e08e 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,8 +1,4 @@
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosbag_storage-1.14.2-r1.ebuild 597 BLAKE2B 396fa1a667259dc91de933d9537bf54db019b2e06c64ab5f4dfe5cc550813ccf5a629dec9ff53d3f409ce602d4b6ce2c7201f505eddc74aa5b9b1d40561f70c1 SHA512 35b01188976c4273bcd62675d4d88cd27947e57e53e0de036084a577c564ffb477bbc46f5966b9abcf7464c8a36bb86c4a91cc89cdb334a1e6abb777caf314f4
-EBUILD rosbag_storage-1.14.3-r2.ebuild 654 BLAKE2B e89f69d4007184e383b514b9dd3a9eae2d45d7f856cfe26db32f3e262c34d7bce64eb62cb35c90930e4408191930ce8c1587f91fdaea2fbb50d11aec270fc941 SHA512 3a9c4f1e3e134d1c7ed44fb998d5b1cbd7cc6e2953a4e5eef3de4daab9b32a75a4693e149d9f104792d3727bd7228a5dee0012c123cc428737658221cde8f6fb
-EBUILD rosbag_storage-1.15.4.ebuild 654 BLAKE2B 1be6603ceba6193bbeaa2276ec10ab58a85016b7c3b32194b7bd1081d9a85d210532138175fdda886b562de6ea1d54f6e323d9d829f3e8dda3022e669cd788af SHA512 22235a935488e0c824bfd3874d8a154cdc3ae62f0e21e883968e540697e58ff9535139de69c343d7a622447f174883e606288c9c90672e6c082c698fb22549d7
-EBUILD rosbag_storage-9999.ebuild 654 BLAKE2B e89f69d4007184e383b514b9dd3a9eae2d45d7f856cfe26db32f3e262c34d7bce64eb62cb35c90930e4408191930ce8c1587f91fdaea2fbb50d11aec270fc941 SHA512 3a9c4f1e3e134d1c7ed44fb998d5b1cbd7cc6e2953a4e5eef3de4daab9b32a75a4693e149d9f104792d3727bd7228a5dee0012c123cc428737658221cde8f6fb
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rosbag_storage-1.15.8-r1.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
+EBUILD rosbag_storage-9999.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.14.2-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.14.2-r1.ebuild
deleted file mode 100644
index 048f341e9d2d..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	app-crypt/gpgme
-	dev-ros/pluginlib
-	dev-ros/cpp_common
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild
deleted file mode 100644
index d2265060d274..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-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
-	app-crypt/gpgme
-	dev-ros/pluginlib
-	dev-ros/cpp_common
-	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}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild
deleted file mode 100644
index 4095940515c2..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-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
-	app-crypt/gpgme
-	dev-ros/pluginlib
-	dev-ros/cpp_common
-	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}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r1.ebuild
new file mode 100644
index 000000000000..b4ede837ca4e
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 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 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
index d2265060d274..b4ede837ca4e 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
@@ -16,13 +16,14 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/console_bridge
-	app-crypt/gpgme
-	dev-ros/pluginlib
+
 	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:=
@@ -31,4 +32,16 @@ RDEPEND="
 	dev-libs/openssl:0=
 	app-crypt/gpgme
 "
-DEPEND="${RDEPEND}"
+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
index 7fac7a1c5265..884fde73e339 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -1,5 +1,7 @@
 AUX catkin_prefix.patch 443 BLAKE2B 4b366a582a5ebda3cfd644fb0319cd6cd07e9e983db9ed6cdb850bc6ecd393172e7e8dc93c30100470ba8417991e0487a7f85be53556472aa37947bae48ff2b6 SHA512 8662743559045f129a1dd94c7b42491f025b9038dff960f5d5259775760c0d3a0ae7086a6faae8bc6f511e72a0c5552013c88c4a8333043a0af6291b894ec5c1
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD rosbash-1.14.7.ebuild 408 BLAKE2B 64ca5af2d4932ca2acdbb32577dbc53ee8f983228b1b38a7433cfb2664f6400f318cd8634c8095d9f1536aad50b062cc7153b1a33a9875165e0629840aa8d1ac SHA512 0f40731f5c48b036bb6d2b1db284a8c5b96efb362566a3af7da7f3ed52850e47ea21f3a210a3eb29297b978dec87c446093e6ef284b518e1815bb901c3a4eba4
-EBUILD rosbash-9999.ebuild 408 BLAKE2B 64ca5af2d4932ca2acdbb32577dbc53ee8f983228b1b38a7433cfb2664f6400f318cd8634c8095d9f1536aad50b062cc7153b1a33a9875165e0629840aa8d1ac SHA512 0f40731f5c48b036bb6d2b1db284a8c5b96efb362566a3af7da7f3ed52850e47ea21f3a210a3eb29297b978dec87c446093e6ef284b518e1815bb901c3a4eba4
+DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD rosbash-1.15.5.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
+EBUILD rosbash-1.15.6.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
+EBUILD rosbash-9999.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.14.7.ebuild b/dev-ros/rosbash/rosbash-1.14.7.ebuild
deleted file mode 100644
index 52caa3880598..000000000000
--- a/dev-ros/rosbash/rosbash-1.14.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-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.5.ebuild b/dev-ros/rosbash/rosbash-1.15.5.ebuild
new file mode 100644
index 000000000000..31312870be31
--- /dev/null
+++ b/dev-ros/rosbash/rosbash-1.15.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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
new file mode 100644
index 000000000000..31312870be31
--- /dev/null
+++ b/dev-ros/rosbash/rosbash-1.15.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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-9999.ebuild b/dev-ros/rosbash/rosbash-9999.ebuild
index 52caa3880598..31312870be31 100644
--- a/dev-ros/rosbash/rosbash-9999.ebuild
+++ b/dev-ros/rosbash/rosbash-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index 6b1a011f45a5..83e109e04069 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -1,16 +1,6 @@
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD rosboost_cfg-1.14.0.ebuild 391 BLAKE2B 043314291eddf3c09b63f5e41485a37fed1fee2d2695cc76495557206add72f37993ebc11fe4a66b0827bc072fcfacef925cf1b4090009c1e9eaf662ef75858a SHA512 ff8642808b2c6f46787a42e48bf0cd0f142d94162e3c501532cbd85b01d654d0f9a09eddb0a7ff69c99b6a150a99cdbe26eb800a86e443b1202756a3f359bddf
-EBUILD rosboost_cfg-1.14.1.ebuild 391 BLAKE2B 043314291eddf3c09b63f5e41485a37fed1fee2d2695cc76495557206add72f37993ebc11fe4a66b0827bc072fcfacef925cf1b4090009c1e9eaf662ef75858a SHA512 ff8642808b2c6f46787a42e48bf0cd0f142d94162e3c501532cbd85b01d654d0f9a09eddb0a7ff69c99b6a150a99cdbe26eb800a86e443b1202756a3f359bddf
-EBUILD rosboost_cfg-1.14.2.ebuild 391 BLAKE2B 043314291eddf3c09b63f5e41485a37fed1fee2d2695cc76495557206add72f37993ebc11fe4a66b0827bc072fcfacef925cf1b4090009c1e9eaf662ef75858a SHA512 ff8642808b2c6f46787a42e48bf0cd0f142d94162e3c501532cbd85b01d654d0f9a09eddb0a7ff69c99b6a150a99cdbe26eb800a86e443b1202756a3f359bddf
-EBUILD rosboost_cfg-1.14.3.ebuild 391 BLAKE2B 043314291eddf3c09b63f5e41485a37fed1fee2d2695cc76495557206add72f37993ebc11fe4a66b0827bc072fcfacef925cf1b4090009c1e9eaf662ef75858a SHA512 ff8642808b2c6f46787a42e48bf0cd0f142d94162e3c501532cbd85b01d654d0f9a09eddb0a7ff69c99b6a150a99cdbe26eb800a86e443b1202756a3f359bddf
-EBUILD rosboost_cfg-1.14.4.ebuild 391 BLAKE2B 043314291eddf3c09b63f5e41485a37fed1fee2d2695cc76495557206add72f37993ebc11fe4a66b0827bc072fcfacef925cf1b4090009c1e9eaf662ef75858a SHA512 ff8642808b2c6f46787a42e48bf0cd0f142d94162e3c501532cbd85b01d654d0f9a09eddb0a7ff69c99b6a150a99cdbe26eb800a86e443b1202756a3f359bddf
-EBUILD rosboost_cfg-1.14.6.ebuild 391 BLAKE2B 043314291eddf3c09b63f5e41485a37fed1fee2d2695cc76495557206add72f37993ebc11fe4a66b0827bc072fcfacef925cf1b4090009c1e9eaf662ef75858a SHA512 ff8642808b2c6f46787a42e48bf0cd0f142d94162e3c501532cbd85b01d654d0f9a09eddb0a7ff69c99b6a150a99cdbe26eb800a86e443b1202756a3f359bddf
-EBUILD rosboost_cfg-1.14.7.ebuild 391 BLAKE2B 043314291eddf3c09b63f5e41485a37fed1fee2d2695cc76495557206add72f37993ebc11fe4a66b0827bc072fcfacef925cf1b4090009c1e9eaf662ef75858a SHA512 ff8642808b2c6f46787a42e48bf0cd0f142d94162e3c501532cbd85b01d654d0f9a09eddb0a7ff69c99b6a150a99cdbe26eb800a86e443b1202756a3f359bddf
-EBUILD rosboost_cfg-9999.ebuild 391 BLAKE2B 043314291eddf3c09b63f5e41485a37fed1fee2d2695cc76495557206add72f37993ebc11fe4a66b0827bc072fcfacef925cf1b4090009c1e9eaf662ef75858a SHA512 ff8642808b2c6f46787a42e48bf0cd0f142d94162e3c501532cbd85b01d654d0f9a09eddb0a7ff69c99b6a150a99cdbe26eb800a86e443b1202756a3f359bddf
+DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+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-9999.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.0.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.0.ebuild
deleted file mode 100644
index 1382c348d89f..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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.14.1.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.1.ebuild
deleted file mode 100644
index 1382c348d89f..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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.14.2.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.2.ebuild
deleted file mode 100644
index 1382c348d89f..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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.14.3.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.3.ebuild
deleted file mode 100644
index 1382c348d89f..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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.14.4.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.4.ebuild
deleted file mode 100644
index 1382c348d89f..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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.14.6.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.6.ebuild
deleted file mode 100644
index 1382c348d89f..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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.14.7.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.7.ebuild
deleted file mode 100644
index 1382c348d89f..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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.5.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.5.ebuild
new file mode 100644
index 000000000000..efba0bfb28e5
--- /dev/null
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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
new file mode 100644
index 000000000000..efba0bfb28e5
--- /dev/null
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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-9999.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild
index 1382c348d89f..efba0bfb28e5 100644
--- a/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/rosbridge_library/Manifest b/dev-ros/rosbridge_library/Manifest
index e9907d73f25b..0149fe1bbc20 100644
--- a/dev-ros/rosbridge_library/Manifest
+++ b/dev-ros/rosbridge_library/Manifest
@@ -1,12 +1,4 @@
-DIST rosbridge_suite-0.10.1.tar.gz 98010 BLAKE2B d634840a68081e7afaba77cff2b0f435392aa061ef6a4d4e75feccaa26811df92e0cd3c1b83973bd7eab534e66a5d5df880428d82fdd7cf20c7997a3427fdcf5 SHA512 455950eb5aebdccd6f173f2b7d1ea0bdf74421172895ab13e3af698a79e49964cb53354f90c396aad596818ecbb36385a3e1c9c373feb3a15aeff13d9e703443
-DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
-DIST rosbridge_suite-0.11.3.tar.gz 101992 BLAKE2B 122aebcd19daec339cd1f39ddcdbd81c7d5fc7b67020afc835e0e816958c413eeeb922654b1717adb7f1882e1b3287d0ddd6dd23bfd57e6542f21a8fcbb65e14 SHA512 818df696c2d0060af18fa1ee1abe365373c199d41d4dd5b25a9cc799665b1a69e76b3cd6425cd4fd8e11241efdd3acf43c5436a0ade5b45c5e9ce3ea831e4974
-DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
-DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
-EBUILD rosbridge_library-0.10.1.ebuild 1483 BLAKE2B 55954740bebbe6fb42218e84a333565b6fa6daaa222928d924c690a451b885b3dba08e1db30b31a0d1386604c8f63a1d103683b3b7ef2833492bd90e0b7fe223 SHA512 74d666ef5c129e85a8eddfb6dd4eb467e6a306349f965e03ad2c8fd4ccc6e0ec89e86fe90cc4d5fbc6f392a8e137600bcf4466d1388a26aa944cd441607b35f7
-EBUILD rosbridge_library-0.11.1.ebuild 1483 BLAKE2B 6bef2ff2c8d85fb5d23ac1b4b1915fde7a30acb81adf3d4db2abb95b79414d0b4adf0a5b43a090e9f38f11651b3f4677beb78b6af20c09571464e7f8e430311d SHA512 bf8c6336f625c62399f9982feb9e848cb24364b59792780d2214df3376b0e5ab2bb55aaee3cd9f3b47e66fa22bf46cf17fe7c3a1ea8f162cb74a871a215bfbfc
-EBUILD rosbridge_library-0.11.3.ebuild 1483 BLAKE2B 6bef2ff2c8d85fb5d23ac1b4b1915fde7a30acb81adf3d4db2abb95b79414d0b4adf0a5b43a090e9f38f11651b3f4677beb78b6af20c09571464e7f8e430311d SHA512 bf8c6336f625c62399f9982feb9e848cb24364b59792780d2214df3376b0e5ab2bb55aaee3cd9f3b47e66fa22bf46cf17fe7c3a1ea8f162cb74a871a215bfbfc
-EBUILD rosbridge_library-0.8.6.ebuild 1451 BLAKE2B 4af51fa5627a70ab81bdaf3948f72ddae45fdbb43353456b9ed5f77a0b8809aad4d4649114c190aa25b412233e67fb4f7af28c1ac877ebd0cc494fdcbdfdce8e SHA512 3d9e933033b2e1f65eb80e3e97e6bce1f9044b6beadcc7f49830202da9d75b9c1b05636569c29835e0553409e04e921c00df232dc201172a227d66bb8dc9adab
-EBUILD rosbridge_library-0.9.0.ebuild 1451 BLAKE2B 429d111b4ce4a0c3b8403a89dbafae8c882907ee468a463f249cdd92341749c81579b008ab101eabcc99d734ab28c43dc743a50d9b8e060b1025b0a41285898f SHA512 c8dc224f9ff3ae1a048a2d9f505c5b4d985418532e167030960782da352f25e29522f09294730bb7dd299ee8a6f60f44672f6c9f6c791cb401efa29ae02d1c9f
-EBUILD rosbridge_library-9999.ebuild 1483 BLAKE2B 55954740bebbe6fb42218e84a333565b6fa6daaa222928d924c690a451b885b3dba08e1db30b31a0d1386604c8f63a1d103683b3b7ef2833492bd90e0b7fe223 SHA512 74d666ef5c129e85a8eddfb6dd4eb467e6a306349f965e03ad2c8fd4ccc6e0ec89e86fe90cc4d5fbc6f392a8e137600bcf4466d1388a26aa944cd441607b35f7
+DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
+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 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.10.1.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.10.1.ebuild
deleted file mode 100644
index 9ebd079262d5..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.10.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cbor[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		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.1.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.11.1.ebuild
deleted file mode 100644
index b8746de4b113..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.11.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cbor[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		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.3.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.11.3.ebuild
deleted file mode 100644
index b8746de4b113..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.11.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cbor[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		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
new file mode 100644
index 000000000000..0e9d84e423a4
--- /dev/null
+++ b/dev-ros/rosbridge_library/rosbridge_library-0.11.9.ebuild
@@ -0,0 +1,43 @@
+# 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.8.6.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.8.6.ebuild
deleted file mode 100644
index 975b2fdc45f6..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.8.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		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.9.0.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.9.0.ebuild
deleted file mode 100644
index 827c969a3754..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.9.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		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
index 9ebd079262d5..0e9d84e423a4 100644
--- a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
+++ b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
+DESCRIPTION="Core rosbridge package for parsing JSON and performing the appropriate action"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	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}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cbor[${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}]
diff --git a/dev-ros/rosbridge_msgs/Manifest b/dev-ros/rosbridge_msgs/Manifest
new file mode 100644
index 000000000000..7e948a86d6bc
--- /dev/null
+++ b/dev-ros/rosbridge_msgs/Manifest
@@ -0,0 +1,4 @@
+DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
+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 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosbridge_msgs/metadata.xml b/dev-ros/rosbridge_msgs/metadata.xml
new file mode 100644
index 000000000000..b99398ddaaba
--- /dev/null
+++ b/dev-ros/rosbridge_msgs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.9.ebuild b/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.9.ebuild
new file mode 100644
index 000000000000..153a13a52cca
--- /dev/null
+++ b/dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.9.ebuild
@@ -0,0 +1,20 @@
+# 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
new file mode 100644
index 000000000000..153a13a52cca
--- /dev/null
+++ b/dev-ros/rosbridge_msgs/rosbridge_msgs-9999.ebuild
@@ -0,0 +1,20 @@
+# 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
index 9d6b8cd30e5d..60f0c8282c0a 100644
--- a/dev-ros/rosbridge_server/Manifest
+++ b/dev-ros/rosbridge_server/Manifest
@@ -1,6 +1,4 @@
-DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
-DIST rosbridge_suite-0.11.3.tar.gz 101992 BLAKE2B 122aebcd19daec339cd1f39ddcdbd81c7d5fc7b67020afc835e0e816958c413eeeb922654b1717adb7f1882e1b3287d0ddd6dd23bfd57e6542f21a8fcbb65e14 SHA512 818df696c2d0060af18fa1ee1abe365373c199d41d4dd5b25a9cc799665b1a69e76b3cd6425cd4fd8e11241efdd3acf43c5436a0ade5b45c5e9ce3ea831e4974
-EBUILD rosbridge_server-0.11.1.ebuild 626 BLAKE2B 104fa4df3e03367cbebc619c64066c2ae136a2db915a58955f2aa8be45e305d3c3bdcfadbd7343a2a5cf2ece6f2f68f16a332b240c277e263f24c52a3cb9959e SHA512 071d9c6b45dbcb06ba682b643c9a3fd1aee0dc0d194c6a0ba2ed2f275ffe4bc738c8ac5b840d5d307d1db784f5e1574fb8ded7b11ad602054fcf24f9661483b4
-EBUILD rosbridge_server-0.11.3.ebuild 626 BLAKE2B 104fa4df3e03367cbebc619c64066c2ae136a2db915a58955f2aa8be45e305d3c3bdcfadbd7343a2a5cf2ece6f2f68f16a332b240c277e263f24c52a3cb9959e SHA512 071d9c6b45dbcb06ba682b643c9a3fd1aee0dc0d194c6a0ba2ed2f275ffe4bc738c8ac5b840d5d307d1db784f5e1574fb8ded7b11ad602054fcf24f9661483b4
-EBUILD rosbridge_server-9999.ebuild 626 BLAKE2B 104fa4df3e03367cbebc619c64066c2ae136a2db915a58955f2aa8be45e305d3c3bdcfadbd7343a2a5cf2ece6f2f68f16a332b240c277e263f24c52a3cb9959e SHA512 071d9c6b45dbcb06ba682b643c9a3fd1aee0dc0d194c6a0ba2ed2f275ffe4bc738c8ac5b840d5d307d1db784f5e1574fb8ded7b11ad602054fcf24f9661483b4
+DIST rosbridge_suite-0.11.9.tar.gz 112209 BLAKE2B 7c874b397f8bf4f5d131e6ec40c6940e0648a0a401d270172b328cb0207b4d3974a37ebb776fc219adbbb77c24a8e77e20b24a93dc2edb3b41e157908648ed68 SHA512 a46aff0ca8b31a08f45c73af89296000d285cb6ca53587b0c2c0bd55c4a43bec2c86c4937082b59e2b6bd78793a3a2a1762aebc1223af0e1ba0d1c18f7d50963
+EBUILD rosbridge_server-0.11.9.ebuild 893 BLAKE2B e3ba10e13fc0aed87643d8170095ecd2e9798623bd64842ab0c20031e41c8aec6308761cd28fdebb3cc57ee5d3508242e0e709d67fde7b3b6516f5571d71768e SHA512 32e9eb7a72b8f9bde712b984caa7852668a50ad32c9cf14c7bb4c7c3ed13651f4d28fb080a8c80c7f09d181d7093835ea4660fdedc7911172668be6fedcc3908
+EBUILD rosbridge_server-9999.ebuild 893 BLAKE2B e3ba10e13fc0aed87643d8170095ecd2e9798623bd64842ab0c20031e41c8aec6308761cd28fdebb3cc57ee5d3508242e0e709d67fde7b3b6516f5571d71768e SHA512 32e9eb7a72b8f9bde712b984caa7852668a50ad32c9cf14c7bb4c7c3ed13651f4d28fb080a8c80c7f09d181d7093835ea4660fdedc7911172668be6fedcc3908
 MISC metadata.xml 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
deleted file mode 100644
index cf540ab83cad..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.3.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.3.ebuild
deleted file mode 100644
index cf540ab83cad..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
new file mode 100644
index 000000000000..d0bbe719c0ac
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.11.9.ebuild
@@ -0,0 +1,29 @@
+# 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"
+IUSE=""
+
+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 "www-servers/tornado[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/autobahn[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "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
index cf540ab83cad..d0bbe719c0ac 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,10 +14,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	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 "www-servers/tornado[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/autobahn[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/twisted[\${PYTHON_USEDEP}]")
 	"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )
+"
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
index 6eef0657b971..b2ebaa2bb4b5 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -1,12 +1,6 @@
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD rosbuild-1.14.2.ebuild 359 BLAKE2B 5480063e327e04bf680869425ce3f41aca4d046a85b6da58e95af25ce09f6a4d20728bfb8306168036e9f6029e0d5bfbbbb631726fece9356ccb11ef5315d7a4 SHA512 c32f230cb997b196c479113619ef447f2dca26eeccc3f3aad5819641f29adddb3c2a7e6b694fd3f1d91987d401bbfe4b736612dfa767251c7cbd3d117c32c1d7
-EBUILD rosbuild-1.14.3.ebuild 359 BLAKE2B 4f06a27d7541789e90b44bdb141bdce321cfa175907435f495b468a131b6bf9fbb12760023c06f2f205a740a26c2f7508e1010c340db44849c342f6575bb5963 SHA512 a81fcf9c6ff5c4255eff7bc0d0a666e479282663477cfc43d6c74bdd8e61108ca05e5fec77511bb70e83c75841ec74b1aa16c850023f81637bcd7528ddcff5c9
-EBUILD rosbuild-1.14.4.ebuild 359 BLAKE2B 4f06a27d7541789e90b44bdb141bdce321cfa175907435f495b468a131b6bf9fbb12760023c06f2f205a740a26c2f7508e1010c340db44849c342f6575bb5963 SHA512 a81fcf9c6ff5c4255eff7bc0d0a666e479282663477cfc43d6c74bdd8e61108ca05e5fec77511bb70e83c75841ec74b1aa16c850023f81637bcd7528ddcff5c9
-EBUILD rosbuild-1.14.6.ebuild 356 BLAKE2B 8cec4ba8b48e6a749971d2b04ed6b2b3823652415923149f63ab2dc2f49416cc4dd6b09a3705686c08221b3c0a7764a9acce9c71b4850ebedbdc60faee9efea6 SHA512 0d001a892f489a2206f4c3d87017f416fbac618cbeac1ce48ca75996459fe902bcee36497dd062dd5d9568f68286aa6e4b31268816b9bbc07f2e3e583aeb2b35
-EBUILD rosbuild-1.14.7.ebuild 356 BLAKE2B 8cec4ba8b48e6a749971d2b04ed6b2b3823652415923149f63ab2dc2f49416cc4dd6b09a3705686c08221b3c0a7764a9acce9c71b4850ebedbdc60faee9efea6 SHA512 0d001a892f489a2206f4c3d87017f416fbac618cbeac1ce48ca75996459fe902bcee36497dd062dd5d9568f68286aa6e4b31268816b9bbc07f2e3e583aeb2b35
-EBUILD rosbuild-9999.ebuild 359 BLAKE2B ad9f9b2884bab7f030013e68e212acf2c4f01a3e7029a9b3970888c7217a286b3801e51b0e07da0a941c67b1faebc754d0740d398f44364b4edced5baa36dcd8 SHA512 9141477396ef5d7dc006c1b6eba58c127a936623c52d4e2ef0da9b47751c56cb2b8eee7f72c255662b98fcec73f32f0c55a0eb8621cee8ef8b22a0d779835611
+DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD rosbuild-1.15.5.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
+EBUILD rosbuild-1.15.6.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
+EBUILD rosbuild-9999.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbuild/rosbuild-1.14.2.ebuild b/dev-ros/rosbuild/rosbuild-1.14.2.ebuild
deleted file mode 100644
index 8af6a6ad043c..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.14.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.3.ebuild b/dev-ros/rosbuild/rosbuild-1.14.3.ebuild
deleted file mode 100644
index a445e3892ca0..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.14.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.4.ebuild b/dev-ros/rosbuild/rosbuild-1.14.4.ebuild
deleted file mode 100644
index a445e3892ca0..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.14.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.6.ebuild b/dev-ros/rosbuild/rosbuild-1.14.6.ebuild
deleted file mode 100644
index 2d4a4233f3e5..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.14.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-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.14.7.ebuild b/dev-ros/rosbuild/rosbuild-1.14.7.ebuild
deleted file mode 100644
index 2d4a4233f3e5..000000000000
--- a/dev-ros/rosbuild/rosbuild-1.14.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-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.5.ebuild b/dev-ros/rosbuild/rosbuild-1.15.5.ebuild
new file mode 100644
index 000000000000..ee01e05ff7a2
--- /dev/null
+++ b/dev-ros/rosbuild/rosbuild-1.15.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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
new file mode 100644
index 000000000000..ee01e05ff7a2
--- /dev/null
+++ b/dev-ros/rosbuild/rosbuild-1.15.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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-9999.ebuild b/dev-ros/rosbuild/rosbuild-9999.ebuild
index b86924b1c966..ee01e05ff7a2 100644
--- a/dev-ros/rosbuild/rosbuild-9999.ebuild
+++ b/dev-ros/rosbuild/rosbuild-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
index 3fecbfa23c26..add66204fcd8 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -1,6 +1,6 @@
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD rosclean-1.14.6.ebuild 466 BLAKE2B 46f00aaa2c01cfab1d78c9988220a12203d25dd1a11d97b9932cee3d7f953891d459425fdc676ce9063c98b5ebcee926cc2a2653d9133541d593945f2dd66e25 SHA512 15cd3ee7a2a47b18c194a54611ed17aff95f692a31b2f7b8b2d4a325fc02e8c9e3a30087f7f0dea4ac9f8f2c3365071ddd2a80c5e2e6898681869c9fa0c7068c
-EBUILD rosclean-1.14.7.ebuild 466 BLAKE2B 46f00aaa2c01cfab1d78c9988220a12203d25dd1a11d97b9932cee3d7f953891d459425fdc676ce9063c98b5ebcee926cc2a2653d9133541d593945f2dd66e25 SHA512 15cd3ee7a2a47b18c194a54611ed17aff95f692a31b2f7b8b2d4a325fc02e8c9e3a30087f7f0dea4ac9f8f2c3365071ddd2a80c5e2e6898681869c9fa0c7068c
-EBUILD rosclean-9999.ebuild 466 BLAKE2B 46f00aaa2c01cfab1d78c9988220a12203d25dd1a11d97b9932cee3d7f953891d459425fdc676ce9063c98b5ebcee926cc2a2653d9133541d593945f2dd66e25 SHA512 15cd3ee7a2a47b18c194a54611ed17aff95f692a31b2f7b8b2d4a325fc02e8c9e3a30087f7f0dea4ac9f8f2c3365071ddd2a80c5e2e6898681869c9fa0c7068c
+DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD rosclean-1.15.5.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
+EBUILD rosclean-1.15.6.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
+EBUILD rosclean-9999.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosclean/rosclean-1.14.6.ebuild b/dev-ros/rosclean/rosclean-1.14.6.ebuild
deleted file mode 100644
index 60b255c11473..000000000000
--- a/dev-ros/rosclean/rosclean-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosclean/rosclean-1.14.7.ebuild b/dev-ros/rosclean/rosclean-1.14.7.ebuild
deleted file mode 100644
index 60b255c11473..000000000000
--- a/dev-ros/rosclean/rosclean-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosclean/rosclean-1.15.5.ebuild b/dev-ros/rosclean/rosclean-1.15.5.ebuild
new file mode 100644
index 000000000000..990890224df3
--- /dev/null
+++ b/dev-ros/rosclean/rosclean-1.15.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
new file mode 100644
index 000000000000..990890224df3
--- /dev/null
+++ b/dev-ros/rosclean/rosclean-1.15.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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-9999.ebuild b/dev-ros/rosclean/rosclean-9999.ebuild
index 60b255c11473..990890224df3 100644
--- a/dev-ros/rosclean/rosclean-9999.ebuild
+++ b/dev-ros/rosclean/rosclean-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
@@ -15,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
+RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
 "
diff --git a/dev-ros/rosconsole/Manifest b/dev-ros/rosconsole/Manifest
index 34e451b49802..61669a285f43 100644
--- a/dev-ros/rosconsole/Manifest
+++ b/dev-ros/rosconsole/Manifest
@@ -1,6 +1,6 @@
-DIST rosconsole-1.13.7.tar.gz 24202 BLAKE2B bee6d4a9a682fe045a233989373e8a283c26d85bd4d746c2363798cd61f168e368afef81872437363b55a44080e6c926b4f3fd9c66fa9e2bf078454a675336ea SHA512 e0e17641011de5a3b58ddc7ac984042463f375f76174ff6bfa8a6c95d7889e33e702156f7ec0d7628f9f37a1d062f0291367ee81025dd9989320d5d24c35b387
-DIST rosconsole-1.13.9.tar.gz 24798 BLAKE2B 1f6d86775affaaf889d51ae27673b3de826cf16a535867e90373d450d82d3e0ae8d1488fd2b4321462070bdf547f23d9ae464ebd2070c5a448e5b15548179d12 SHA512 cb2c47551c210f8d4b9d41f4b33a27599b5a22dff84344d0d564a5b9b2088cb2da8cc3afce97058a456c1dc4b7b8127fcaa8344f6110a40586d60f16278fd1ff
-EBUILD rosconsole-1.13.7.ebuild 768 BLAKE2B 37be9672eca809f1d87e07f24ecf6b304e9319fa2b02dc55a65566f852fa3886673a99a2fb4996d898554876383e5e62e4d51aed618a4c58a1fab9d0b0a6b816 SHA512 cf432c484a52e4b4c59a01cf4a1f6b0cd76dab279cf8d616c1a32eb752c827b8167362e7656a0194e9494f8b3922f5692115d8f6ed1d9b93202fa008a70991e3
-EBUILD rosconsole-1.13.9.ebuild 765 BLAKE2B 3a862dbf876368500eafc18e965366c8fc17132d8549fd1af8f38c51e1034ec2c0d56cc01e9761800c995a93dba598d91ab76aaff7f1b17955034df1dbc4f8b7 SHA512 4c6ea3799ea92954adabae76ca629488d4284b17a114659f341287ee08e82f3a4144dc3ec892fb74afa1748ef598302c792d22d21ed92e7156da14b6835cd3b6
-EBUILD rosconsole-9999.ebuild 768 BLAKE2B 37be9672eca809f1d87e07f24ecf6b304e9319fa2b02dc55a65566f852fa3886673a99a2fb4996d898554876383e5e62e4d51aed618a4c58a1fab9d0b0a6b816 SHA512 cf432c484a52e4b4c59a01cf4a1f6b0cd76dab279cf8d616c1a32eb752c827b8167362e7656a0194e9494f8b3922f5692115d8f6ed1d9b93202fa008a70991e3
+DIST rosconsole-1.14.0.tar.gz 26166 BLAKE2B 79d73e5918eb5f3837e57e4207b3b42cc3222a92e8357265132d2d0848f966fa1e1aed69f8809af30497ef6b1f52c0de0073c20bf6e309010a8d98e0f745fb9c SHA512 68a5d709294b162d5b424bdbcd70fb66a43ccd8512bc60f571fe24bb0150e52f93addc3f22777c2f5810e95492265be58d3cfc6563a4e66665b3261ef161d5cd
+DIST rosconsole-1.14.2.tar.gz 26212 BLAKE2B b43f07f920a526c740d1ee8c3f5d7f5724ed617adad409df84001571e0df30df65c200bfc50c4c6a97a24642b3ad61340706ed4b6d14822935256bfb305350a3 SHA512 f1af112ada723195acda17edb64f75969a0abea58504d14507470eb36b0649e028cd675a368e040ddc955216da304dd64416fda8de7bc29dcd73c56c8286f311
+EBUILD rosconsole-1.14.0.ebuild 765 BLAKE2B 7351af58d0d748ec7f8675088f51e01f17283a47a88bd5b5bb05af37496a27294c862c46d230b8618d7fc48cc7bc876453960e0dadf7f5c0fb58d727e53a87f5 SHA512 5458fd9162a1a8af31ca61a600cfe02300090681848f0653e15fbfb47bca48bab148d6394b7c4ca6cb0b260e1c40f32e058bbfe50f1b5abd692ae9fee1714758
+EBUILD rosconsole-1.14.2.ebuild 765 BLAKE2B 7351af58d0d748ec7f8675088f51e01f17283a47a88bd5b5bb05af37496a27294c862c46d230b8618d7fc48cc7bc876453960e0dadf7f5c0fb58d727e53a87f5 SHA512 5458fd9162a1a8af31ca61a600cfe02300090681848f0653e15fbfb47bca48bab148d6394b7c4ca6cb0b260e1c40f32e058bbfe50f1b5abd692ae9fee1714758
+EBUILD rosconsole-9999.ebuild 765 BLAKE2B 7351af58d0d748ec7f8675088f51e01f17283a47a88bd5b5bb05af37496a27294c862c46d230b8618d7fc48cc7bc876453960e0dadf7f5c0fb58d727e53a87f5 SHA512 5458fd9162a1a8af31ca61a600cfe02300090681848f0653e15fbfb47bca48bab148d6394b7c4ca6cb0b260e1c40f32e058bbfe50f1b5abd692ae9fee1714758
 MISC metadata.xml 508 BLAKE2B 5641aa17bb1302f29cbbe3015007bcbff004d8681223ab9140296209f1ea7995340b3a21890dcaacb3f15020b3431660bf1124fdccc5697bd9222f6b7ebf2d76 SHA512 cc34b9588999d9e10ee8537f509b7ae72b100e477b9f545fad31043eabf0a9f27913b608e4d198ca4b99d5fc1643332fe28ea065181fb3a195472a6726c272a2
diff --git a/dev-ros/rosconsole/rosconsole-1.13.7.ebuild b/dev-ros/rosconsole/rosconsole-1.13.7.ebuild
deleted file mode 100644
index 184a614f8a0c..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.13.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/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:=[threads]
-	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.13.9.ebuild b/dev-ros/rosconsole/rosconsole-1.13.9.ebuild
deleted file mode 100644
index 247659b7d3ab..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.13.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/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:=[threads]
-	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.0.ebuild b/dev-ros/rosconsole/rosconsole-1.14.0.ebuild
new file mode 100644
index 000000000000..76c9a71eb9d4
--- /dev/null
+++ b/dev-ros/rosconsole/rosconsole-1.14.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 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"
+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:=[threads]
+	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.ebuild b/dev-ros/rosconsole/rosconsole-1.14.2.ebuild
new file mode 100644
index 000000000000..76c9a71eb9d4
--- /dev/null
+++ b/dev-ros/rosconsole/rosconsole-1.14.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 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"
+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:=[threads]
+	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
index 184a614f8a0c..76c9a71eb9d4 100644
--- a/dev-ros/rosconsole/rosconsole-9999.ebuild
+++ b/dev-ros/rosconsole/rosconsole-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/rosconsole"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/rosconsole_bridge/Manifest b/dev-ros/rosconsole_bridge/Manifest
index 15ffa959ade0..960760b237fc 100644
--- a/dev-ros/rosconsole_bridge/Manifest
+++ b/dev-ros/rosconsole_bridge/Manifest
@@ -1,4 +1,4 @@
-DIST rosconsole_bridge-0.5.2.tar.gz 4640 BLAKE2B 3adc06db7f3d25767c95755d6bbd0ec6237f46c2e560c990cb54fa5e361e2c20cd8a68c5ae7a1570a01f9dd462bb1272e507f7b0a84282efaf6e35713d5f4653 SHA512 ce80620e485b1b4fe1272c5d982d6ed985357801f2ead2cd81f9fae64743869fa76b31685e41e6a229c0d10752a54da883b7e52d8b32c74fee216978a0034cd8
-EBUILD rosconsole_bridge-0.5.2.ebuild 403 BLAKE2B cb107fb3c44f0a2f16daed96286df423f1a5cee122aec7f55a739fb6406714a25698bf457a5bd60e38b49857e5a69d75b4872941c4aff01bd87720d0b74c8d58 SHA512 f4092640b779fa15a66234e7a8d8f6d60fe91a756214a922f408a86bfd70bf69f3c42217ce98d714141f1062ba5621b528f9a4963f4b5bc70c318452c2ba0cd6
-EBUILD rosconsole_bridge-9999.ebuild 403 BLAKE2B 2e63417dbae4303e83ce230033969561f2dd9e777f669a12c39863fef88c501eae7b3522129a86c2cbc8958e08d98422b8f5f8cf7a40edd790edb742be7304b7 SHA512 0a5ba09b3000e72a0a7fcd73bcc025e66e4742a7940ba3cd540397d80c4368d1c7374ede011dcb949a28c3e74a53c2409e07cbab4ad57de3471521574be658fa
+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 335 BLAKE2B a58e74032004aa5f1931596ae42320a9cd70e11fd3ed44da70d2046a00fefb38074b38b8499a0f78ff1e703e850942344b74280e3b85419ad38871bb66875e1c SHA512 3408e0d76fd62d51c81844969b403a91a7c4a2063a1784acf5a7d924f2f89c72c32ef7f368b0b1d7b84ac477d6147e11b205f3fad2aa341610640f46bad23f54
diff --git a/dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.2.ebuild b/dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.2.ebuild
deleted file mode 100644
index 41079a236c96..000000000000
--- a/dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.5.4.ebuild b/dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.4.ebuild
new file mode 100644
index 000000000000..4b81c6cd3740
--- /dev/null
+++ b/dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 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
index 9680c6b48ced..4b81c6cd3740 100644
--- a/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild
+++ b/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/rosconsole_bridge"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index 0da9943f990d..de84df2ca95d 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,8 +1,7 @@
-AUX boost.patch 1237 BLAKE2B bdea2bd55d1df3db2bdf3df15fd648bd488403068fc4667a2f1217cedaa066d5bb24cde84f1b9bc2ae43c33baec0dd601e0de1c036d0a522d9bf215f00cdf8eb SHA512 383a3c7ec2f4d92f578a18f530e2cf856c269bf761adb4c2a015fdffa5ee8adfbb2d62086c0c2a126653ea63a97763a8631eb93a82d1e9da5898c54f7187eadd
 AUX boost173.patch 3035 BLAKE2B 3ce759d081ebaaab9e10b838515ffe41d3e5c3925e995379fe768030e1a308f3531aea70c97aa0b761fd9531ec18fb054a7b1f4ff0ad3f522a4e28a7165f7571 SHA512 6b263429c7172189e4d341a1e0471d70de419d3c694bcd09549d057fd8568facd30b46a2adbb66f0cb5216333225ed5db5752be4ebc17980e2080312031c7409
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD roscpp-1.14.3-r1.ebuild 644 BLAKE2B ccb0c12829043287d21b36636ec34b2aecd9f4b3aaf6f66619bd76fd7886b2aa789bd47eabe348c4b8c374cefd07370485816e6160ce7740b1ad22dfcdf23905 SHA512 a10ac9244f4b769ec523147a325088294340787ac09a56f32826796b9df9d83b3bdc98101a422794494d5fcaedeef9c1b7bc35ad593acc8a086e7b8e22a07dd7
-EBUILD roscpp-1.15.4.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
+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
+EBUILD roscpp-1.15.7.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
+EBUILD roscpp-1.15.8.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
 EBUILD roscpp-9999.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/files/boost.patch b/dev-ros/roscpp/files/boost.patch
deleted file mode 100644
index 1d509a8ab6c7..000000000000
--- a/dev-ros/roscpp/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
-Author: Maarten de Vries <maarten@de-vri.es>
-Date:   Thu Jan 31 00:58:29 2019 +0100
-
-    Remove signals from find_package(Boost COMPONENTS ...) (#1580)
-    
-    The packages use signals2, not signals. Only boost libraries with
-    compiled code should be passed to find_package(Boost COMPONENTS ...),
-    and the signals2 library has always been header only.
-    
-    Boost 1.69 has removed the deprecated signals library, so the otherwise
-    useless but harmless `signals` component now breaks the build.
-
-diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
-index a5d354ea6..8f462df2c 100644
---- a/clients/roscpp/CMakeLists.txt
-+++ b/clients/roscpp/CMakeLists.txt
-@@ -22,7 +22,7 @@ list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH)
- 
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)
- 
--find_package(Boost REQUIRED COMPONENTS chrono filesystem signals system)
-+find_package(Boost REQUIRED COMPONENTS chrono filesystem system)
- 
- include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
- 
diff --git a/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
deleted file mode 100644
index 9f927d9f390b..000000000000
--- a/dev-ros/roscpp/roscpp-1.14.3-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=5
-
-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}"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/roscpp/roscpp-1.15.4.ebuild b/dev-ros/roscpp/roscpp-1.15.7.ebuild
index 8863bf3d38b4..8863bf3d38b4 100644
--- a/dev-ros/roscpp/roscpp-1.15.4.ebuild
+++ b/dev-ros/roscpp/roscpp-1.15.7.ebuild
diff --git a/dev-ros/roscpp/roscpp-1.15.8.ebuild b/dev-ros/roscpp/roscpp-1.15.8.ebuild
new file mode 100644
index 000000000000..8863bf3d38b4
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.15.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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}"
+PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscpp_serialization/Manifest b/dev-ros/roscpp_serialization/Manifest
index f20b642d4794..61d18a55afeb 100644
--- a/dev-ros/roscpp_serialization/Manifest
+++ b/dev-ros/roscpp_serialization/Manifest
@@ -1,8 +1,4 @@
-DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
-DIST roscpp_core-0.6.12.tar.gz 35606 BLAKE2B 5f249ce576e046b487a12fc1d598429741329b57f4226a6a0fa7b62e0a5a6fa0716814e0c8cd8a4d4378f8994ca1534530d410a8865d666397328047f12f821d SHA512 a84799ee67cf205c9c304433f70aaf80c8f19eac86bc0c9c3207aa0ae255f33b302b4ad9e37feeb5d95d7e2db9210679871548313612f220e06fef3db2357f89
-DIST roscpp_core-0.6.13.tar.gz 35881 BLAKE2B f1eee242ecbda14de4d1b4f92c4552b249398eea0216300933e0ea73d86bce970e7db375b23d5ecb023e8a8a2e75baec8b7c0a935647143f1ff2a1eaf0bcbd5b SHA512 7d81371c383b8b2ae8d31731f21213ac2c5c4d47ed038890214c9da527f27149ce1deeda4a5e67adaabbfb7ff4a6edc53495cfa50625eeb94089eb7615850d2c
-EBUILD roscpp_serialization-0.6.11.ebuild 387 BLAKE2B 8c6cce04919a8a1ff197d4518b83da92e5a4e8b72fec4288bae1a0e5a79a26200d5baef7d2f7b33585f453e1082b338c37881601d497134a881139ca4bc3ed5b SHA512 6c11b64d7abcde3b95ae30401a44f183775cedddf083bc50a78dbc2f41e14738315a9b7190fa1f7873f2208eb8227a3a7603235f9c093576cfdd1cc3c2a84b5e
-EBUILD roscpp_serialization-0.6.12.ebuild 384 BLAKE2B be4f560014df6e0952625a26b97fb0ffc2a10c64952c3362edc7444148c29c7ecf826183bd1edee31a2d661550ed5e80b3e5dd2aadab7c832eb3247f64c41eef SHA512 99bff10bc01076cba3cdeb7f394fed9ad3f30f3b6b1a94df419d54f68a593c5372c25a1ac881035013e71dc4c55f832d4d354d439c6f61fb943cf8e835cdd786
-EBUILD roscpp_serialization-0.6.13.ebuild 384 BLAKE2B be4f560014df6e0952625a26b97fb0ffc2a10c64952c3362edc7444148c29c7ecf826183bd1edee31a2d661550ed5e80b3e5dd2aadab7c832eb3247f64c41eef SHA512 99bff10bc01076cba3cdeb7f394fed9ad3f30f3b6b1a94df419d54f68a593c5372c25a1ac881035013e71dc4c55f832d4d354d439c6f61fb943cf8e835cdd786
-EBUILD roscpp_serialization-9999.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
+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 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.11.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.11.ebuild
deleted file mode 100644
index 85ab25009f61..000000000000
--- a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.11.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.12.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.12.ebuild
deleted file mode 100644
index 29c448abab13..000000000000
--- a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.13.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.13.ebuild
deleted file mode 100644
index 29c448abab13..000000000000
--- a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.13.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.7.2.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.7.2.ebuild
new file mode 100644
index 000000000000..6aaa762b9466
--- /dev/null
+++ b/dev-ros/roscpp_serialization/roscpp_serialization-0.7.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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
index 0e50b4baa259..6aaa762b9466 100644
--- a/dev-ros/roscpp_serialization/roscpp_serialization-9999.ebuild
+++ b/dev-ros/roscpp_serialization/roscpp_serialization-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/roscpp_core"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/roscpp_traits/Manifest b/dev-ros/roscpp_traits/Manifest
index 62704b2db1a5..fc2879307bf7 100644
--- a/dev-ros/roscpp_traits/Manifest
+++ b/dev-ros/roscpp_traits/Manifest
@@ -1,32 +1,4 @@
-DIST roscpp_core-0.5.6.tar.gz 31734 BLAKE2B b72e8f7ed04cac701e867cdc9c88ec4435cdf00d484628e19439274f55fb04de3d1cc563f91b3794517573b6639c19f4d00d260caf53c843ff9f3fbb95a80cc2 SHA512 caebca2817721a46c8ce850bc15bdeadb3bf6ad12aeb134b11bdb04da6054eb4056aef8c5194ca4e7fffa3e3f3563faf8e3148eebfba93bc6b5673d5437d977f
-DIST roscpp_core-0.5.7.tar.gz 32006 BLAKE2B d63c6bcf314de4237ed8c08b5af7a1a097b9d5af76b0644124419bb516f08f8c9030e509b9a4dfbd80fd2f1fff35b58e0452293339b0081c4d1cef590e5c05f3 SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe
-DIST roscpp_core-0.6.0.tar.gz 32255 BLAKE2B d184d3d3c05a041c1c027877a314f5bd98515ee02d607cf3575ca939e7ec7d87807bf2ee96717cc5b23971ce297d3bdeb6f78c5883dbb6350ae01ba23ae8246e SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75
-DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023a0241422e463dd8fc12f697604e655f01dfe5ea0142b819aa638903fb94adaec985a0c7c2feb79db886a2b97db18 SHA512 167d3b7bfa048a2c3f7b4239402c9077e1871aa2cc5f60ebab3e5ad3cb5acd94667b4e7de9eb2af2f8dfba74e0d82510f6bb591f7096d99e465f987643b2681a
-DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
-DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
-DIST roscpp_core-0.6.12.tar.gz 35606 BLAKE2B 5f249ce576e046b487a12fc1d598429741329b57f4226a6a0fa7b62e0a5a6fa0716814e0c8cd8a4d4378f8994ca1534530d410a8865d666397328047f12f821d SHA512 a84799ee67cf205c9c304433f70aaf80c8f19eac86bc0c9c3207aa0ae255f33b302b4ad9e37feeb5d95d7e2db9210679871548313612f220e06fef3db2357f89
-DIST roscpp_core-0.6.13.tar.gz 35881 BLAKE2B f1eee242ecbda14de4d1b4f92c4552b249398eea0216300933e0ea73d86bce970e7db375b23d5ecb023e8a8a2e75baec8b7c0a935647143f1ff2a1eaf0bcbd5b SHA512 7d81371c383b8b2ae8d31731f21213ac2c5c4d47ed038890214c9da527f27149ce1deeda4a5e67adaabbfb7ff4a6edc53495cfa50625eeb94089eb7615850d2c
-DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
-DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
-DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
-DIST roscpp_core-0.6.5.tar.gz 34493 BLAKE2B 9804fe6f23192e0e19bfb26e0671ad36189b936701e45755adb0c54e25c1c92dabd6f645bd014451bcd21f45af39be2f1c24727d1231cc52b62caba4d01ca4ff SHA512 32314cac55716b074416fac6665a8dec3a6a64abfac55be709f50b7ca1cbd993797d176bc2aefe2ae8b233b21e8464f330ad31de98bf60edc63149215dcb0cda
-DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
-DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
-DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
-EBUILD roscpp_traits-0.5.6.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
-EBUILD roscpp_traits-0.5.7.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
-EBUILD roscpp_traits-0.6.0.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
-EBUILD roscpp_traits-0.6.1.ebuild 361 BLAKE2B b76fc1310778e384f2bd719b9319a97e24594c84d6c309ab86946024b3484394a1a2170dfd44ab6e113b54b7e36562045196665f1bd9a5e3106a903e739a9595 SHA512 fc9ed293ada85a69388adfefe444e9abda9d6f038922b81f033b86de891fffa34d9ab30ca50426bb3e68014e3791ce082df7254577db2479524c0e2c6c8fcddb
-EBUILD roscpp_traits-0.6.10.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
-EBUILD roscpp_traits-0.6.11.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
-EBUILD roscpp_traits-0.6.12.ebuild 358 BLAKE2B 74840974f8233de382c8a9de7c209493ccd2e629b69ed4407898cc6ea47bf0f6f530351e9d8ca4e3f3673e624f2f97a4884778599dc87021e5c11eeae2ef994d SHA512 9450166ca9d1cbf7af340892856a078ed2a37f735976994f4446c5a12f2fe3d2c84035a4e1bbcd7ca30be6eb49a616b0815de6ba23b0a602b499879d8641f3d1
-EBUILD roscpp_traits-0.6.13.ebuild 358 BLAKE2B 74840974f8233de382c8a9de7c209493ccd2e629b69ed4407898cc6ea47bf0f6f530351e9d8ca4e3f3673e624f2f97a4884778599dc87021e5c11eeae2ef994d SHA512 9450166ca9d1cbf7af340892856a078ed2a37f735976994f4446c5a12f2fe3d2c84035a4e1bbcd7ca30be6eb49a616b0815de6ba23b0a602b499879d8641f3d1
-EBUILD roscpp_traits-0.6.2.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
-EBUILD roscpp_traits-0.6.3.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
-EBUILD roscpp_traits-0.6.4.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
-EBUILD roscpp_traits-0.6.5.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
-EBUILD roscpp_traits-0.6.7.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
-EBUILD roscpp_traits-0.6.8.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
-EBUILD roscpp_traits-0.6.9.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
-EBUILD roscpp_traits-9999.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
+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 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.5.6.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.5.6.ebuild
deleted file mode 100644
index e2f421900693..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.5.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Message traits code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.5.7.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.5.7.ebuild
deleted file mode 100644
index e2f421900693..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.5.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Message traits code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.6.0.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.0.ebuild
deleted file mode 100644
index e2f421900693..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Message traits code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.6.1.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.1.ebuild
deleted file mode 100644
index 0f7b384544d6..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Message traits code"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.6.10.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.10.ebuild
deleted file mode 100644
index 48ba1af0d0b9..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.11.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.11.ebuild
deleted file mode 100644
index 48ba1af0d0b9..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.12.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.12.ebuild
deleted file mode 100644
index a8e2304e4614..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.13.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.13.ebuild
deleted file mode 100644
index a8e2304e4614..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.13.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.2.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.2.ebuild
deleted file mode 100644
index a0a59948d49b..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.3.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.3.ebuild
deleted file mode 100644
index a0a59948d49b..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.4.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.4.ebuild
deleted file mode 100644
index a0a59948d49b..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.5.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.5.ebuild
deleted file mode 100644
index a0a59948d49b..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.7.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.7.ebuild
deleted file mode 100644
index a0a59948d49b..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.8.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.8.ebuild
deleted file mode 100644
index 48ba1af0d0b9..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.6.9.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.9.ebuild
deleted file mode 100644
index 48ba1af0d0b9..000000000000
--- a/dev-ros/roscpp_traits/roscpp_traits-0.6.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-0.7.2.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.7.2.ebuild
new file mode 100644
index 000000000000..e3e556dff1e0
--- /dev/null
+++ b/dev-ros/roscpp_traits/roscpp_traits-0.7.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
index e2f421900693..e3e556dff1e0 100644
--- a/dev-ros/roscpp_traits/roscpp_traits-9999.ebuild
+++ b/dev-ros/roscpp_traits/roscpp_traits-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/roscpp_core"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/roscpp_tutorials/Manifest b/dev-ros/roscpp_tutorials/Manifest
index e531b79389e9..06c7eaae969b 100644
--- a/dev-ros/roscpp_tutorials/Manifest
+++ b/dev-ros/roscpp_tutorials/Manifest
@@ -1,18 +1,6 @@
-DIST ros_tutorials-0.10.0.tar.gz 159486 BLAKE2B 71b6fabb1a85ac9740dfba9f40be318e211d519189f8be05e58bf146b5d22566ea6ddcdca6331366c05e95c314b656c4f5688c4da3d20b1cdce78639a76e14c5 SHA512 dba529965bad64957721c71f1c7b2b60ece085ed0186a107fbec03c231940b19004b3bf9dce5c1ac3dcfe1c339d49a2214811d5227f453b1c3f541076a653048
-DIST ros_tutorials-0.6.1.tar.gz 126792 BLAKE2B 5964c8fe5ddc736e9933b89f9c66eae436805ec5c564a2144c1e338537da18b2064e9aba209f25a82b7d88e5b2bd2e1401dbe931614f65544ae2f5170270ff1f SHA512 f09e5451030c0a76a9473020535e79ac06e748f4208109cf83e61526d13472c3390402814a3d145cb793c5418af703cd9959ca57143798d1706185c13d3418c5
-DIST ros_tutorials-0.7.0.tar.gz 140125 BLAKE2B 9f1006c933b4cb642f77c8e68ddda92213b9cfd132131b2768c4fe17ef6b1b8bf8da89da3fea2a0692d340d9f0b1e953fb150e2dae9e18de86b59fe50b72cb74 SHA512 b7c51bc007c0bddfb38361750a0225606d9e85a3404d6b21f3a32c8ccb1786844f225a49ad8f525c684c838eff9ec9f7e7c39a15adf5ea5dd187a59c90144711
-DIST ros_tutorials-0.7.1.tar.gz 140483 BLAKE2B 8f2d4aee6494476bf7efb2ea35962ea6154485143f108b8e7603a9a1e67cb76f6c87e7b2612cd07ba19c50b44cd7fbbcd89f13f902eafd17c2a0eb8738357050 SHA512 0970e6428af992addfa1af327b2e0a3f85a926c90cfceba89d415acc5404a364164e0dd497c9296f03ac06c575380ad21e83b0cdbf6709c49dc650087145ddaa
-DIST ros_tutorials-0.8.0.tar.gz 153739 BLAKE2B 0dc7918a2b95a26518d07d753040e381b26c357eb3995a22a429d58c244751d7c58c8736efbab23a6a5ca6903f08e43acf9519f2a534b22fe89ea853b2e3fbff SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795
-DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
-DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
-DIST ros_tutorials-0.9.1.tar.gz 155151 BLAKE2B 7371063ef77981892fee54b6b3d29907421f29deece22c6d53ace576717357a9700a2e14a03bd9f24c2285a16b55f5c9665a0da5081ae1599da8df5ec68ba425 SHA512 62a980e9515515496de39aa360df030f0dd8678bbf132d90386775c34e3b54f33a477aaefb65db803dcd704b8fbc61d445617399ac38cc2fa3f3363a6052682f
-EBUILD roscpp_tutorials-0.10.0.ebuild 613 BLAKE2B 166eb266d54bf9347c8d4f772c12cf4003b3facd229819f766c40a630e34293d24e7b9cfd63571882205682fe5245a3573695fc6445a9aa87b491b4bf22bd49c SHA512 beb1445bca385d8eb788ad7757b3dac18f474a49ca6c260d322510605dcebaa4f7ad2cd39390ccac2382d2015d46a9ca4dcaf5aec0dd9ba222dd069362c9f8ae
-EBUILD roscpp_tutorials-0.6.1.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
-EBUILD roscpp_tutorials-0.7.0.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
-EBUILD roscpp_tutorials-0.7.1.ebuild 616 BLAKE2B b4ed00d497e609ef6d5888556fdfabb84912cb4f2f55f42990f18f9864edd3bca19743bbfdfb37f42dc1db183e4c11e8d0af2fc974122fe7dff136b9efcc281f SHA512 8eeebc4781f2d72898298228e28808f0fcfbce52f1a81b4fe532d037570e1a42de256f569fa8e21453e34941bfff6365592b5dfc4e6a0f3795b7c1b7ef7e8935
-EBUILD roscpp_tutorials-0.8.0.ebuild 616 BLAKE2B 277dfb5f79c390b88e1d938da3e4b9929edaa970280ff7b36c82bda6501d10fef0f99992f0523906ce62fee7942e5f69e2d33565c346f44a68c2ac3dd91d09c2 SHA512 229897133f8ca39d82fe27ceafff9ad80157996a13797d3bbc526a58f479812081e2ea1d8ee316ee0f66ab1bb8af713e51ef2a8a882ff2f2b357364109ddabea
-EBUILD roscpp_tutorials-0.8.1.ebuild 616 BLAKE2B 277dfb5f79c390b88e1d938da3e4b9929edaa970280ff7b36c82bda6501d10fef0f99992f0523906ce62fee7942e5f69e2d33565c346f44a68c2ac3dd91d09c2 SHA512 229897133f8ca39d82fe27ceafff9ad80157996a13797d3bbc526a58f479812081e2ea1d8ee316ee0f66ab1bb8af713e51ef2a8a882ff2f2b357364109ddabea
-EBUILD roscpp_tutorials-0.9.0.ebuild 616 BLAKE2B e3b6ddeff592902eefe58708f682822a152139dc186981d6f605e255b585cb5b4c401de2db24bfcc5f1eba8cb3ef2dda39164643d43e2c3b9d2fcee2ea92c1bf SHA512 c13ed8ca592c4c3cc90618fc4b85754de386a39ec491f544b4c580ae30b4f493fd27cf13f080e0f5e201ac9ff7ce057ddb99cfe3a287eba971124769d498c46d
-EBUILD roscpp_tutorials-0.9.1.ebuild 613 BLAKE2B 072af07aa2ae15bbd01ad6f4b064a27fc4c1bd364f822c1714381284865663461a309d4128a7c944159ef80e356fb6c5f977b4ab266548334c62aa376bb337d6 SHA512 334204fa1f456bb3f74b45fcb8a8577b849a401c64b5aa4e1ebddb36ac9f090ca604704596bc15adef2d5681523854886895c2f1b4eb162970e5b2586dcbee8a
-EBUILD roscpp_tutorials-9999.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
+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.ebuild 538 BLAKE2B 4fe81181fee392c7c9fdbcab5957cf70d8ecd6ca82eaee221b0a6aeb288ed97a5674c692b493f65d633233a14da2684247adbc59dadc38783720ef83a1fc7103 SHA512 730cd937fc78bc2954f51fc3bbc759561152007427a02087b6c10c1546f4fce7962b2c272e9e9a90458695564e8d1e2826e4f06d61a9b1e96e3fefcfca1d36bf
+EBUILD roscpp_tutorials-0.10.2.ebuild 538 BLAKE2B 4fe81181fee392c7c9fdbcab5957cf70d8ecd6ca82eaee221b0a6aeb288ed97a5674c692b493f65d633233a14da2684247adbc59dadc38783720ef83a1fc7103 SHA512 730cd937fc78bc2954f51fc3bbc759561152007427a02087b6c10c1546f4fce7962b2c272e9e9a90458695564e8d1e2826e4f06d61a9b1e96e3fefcfca1d36bf
+EBUILD roscpp_tutorials-9999.ebuild 538 BLAKE2B 4fe81181fee392c7c9fdbcab5957cf70d8ecd6ca82eaee221b0a6aeb288ed97a5674c692b493f65d633233a14da2684247adbc59dadc38783720ef83a1fc7103 SHA512 730cd937fc78bc2954f51fc3bbc759561152007427a02087b6c10c1546f4fce7962b2c272e9e9a90458695564e8d1e2826e4f06d61a9b1e96e3fefcfca1d36bf
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.0.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.0.ebuild
deleted file mode 100644
index 393ca54867e1..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.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=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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.1.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.1.ebuild
new file mode 100644
index 000000000000..73bab99e031e
--- /dev/null
+++ b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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-libs/boost:=[threads]
+	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.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.2.ebuild
new file mode 100644
index 000000000000..73bab99e031e
--- /dev/null
+++ b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.10.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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-libs/boost:=[threads]
+	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.6.1.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.6.1.ebuild
deleted file mode 100644
index 88f93b70af53..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.6.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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.7.0.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.7.0.ebuild
deleted file mode 100644
index 88f93b70af53..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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.7.1.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.7.1.ebuild
deleted file mode 100644
index 092c5ef28596..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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.8.0.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.8.0.ebuild
deleted file mode 100644
index 07b28d3562d5..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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.8.1.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.8.1.ebuild
deleted file mode 100644
index 07b28d3562d5..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.8.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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.9.0.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.0.ebuild
deleted file mode 100644
index ed62b87963c3..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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.9.1.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.1.ebuild
deleted file mode 100644
index ce7133ab81ce..000000000000
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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
index 88f93b70af53..73bab99e031e 100644
--- a/dev-ros/roscpp_tutorials/roscpp_tutorials-9999.ebuild
+++ b/dev-ros/roscpp_tutorials/roscpp_tutorials-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/ros_tutorials"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
+DESCRIPTION="Attempts to show the features of ROS step-by-step"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
index c4fba97d5a00..5ff5685240a1 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -1,4 +1,4 @@
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD roscreate-1.14.7.ebuild 506 BLAKE2B 2a718c7b59159378e2a5f850dd42849bef1bed69ce27bde5a1866050609c8152ee39755e62cc936b8b0f78f7fe4fb2fb5e292737d3c4c9d4f131337e54156367 SHA512 9dbd727d48329d8516de1e11467a26e8da01ba49898c3170af9b5f02f67effa98255c3f4002f9d4c26c21e9c0c4f4b9f3c5f86e4ed073aa4738ac4eff307ac6e
-EBUILD roscreate-9999.ebuild 506 BLAKE2B 2a718c7b59159378e2a5f850dd42849bef1bed69ce27bde5a1866050609c8152ee39755e62cc936b8b0f78f7fe4fb2fb5e292737d3c4c9d4f131337e54156367 SHA512 9dbd727d48329d8516de1e11467a26e8da01ba49898c3170af9b5f02f67effa98255c3f4002f9d4c26c21e9c0c4f4b9f3c5f86e4ed073aa4738ac4eff307ac6e
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD roscreate-1.15.6.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
+EBUILD roscreate-9999.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roscreate/roscreate-1.14.7.ebuild b/dev-ros/roscreate/roscreate-1.14.7.ebuild
deleted file mode 100644
index 41dae056f1c9..000000000000
--- a/dev-ros/roscreate/roscreate-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.15.6.ebuild b/dev-ros/roscreate/roscreate-1.15.6.ebuild
new file mode 100644
index 000000000000..5a077c7eb99f
--- /dev/null
+++ b/dev-ros/roscreate/roscreate-1.15.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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-9999.ebuild b/dev-ros/roscreate/roscreate-9999.ebuild
index 41dae056f1c9..5a077c7eb99f 100644
--- a/dev-ros/roscreate/roscreate-9999.ebuild
+++ b/dev-ros/roscreate/roscreate-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
@@ -16,8 +15,13 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	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
index 928842b69962..1d50e7c4c258 100644
--- a/dev-ros/rosdiagnostic/Manifest
+++ b/dev-ros/rosdiagnostic/Manifest
@@ -1,8 +1,8 @@
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD rosdiagnostic-1.9.0.ebuild 500 BLAKE2B 4e29cfbdea9d462e0eb76576f654894a67e91e19fa252f3272f9b513415b38f8f6c96cb5b5af4a89203650cc1f66917f5e8ca9eee34df22a609d2c6c4fcde7fe SHA512 a6382ca1963af712509f5f8f2cda581b9844010d2bd684e857058959c005377af68c071b2af6140bbe18e88e39f001bcbb57e8ab991fdcc02a943624bc7e2a5d
-EBUILD rosdiagnostic-1.9.2.ebuild 500 BLAKE2B 4e29cfbdea9d462e0eb76576f654894a67e91e19fa252f3272f9b513415b38f8f6c96cb5b5af4a89203650cc1f66917f5e8ca9eee34df22a609d2c6c4fcde7fe SHA512 a6382ca1963af712509f5f8f2cda581b9844010d2bd684e857058959c005377af68c071b2af6140bbe18e88e39f001bcbb57e8ab991fdcc02a943624bc7e2a5d
-EBUILD rosdiagnostic-1.9.3.ebuild 500 BLAKE2B 4e29cfbdea9d462e0eb76576f654894a67e91e19fa252f3272f9b513415b38f8f6c96cb5b5af4a89203650cc1f66917f5e8ca9eee34df22a609d2c6c4fcde7fe SHA512 a6382ca1963af712509f5f8f2cda581b9844010d2bd684e857058959c005377af68c071b2af6140bbe18e88e39f001bcbb57e8ab991fdcc02a943624bc7e2a5d
-EBUILD rosdiagnostic-9999.ebuild 500 BLAKE2B 4e29cfbdea9d462e0eb76576f654894a67e91e19fa252f3272f9b513415b38f8f6c96cb5b5af4a89203650cc1f66917f5e8ca9eee34df22a609d2c6c4fcde7fe SHA512 a6382ca1963af712509f5f8f2cda581b9844010d2bd684e857058959c005377af68c071b2af6140bbe18e88e39f001bcbb57e8ab991fdcc02a943624bc7e2a5d
+DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+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.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 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.1.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.1.ebuild
new file mode 100644
index 000000000000..89a06deb6a4d
--- /dev/null
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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.0.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.0.ebuild
deleted file mode 100644
index 95a6acb8adc5..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.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=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.2.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.2.ebuild
deleted file mode 100644
index 95a6acb8adc5..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.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=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.3.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.3.ebuild
deleted file mode 100644
index 95a6acb8adc5..000000000000
--- a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.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=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild
new file mode 100644
index 000000000000..89a06deb6a4d
--- /dev/null
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
new file mode 100644
index 000000000000..89a06deb6a4d
--- /dev/null
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-1.9.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
index 95a6acb8adc5..89a06deb6a4d 100644
--- a/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -16,6 +15,6 @@ IUSE=""
 
 DEPEND="
 	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 269425a10d7e..e832b8198ce8 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,9 +1,4 @@
-AUX py3-2.patch 2357 BLAKE2B a3af95fdd93c1e5540626a529696583c366623a34a056122efde2eccf19219c70528cfcf227ffe96c2e5c90c5d26da5127f5ae3fdbd47a0da045dea4e9b34f08 SHA512 3437178097e04ac0b169a0612579a839f1d1d391859df9e215a3a016b301d1a22cd37a1c25684d55e7af0958a46af0e6d8ed759798a350dd7839a1b2b5bc7783
-AUX py3.patch 1616 BLAKE2B 56b70362a387ca67c97041456f185f4fb10959d32c7a54d825c8ee2a2dc71cc6bef3f2b9883083596f28bd26442d1b6d9bf92e563a5d3a8872a608a676949aa4 SHA512 e12466e7f86252516a7a094fdb6b0bbfeef784cae3a6638683b84aa5ee94c6848ecb1a22121719339f65fecdaa0d25a26c27d986c771ad2a82dc42975dad6118
-AUX yaml.patch 2245 BLAKE2B 2048938c0532efee2bca2cd7bdc5f544670245cd3b647613e8ec1a80588fad33287931ead00fc63c27e03e825bfb5c2b8db5bae75446184f85fc0c09abb26f3d SHA512 6346eb9231152dd91627b67f99f1268fc158136092d62e86fa01c7adb831a31e36844c12dbb3c52f190fbd6b4dbd77b026fe5190496d88ba4326abf55f7339ac
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosgraph-1.14.3-r1.ebuild 638 BLAKE2B 466cd36f189b553c024553471e9bc912cb1c7c56c5e99d85c3783e8806b047c5dde65a2212e8e75008e6baa571d974ccc88fee8484fb585f4ffd440f1cfc8554 SHA512 241bcf3ac7f4a244bb186a23d2b66bcdbd0101234acbeb64acef219c81220789f080610e6aeec0767f76f74814f3d640f48daae630e1221c88ab74c725f7470a
-EBUILD rosgraph-1.15.4.ebuild 551 BLAKE2B 16d5178f64797054ee4de083110175ddffa6b0edd714c64fbd149cf8493f97ff8839f4fa83d7724689aad6a4cb6d38238ed07461b07addd286afbe2725502324 SHA512 39901b1d4e9df5316c0a170a928cd4e09bad87a564be69897b9f594c4008ce96a67459d989cd419fc370f0b1b8a1cc890f97e690b46a99da0056e7be3d0454c9
-EBUILD rosgraph-9999.ebuild 551 BLAKE2B 16d5178f64797054ee4de083110175ddffa6b0edd714c64fbd149cf8493f97ff8839f4fa83d7724689aad6a4cb6d38238ed07461b07addd286afbe2725502324 SHA512 39901b1d4e9df5316c0a170a928cd4e09bad87a564be69897b9f594c4008ce96a67459d989cd419fc370f0b1b8a1cc890f97e690b46a99da0056e7be3d0454c9
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rosgraph-1.15.8.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
+EBUILD rosgraph-9999.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/files/py3-2.patch b/dev-ros/rosgraph/files/py3-2.patch
deleted file mode 100644
index b83b349576bd..000000000000
--- a/dev-ros/rosgraph/files/py3-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py   |  6 +--
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- .../test/test_roslogging_user_logger.py       |  8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py   |  2 +-
- tools/rosmsg/src/rosmsg/__init__.py           |  2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py     | 20 ++++----
- .../test_rostopic_command_line_offline.py     | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
-index bbf1d9f49..51c39becd 100644
---- a/tools/rosgraph/src/rosgraph/roslogging.py
-+++ b/tools/rosgraph/src/rosgraph/roslogging.py
-@@ -49,7 +49,7 @@
- class LoggingException(Exception): pass
- 
- class RospyLogger(logging.getLoggerClass()):
--    def findCaller(self, dummy=False): # Dummy second arg to match Python3 function declaration
-+    def findCaller(self, stack_info=False):
-         """
-         Find the stack frame of the caller so that we can note the source
-         file name, line number, and function name with class name if possible.
-diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
-index 4ac4f8291..1c3cb5df5 100644
---- a/tools/rosgraph/test/test_roslogging_user_logger.py
-+++ b/tools/rosgraph/test/test_roslogging_user_logger.py
-@@ -51,12 +51,16 @@
- 
- # set user defined custom logger
- class UserCustomLogger(logging.Logger):
--    def findCaller(self):
-+    def findCaller(self, stack_info=False):
-         """Returns static caller.
- 
-         This method is being overwritten in rosgraph.roslogging.
-         """
--        return '<filename>', '<lineno>', '<func_name>'
-+        if sys.version_info > (3, 2):
-+            # Dummy last argument to match Python3 return type
-+            return '<filename>', '<lineno>', '<func_name>', None
-+        else:
-+            return '<filename>', '<lineno>', '<func_name>'
- 
-     def _log(self, level, msg, args, exc_info=None, extra=None):
-         """Write log with ROS_IP.
diff --git a/dev-ros/rosgraph/files/py3.patch b/dev-ros/rosgraph/files/py3.patch
deleted file mode 100644
index 45798c1d618e..000000000000
--- a/dev-ros/rosgraph/files/py3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows  | 2 +-
- test/test_rosmaster/test/nodes/testMaster          | 2 +-
- test/test_rosmaster/test/nodes/testSlave           | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py        | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py             | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py           | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/tools/rosgraph/test/test_roslogging.py b/tools/rosgraph/test/test_roslogging.py
-index f9e618f87..ca38c80e8 100644
---- a/tools/rosgraph/test/test_roslogging.py
-+++ b/tools/rosgraph/test/test_roslogging.py
-@@ -32,7 +32,10 @@
- 
- import logging
- import os
--from StringIO import StringIO
-+try:
-+    from cStringIO import StringIO
-+except ImportError:
-+    from io import StringIO
- import sys
- 
- import re
-diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
-index 62051638a..4ac4f8291 100644
---- a/tools/rosgraph/test/test_roslogging_user_logger.py
-+++ b/tools/rosgraph/test/test_roslogging_user_logger.py
-@@ -38,7 +38,10 @@
- 
- import logging
- import os
--from StringIO import StringIO
-+try:
-+    from cStringIO import StringIO
-+except ImportError:
-+    from io import StringIO
- import sys
- 
- from nose.tools import assert_regexp_matches
diff --git a/dev-ros/rosgraph/files/yaml.patch b/dev-ros/rosgraph/files/yaml.patch
deleted file mode 100644
index 32ea589c8e49..000000000000
--- a/dev-ros/rosgraph/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
-index ffe975dab..bbf1d9f49 100644
---- a/tools/rosgraph/src/rosgraph/roslogging.py
-+++ b/tools/rosgraph/src/rosgraph/roslogging.py
-@@ -178,7 +178,7 @@ def configure_logging(logname, level=logging.INFO, filename=None, env=None):
-     os.environ['ROS_LOG_FILENAME'] = log_filename
-     if config_file.endswith(('.yaml', '.yml')):
-         with open(config_file) as f:
--            dict_conf = yaml.load(f)
-+            dict_conf = yaml.safe_load(f)
-         dict_conf.setdefault('version', 1)
-         logging.config.dictConfig(dict_conf)
-     else:
diff --git a/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
deleted file mode 100644
index a3f0ad00a7c1..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.14.3-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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
diff --git a/dev-ros/rosgraph/rosgraph-1.15.4.ebuild b/dev-ros/rosgraph/rosgraph-1.15.4.ebuild
deleted file mode 100644
index 49cca14bf4f3..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.15.8.ebuild b/dev-ros/rosgraph/rosgraph-1.15.8.ebuild
new file mode 100644
index 000000000000..171218629338
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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
index 49cca14bf4f3..171218629338 100644
--- a/dev-ros/rosgraph/rosgraph-9999.ebuild
+++ b/dev-ros/rosgraph/rosgraph-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
@@ -16,7 +15,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
+	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
index ce83fe460424..b936c1721c85 100644
--- a/dev-ros/rosgraph_msgs/Manifest
+++ b/dev-ros/rosgraph_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST ros_comm_msgs-1.11.2.tar.gz 2482 BLAKE2B 886f0bbbb00b0a291ba32ade834e466e03063087e0feaed9d7edbebb2871bc6ec314b4259bb728e662138384d455d5bbec5df49c5b1b6a448e98339cb3516ab7 SHA512 4750e234725b3cad8e2deb681f827e2f979f50bdfc0fccf4100288d2f663a68561f363702340b4569572837462cf6578f51213362d18b9694f6952fdcede1e6e
-EBUILD rosgraph_msgs-1.11.2.ebuild 448 BLAKE2B 000d1ed9530687bb7c03e9cec40bcdd13c9275f46bbb323f1a31881e8465f340f22491dad8b5cf0f23dfd38183b99a1f17ee46dc6e50ad0cddf985800d0df738 SHA512 77af4285014f5238542468f2d31ce263e9b29ce7402b5bd6babf7de9d4ae32ba54333481f29744eceed93befcdffe26bfe8208f22ce2af8223429fc8dd13b41d
-EBUILD rosgraph_msgs-9999.ebuild 448 BLAKE2B 000d1ed9530687bb7c03e9cec40bcdd13c9275f46bbb323f1a31881e8465f340f22491dad8b5cf0f23dfd38183b99a1f17ee46dc6e50ad0cddf985800d0df738 SHA512 77af4285014f5238542468f2d31ce263e9b29ce7402b5bd6babf7de9d4ae32ba54333481f29744eceed93befcdffe26bfe8208f22ce2af8223429fc8dd13b41d
+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 331 BLAKE2B bb21abfb707c7a52640eeb013b04df43dd72b32d8f048207f2d0d0e23732dd2c5727a3bfbc6a1a84d7c4885ba560e15b1dcca0089b1a0e301d2491cc117b9c5d SHA512 365791913afec69e27e8c220acd643eb6ac8e13419a04d38a672a9ba50e696719563b246207abe70a1b945e42c1b61c3348f543f4d7a66b0b6cf62668769cf64
diff --git a/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.2.ebuild b/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.2.ebuild
deleted file mode 100644
index 7cee75bd3604..000000000000
--- a/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.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=5
-
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-1.11.3.ebuild b/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.3.ebuild
new file mode 100644
index 000000000000..9cc4b761683f
--- /dev/null
+++ b/dev-ros/rosgraph_msgs/rosgraph_msgs-1.11.3.ebuild
@@ -0,0 +1,20 @@
+# 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
index 7cee75bd3604..9cc4b761683f 100644
--- a/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild
+++ b/dev-ros/rosgraph_msgs/rosgraph_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
index 09b356360081..299a953c6777 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -1,30 +1,6 @@
-DIST ros-1.12.3.tar.gz 162506 BLAKE2B 79806b47e025fa7470db64e15af75e2db63bd9e71dd041c95a0d2337b706c0290ef5520ec8cb0d49a533fb25d204338033f9d9c97a918dd4d365c17373e7c0f0 SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c
-DIST ros-1.12.5.tar.gz 162845 BLAKE2B 4e0a7f19af528bea60eb3e6b93f9b2d27047474eace593c2411866dd26bf64c13386881e9d768930e64c309fe2aecb451024b236a298ce2473e8d39396be91bd SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314
-DIST ros-1.13.1.tar.gz 165211 BLAKE2B 5fe15d28224a2c7fb39d9d2b6d5431e4cb22d71f79ac8443956e93c24913f2c0ade55342a95d5c524c66eeffe39aefcf113a4227343333c952b78d9d78b92db6 SHA512 7902fa33b4442feadd11ac8b965fbc7b94bbf9126320681bc83a067c5a2031f062ce0fe7585e482cac61c81cf2ef1b5dd92a37a4243908095d76869585962218
-DIST ros-1.13.2.tar.gz 165502 BLAKE2B 97d9e32c3167c9e67cce0f2194ae650ef9275263aa70d162103cf86d032e8e94a3c0403e07c50c23087de48e8f66da3a25d4fd9ce9607e9584cf2866da4e6659 SHA512 d6a407ba1916667e7cae0f16f87d2a0ac49bc019195e423289e0f3380ca50404a21bcd8ee6212005bc3fa528ee7e8ae5dd0d993c5f213e5690509926f7984e26
-DIST ros-1.13.3.tar.gz 165919 BLAKE2B e7c5ea1e42dfc7772b8a55ecd04fe3111b96b01da7dea7d1997fae3df95ab896dfc2450a774e8c6b9f6ba2de22a5bbc8a94eaad5362e9f337a449986cefb626e SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e
-DIST ros-1.13.4.tar.gz 165984 BLAKE2B 591ff73ae9eaeb3e85cb95bd808cc957e5471feb765e9a06c3a3dc0026a8699ea673913d2e8352252c17edac16cf8030d142b9237ef1a11cfae3b1ed7d5e8753 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8
-DIST ros-1.13.5.tar.gz 167351 BLAKE2B a9a2b9aa4ca2fd9391eebe0f757cbd229d480f8be8b0f889c735b37719d910a661b0cf93efbb2aa9bd55241ec986e6526a4d3b3d734566817b0d8ec884157e94 SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD roslang-1.12.3.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
-EBUILD roslang-1.12.5.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
-EBUILD roslang-1.13.1.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
-EBUILD roslang-1.13.2.ebuild 345 BLAKE2B 6f4f40881d84c2df41b9b81efe968b93bcd499d00d94103a6ab036b722485fb3a254412e6b7f50c8b1eca52234c23cea48b9d10376fc7684a129656ee6f70518 SHA512 e6e310d6dac160215b4b209386d8407b8bddefafe1bbe1dea351e5a59674b162b86eb079cf7a739105332b6639f767889c577d03244ee39a974b8999e987fe57
-EBUILD roslang-1.13.3.ebuild 345 BLAKE2B 6f4f40881d84c2df41b9b81efe968b93bcd499d00d94103a6ab036b722485fb3a254412e6b7f50c8b1eca52234c23cea48b9d10376fc7684a129656ee6f70518 SHA512 e6e310d6dac160215b4b209386d8407b8bddefafe1bbe1dea351e5a59674b162b86eb079cf7a739105332b6639f767889c577d03244ee39a974b8999e987fe57
-EBUILD roslang-1.13.4.ebuild 345 BLAKE2B 6f4f40881d84c2df41b9b81efe968b93bcd499d00d94103a6ab036b722485fb3a254412e6b7f50c8b1eca52234c23cea48b9d10376fc7684a129656ee6f70518 SHA512 e6e310d6dac160215b4b209386d8407b8bddefafe1bbe1dea351e5a59674b162b86eb079cf7a739105332b6639f767889c577d03244ee39a974b8999e987fe57
-EBUILD roslang-1.13.5.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
-EBUILD roslang-1.14.0.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
-EBUILD roslang-1.14.1.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
-EBUILD roslang-1.14.2.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
-EBUILD roslang-1.14.3.ebuild 345 BLAKE2B abac9fc1ac751a5421d26bc2497de9c7156b80a77c03de6a08d07a7cabf66b6b93fcc76a1da6b9727868682d3f356742ad508dbf10abcb99b8fa73faa5157b44 SHA512 f38c714eb4eff24db349063fb01c53b141a59ada5911569404fc31923252929d5de33111d2e875853b994202537974d36d8d347d07ba93c6a7495daed44ed0c9
-EBUILD roslang-1.14.4.ebuild 345 BLAKE2B abac9fc1ac751a5421d26bc2497de9c7156b80a77c03de6a08d07a7cabf66b6b93fcc76a1da6b9727868682d3f356742ad508dbf10abcb99b8fa73faa5157b44 SHA512 f38c714eb4eff24db349063fb01c53b141a59ada5911569404fc31923252929d5de33111d2e875853b994202537974d36d8d347d07ba93c6a7495daed44ed0c9
-EBUILD roslang-1.14.6.ebuild 342 BLAKE2B 04b11038683debcdd01e91a2fb8b1ef67bad2c18ffd4f2112ffd589038c0cd91ca31c4326f24dee4e7e14ca22292b43c1eebb9c45242c13563146bae2755bcca SHA512 8e2bcdeb858cc835908a7e4d39cbb6dbaa057b24c18b554e653be243b07a40fd9c699251ef14992ac0cc2099aeb9218d24bfe56a2b255987945f6d2f1ac57247
-EBUILD roslang-1.14.7.ebuild 342 BLAKE2B 04b11038683debcdd01e91a2fb8b1ef67bad2c18ffd4f2112ffd589038c0cd91ca31c4326f24dee4e7e14ca22292b43c1eebb9c45242c13563146bae2755bcca SHA512 8e2bcdeb858cc835908a7e4d39cbb6dbaa057b24c18b554e653be243b07a40fd9c699251ef14992ac0cc2099aeb9218d24bfe56a2b255987945f6d2f1ac57247
-EBUILD roslang-9999.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
+DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD roslang-1.15.5.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
+EBUILD roslang-1.15.6.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
+EBUILD roslang-9999.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslang/roslang-1.12.3.ebuild b/dev-ros/roslang/roslang-1.12.3.ebuild
deleted file mode 100644
index a59fb6797bb5..000000000000
--- a/dev-ros/roslang/roslang-1.12.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.12.5.ebuild b/dev-ros/roslang/roslang-1.12.5.ebuild
deleted file mode 100644
index a59fb6797bb5..000000000000
--- a/dev-ros/roslang/roslang-1.12.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.13.1.ebuild b/dev-ros/roslang/roslang-1.13.1.ebuild
deleted file mode 100644
index a59fb6797bb5..000000000000
--- a/dev-ros/roslang/roslang-1.13.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.13.2.ebuild b/dev-ros/roslang/roslang-1.13.2.ebuild
deleted file mode 100644
index ff3730bfc8a9..000000000000
--- a/dev-ros/roslang/roslang-1.13.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.13.3.ebuild b/dev-ros/roslang/roslang-1.13.3.ebuild
deleted file mode 100644
index ff3730bfc8a9..000000000000
--- a/dev-ros/roslang/roslang-1.13.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.13.4.ebuild b/dev-ros/roslang/roslang-1.13.4.ebuild
deleted file mode 100644
index ff3730bfc8a9..000000000000
--- a/dev-ros/roslang/roslang-1.13.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.13.5.ebuild b/dev-ros/roslang/roslang-1.13.5.ebuild
deleted file mode 100644
index 0f747a43676e..000000000000
--- a/dev-ros/roslang/roslang-1.13.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.0.ebuild b/dev-ros/roslang/roslang-1.14.0.ebuild
deleted file mode 100644
index 0f747a43676e..000000000000
--- a/dev-ros/roslang/roslang-1.14.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.1.ebuild b/dev-ros/roslang/roslang-1.14.1.ebuild
deleted file mode 100644
index 0f747a43676e..000000000000
--- a/dev-ros/roslang/roslang-1.14.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.2.ebuild b/dev-ros/roslang/roslang-1.14.2.ebuild
deleted file mode 100644
index 0f747a43676e..000000000000
--- a/dev-ros/roslang/roslang-1.14.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.3.ebuild b/dev-ros/roslang/roslang-1.14.3.ebuild
deleted file mode 100644
index 770e484fec52..000000000000
--- a/dev-ros/roslang/roslang-1.14.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.4.ebuild b/dev-ros/roslang/roslang-1.14.4.ebuild
deleted file mode 100644
index 770e484fec52..000000000000
--- a/dev-ros/roslang/roslang-1.14.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.14.6.ebuild b/dev-ros/roslang/roslang-1.14.6.ebuild
deleted file mode 100644
index 6cfd17c1b787..000000000000
--- a/dev-ros/roslang/roslang-1.14.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-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.14.7.ebuild b/dev-ros/roslang/roslang-1.14.7.ebuild
deleted file mode 100644
index 6cfd17c1b787..000000000000
--- a/dev-ros/roslang/roslang-1.14.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-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.5.ebuild b/dev-ros/roslang/roslang-1.15.5.ebuild
new file mode 100644
index 000000000000..5c52cec83fd8
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.15.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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
new file mode 100644
index 000000000000..5c52cec83fd8
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.15.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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-9999.ebuild b/dev-ros/roslang/roslang-9999.ebuild
index a59fb6797bb5..5c52cec83fd8 100644
--- a/dev-ros/roslang/roslang-9999.ebuild
+++ b/dev-ros/roslang/roslang-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index c44735ec8b20..b841b0ea100c 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -1,16 +1,10 @@
-AUX 40roslaunch 41 BLAKE2B a07c8484065add0cec5d9cf2e586a7a1fff3b7df575a904f224eeb20fbf88c707212458e53f45799822703fad633efd944f8c0cab35fb1e22c701d40c17d8efa SHA512 1b32e0967267e2d6f40583f3463e989f52ff2aeb243fd3b96647e946c95bab553a0b969407579ea3b700234fd554ff23a4208562ffb741c0a5a47a42da28525a
-AUX py3-2.patch 1430 BLAKE2B bbb55f75603556a96e4a573039c20aa41caea7c3758a2a994e80d8dd4175c97467c740cc1319d61812301fe74956a63e5385eb2220573e36a6f557e9ba1b97ed SHA512 57c8853bf8130c2c5050d1191e197f37e38937ad524e01de551d0f1d018b507af3bb6de463381f743740ca8c52cdd1ed2ed85a9fa6830960a3c3b6661686c3ad
-AUX py3.patch 1989 BLAKE2B 635135fc80d5f28c7953fd28105793b74ef51384bdc269a3b45c85e5519a700014ff02a2eedc38aa8dc5642ca269421d5521197957f5ccbae8fe42d88bde18a1 SHA512 5ebf4e0bf6d5f814dd9ee4fee868127dd7fb13b78f488bed7875d1a0102ba7ff63b848d843d9a94eeee13aa79694b0f6d8a2a2bbc74294861a27dc3b8255248a
+AUX 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
-AUX timeout.patch 623 BLAKE2B 0889396c4a38d3f62fd928dcd2f8d982a7fb070da0912d16f68ff61bf15c0d10f7b4f8dc70f8df9d946608c6755dbcfeb770d9cbc6e5acc9dfd0e3d509177258 SHA512 56ded8178faab6d74245479afe013fbffc984037263cae502ec411ce5e681efa6a8d11fc3b2083673df3e69a011db0c2e0992c5900fa5409338f7be84b0ea843
-AUX yaml.patch 1951 BLAKE2B cb6a66bb788221cd666d199d28a9844e10e61955e254bbd73e93e4595a1b6f3f9bbd292bf2781c46b5f3a0e4d052b79691a896a4fb922ab7db10918d61c86519 SHA512 964212c13d5cdef7fa0b19a947d1740b0782eac35e62e9bac41bc5e4fa33ebb3e15ca7ba6007ec97df2903237c250cdbc87d438804bdf5648ecec55f24ccd21d
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD roslaunch-1.14.3-r2.ebuild 1500 BLAKE2B 829c844a6f728b8dac5f494ba96c82bd9eadb500430e6f0bf7f393c57e50d23b5858da818b628d756949849580f5e66fffb94684b30dd5bb4b1f20c2250c65a6 SHA512 bb54582f417f932e4dac68d7214acd7c0343ad4681cb54b8167417b52af02f0adb1160c0013a0dcd96856052349032b148bf01cdeb4c26cfafa88154ab828a3a
-EBUILD roslaunch-1.15.4.ebuild 1425 BLAKE2B 94a0208aa65bfa08d0c7a51d84bed57f7b51ee767ec1181a5016299ac57867c3ba8b3f75d4ef82b665d89043365b0b409171d937816b093002b8cda0ab6358d7 SHA512 5e9e26393d979cf1ff0b5167b9ed2cf7b9e561d1cde8a744cb77cb9872c8beac5f58fbbc08a646cd65a91d7365139f4e51819a3120ff2f4db350407c0b58382c
-EBUILD roslaunch-9999.ebuild 1425 BLAKE2B 94a0208aa65bfa08d0c7a51d84bed57f7b51ee767ec1181a5016299ac57867c3ba8b3f75d4ef82b665d89043365b0b409171d937816b093002b8cda0ab6358d7 SHA512 5e9e26393d979cf1ff0b5167b9ed2cf7b9e561d1cde8a744cb77cb9872c8beac5f58fbbc08a646cd65a91d7365139f4e51819a3120ff2f4db350407c0b58382c
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD roslaunch-1.15.8-r1.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
+EBUILD roslaunch-9999.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/files/40roslaunch b/dev-ros/roslaunch/files/40roslaunch
index 1e8f4dadcf29..e9dac18dd65f 100644
--- a/dev-ros/roslaunch/files/40roslaunch
+++ b/dev-ros/roslaunch/files/40roslaunch
@@ -1 +1,2 @@
 ROS_MASTER_URI="http://localhost:11311/"
+ROS_DISTRO=Gentoo
diff --git a/dev-ros/roslaunch/files/py3-2.patch b/dev-ros/roslaunch/files/py3-2.patch
deleted file mode 100644
index d3ae600e4d7e..000000000000
--- a/dev-ros/roslaunch/files/py3-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py   |  6 +--
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- .../test/test_roslogging_user_logger.py       |  8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py   |  2 +-
- tools/rosmsg/src/rosmsg/__init__.py           |  2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py     | 20 ++++----
- .../test_rostopic_command_line_offline.py     | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py
-index ac30189d0..f582ec230 100644
---- a/tools/roslaunch/test/unit/test_xmlloader.py
-+++ b/tools/roslaunch/test/unit/test_xmlloader.py
-@@ -218,7 +218,7 @@ def test_params(self):
-         p = [p for p in mock.params if p.key == '/configfile'][0]
-         self.assertEquals(contents, p.value, 1)
-         p = [p for p in mock.params if p.key == '/binaryfile'][0]
--        self.assertEquals(Binary(contents), p.value, 1)
-+        self.assertEquals(Binary(contents.encode()), p.value, 1)
- 
-         f = open(os.path.join(get_example_path(), 'example.launch'))
-         try:
diff --git a/dev-ros/roslaunch/files/py3.patch b/dev-ros/roslaunch/files/py3.patch
deleted file mode 100644
index 8fa2c6e2fab2..000000000000
--- a/dev-ros/roslaunch/files/py3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows  | 2 +-
- test/test_rosmaster/test/nodes/testMaster          | 2 +-
- test/test_rosmaster/test/nodes/testSlave           | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py        | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py             | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py           | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/tools/roslaunch/src/roslaunch/depends.py b/tools/roslaunch/src/roslaunch/depends.py
-index a3fbf7a41..91ae26998 100644
---- a/tools/roslaunch/src/roslaunch/depends.py
-+++ b/tools/roslaunch/src/roslaunch/depends.py
-@@ -86,21 +86,21 @@ def __str__(self):
- 
- def _get_arg_value(tag, context):
-     name = tag.attributes['name'].value
--    if tag.attributes.has_key('value'):
-+    if 'value' in tag.attributes.keys():
-         return resolve_args(tag.attributes['value'].value, context)
-     elif name in context['arg']:
-         return context['arg'][name]
--    elif tag.attributes.has_key('default'):
-+    elif 'default' in tag.attributes.keys():
-         return resolve_args(tag.attributes['default'].value, context)
-     else:
-         raise RoslaunchDepsException("No value for arg [%s]"%(name))
- 
- def _check_ifunless(tag, context):
--    if tag.attributes.has_key('if'):
-+    if 'if' in tag.attributes.keys():
-         val = resolve_args(tag.attributes['if'].value, context)
-         if not convert_value(val, 'bool'):
-             return False
--    elif tag.attributes.has_key('unless'):
-+    elif 'unless' in tag.attributes.keys():
-         val = resolve_args(tag.attributes['unless'].value, context)
-         if convert_value(val, 'bool'):
-             return False
diff --git a/dev-ros/roslaunch/files/timeout.patch b/dev-ros/roslaunch/files/timeout.patch
deleted file mode 100644
index 169b12813c70..000000000000
--- a/dev-ros/roslaunch/files/timeout.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Slow HW like the raspberry pi easily hit this timeout over NFS.
-Increase it to 1 min.
-
-diff --git a/tools/roslaunch/src/roslaunch/launch.py b/tools/roslaunch/src/roslaunch/launch.py
-index 9a3b931..8e33c0c 100644
---- a/tools/roslaunch/src/roslaunch/launch.py
-+++ b/tools/roslaunch/src/roslaunch/launch.py
-@@ -57,8 +57,8 @@ from roslaunch.pmon import start_process_monitor, ProcessListener
- 
- from roslaunch.rlutil import update_terminal_name
- 
--_TIMEOUT_MASTER_START = 10.0 #seconds
--_TIMEOUT_MASTER_STOP  = 10.0 #seconds
-+_TIMEOUT_MASTER_START = 60.0 #seconds
-+_TIMEOUT_MASTER_STOP  = 60.0 #seconds
- 
- _ID = '/roslaunch'
- 
diff --git a/dev-ros/roslaunch/files/yaml.patch b/dev-ros/roslaunch/files/yaml.patch
deleted file mode 100644
index 135e9927c408..000000000000
--- a/dev-ros/roslaunch/files/yaml.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: roslaunch/src/roslaunch/loader.py
-===================================================================
---- roslaunch.orig/src/roslaunch/loader.py
-+++ roslaunch/src/roslaunch/loader.py
-@@ -98,7 +98,7 @@ def convert_value(value, type_):
-         raise ValueError("%s is not a '%s' type"%(value, type_))
-     elif type_ == 'yaml':
-         try:
--            return yaml.load(value)
-+            return yaml.safe_load(value)
-         except yaml.parser.ParserError as e:
-             raise ValueError(e)
-     else:
-@@ -409,7 +409,7 @@ class Loader(object):
-             if rosparam is None:
-                 import rosparam
-             try:
--                data = yaml.load(text)
-+                data = yaml.safe_load(text)
-                 # #3162: if there is no YAML, load() will return an
-                 # empty string.  We want an empty dictionary instead
-                 # for our representation of empty.
-Index: roslaunch/test/unit/test_roslaunch_dump_params.py
-===================================================================
---- roslaunch.orig/test/unit/test_roslaunch_dump_params.py
-+++ roslaunch/test/unit/test_roslaunch_dump_params.py
-@@ -53,7 +53,7 @@ class TestDumpParams(unittest.TestCase):
-         o, e = p.communicate()
-         self.assert_(p.returncode == 0, "Return code nonzero for param dump! Code: %d" % (p.returncode))
- 
--        self.assertEquals({'/noop': 'noop'}, yaml.load(o))
-+        self.assertEquals({'/noop': 'noop'}, yaml.safe_load(o))
- 
-         p = Popen([cmd, '--dump-params', 'roslaunch', 'test-dump-rosparam.launch'], stdout = PIPE)
-         o, e = p.communicate()
-@@ -95,7 +95,7 @@ class TestDumpParams(unittest.TestCase):
-             '/noparam1': 'value1',
-             '/noparam2': 'value2',
-             }
--        output_val = yaml.load(o)
-+        output_val = yaml.safe_load(o)
-         if not val == output_val:
-             for k, v in val.items():
-                 if k not in output_val:
diff --git a/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild b/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
deleted file mode 100644
index 61eb48c58d38..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
deleted file mode 100644
index 4538fcdb1d63..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild b/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
new file mode 100644
index 000000000000..b0c3d9412aae
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 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 user
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	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
+"
+DEPEND="${RDEPEND}
+	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
+}
+
+pkg_preinst() {
+	enewgroup ros
+	enewuser ros -1 -1 /home/ros ros
+}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index 4538fcdb1d63..b0c3d9412aae 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin user
 
@@ -16,25 +15,24 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-ros/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_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosout
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 		dev-ros/test_rosmaster
 	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
 
 src_test() {
-	rosdep update
+	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
 }
 
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index fe24ee18d21c..87190f1a4a90 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -1,17 +1,4 @@
-AUX envhook.patch 1627 BLAKE2B 5cdc90c1828c9bad7777b6ae113f6f44a1e26a3fb5ace8f103958cedbdd3039ccffcae44a7ecdc97f12559aa0f11ebbc6719f861fb65409bff7759852151fe7d SHA512 a2d76712b068918c52a77d610a2a235298069b0ee0cbdac8d06b7a5ff5ed04cc824c7b8dba3cafb141910eb09a0a2d1a42b8cf96cb19b2f4b5982a21d0817c26
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD roslib-1.14.0-r1.ebuild 581 BLAKE2B 116b650156b83d1a5edebeb5fee143f9e2bed22eb58733f7d04a87445ab9f7c5685a84365f764bcd9a775048db3e2771e4b9dfea81d2608de593c06bb658503e SHA512 a9a49a50da67d53d2ae6d98065cdf8009244fac05c1c08d808b97583c02a8d8ea15cebb94ff962dfd3c3f8ce7322c3b272e6b7e42c63fd2bd381ed8469ad3b90
-EBUILD roslib-1.14.1.ebuild 581 BLAKE2B 116b650156b83d1a5edebeb5fee143f9e2bed22eb58733f7d04a87445ab9f7c5685a84365f764bcd9a775048db3e2771e4b9dfea81d2608de593c06bb658503e SHA512 a9a49a50da67d53d2ae6d98065cdf8009244fac05c1c08d808b97583c02a8d8ea15cebb94ff962dfd3c3f8ce7322c3b272e6b7e42c63fd2bd381ed8469ad3b90
-EBUILD roslib-1.14.2.ebuild 581 BLAKE2B 116b650156b83d1a5edebeb5fee143f9e2bed22eb58733f7d04a87445ab9f7c5685a84365f764bcd9a775048db3e2771e4b9dfea81d2608de593c06bb658503e SHA512 a9a49a50da67d53d2ae6d98065cdf8009244fac05c1c08d808b97583c02a8d8ea15cebb94ff962dfd3c3f8ce7322c3b272e6b7e42c63fd2bd381ed8469ad3b90
-EBUILD roslib-1.14.3.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
-EBUILD roslib-1.14.4.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
-EBUILD roslib-1.14.6.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
-EBUILD roslib-1.14.7.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
-EBUILD roslib-9999.ebuild 566 BLAKE2B 9f4ee16e1b0af983334e47a55f4915d9680aa8f56637e79b7c890343b5c212187b62ba0b88754ec601b66b63fd034f858546e8b4dadd2d9d177576bdc53e6bea SHA512 266d92524154e94817141fec4c1c6111c4d5e5d291058a1e2a434a40b4e4a1a3c104c6f64405b7a9f8df63f92421cd31171694fd48f49b92f7718eb0f387b8a0
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD roslib-1.15.6.ebuild 654 BLAKE2B 805e9c77fd269f613d293ea6050de03e66071f62d7d171b99f6d35976cc04a8a42e59a56cbbd4cbb9e96491363092d277e601a10e5a248106cace80f3f9e015c SHA512 d91fdb48693a37e9b68e7e0f03744cd5845aacb66f46edeb07428e182cba0587511a45095206886374dd59bbb023aa99b5d6e1e379a2f42438ed1e2be69dceeb
+EBUILD roslib-9999.ebuild 654 BLAKE2B 805e9c77fd269f613d293ea6050de03e66071f62d7d171b99f6d35976cc04a8a42e59a56cbbd4cbb9e96491363092d277e601a10e5a248106cace80f3f9e015c SHA512 d91fdb48693a37e9b68e7e0f03744cd5845aacb66f46edeb07428e182cba0587511a45095206886374dd59bbb023aa99b5d6e1e379a2f42438ed1e2be69dceeb
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslib/files/envhook.patch b/dev-ros/roslib/files/envhook.patch
deleted file mode 100644
index d4e24e937351..000000000000
--- a/dev-ros/roslib/files/envhook.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Use env python for running python so that it uses the proper version on Gentoo.
-Honour CATKIN_PREFIX_PATH gentoo addition.
-
-Index: roslib/env-hooks/10.ros.sh.em
-===================================================================
---- roslib.orig/env-hooks/10.ros.sh.em
-+++ roslib/env-hooks/10.ros.sh.em
-@@ -1,8 +1,5 @@
- # generated from ros/env-hooks/10.ros.sh.em
- 
--# scrub old ROS bin dirs, to avoid accidentally finding the wrong executables
--export PATH="`@(PYTHON_EXECUTABLE) -c \"import os; print(os.pathsep.join([x for x in \\\"$PATH\\\".split(os.pathsep) if not any([d for d in ['cturtle', 'diamondback', 'electric', 'fuerte'] if d in x])]))\"`"
--
- @{
- # This is a build-time environment variable which allows a build engineer to override the expected
- # ROS_DISTRO value for a workspace, for example to deliberately use a newer version of roslib with
-@@ -19,7 +16,7 @@ export ROS_DISTRO=@(ROS_DISTRO)
- PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF
- from __future__ import print_function
- import os
--env_name = 'CMAKE_PREFIX_PATH'
-+env_name = 'CATKIN_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 []
- workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.catkin'))]
- paths = []
-@@ -38,7 +35,7 @@ for workspace in workspaces:
- print(os.pathsep.join(paths))
- EOF
- )
--export ROS_PACKAGE_PATH="`@(PYTHON_EXECUTABLE) -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`"
-+export ROS_PACKAGE_PATH="`/usr/bin/env python -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`"
- 
- @[if DEVELSPACE]@
- # env variables in develspace
diff --git a/dev-ros/roslib/roslib-1.14.0-r1.ebuild b/dev-ros/roslib/roslib-1.14.0-r1.ebuild
deleted file mode 100644
index 22d5f9d983e3..000000000000
--- a/dev-ros/roslib/roslib-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )
diff --git a/dev-ros/roslib/roslib-1.14.1.ebuild b/dev-ros/roslib/roslib-1.14.1.ebuild
deleted file mode 100644
index 22d5f9d983e3..000000000000
--- a/dev-ros/roslib/roslib-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )
diff --git a/dev-ros/roslib/roslib-1.14.2.ebuild b/dev-ros/roslib/roslib-1.14.2.ebuild
deleted file mode 100644
index 22d5f9d983e3..000000000000
--- a/dev-ros/roslib/roslib-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )
diff --git a/dev-ros/roslib/roslib-1.14.3.ebuild b/dev-ros/roslib/roslib-1.14.3.ebuild
deleted file mode 100644
index 941ea404b20b..000000000000
--- a/dev-ros/roslib/roslib-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roslib/roslib-1.14.4.ebuild b/dev-ros/roslib/roslib-1.14.4.ebuild
deleted file mode 100644
index 941ea404b20b..000000000000
--- a/dev-ros/roslib/roslib-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roslib/roslib-1.14.6.ebuild b/dev-ros/roslib/roslib-1.14.6.ebuild
deleted file mode 100644
index 941ea404b20b..000000000000
--- a/dev-ros/roslib/roslib-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roslib/roslib-1.14.7.ebuild b/dev-ros/roslib/roslib-1.14.7.ebuild
deleted file mode 100644
index 941ea404b20b..000000000000
--- a/dev-ros/roslib/roslib-1.14.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=core/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Base dependencies and support libraries for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/rospack
-	dev-ros/ros_environment
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roslib/roslib-1.15.6.ebuild b/dev-ros/roslib/roslib-1.15.6.ebuild
new file mode 100644
index 000000000000..26e633c4c21c
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.15.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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="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:=[threads]
+	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
index 941ea404b20b..26e633c4c21c 100644
--- a/dev-ros/roslib/roslib-9999.ebuild
+++ b/dev-ros/roslib/roslib-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=core/${PN}
 
 inherit ros-catkin
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
 	dev-libs/boost:=[threads]
 	dev-ros/rospack
 	dev-ros/ros_environment
@@ -24,5 +23,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(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
index 3f206e960fd5..0389b3968f66 100644
--- a/dev-ros/roslint/Manifest
+++ b/dev-ros/roslint/Manifest
@@ -1,8 +1,4 @@
-DIST roslint-0.11.0.tar.gz 97432 BLAKE2B d923759663726689fd2c94af21ec74a800825636c71fbcce178be3bc559e63cb67c040fefce0c3e420d09899010f6f059143dc22d236e511eae815584849e015 SHA512 42a77c30f3e34f284852178d5debd802ca7ee5720821b8441f7f702093f46f16ea371713966087eb402cc161ac1c0698cd398d7d5c2fa636dc41f857471fbb0c
-DIST roslint-0.11.1.tar.gz 97481 BLAKE2B d42e4998f2a51d6bebe9060745dce2ed3b3299725762445621cdb0464acfe17454ddfa747ebbc7a7e5c3482a18d905d3a930cfb2f7bef20ce5ef90987788e92d SHA512 5cb0ce8de001565e33e8d96a8f71df0f80792851abdb1ff68663f5672b5a3c6ea193a3083e6074b182a245de364c153007fa105dc2cdd900ed60d4f9cb799483
-DIST roslint-0.11.2.tar.gz 97537 BLAKE2B 3460ecff57588ad0579fba96bd77b45ab86b7c4a160209a8515f3c4881290528e8ca138522df3f9a76f00d3e24d66d91ca78292510a1ae7024bed6cd2f8151f9 SHA512 0aa80b679bf38ed503ab06227bc3c949f5b5473d0a6b0b0c496ae8b37611ae7edb8a42bbb1b0398a9b3428a23934a6805da04fd29668aab93c212f87aa224b2b
-EBUILD roslint-0.11.0.ebuild 409 BLAKE2B f67a61ee44db5d8e71208e01b3bb4d546e0e5a09141c6385273cbbc097ea9bc3fb3582c2a387a9e90c321006e91694e2c48d8b5c46095db4bd43254b2fe6e4f6 SHA512 dcf4f23d6769f13b8e734871f5d280314bc3f4ab039c199959bbb997b0b5d6bcf671dcc0274ff395d5b411375d07f38e74bf435e7b63befc53e066328444be72
-EBUILD roslint-0.11.1.ebuild 409 BLAKE2B f67a61ee44db5d8e71208e01b3bb4d546e0e5a09141c6385273cbbc097ea9bc3fb3582c2a387a9e90c321006e91694e2c48d8b5c46095db4bd43254b2fe6e4f6 SHA512 dcf4f23d6769f13b8e734871f5d280314bc3f4ab039c199959bbb997b0b5d6bcf671dcc0274ff395d5b411375d07f38e74bf435e7b63befc53e066328444be72
-EBUILD roslint-0.11.2.ebuild 409 BLAKE2B f67a61ee44db5d8e71208e01b3bb4d546e0e5a09141c6385273cbbc097ea9bc3fb3582c2a387a9e90c321006e91694e2c48d8b5c46095db4bd43254b2fe6e4f6 SHA512 dcf4f23d6769f13b8e734871f5d280314bc3f4ab039c199959bbb997b0b5d6bcf671dcc0274ff395d5b411375d07f38e74bf435e7b63befc53e066328444be72
-EBUILD roslint-9999.ebuild 409 BLAKE2B f67a61ee44db5d8e71208e01b3bb4d546e0e5a09141c6385273cbbc097ea9bc3fb3582c2a387a9e90c321006e91694e2c48d8b5c46095db4bd43254b2fe6e4f6 SHA512 dcf4f23d6769f13b8e734871f5d280314bc3f4ab039c199959bbb997b0b5d6bcf671dcc0274ff395d5b411375d07f38e74bf435e7b63befc53e066328444be72
+DIST roslint-0.12.0.tar.gz 103218 BLAKE2B f4396457df4d575a5ffecb5d6aac299c7d614272e5189cd20fcaaf36bc3ac2bbf7aa47806a9b0f7de35d242f93747af5e420d1aea21f69eadc83150b6311aceb SHA512 f533852f193fe0c78940a42bcff0971c3ac71f550a83120414bfcb954ea6c919c50f843e08fb4e3b14f76647676c7adf0fd8bb9dd5f835b4477f3fa8b39f25d7
+EBUILD roslint-0.12.0.ebuild 426 BLAKE2B 1f44c5bd09a34648055e9d36eea98911c3d4df2cbd0b5fcc51fbd87eb2131d1fc42b8dc4a55003e66e9953bd8d6080cd3570c8a9eee1e828ce70fcb1a1bcc67b SHA512 c30285715279a27878d7c4c4579e094233ae00a2169264acb6ca054a112188f9192c92e36705714762c076778e3f7893d3ef502f4336ff58b92756c10a0f3789
+EBUILD roslint-9999.ebuild 426 BLAKE2B 1f44c5bd09a34648055e9d36eea98911c3d4df2cbd0b5fcc51fbd87eb2131d1fc42b8dc4a55003e66e9953bd8d6080cd3570c8a9eee1e828ce70fcb1a1bcc67b SHA512 c30285715279a27878d7c4c4579e094233ae00a2169264acb6ca054a112188f9192c92e36705714762c076778e3f7893d3ef502f4336ff58b92756c10a0f3789
 MISC metadata.xml 325 BLAKE2B f8a1852943299f6b6878c64d48c12ea7f26f8e14cc010cb8153c9c8a69e290c0b08fb3cb04ccc9f7b0fcd36d8acfe6a18df8e7c703235824f1b9adf5c5a4d66a SHA512 e9e099e4c6561ab2d69ce77611b9380b031695d7171fae4abe83cfe370237c03be08c4e54cd7cbbb439fcd3c2a2512a4d2a2a76fc6b9df8218dadd5e2b8d1aea
diff --git a/dev-ros/roslint/roslint-0.11.0.ebuild b/dev-ros/roslint/roslint-0.11.0.ebuild
deleted file mode 100644
index 30a13432d8c5..000000000000
--- a/dev-ros/roslint/roslint-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=5
-ROS_REPO_URI="https://github.com/ros/roslint"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Performs 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-0.11.1.ebuild b/dev-ros/roslint/roslint-0.11.1.ebuild
deleted file mode 100644
index 30a13432d8c5..000000000000
--- a/dev-ros/roslint/roslint-0.11.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=5
-ROS_REPO_URI="https://github.com/ros/roslint"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Performs 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-0.11.2.ebuild b/dev-ros/roslint/roslint-0.11.2.ebuild
deleted file mode 100644
index 30a13432d8c5..000000000000
--- a/dev-ros/roslint/roslint-0.11.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=5
-ROS_REPO_URI="https://github.com/ros/roslint"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Performs 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-0.12.0.ebuild b/dev-ros/roslint/roslint-0.12.0.ebuild
new file mode 100644
index 000000000000..58b60db84260
--- /dev/null
+++ b/dev-ros/roslint/roslint-0.12.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 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"
+
+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}"
+CMAKE_MAKEFILE_GENERATOR="emake" # https://bugs.gentoo.org/738584
diff --git a/dev-ros/roslint/roslint-9999.ebuild b/dev-ros/roslint/roslint-9999.ebuild
index 30a13432d8c5..58b60db84260 100644
--- a/dev-ros/roslint/roslint-9999.ebuild
+++ b/dev-ros/roslint/roslint-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/roslint"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
-DESCRIPTION="Performs static checking of Python or C++ source code for errors and standards compliance"
+DESCRIPTION="Static checking of Python or C++ source code for errors and standards compliance"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
+CMAKE_MAKEFILE_GENERATOR="emake" # https://bugs.gentoo.org/738584
diff --git a/dev-ros/roslisp/Manifest b/dev-ros/roslisp/Manifest
index 1a2c575c8aed..d27d996afe55 100644
--- a/dev-ros/roslisp/Manifest
+++ b/dev-ros/roslisp/Manifest
@@ -1,4 +1,4 @@
-DIST roslisp-1.9.22.tar.gz 116790 BLAKE2B 0cfdaf21a485b2bd8682e07d095b31d5c87a8eec09f6c52af5006deb79b75927aaa13e3d972c0ac10eb8df809e004bf825011708ad797e08306c47857f6868d0 SHA512 ac6476d1b5e81fa8d7dbec0f804ea60fd7de665619e84b3f4284fcc1226c427ffc3abd71158d4bdb9f85786139ce197595b18d8cda4a597be1e84d20fad02442
-EBUILD roslisp-1.9.22.ebuild 394 BLAKE2B ed8cd886cea969b6b343e1f93aca4aa0753f2545523f05d572ee58c0ad05ea660a057417fe72f66785a5c382f95202be4496e1a9922451292d4e9fa6276345c2 SHA512 048903bf595a3ed9bbe7aac2b0e1d3efcc787457cf79d7265df3184444ce38205107fbb4e7dfe97b1b805af4c66ae59a1095d1190d5ebd987815a51c45800368
-EBUILD roslisp-9999.ebuild 397 BLAKE2B 7758ed4c583ee252596b9339b9ed750db0ad4a6919caa22f9de828c4dcffbbcf92c28a552d8b45d41d94bb506b14d10c36d1bd0df49ff9be2e099b9a96cbee59 SHA512 1a2b7b80e54b1e11f9ec7e8defb700b9b12a17c15081e6d95a3004b44a71b325f0983ffcd9b6113dc2d943de558bcf66095ecba9923f94f7d1ee90ce9ac4b2e0
+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 325 BLAKE2B c0fc43b32a0177d24f912ce281b2944049a23b10091e42b6554706b252ebc91acac09bd2b2a61fd06255c1adc949f7c9ed2fce19f5127db240e84d7f21af9318 SHA512 adaa5720c07e49aca1c5d959e88a0ff844c00529165adc0c1f1533197c9c55c5e7332beb1d3c2cdefab001eee6305004557e76bd4cd7e48c0a23274218b0bbfb
diff --git a/dev-ros/roslisp/roslisp-1.9.22.ebuild b/dev-ros/roslisp/roslisp-1.9.22.ebuild
deleted file mode 100644
index d9e0b6f55700..000000000000
--- a/dev-ros/roslisp/roslisp-1.9.22.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/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-1.9.24.ebuild b/dev-ros/roslisp/roslisp-1.9.24.ebuild
new file mode 100644
index 000000000000..661bfba7dea6
--- /dev/null
+++ b/dev-ros/roslisp/roslisp-1.9.24.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
index 13e083962d01..661bfba7dea6 100644
--- a/dev-ros/roslisp/roslisp-9999.ebuild
+++ b/dev-ros/roslisp/roslisp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/roslisp"
 KEYWORDS="~amd64"
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index b7aed5db2bbd..79ab4414ccc7 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD roslz4-1.13.0.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.1.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.2.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.4.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.5.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.13.6.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.14.2.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.14.3.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-1.15.4.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
-EBUILD roslz4-9999.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD roslz4-1.15.8.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
+EBUILD roslz4-9999.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslz4/roslz4-1.13.0.ebuild b/dev-ros/roslz4/roslz4-1.13.0.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.1.ebuild b/dev-ros/roslz4/roslz4-1.13.1.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.2.ebuild b/dev-ros/roslz4/roslz4-1.13.2.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.4.ebuild b/dev-ros/roslz4/roslz4-1.13.4.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.5.ebuild b/dev-ros/roslz4/roslz4-1.13.5.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.13.6.ebuild b/dev-ros/roslz4/roslz4-1.13.6.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.14.2.ebuild b/dev-ros/roslz4/roslz4-1.14.2.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.14.3.ebuild b/dev-ros/roslz4/roslz4-1.14.3.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/roslz4/roslz4-1.15.4.ebuild b/dev-ros/roslz4/roslz4-1.15.4.ebuild
deleted file mode 100644
index acf0fcec87e0..000000000000
--- a/dev-ros/roslz4/roslz4-1.15.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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"
-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
new file mode 100644
index 000000000000..6f69f8c2dc65
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
index acf0fcec87e0..6f69f8c2dc65 100644
--- a/dev-ros/roslz4/roslz4-9999.ebuild
+++ b/dev-ros/roslz4/roslz4-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=utilities/${PN}
 
 inherit ros-catkin
@@ -15,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="app-arch/lz4"
+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
index aff698e1a523..c3a8bf2481ee 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -1,4 +1,6 @@
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD rosmake-1.14.7.ebuild 440 BLAKE2B bec302608b2024c73501d61bcf6a378cd7721db91818fc4c3f7f0c8f6b4cf09f78a9b48250c588d12c2fe21d7e8bd7c767d584dbd8c82b3ee533cdf5a4b699f5 SHA512 6e05f75d9ca6349ab4e9e75e92b4e1de4aeff843fd6f13a17a9e29e2dbc9f94eeefb999d01767f1bf98659c8829bdd323018b74751caf830cb9588bf90e4447d
-EBUILD rosmake-9999.ebuild 440 BLAKE2B bec302608b2024c73501d61bcf6a378cd7721db91818fc4c3f7f0c8f6b4cf09f78a9b48250c588d12c2fe21d7e8bd7c767d584dbd8c82b3ee533cdf5a4b699f5 SHA512 6e05f75d9ca6349ab4e9e75e92b4e1de4aeff843fd6f13a17a9e29e2dbc9f94eeefb999d01767f1bf98659c8829bdd323018b74751caf830cb9588bf90e4447d
+DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD rosmake-1.15.5.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
+EBUILD rosmake-1.15.6.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
+EBUILD rosmake-9999.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.14.7.ebuild b/dev-ros/rosmake/rosmake-1.14.7.ebuild
deleted file mode 100644
index 68a65900edd9..000000000000
--- a/dev-ros/rosmake/rosmake-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.15.5.ebuild b/dev-ros/rosmake/rosmake-1.15.5.ebuild
new file mode 100644
index 000000000000..d848bd5393ac
--- /dev/null
+++ b/dev-ros/rosmake/rosmake-1.15.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
new file mode 100644
index 000000000000..d848bd5393ac
--- /dev/null
+++ b/dev-ros/rosmake/rosmake-1.15.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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-9999.ebuild b/dev-ros/rosmake/rosmake-9999.ebuild
index 68a65900edd9..d848bd5393ac 100644
--- a/dev-ros/rosmake/rosmake-9999.ebuild
+++ b/dev-ros/rosmake/rosmake-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
@@ -15,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
+RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
 "
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index 413b419d58c9..bd0271937e80 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1,20 +1,6 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosmaster-1.13.0.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.1.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.2.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.4.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.5.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.13.6.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.14.2.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.14.3.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-1.15.4.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
-EBUILD rosmaster-9999.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
+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
+EBUILD rosmaster-1.15.7.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
+EBUILD rosmaster-1.15.8.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
+EBUILD rosmaster-9999.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmaster/rosmaster-1.13.0.ebuild b/dev-ros/rosmaster/rosmaster-1.13.0.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.1.ebuild b/dev-ros/rosmaster/rosmaster-1.13.1.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.2.ebuild b/dev-ros/rosmaster/rosmaster-1.13.2.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.4.ebuild b/dev-ros/rosmaster/rosmaster-1.13.4.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.5.ebuild b/dev-ros/rosmaster/rosmaster-1.13.5.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.13.6.ebuild b/dev-ros/rosmaster/rosmaster-1.13.6.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.14.2.ebuild b/dev-ros/rosmaster/rosmaster-1.14.2.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.14.3.ebuild b/dev-ros/rosmaster/rosmaster-1.14.3.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmaster/rosmaster-1.15.4.ebuild b/dev-ros/rosmaster/rosmaster-1.15.4.ebuild
deleted file mode 100644
index a339d31c4b73..000000000000
--- a/dev-ros/rosmaster/rosmaster-1.15.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS Master implementation"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( 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
new file mode 100644
index 000000000000..82438464c6ff
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
new file mode 100644
index 000000000000..82438464c6ff
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
index a339d31c4b73..82438464c6ff 100644
--- a/dev-ros/rosmaster/rosmaster-9999.ebuild
+++ b/dev-ros/rosmaster/rosmaster-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
@@ -16,8 +15,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 95e19290070d..f86d36d5d6a9 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,9 +1,6 @@
-AUX norm.patch 1260 BLAKE2B 09c790fa6d31a76d07a44622c514391a30c855c167aa3598f300754ba24249023efef644c397203e66d25c467b6043a6a6f02d9d19d9a23d1b920619d04e7b9e SHA512 3fe87e224a10bd5b3eaafbb370031ee0ca30f3a968742df78fc6319875f1ae374e06d58dd2d47a499065dba2030914ad5b4221b856b18d340f7119b6435b19cb
-AUX py3.patch 12157 BLAKE2B 13c70122c5b790e9d3f54ed9709d01ec4fbb98ba9b0f912d61d016afe265d81abe19e3e8a1b308536019fb995277e0931a0d1238dd1af128059462d7439a132c SHA512 756d32eef5be6e40564654f0bd8eb66295e02af91e3a6f56b995a593a5687fd5e324a5963e68a44a7f19f7fe98eca5717b272533add90710bea46d05912a1066
-AUX tests.patch 811 BLAKE2B 66d61f39aaa4138f1e4ef60c24724216a698d4c355b6830802a176c74cccddd742849377abdd4773c241cf3096d0023fa6ea98aa0a975376fa02d2ba6ea0510e SHA512 3fca6df07aacb5a8230c5990ded10f18127cd92947b3d263042fe49938a224bce0874bc5bc5924a258b116f88f3176c8aedc0ebc92492329c84320d1e2eb20d4
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosmsg-1.14.3-r1.ebuild 685 BLAKE2B 4bba0c3d568621b570992e8c4943e6a3248740f9dbef4658d0b519ff84f8456cf200a5e4a26d78328583f9a113a141e3a3e922b80a77351d86fc18f289751d0b SHA512 a2d87e5b732375bc69f1b74e8b1e2afb2b5234fd5e34cb127e738762605f8fcd72d92624fae274fb67681bd86321dbb96b4c0b2a3ec8f3be3e26dbb6c5a978dd
-EBUILD rosmsg-1.15.4.ebuild 598 BLAKE2B 8618b8067bcb689d8b6fb14cbc7c5a427c1b3d9f9f2eb8bec937d49ee08728e1e3b068340422079f697a809651cc0cc52f40a97333b4912863ac1d94e3cf8df6 SHA512 bf2879ef4ca972720b05abb1a3b14abe49b377b4a4ca8af65b810b411b04febfb974208b1106c39bbeeb60832bd4352610df73b3ee9c68904217018c9403e2fd
-EBUILD rosmsg-9999.ebuild 598 BLAKE2B 8618b8067bcb689d8b6fb14cbc7c5a427c1b3d9f9f2eb8bec937d49ee08728e1e3b068340422079f697a809651cc0cc52f40a97333b4912863ac1d94e3cf8df6 SHA512 bf2879ef4ca972720b05abb1a3b14abe49b377b4a4ca8af65b810b411b04febfb974208b1106c39bbeeb60832bd4352610df73b3ee9c68904217018c9403e2fd
+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
+EBUILD rosmsg-1.15.7.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
+EBUILD rosmsg-1.15.8.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
+EBUILD rosmsg-9999.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/files/norm.patch b/dev-ros/rosmsg/files/norm.patch
deleted file mode 100644
index 530da65fcd24..000000000000
--- a/dev-ros/rosmsg/files/norm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0648d3019dc2395f61a8a7a3d1bbf790eca98739 Mon Sep 17 00:00:00 2001
-From: James Xu <kejia.xu@microsoft.com>
-Date: Wed, 6 Feb 2019 09:47:54 -0800
-Subject: [PATCH] normalize paths before comparison in rosmsg (#1586)
-
-* normalize paths before comparison in rosmsg
-
-* remove use of normcase and remove path_in_workspaces temp variable
-
-* remove duplicated control
-
-* revert unrelated whitespace changes
-
-* keep order of operands
----
- tools/rosmsg/src/rosmsg/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py
-index 83b629e7e..4ed7aa542 100644
---- a/tools/rosmsg/src/rosmsg/__init__.py
-+++ b/tools/rosmsg/src/rosmsg/__init__.py
-@@ -551,7 +551,7 @@ def _get_package_paths(pkgname, rospack):
-     path = rospack.get_path(pkgname)
-     paths.append(path)
-     results = find_in_workspaces(search_dirs=['share'], project=pkgname, first_match_only=True, workspace_to_source_spaces=_catkin_workspace_to_source_spaces, source_path_to_packages=_catkin_source_path_to_packages)
--    if results and results[0] != path:
-+    if results and results[0].replace(os.path.sep, '/') != path.replace(os.path.sep, '/'):
-         paths.append(results[0])
-     return paths
-     
diff --git a/dev-ros/rosmsg/files/py3.patch b/dev-ros/rosmsg/files/py3.patch
deleted file mode 100644
index 4cfcb77d2a26..000000000000
--- a/dev-ros/rosmsg/files/py3.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py   |  6 +--
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- .../test/test_roslogging_user_logger.py       |  8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py   |  2 +-
- tools/rosmsg/src/rosmsg/__init__.py           |  2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py     | 20 ++++----
- .../test_rostopic_command_line_offline.py     | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py
-index 4ed7aa542..75f5afcbd 100644
---- a/tools/rosmsg/src/rosmsg/__init__.py
-+++ b/tools/rosmsg/src/rosmsg/__init__.py
-@@ -240,7 +240,7 @@ def create_names_filter(names):
-     """
-     returns a function to use as filter that returns all objects slots except those with names in list.
-     """
--    return lambda obj : filter(lambda slotname : not slotname in names, obj.__slots__)
-+    return lambda obj : list(filter(lambda slotname : not slotname in names, obj.__slots__))
- 
- 
- def init_rosmsg_proto():
-diff --git a/tools/rosmsg/test/test_rosmsg_command_line.py b/tools/rosmsg/test/test_rosmsg_command_line.py
-index 02e31022e..d5515a3ac 100644
---- a/tools/rosmsg/test/test_rosmsg_command_line.py
-+++ b/tools/rosmsg/test/test_rosmsg_command_line.py
-@@ -54,24 +54,24 @@ def test_cmd_help(self):
-         
-         for cmd in ['rosmsg', 'rossrv']:
-             glob_cmd=[os.path.join(_SCRIPT_FOLDER, cmd)]
--            output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0]
-+            output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0].decode()
-             self.assert_('Commands' in output)
--            output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0]
-+            output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode()
-             self.assert_('Commands' in output)
-             self.assert_('Traceback' not in output)
-             for c in sub:
-                 self.assert_("%s %s"%(cmd, c) in output, "%s %s"%(cmd, c) + " not in "+ output + " of " + str(glob_cmd))
-                 
-             for c in sub:
--                output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0]
-+                output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode()
-                 self.assert_('Usage' in output)
-                 self.assert_("%s %s"%(cmd, c) in output, output)
-             
-     def test_cmd_packages(self):
-         # - single line
--        output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0]
-+        output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0].decode()
-         # - multi-line
--        output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0]
-+        output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0].decode()
-         l1 = [x for x in output1.split() if x]
-         l2 = [x.strip() for x in output2.split('\n') if x.strip()]
-         self.assertEquals(l1, l2)
-@@ -80,8 +80,8 @@ def test_cmd_packages(self):
-         for p in ['std_srvs', 'rosmsg']:
-             self.assert_(p not in l1)
- 
--        output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0]
--        output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0]
-+        output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0].decode()
-+        output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0].decode()
-         l1 = [x for x in output1.split() if x]
-         l2 = [x.strip() for x in output2.split('\n') if x.strip()]
-         self.assertEquals(l1, l2)
-@@ -92,14 +92,14 @@ def test_cmd_packages(self):
- 
-     def test_cmd_list(self):
-         # - multi-line
--        output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0]
-+        output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0].decode()
-         l1 = [x.strip() for x in output1.split('\n') if x.strip()]
-         for p in ['std_msgs/String', 'test_rosmaster/Floats']:
-             self.assert_(p in l1)
-         for p in ['std_srvs/Empty', 'roscpp/Empty']:
-             self.assert_(p not in l1)
- 
--        output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0]
-+        output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0].decode()
-         l1 = [x.strip() for x in output1.split('\n') if x.strip()]
-         for p in ['std_srvs/Empty', 'roscpp/Empty']:
-             self.assert_(p in l1)
-@@ -109,9 +109,9 @@ def test_cmd_list(self):
-     def test_cmd_package(self):
-         # this test is obviously very brittle, but should stabilize as the tests stabilize
-         # - single line output
--        output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0]
-+        output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-         # - multi-line output
--        output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0]
-+        output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-         l = set([x for x in output1.split() if x])        
-         l2 = set([x.strip() for x in output2.split('\n') if x.strip()])
-         self.assertEquals(l, l2)
-@@ -121,8 +121,8 @@ def test_cmd_package(self):
-                   'test_rosmaster/RosmsgC']:
-             self.assertTrue(m in l, l)
-         
--        output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0]
--        output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0]        
-+        output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-+        output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-         l = set([x for x in output.split() if x])
-         l2 = set([x.strip() for x in output2.split('\n') if x.strip()])
-         self.assertEquals(l, l2)
-@@ -132,14 +132,14 @@ def test_cmd_package(self):
-         
-     ## test that the rosmsg/rossrv show command works
-     def test_cmd_show(self):
--        output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0]
-+        output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0].decode()
-         self.assertEquals('string data', output.strip())
- 
--        output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0]
-+        output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode()
-         self.assertEquals('---', output.strip())
--        output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0]
-+        output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode()
-         self.assertEquals('---', output.strip())
--        output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0]
-+        output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0].decode()
-         self.assertEquals('int64 a\nint64 b\n---\nint64 sum', output.strip())
- 
-         # test against test_rosmsg package
-@@ -159,20 +159,20 @@ def test_cmd_show(self):
-             text = text+'\n' # running command adds one new line
-             text_raw = text_raw+'\n'
-             type_ =test_message_package+'/'+t
--            output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0]
-+            output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text, output)
--            output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0]
-+            output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text_raw, output)
--            output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0]
-+            output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text_raw, output)
- 
-             # test as search
-             type_ = t
-             text = "[test_rosmaster/%s]:\n%s"%(t, text)
-             text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw)
--            output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0]
-+            output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text, output)
-             output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate()
--            self.assertEquals(text_raw, output[0], "Failed: %s"%(str(output)))
--            output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0]
-+            self.assertEquals(text_raw, output[0].decode(), "Failed: %s"%(str(output)))
-+            output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text_raw, output)
-diff --git a/tools/rosmsg/test/test_rosmsgproto_command_line.py b/tools/rosmsg/test/test_rosmsgproto_command_line.py
-index b5b555e78..b4aa0c5b3 100644
---- a/tools/rosmsg/test/test_rosmsgproto_command_line.py
-+++ b/tools/rosmsg/test/test_rosmsgproto_command_line.py
-@@ -67,37 +67,37 @@ def testFail(self):
-         cmd.extend(["msg", "foo123barxyz"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertTrue('Unknown message name foo123barxyz' in erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertTrue('Unknown message name foo123barxyz' in erroutput.decode())
- 
-     def testSilentFail(self):
-         cmd = copy.copy(ROSMSGPROTO_FN)
-         cmd.extend(["msg", "-s", "foo123barxyz"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertEqual('', erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertEqual(b'', erroutput)
- 
-     def testSilentFailCpp(self):
-         cmd = copy.copy(ROSMSGPROTO_FN)
-         cmd.extend(["msg", "-s", "foo123barxyz::bar"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertEqual('', erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertEqual(b'', erroutput)
- 
-     def testSilentFailDot(self):
-         cmd = copy.copy(ROSMSGPROTO_FN)
-         cmd.extend(["msg", "-s", "foo123barxyz.bar"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertEqual('', erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertEqual(b'', erroutput)
- 
-     def testSilentFailMode(self):
-         cmd = copy.copy(ROSMSGPROTO_FN)
-         cmd.extend(["msgfoobar", "-s", "foo123barxyz.bar"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertEqual('', erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertEqual(b'', erroutput)
diff --git a/dev-ros/rosmsg/files/tests.patch b/dev-ros/rosmsg/files/tests.patch
deleted file mode 100644
index f8b514b4e127..000000000000
--- a/dev-ros/rosmsg/files/tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: rosmsg/test/test_rosmsg_command_line.py
-===================================================================
---- rosmsg.orig/test/test_rosmsg_command_line.py
-+++ rosmsg/test/test_rosmsg_command_line.py
-@@ -168,8 +168,8 @@ class TestRosmsg(unittest.TestCase):
- 
-             # test as search
-             type_ = t
--            text = "[test_rosmaster/%s]:\n%s"%(t, text)
--            text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw)
-+            text = ("[test_rosmaster/%s]:\n%s"%(t, text))*2
-+            text_raw = ("[test_rosmaster/%s]:\n%s"%(t, text_raw))*2
-             output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text, output)
-             output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate()
diff --git a/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild b/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild
deleted file mode 100644
index a76abe4007fc..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.14.3-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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
-"
-PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/norm.patch" "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/rosmsg/rosmsg-1.15.4.ebuild b/dev-ros/rosmsg/rosmsg-1.15.4.ebuild
deleted file mode 100644
index 941834eadacc..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.15.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmsg/rosmsg-1.15.7.ebuild b/dev-ros/rosmsg/rosmsg-1.15.7.ebuild
new file mode 100644
index 000000000000..ba0d62bb080b
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.15.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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 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}] )
+"
diff --git a/dev-ros/rosmsg/rosmsg-1.15.8.ebuild b/dev-ros/rosmsg/rosmsg-1.15.8.ebuild
new file mode 100644
index 000000000000..ba0d62bb080b
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.15.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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 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}] )
+"
diff --git a/dev-ros/rosmsg/rosmsg-9999.ebuild b/dev-ros/rosmsg/rosmsg-9999.ebuild
index 941834eadacc..ba0d62bb080b 100644
--- a/dev-ros/rosmsg/rosmsg-9999.ebuild
+++ b/dev-ros/rosmsg/rosmsg-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,11 +15,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
+	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_USEDEP}] )
+	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
 "
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 5e061965ca39..8aa1f13ed71e 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosnode-1.13.0.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.1.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.2.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.4.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.5.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.13.6.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.14.2.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.14.3.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-1.15.4.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
-EBUILD rosnode-9999.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rosnode-1.15.8.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
+EBUILD rosnode-9999.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosnode/rosnode-1.13.0.ebuild b/dev-ros/rosnode/rosnode-1.13.0.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.1.ebuild b/dev-ros/rosnode/rosnode-1.13.1.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.2.ebuild b/dev-ros/rosnode/rosnode-1.13.2.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.4.ebuild b/dev-ros/rosnode/rosnode-1.13.4.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.5.ebuild b/dev-ros/rosnode/rosnode-1.13.5.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.13.6.ebuild b/dev-ros/rosnode/rosnode-1.13.6.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.14.2.ebuild b/dev-ros/rosnode/rosnode-1.14.2.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.14.3.ebuild b/dev-ros/rosnode/rosnode-1.14.3.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.15.4.ebuild b/dev-ros/rosnode/rosnode-1.15.4.ebuild
deleted file mode 100644
index 032e59ae3c1e..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.15.8.ebuild b/dev-ros/rosnode/rosnode-1.15.8.ebuild
new file mode 100644
index 000000000000..6ac973a5e5a1
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.15.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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
index 032e59ae3c1e..6ac973a5e5a1 100644
--- a/dev-ros/rosnode/rosnode-9999.ebuild
+++ b/dev-ros/rosnode/rosnode-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,9 +15,13 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	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_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index 720f18934063..471da6477f52 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1,20 +1,6 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosout-1.13.0.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.1.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.2.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.4.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.5.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
-EBUILD rosout-1.13.6.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
-EBUILD rosout-1.14.2.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
-EBUILD rosout-1.14.3.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
-EBUILD rosout-1.15.4.ebuild 444 BLAKE2B eef3bc8ba0a343f04a15b9c406cf75e49da247ffa471e43e84ebc82735039f6c8e9f37154c024c637d14404cabcbaf0bfb00e02384c92141da9ce83794917526 SHA512 d70e2077c1f64dc89dd751fc7c5c23d04069b77d06a91a64812afd8a0c7be5fb901d075fbb109246ad92a28de0492ddec054259b2a8fb10777ad5b6f3271cfa6
-EBUILD rosout-9999.ebuild 447 BLAKE2B adabe1d2c1ee22ac5c5a0a779b6aaf8727ef695af867b2c8b0c91d9d68f4fcefe12641d6952981925090335b78df5c35fc8f91d022e6e6abaaacea5539a59f6a SHA512 803a69ff8f9f0ee9dfd2c1d071307f185fead002952113c31c216583f3d77688bf86205e76d79326c72d2472e533d685304247178debda9607fa2d3547433a6b
+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
+EBUILD rosout-1.15.7.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
+EBUILD rosout-1.15.8.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
+EBUILD rosout-9999.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosout/rosout-1.13.0.ebuild b/dev-ros/rosout/rosout-1.13.0.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.1.ebuild b/dev-ros/rosout/rosout-1.13.1.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.2.ebuild b/dev-ros/rosout/rosout-1.13.2.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.4.ebuild b/dev-ros/rosout/rosout-1.13.4.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.5.ebuild b/dev-ros/rosout/rosout-1.13.5.ebuild
deleted file mode 100644
index 956032ae87e7..000000000000
--- a/dev-ros/rosout/rosout-1.13.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.13.6.ebuild b/dev-ros/rosout/rosout-1.13.6.ebuild
deleted file mode 100644
index 73aa43ce3f38..000000000000
--- a/dev-ros/rosout/rosout-1.13.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.14.2.ebuild b/dev-ros/rosout/rosout-1.14.2.ebuild
deleted file mode 100644
index 73aa43ce3f38..000000000000
--- a/dev-ros/rosout/rosout-1.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.14.3.ebuild b/dev-ros/rosout/rosout-1.14.3.ebuild
deleted file mode 100644
index 73aa43ce3f38..000000000000
--- a/dev-ros/rosout/rosout-1.14.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.15.4.ebuild b/dev-ros/rosout/rosout-1.15.4.ebuild
deleted file mode 100644
index 0315427da820..000000000000
--- a/dev-ros/rosout/rosout-1.15.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=5
-
-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
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosout/rosout-1.15.7.ebuild b/dev-ros/rosout/rosout-1.15.7.ebuild
new file mode 100644
index 000000000000..4a60a4d6a5fe
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
new file mode 100644
index 000000000000..4a60a4d6a5fe
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
index d76a1b4bd999..4a60a4d6a5fe 100644
--- a/dev-ros/rosout/rosout-9999.ebuild
+++ b/dev-ros/rosout/rosout-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
@@ -16,6 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospack/Manifest b/dev-ros/rospack/Manifest
index a7e8754647dc..677329b4026c 100644
--- a/dev-ros/rospack/Manifest
+++ b/dev-ros/rospack/Manifest
@@ -1,9 +1,5 @@
 AUX gentoo.patch 576 BLAKE2B e53b90591c46bc876d0cebdbeb660257c8a5ff3fe7aebc3d895a04011f1bb0fb004fecb375157f3d70811203445db11f2b6bd51e6994ecca71ce9cc132ee33b7 SHA512 85bc49da821ff4a31d6cff838f2ff006625f0f5041c2bfa8f742c92173c48fc6d2a4601e370058478afe66e1b0aa5e237964b950554c40710f9f411e1e04bbad
-DIST rospack-2.4.3.tar.gz 72327 BLAKE2B b154ce307ed95403382030c0fe14bd6296174289333fea83356a4f77add0fe2a1e48c8e2b6ee037def2e823f61a7b6df4ea62fd9a6f84433f12247003823f86f SHA512 4396ef24d0bd826235d7ac0da8a0b502557ecc0086eadcda96d44779ed5d8134e9a53cd861ee135a4b1da53074bdcf906dc4cb6ea0c36798326c17788ee1e2be
-DIST rospack-2.5.0.tar.gz 72447 BLAKE2B 820e893544b38464bfc63b516697fac9e5875bfffb0922aa0da4b572af5e47a0f4a63134786131fd0ae97751916748b0a1e6af6ca29897ef72759b601bffb551 SHA512 8c9ed4566aa1456b2dd3c4249f7023121d21ee99427d0ef78a7237fbe418f333859091b66870572d5a80995ebda9d5208643ae92213827af40c63b49be4a2560
-DIST rospack-2.5.1.tar.gz 72488 BLAKE2B 3e05ce597bbe39bffbafb898e1cbcd02e1a45d23cddec47f0bda2504937f2a288658ae41d7b6a30514064534417ff26fc919af4567c5aca62ae33752c26f56e8 SHA512 696060afe914f786ee1ef2960ef7608b52df90712936c86d4f4ebe380c23ca21b6f1a283e5903e851ed7c903c457ad0432e50e8f759f4d536dd6970b77b8183a
-EBUILD rospack-2.4.3.ebuild 564 BLAKE2B b20791ff8bab8e5d800a0de2ddcbcb94900ac52797dafa4e3c3a8ec4e93389015f1424e4f44f92b79193872c80a1569b3abb15e877150629365a4184427eedfc SHA512 9814190d49aa220554bf3a440e781642eeefbb5f1b5126c1b74e0fbe98ddd946327f38973fe7215b27b0de6d5a799af221940659c51294fd28906423e3be19be
-EBUILD rospack-2.5.0.ebuild 568 BLAKE2B a840a0e1f4ef10e1366d6b8c71df812f92930604464da318aa7593c4e00b1fe9f7b83c603086f9cb4c7977f917c2501b1796e4602cceab55dde64637f64eda8d SHA512 ab3a5283d2a7c6e55ae7e9f526338296baea9aa151b22facb07c0ca604348b7c520527e4586ccda1078005ede35be56bbd1321f98552a5b354132a4a8dd8bb04
-EBUILD rospack-2.5.1.ebuild 614 BLAKE2B 332ecf52e3c5014802eadbabd0d5d4b10141dd543eb7029225db1b827d36e3f0fbf669cc1535840b507e6cd6030252df1163d77583cf6c809ed34a36932c1437 SHA512 99dd0647ab97252e9f220ea9b42dedd82a3f794d5e0979442170e5997f7ff2b5b47de5a108cfa6a871de78b49f5799cf25f141ff3083e20854b609f7e5b14157
-EBUILD rospack-9999.ebuild 614 BLAKE2B 332ecf52e3c5014802eadbabd0d5d4b10141dd543eb7029225db1b827d36e3f0fbf669cc1535840b507e6cd6030252df1163d77583cf6c809ed34a36932c1437 SHA512 99dd0647ab97252e9f220ea9b42dedd82a3f794d5e0979442170e5997f7ff2b5b47de5a108cfa6a871de78b49f5799cf25f141ff3083e20854b609f7e5b14157
+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 325 BLAKE2B 5a5a1c31afa5d12425b09321ce006e4e921cf4bb4b90748045afd58cedbb4e67534dc16c27d338ed759586efb03ddda6ce053cf744025fe7e489320d9b271ca4 SHA512 2718fee8c06627957b95d0e99b517d2dcb2428279925a22e6cbbab1e56ea6d25da57c7143d316e7406419b7d2ff75187950957a705348adfb4008413923dda5c
diff --git a/dev-ros/rospack/rospack-2.4.3.ebuild b/dev-ros/rospack/rospack-2.4.3.ebuild
deleted file mode 100644
index 18b9f633ad3f..000000000000
--- a/dev-ros/rospack/rospack-2.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/rospack"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves information about ROS packages available on the filesystem"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-ros/cmake_modules-0.4.1
-	test? (
-		dev-cpp/gtest
-		dev-python/nose
-	)"
-
-PATCHES=(
-	"${FILESDIR}/gentoo.patch"
-)
diff --git a/dev-ros/rospack/rospack-2.5.0.ebuild b/dev-ros/rospack/rospack-2.5.0.ebuild
deleted file mode 100644
index cf86c350e8c7..000000000000
--- a/dev-ros/rospack/rospack-2.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/rospack"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves information about ROS packages available on the filesystem"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/tinyxml2-5:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-ros/cmake_modules-0.4.1
-	test? (
-		dev-cpp/gtest
-		dev-python/nose
-	)"
-
-PATCHES=(
-	"${FILESDIR}/gentoo.patch"
-)
diff --git a/dev-ros/rospack/rospack-2.5.1.ebuild b/dev-ros/rospack/rospack-2.5.1.ebuild
deleted file mode 100644
index 69cbb346fe5e..000000000000
--- a/dev-ros/rospack/rospack-2.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/rospack"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves information about ROS packages available on the filesystem"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/tinyxml2-5:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-ros/cmake_modules-0.4.1
-	test? (
-		dev-cpp/gtest
-		dev-python/nose
-	)"
-RDEPEND="${RDEPEND}
-	dev-ros/ros_environment"
-
-PATCHES=(
-	"${FILESDIR}/gentoo.patch"
-)
diff --git a/dev-ros/rospack/rospack-2.6.2.ebuild b/dev-ros/rospack/rospack-2.6.2.ebuild
new file mode 100644
index 000000000000..e3e141969c87
--- /dev/null
+++ b/dev-ros/rospack/rospack-2.6.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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
index 69cbb346fe5e..e3e141969c87 100644
--- a/dev-ros/rospack/rospack-9999.ebuild
+++ b/dev-ros/rospack/rospack-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/rospack"
 KEYWORDS="~amd64 ~arm"
@@ -13,20 +13,18 @@ DESCRIPTION="Retrieves information about ROS packages available on the filesyste
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	dev-libs/boost:=
-	>=dev-libs/tinyxml2-5:=
-	${PYTHON_DEPS}"
+	>=dev-libs/tinyxml2-5:="
 DEPEND="${RDEPEND}
-	>=dev-ros/cmake_modules-0.4.1
 	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
index a2105d3d7329..aad597d3d0d1 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,8 +1,6 @@
-AUX yaml.patch 895 BLAKE2B 983493cadf83e5eee7646769ddc8560bbcff3756ebdb77f4365e0a3e10d97b104c4a6ec3ceb0d7e3504502c250cc21ee07b3f5582e3521a5eafe7f5925c622a1 SHA512 92a6ba5660b2cc0a490477d4e4fd39ebbd95912804d5c32c76eec5dc4fc5a67e043dc9cce2ee13d44c623b7a7b710d045fabd68ff3968d2e5ea555d97eb219f2
-AUX yaml2.patch 3279 BLAKE2B 8ca2d9dcd99eeefe7ca2c5039a894bfcda02586995a2982c8f6ea6ac61c19c16325e53bd0733b1c3272160f3dd572ed8aa5c754ad7d182adfc8e85f7b39e0c99 SHA512 23856b931f203fc3c0adfddbcc3c94ea1b827eb2a1f8550d130ac25abdb09a2167da5f4ae9aaf9d869326a80f1964e0f5a00e68895133fb101e4accdf6f5a4c4
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosparam-1.14.3-r1.ebuild 562 BLAKE2B 77a1ff5ef7d1035009421bd5582e5bea52ea11e5fdbb45349ef37a4c46449aac66333e16b89158e367ee2e379cd94c3a8dd11f23339a498c2d10ec8cd3b6cebf SHA512 d3056a70cbf9903d22f9d5d76b243d6f98aa50563a9be7248972dbd1cbca4570e922a304af8555be8c47254732f2a2aa7973c5fffa27b5a5a4118fddb721325a
-EBUILD rosparam-1.15.4.ebuild 499 BLAKE2B 44b8e57ab8d44f3f014c3a04520698fd27495d948c7423720a9d3b4f92f227bc782319d90f20a87b3389381127f6f405630c6138e62e5c0e8745ce3e9072ebaf SHA512 902d85db77f75bc112fb01ff608994c4c98fbd6b862a0f195a88956a0319752cacbf0ec314a41af8f2f5e9ec9b2da842a674154db60012c624d8dc91b3428546
-EBUILD rosparam-9999.ebuild 499 BLAKE2B 44b8e57ab8d44f3f014c3a04520698fd27495d948c7423720a9d3b4f92f227bc782319d90f20a87b3389381127f6f405630c6138e62e5c0e8745ce3e9072ebaf SHA512 902d85db77f75bc112fb01ff608994c4c98fbd6b862a0f195a88956a0319752cacbf0ec314a41af8f2f5e9ec9b2da842a674154db60012c624d8dc91b3428546
+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
+EBUILD rosparam-1.15.7.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
+EBUILD rosparam-1.15.8.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
+EBUILD rosparam-9999.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/files/yaml.patch b/dev-ros/rosparam/files/yaml.patch
deleted file mode 100644
index a4ed42758f13..000000000000
--- a/dev-ros/rosparam/files/yaml.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 481ad19689561052afde658ab0c54c91b0e5e04a Mon Sep 17 00:00:00 2001
-From: Maxime St-Pierre <me@maximest-pierre.me>
-Date: Sun, 10 Nov 2019 06:27:40 -0500
-Subject: [PATCH] Fix #1833 change unsafe yaml.load to yaml.safe_load
-
----
- tools/rosparam/src/rosparam/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
-index 3279ab97d..fd8b0569f 100644
---- a/tools/rosparam/src/rosparam/__init__.py
-+++ b/tools/rosparam/src/rosparam/__init__.py
-@@ -368,7 +368,7 @@ def set_param(param, value, verbose=False):
-     :param param: parameter name, ``str``
-     :param value: yaml-encoded value, ``str``
-     """
--    set_param_raw(param, yaml.load(value), verbose=verbose)
-+    set_param_raw(param, yaml.safe_load(value), verbose=verbose)
- 
- def upload_params(ns, values, verbose=False):
-     """
diff --git a/dev-ros/rosparam/files/yaml2.patch b/dev-ros/rosparam/files/yaml2.patch
deleted file mode 100644
index 1e36844ee38c..000000000000
--- a/dev-ros/rosparam/files/yaml2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
-index 41b806711..3279ab97d 100644
---- a/tools/rosparam/src/rosparam/__init__.py
-+++ b/tools/rosparam/src/rosparam/__init__.py
-@@ -99,6 +99,7 @@ def construct_yaml_binary(loader, node):
- # register the (de)serializers with pyyaml
- yaml.add_representer(Binary,represent_xml_binary)
- yaml.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
-+yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
- 
- def construct_angle_radians(loader, node):
-     """
-@@ -185,7 +186,7 @@ def load_str(str, filename, default_namespace=None, verbose=False):
-     """
-     paramlist = []
-     default_namespace = default_namespace or get_ros_namespace()
--    for doc in yaml.load_all(str):
-+    for doc in yaml.safe_load_all(str):
-         if NS in doc:
-             ns = ns_join(default_namespace, doc.get(NS, None))
-             if verbose:
-@@ -633,10 +634,14 @@ def yamlmain(argv=None):
- 
- yaml.add_constructor(u'!radians', construct_angle_radians)
- yaml.add_constructor(u'!degrees', construct_angle_degrees)
-+yaml.SafeLoader.add_constructor(u'!radians', construct_angle_radians)
-+yaml.SafeLoader.add_constructor(u'!degrees', construct_angle_degrees)
- 
- # allow both !degrees 180, !radians 2*pi
- pattern = re.compile(r'^deg\([^\)]*\)$')
- yaml.add_implicit_resolver(u'!degrees', pattern, first="deg(")
-+yaml.SafeLoader.add_implicit_resolver(u'!degrees', pattern, first="deg(")
- pattern = re.compile(r'^rad\([^\)]*\)$')
- yaml.add_implicit_resolver(u'!radians', pattern, first="rad(")
-+yaml.SafeLoader.add_implicit_resolver(u'!radians', pattern, first="rad(")
- 
diff --git a/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild b/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild
deleted file mode 100644
index f0fe1a56c7cf..000000000000
--- a/dev-ros/rosparam/rosparam-1.14.3-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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/yaml2.patch" )
diff --git a/dev-ros/rosparam/rosparam-1.15.4.ebuild b/dev-ros/rosparam/rosparam-1.15.4.ebuild
deleted file mode 100644
index 07a0e27680c2..000000000000
--- a/dev-ros/rosparam/rosparam-1.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.15.7.ebuild b/dev-ros/rosparam/rosparam-1.15.7.ebuild
new file mode 100644
index 000000000000..0e2d39275623
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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
new file mode 100644
index 000000000000..0e2d39275623
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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
index 07a0e27680c2..0e2d39275623 100644
--- a/dev-ros/rosparam/rosparam-9999.ebuild
+++ b/dev-ros/rosparam/rosparam-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	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
index f2523aa6960e..2bb2fc72179f 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,7 +1,6 @@
-AUX yaml.patch 2320 BLAKE2B 2b59ccbd08c333df5b6ec603136ac94202da82eec17f13b4b84c1df66636d2fadf22eaacb5d24e7d00543358eb1f539ffa7c09498ed0afeda5ae5e382b17660f SHA512 de3f2c418f5d84f99af771634cca03e5982ca0a828f404fdfe62de2e8fac9cf4dcaf681e1892f37908568fd5b70f527c0f4f860e201ba330dda65b1e7098de30
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rospy-1.14.3-r1.ebuild 757 BLAKE2B e6a4dddf0d7316388b6c5de241c94be85680c212508f0301b13d140e51c007ace25e94f429d7c037e836f6da98986386b1b945c663ba18cda1cb4bd9e1bccea6 SHA512 00efa18957a3fb4f556c41a998e060888e1d5cb299e3a197c6a2a669c4996892e18ab9c92a4b93623d0b30ab8525108c1b8855b56bc797bba5e00f5f45d2e1a3
-EBUILD rospy-1.15.4.ebuild 720 BLAKE2B 718df093cd4d0c42aff4a245a6cc6f070aba7100e45f978fd3257b711b81e857547ee05665c48f7c9f36a813c6eb12fa26d594a9776ed3ddbdd7cfc7bfd3b342 SHA512 83e83ccd7a5a61df417dbc81f0a8691fc5265f76cb301329cad5d4fd35bc428cf7500479934081d69fed3e285ff28945c5f69943c2e7585e0d3ec343d58b9a42
-EBUILD rospy-9999.ebuild 720 BLAKE2B 718df093cd4d0c42aff4a245a6cc6f070aba7100e45f978fd3257b711b81e857547ee05665c48f7c9f36a813c6eb12fa26d594a9776ed3ddbdd7cfc7bfd3b342 SHA512 83e83ccd7a5a61df417dbc81f0a8691fc5265f76cb301329cad5d4fd35bc428cf7500479934081d69fed3e285ff28945c5f69943c2e7585e0d3ec343d58b9a42
+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
+EBUILD rospy-1.15.7.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
+EBUILD rospy-1.15.8.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
+EBUILD rospy-9999.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rospy/files/yaml.patch b/dev-ros/rospy/files/yaml.patch
deleted file mode 100644
index e9e9aa8202a9..000000000000
--- a/dev-ros/rospy/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/clients/rospy/src/rospy/client.py b/clients/rospy/src/rospy/client.py
-index d543c53ac..c72d6d6f0 100644
---- a/clients/rospy/src/rospy/client.py
-+++ b/clients/rospy/src/rospy/client.py
-@@ -101,7 +101,7 @@ def load_command_line_node_params(argv):
-                 src, dst = [x.strip() for x in arg.split(rosgraph.names.REMAP)]
-                 if src and dst:
-                     if len(src) > 1 and src[0] == '_' and src[1] != '_':
--                        mappings[src[1:]] = yaml.load(dst)
-+                        mappings[src[1:]] = yaml.safe_load(dst)
-         return mappings
-     except Exception as e:
-         raise rospy.exceptions.ROSInitException("invalid command-line parameters: %s"%(str(e)))
diff --git a/dev-ros/rospy/rospy-1.14.3-r1.ebuild b/dev-ros/rospy/rospy-1.14.3-r1.ebuild
deleted file mode 100644
index 72153d4c7f54..000000000000
--- a/dev-ros/rospy/rospy-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roscpp[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/yaml.patch" )
-
-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.4.ebuild b/dev-ros/rospy/rospy-1.15.4.ebuild
deleted file mode 100644
index ed13430b1e69..000000000000
--- a/dev-ros/rospy/rospy-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roscpp[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	# Other tests need these nodes
-	exeinto /usr/share/${PN}
-	doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.15.7.ebuild b/dev-ros/rospy/rospy-1.15.7.ebuild
new file mode 100644
index 000000000000..c15250f755ce
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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
new file mode 100644
index 000000000000..c15250f755ce
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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
index ed13430b1e69..c15250f755ce 100644
--- a/dev-ros/rospy/rospy-9999.ebuild
+++ b/dev-ros/rospy/rospy-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=clients/${PN}
 
 inherit ros-catkin
@@ -17,10 +16,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roscpp[${PYTHON_USEDEP}]
+	dev-ros/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}"
diff --git a/dev-ros/rospy_tutorials/Manifest b/dev-ros/rospy_tutorials/Manifest
index 9764a026dc96..7b4d84a264f0 100644
--- a/dev-ros/rospy_tutorials/Manifest
+++ b/dev-ros/rospy_tutorials/Manifest
@@ -1,18 +1,6 @@
-DIST ros_tutorials-0.10.0.tar.gz 159486 BLAKE2B 71b6fabb1a85ac9740dfba9f40be318e211d519189f8be05e58bf146b5d22566ea6ddcdca6331366c05e95c314b656c4f5688c4da3d20b1cdce78639a76e14c5 SHA512 dba529965bad64957721c71f1c7b2b60ece085ed0186a107fbec03c231940b19004b3bf9dce5c1ac3dcfe1c339d49a2214811d5227f453b1c3f541076a653048
-DIST ros_tutorials-0.6.1.tar.gz 126792 BLAKE2B 5964c8fe5ddc736e9933b89f9c66eae436805ec5c564a2144c1e338537da18b2064e9aba209f25a82b7d88e5b2bd2e1401dbe931614f65544ae2f5170270ff1f SHA512 f09e5451030c0a76a9473020535e79ac06e748f4208109cf83e61526d13472c3390402814a3d145cb793c5418af703cd9959ca57143798d1706185c13d3418c5
-DIST ros_tutorials-0.7.0.tar.gz 140125 BLAKE2B 9f1006c933b4cb642f77c8e68ddda92213b9cfd132131b2768c4fe17ef6b1b8bf8da89da3fea2a0692d340d9f0b1e953fb150e2dae9e18de86b59fe50b72cb74 SHA512 b7c51bc007c0bddfb38361750a0225606d9e85a3404d6b21f3a32c8ccb1786844f225a49ad8f525c684c838eff9ec9f7e7c39a15adf5ea5dd187a59c90144711
-DIST ros_tutorials-0.7.1.tar.gz 140483 BLAKE2B 8f2d4aee6494476bf7efb2ea35962ea6154485143f108b8e7603a9a1e67cb76f6c87e7b2612cd07ba19c50b44cd7fbbcd89f13f902eafd17c2a0eb8738357050 SHA512 0970e6428af992addfa1af327b2e0a3f85a926c90cfceba89d415acc5404a364164e0dd497c9296f03ac06c575380ad21e83b0cdbf6709c49dc650087145ddaa
-DIST ros_tutorials-0.8.0.tar.gz 153739 BLAKE2B 0dc7918a2b95a26518d07d753040e381b26c357eb3995a22a429d58c244751d7c58c8736efbab23a6a5ca6903f08e43acf9519f2a534b22fe89ea853b2e3fbff SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795
-DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
-DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
-DIST ros_tutorials-0.9.1.tar.gz 155151 BLAKE2B 7371063ef77981892fee54b6b3d29907421f29deece22c6d53ace576717357a9700a2e14a03bd9f24c2285a16b55f5c9665a0da5081ae1599da8df5ec68ba425 SHA512 62a980e9515515496de39aa360df030f0dd8678bbf132d90386775c34e3b54f33a477aaefb65db803dcd704b8fbc61d445617399ac38cc2fa3f3363a6052682f
-EBUILD rospy_tutorials-0.10.0.ebuild 581 BLAKE2B 24b34242778a10db129f8ab7e0febe8bb70187f3101bc3a360923f291aca86cc6414b438eb9def85c3c3dea7009a446ba9d2a8cfcd85a68a9771ee883a53adcb SHA512 801bccc7493e6a688392c5346faefb52dcc1077238ec6b5cfab6520923e749eb2f9cb0f7c83266849fb2692a5c7cf858d3a015d02f15e744e1645e087317adec
-EBUILD rospy_tutorials-0.6.1.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
-EBUILD rospy_tutorials-0.7.0.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
-EBUILD rospy_tutorials-0.7.1.ebuild 584 BLAKE2B ed4d39bd594234392e65e19dcaa019c7620196cc3807203984c77e779c9ad1b28f5940882bf2e131a21bce294c222a2c2131660c7a7bbf87a2ad0c8cdc990240 SHA512 3ac348fb1a4436859b9f74e9fe78db3d239f78fd12757f2d5481c5b2562c56fb36aeae28e23419cd278e7d34f7ff8404af81dce5e0322f9131ed69ac2d71f748
-EBUILD rospy_tutorials-0.8.0.ebuild 584 BLAKE2B 40388c2c6d10ade2e2b313523f6d21d5fadc0c6d9c71769245833e5e5b56a3b16ab8d97c72bf4c4672e0431c33ad3092e675e04d5070bdf26f1df8ad3c63aa61 SHA512 01fb16bb755f6f9f9afa5045fd4b76b370800b3e59dce440317a4c5b26cfeb6e2d1d66195fee0374185cd08e91dd25bcba9cb5130581727293de7e1eb27a5712
-EBUILD rospy_tutorials-0.8.1.ebuild 584 BLAKE2B 40388c2c6d10ade2e2b313523f6d21d5fadc0c6d9c71769245833e5e5b56a3b16ab8d97c72bf4c4672e0431c33ad3092e675e04d5070bdf26f1df8ad3c63aa61 SHA512 01fb16bb755f6f9f9afa5045fd4b76b370800b3e59dce440317a4c5b26cfeb6e2d1d66195fee0374185cd08e91dd25bcba9cb5130581727293de7e1eb27a5712
-EBUILD rospy_tutorials-0.9.0.ebuild 584 BLAKE2B efcf40c9f6d8e01f5195c13812c8155ad424281f6320d3cdf3aa1848f009db86b8d04b6ea0c120dffc3135f1d218807e260fd4711955aace0dda5880f5af7866 SHA512 91fdde82439c6052e3beaa60c3fcf05584db3b37b15feab37f84ec9c5eb3c8c74a36b630232756bd5c71d31d8ee328f811c0e7742899eae1c765b930e839f0ac
-EBUILD rospy_tutorials-0.9.1.ebuild 581 BLAKE2B 2a1246c99e200e97be41048d1706d59efc4401746b49776def06cd7a190b588af3b561aa891abade9c177028ba48ec12ed76f0b492ebe21769f7a1dc95fb1ba9 SHA512 445d3b6cfc8ac0a9705cfa0c22b219c2c97f9ec6955736ddac89adb655b5f31bb79fd9c774b2eb06f7820e7c1ce328ce1dcfa8051005865490806e9290ebe018
-EBUILD rospy_tutorials-9999.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
+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 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.0.ebuild
deleted file mode 100644
index 31948ff70209..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.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=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
new file mode 100644
index 000000000000..ecde7b0dc1db
--- /dev/null
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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
new file mode 100644
index 000000000000..ecde7b0dc1db
--- /dev/null
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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.6.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.6.1.ebuild
deleted file mode 100644
index 57da80ce742c..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild
deleted file mode 100644
index 57da80ce742c..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.7.1.ebuild
deleted file mode 100644
index 490201e139c2..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.8.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.8.0.ebuild
deleted file mode 100644
index fb8c51aee23a..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.8.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.8.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.8.1.ebuild
deleted file mode 100644
index fb8c51aee23a..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.8.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.ebuild
deleted file mode 100644
index 4ad7609bac39..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild
deleted file mode 100644
index 0884ee095a59..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
index 57da80ce742c..ecde7b0dc1db 100644
--- a/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
@@ -1,23 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/ros_tutorials"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
+DESCRIPTION="Attempts to show the features of ROS step-by-step"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+	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
index 1c430966dfe8..2b0c6b0a1352 100644
--- a/dev-ros/rosserial_arduino/Manifest
+++ b/dev-ros/rosserial_arduino/Manifest
@@ -1,18 +1,4 @@
-DIST rosserial-0.7.1.tar.gz 102204 BLAKE2B 86f7bf1387aeef048e97e055a12d6ba94bbfe8e51bd73fa77be9bd9c603f19eb5fa28d461fc00a7614f8a855f3110187d0daf47952b6568b70e851c22002ce5d SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5
-DIST rosserial-0.7.2.tar.gz 143811 BLAKE2B 6c72cf06ba4c3def69c53eeddfb9991322d51e8eba3c5095564d8c5ebde8aca866a5a9e9cecbdecd52fb03e50f398662821e5aa5f85f49e97fc299244fac8d1b SHA512 d6f7250050f68884e943aa4cc59740506fa317ab60973deb25da824d8614a3fb7c16ed5ce2123e0eb181ab906d8f7156c3ba1ea480468a01df45ab682cddc2cd
-DIST rosserial-0.7.3.tar.gz 143866 BLAKE2B a2af4bedb91363e7a4960c1e101ead1213a0d1f7742d7150485dd314742471c5ac07d49498788345a664b21e3157d9c8b198ace01d7835cc19031630b502bcc4 SHA512 3ae2eb7fe525fbcecdb1137c1492a729ec5cac4a57b648f08f02fa348566aaedb64cfc38f255c3872c28ffa46fcf2aa40e951556cc84698f5c4a396af454d5ad
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_arduino-0.7.1.ebuild 565 BLAKE2B c1b603261718b0ac7330e872a6c416d3ee966882273298321b5dc0f723cdeaa51f1f15da8f03cfea0393cab1d7e1cbe07824b508b1f12c36e17c5ae73c61f2c2 SHA512 bd318df888557becfd527a91a8d75cc3230efb31cb3d95a3dfa4539d1fb5e6b18997f9d383fec8c324373f0c46804af2aff965d6fcddd6cbacf40ee86cabf6cf
-EBUILD rosserial_arduino-0.7.2.ebuild 565 BLAKE2B a040a35fb8c227fe92a2d8c9dc3fed52d6b131fd0f74406ae32e36934ff9e49002989c3e084dc682d71ed71e9ac4b7bbb4cf6c31a04795e40384fc68502430b7 SHA512 ce340ba0c3443d67d2f78451d19b729493a3b2aa218af89161c76972a6d4880b9bb54b516edc8f490e728031511f531d8d0ec308df4b84f1d31c126588ea1566
-EBUILD rosserial_arduino-0.7.3.ebuild 565 BLAKE2B a040a35fb8c227fe92a2d8c9dc3fed52d6b131fd0f74406ae32e36934ff9e49002989c3e084dc682d71ed71e9ac4b7bbb4cf6c31a04795e40384fc68502430b7 SHA512 ce340ba0c3443d67d2f78451d19b729493a3b2aa218af89161c76972a6d4880b9bb54b516edc8f490e728031511f531d8d0ec308df4b84f1d31c126588ea1566
-EBUILD rosserial_arduino-0.7.4.ebuild 565 BLAKE2B a040a35fb8c227fe92a2d8c9dc3fed52d6b131fd0f74406ae32e36934ff9e49002989c3e084dc682d71ed71e9ac4b7bbb4cf6c31a04795e40384fc68502430b7 SHA512 ce340ba0c3443d67d2f78451d19b729493a3b2aa218af89161c76972a6d4880b9bb54b516edc8f490e728031511f531d8d0ec308df4b84f1d31c126588ea1566
-EBUILD rosserial_arduino-0.7.5.ebuild 565 BLAKE2B a040a35fb8c227fe92a2d8c9dc3fed52d6b131fd0f74406ae32e36934ff9e49002989c3e084dc682d71ed71e9ac4b7bbb4cf6c31a04795e40384fc68502430b7 SHA512 ce340ba0c3443d67d2f78451d19b729493a3b2aa218af89161c76972a6d4880b9bb54b516edc8f490e728031511f531d8d0ec308df4b84f1d31c126588ea1566
-EBUILD rosserial_arduino-0.7.6.ebuild 565 BLAKE2B b6e4055c2f799ca65eb77dd65a51fea6c180fbc3b2493994c3ef2b08740d949f26134e5d957b5cc30f9c478b49ea0b674e1ccc9c6d6501384653bbec2ae6e9ee SHA512 f9dfe57084c67a20730353050ff1b7dd83c35b2056e2124f2850feb2737ddadb64c0dc204a14be3b2292f29f9dd70389161db486bb3a67f6b73e521876da9103
-EBUILD rosserial_arduino-0.7.7.ebuild 565 BLAKE2B b6e4055c2f799ca65eb77dd65a51fea6c180fbc3b2493994c3ef2b08740d949f26134e5d957b5cc30f9c478b49ea0b674e1ccc9c6d6501384653bbec2ae6e9ee SHA512 f9dfe57084c67a20730353050ff1b7dd83c35b2056e2124f2850feb2737ddadb64c0dc204a14be3b2292f29f9dd70389161db486bb3a67f6b73e521876da9103
-EBUILD rosserial_arduino-0.8.0.ebuild 562 BLAKE2B 16613c8efb5ade0a26aea1bc05ecf068b01c7a80caad17377cc43a1ce0c6eb7a4a8aab2898a61670cdfd2fe91e55833c8e55853e7233b9d9d16bf4c9861ba2f0 SHA512 43423ae8c254ba37d9e8f847fa87ba6424f4d01facb3ca9ded24fd2ab8053d674b66415d97b1b8706b01d46ad5cad59c970f2d8b3aba1683008344a69291a243
-EBUILD rosserial_arduino-9999.ebuild 565 BLAKE2B c1b603261718b0ac7330e872a6c416d3ee966882273298321b5dc0f723cdeaa51f1f15da8f03cfea0393cab1d7e1cbe07824b508b1f12c36e17c5ae73c61f2c2 SHA512 bd318df888557becfd527a91a8d75cc3230efb31cb3d95a3dfa4539d1fb5e6b18997f9d383fec8c324373f0c46804af2aff965d6fcddd6cbacf40ee86cabf6cf
+EBUILD rosserial_arduino-0.8.0.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
+EBUILD rosserial_arduino-9999.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild
deleted file mode 100644
index fbaa323fda1f..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.2.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.2.ebuild
deleted file mode 100644
index 761476af3982..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.3.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.3.ebuild
deleted file mode 100644
index 761476af3982..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.4.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.4.ebuild
deleted file mode 100644
index 761476af3982..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.5.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.5.ebuild
deleted file mode 100644
index 761476af3982..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.6.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.6.ebuild
deleted file mode 100644
index b718f56cc16f..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.7.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.7.ebuild
deleted file mode 100644
index b718f56cc16f..000000000000
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.8.0.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.8.0.ebuild
index 2891fc8927ff..f444499009fb 100644
--- a/dev-ros/rosserial_arduino/rosserial_arduino-0.8.0.ebuild
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-0.8.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,8 +15,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${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
index fbaa323fda1f..f444499009fb 100644
--- a/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,8 +15,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosserial_client[${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
index 07453152e04f..9d368eff9db2 100644
--- a/dev-ros/rosserial_client/Manifest
+++ b/dev-ros/rosserial_client/Manifest
@@ -1,6 +1,4 @@
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_client-0.7.7.ebuild 556 BLAKE2B 96d4baad441b4dc57ca089b4a9c8fda750cd160e5b47dc92460ee8763039a96685fdb3aab9d24e417d67c06b62a99314cd1004cb3e4536f69d0bd937fdda951f SHA512 31868f6774400e2764d5cb28c65b44fd26427797f83841e86095ff5a53f5f82a3d554fddd2919beeeb449e7030b1d5cd8c95a72815fca2ec88f717fecec5b1a6
-EBUILD rosserial_client-0.8.0.ebuild 553 BLAKE2B bc3c86695f32c1adaa5c208bb52698c354e8e9a82307a45fc98fb3fcb50561731ecee03b1141f8d5ae67e8b4e262b7b23fc10679083910b44057c38114f769da SHA512 0979da446cddde15bbcef0bdd5bd95572216e76a27442f733d279b60be233b30295c95db3de4863c185a16f1da8f8bf76cb36c540824c099835182d3f3b90665
-EBUILD rosserial_client-9999.ebuild 556 BLAKE2B 06ea10e8faeb3a723a7687cc2e3ae64afd2a8bd23454868ca9b5eb96666652c41344d49a568d4da50261b4c93bacbba903cebfa4ba8a73049b4ea329e5ad43aa SHA512 f647432857d5c262bdf873563de57cf35a8f538ca5abef5be9a7b14e69e05f800b91b2b993667930de8d3aa7e71e16ad4cd4a90afb3107ed8b1de933fb6b097e
+EBUILD rosserial_client-0.8.0.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
+EBUILD rosserial_client-9999.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_client/rosserial_client-0.7.7.ebuild b/dev-ros/rosserial_client/rosserial_client-0.7.7.ebuild
deleted file mode 100644
index 026f55d59186..000000000000
--- a/dev-ros/rosserial_client/rosserial_client-0.7.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Generalized client side source for rosserial"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_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.8.0.ebuild b/dev-ros/rosserial_client/rosserial_client-0.8.0.ebuild
index 11f287e29b4f..6dab12d86ad4 100644
--- a/dev-ros/rosserial_client/rosserial_client-0.8.0.ebuild
+++ b/dev-ros/rosserial_client/rosserial_client-0.8.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,8 +14,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	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}]
 "
diff --git a/dev-ros/rosserial_client/rosserial_client-9999.ebuild b/dev-ros/rosserial_client/rosserial_client-9999.ebuild
index 6ed97cf7f78c..6dab12d86ad4 100644
--- a/dev-ros/rosserial_client/rosserial_client-9999.ebuild
+++ b/dev-ros/rosserial_client/rosserial_client-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,8 +14,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	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}]
 "
diff --git a/dev-ros/rosserial_embeddedlinux/Manifest b/dev-ros/rosserial_embeddedlinux/Manifest
index 110a97820314..0fcdb4271c8d 100644
--- a/dev-ros/rosserial_embeddedlinux/Manifest
+++ b/dev-ros/rosserial_embeddedlinux/Manifest
@@ -1,18 +1,4 @@
-DIST rosserial-0.7.1.tar.gz 102204 BLAKE2B 86f7bf1387aeef048e97e055a12d6ba94bbfe8e51bd73fa77be9bd9c603f19eb5fa28d461fc00a7614f8a855f3110187d0daf47952b6568b70e851c22002ce5d SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5
-DIST rosserial-0.7.2.tar.gz 143811 BLAKE2B 6c72cf06ba4c3def69c53eeddfb9991322d51e8eba3c5095564d8c5ebde8aca866a5a9e9cecbdecd52fb03e50f398662821e5aa5f85f49e97fc299244fac8d1b SHA512 d6f7250050f68884e943aa4cc59740506fa317ab60973deb25da824d8614a3fb7c16ed5ce2123e0eb181ab906d8f7156c3ba1ea480468a01df45ab682cddc2cd
-DIST rosserial-0.7.3.tar.gz 143866 BLAKE2B a2af4bedb91363e7a4960c1e101ead1213a0d1f7742d7150485dd314742471c5ac07d49498788345a664b21e3157d9c8b198ace01d7835cc19031630b502bcc4 SHA512 3ae2eb7fe525fbcecdb1137c1492a729ec5cac4a57b648f08f02fa348566aaedb64cfc38f255c3872c28ffa46fcf2aa40e951556cc84698f5c4a396af454d5ad
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_embeddedlinux-0.7.1.ebuild 704 BLAKE2B 526d9b072a960c13621acfb7386a6401a8b535f98659b1c3fe5f2e30fbdf34ba4bd22786858a594d770cf010199f856753d9b726190ab21bf4e9549bd97f6d29 SHA512 32ec8ea14c7ca6dc3bea05d1b88a91f6ec48c46f5839e6154d80e8700bf5430ef382ada63ab61710025c45c8944a90431fc4b01fbefdb8df12fa6a79fb8514fb
-EBUILD rosserial_embeddedlinux-0.7.2.ebuild 704 BLAKE2B d7f12810be4890bc54ea7e253445d709b6e849407724d21ad2f9121c079b9b2b449ef1bbeb1091e83c946c022e37c79b2ccd54a1d711cda1d4bf8e442b99affa SHA512 03f25c5cc7c4b7f839f54bc647fec5f99609f1cc1b078b61d0cda8e9fdaa57fb032a690db0965df1309d09e2955087d97546b162ce093eb989ef2751f829e967
-EBUILD rosserial_embeddedlinux-0.7.3.ebuild 704 BLAKE2B d7f12810be4890bc54ea7e253445d709b6e849407724d21ad2f9121c079b9b2b449ef1bbeb1091e83c946c022e37c79b2ccd54a1d711cda1d4bf8e442b99affa SHA512 03f25c5cc7c4b7f839f54bc647fec5f99609f1cc1b078b61d0cda8e9fdaa57fb032a690db0965df1309d09e2955087d97546b162ce093eb989ef2751f829e967
-EBUILD rosserial_embeddedlinux-0.7.4.ebuild 704 BLAKE2B d7f12810be4890bc54ea7e253445d709b6e849407724d21ad2f9121c079b9b2b449ef1bbeb1091e83c946c022e37c79b2ccd54a1d711cda1d4bf8e442b99affa SHA512 03f25c5cc7c4b7f839f54bc647fec5f99609f1cc1b078b61d0cda8e9fdaa57fb032a690db0965df1309d09e2955087d97546b162ce093eb989ef2751f829e967
-EBUILD rosserial_embeddedlinux-0.7.5.ebuild 704 BLAKE2B d7f12810be4890bc54ea7e253445d709b6e849407724d21ad2f9121c079b9b2b449ef1bbeb1091e83c946c022e37c79b2ccd54a1d711cda1d4bf8e442b99affa SHA512 03f25c5cc7c4b7f839f54bc647fec5f99609f1cc1b078b61d0cda8e9fdaa57fb032a690db0965df1309d09e2955087d97546b162ce093eb989ef2751f829e967
-EBUILD rosserial_embeddedlinux-0.7.6.ebuild 704 BLAKE2B 2fad33898588fd1728e94b148d2213906cb764d4a57c6d08c8f4250668cd34a1bb6e80c79b7be2a3807aa327414d08e80c3fdf612e329856877149dbf413d757 SHA512 40bbdb4eb75fbe1d075f23b3108398767d0ca990ad023e4c1f11b2382c1ee094e7a91f3c273e06af2b90079e32d5f331a77edafb2f8556d97740a8d23e5f3570
-EBUILD rosserial_embeddedlinux-0.7.7.ebuild 704 BLAKE2B 2fad33898588fd1728e94b148d2213906cb764d4a57c6d08c8f4250668cd34a1bb6e80c79b7be2a3807aa327414d08e80c3fdf612e329856877149dbf413d757 SHA512 40bbdb4eb75fbe1d075f23b3108398767d0ca990ad023e4c1f11b2382c1ee094e7a91f3c273e06af2b90079e32d5f331a77edafb2f8556d97740a8d23e5f3570
-EBUILD rosserial_embeddedlinux-0.8.0.ebuild 701 BLAKE2B b1df18c38d17896190e09fb855a46471a6cba54546a063712f9693df291c2f9f94515a3c9824c57d5af23f9d3e7d1ff26135ce089a2b8e2279a7f6a1611aa0b8 SHA512 7f7378ab5db69267abf54883de28bb4541533d679d2b41906761315e6abf79cd587b48139e2d1e6a1178c424a8d63e94527f9a11467516e4005d5865fd7681c6
-EBUILD rosserial_embeddedlinux-9999.ebuild 704 BLAKE2B 526d9b072a960c13621acfb7386a6401a8b535f98659b1c3fe5f2e30fbdf34ba4bd22786858a594d770cf010199f856753d9b726190ab21bf4e9549bd97f6d29 SHA512 32ec8ea14c7ca6dc3bea05d1b88a91f6ec48c46f5839e6154d80e8700bf5430ef382ada63ab61710025c45c8944a90431fc4b01fbefdb8df12fa6a79fb8514fb
+EBUILD rosserial_embeddedlinux-0.8.0.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
+EBUILD rosserial_embeddedlinux-9999.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild
deleted file mode 100644
index d7cd211d8864..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.2.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.2.ebuild
deleted file mode 100644
index e9c1ba0f2ea7..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.3.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.3.ebuild
deleted file mode 100644
index e9c1ba0f2ea7..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.4.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.4.ebuild
deleted file mode 100644
index e9c1ba0f2ea7..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.5.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.5.ebuild
deleted file mode 100644
index e9c1ba0f2ea7..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.6.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.6.ebuild
deleted file mode 100644
index 9fac723b1488..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.7.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.7.ebuild
deleted file mode 100644
index 9fac723b1488..000000000000
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.8.0.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.8.0.ebuild
index 10517c437cbb..49525af06d65 100644
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.8.0.ebuild
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.8.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -19,7 +18,7 @@ RDEPEND="
 	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_USEDEP}]
-	dev-ros/rospy[${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
index d7cd211d8864..49525af06d65 100644
--- a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -19,7 +18,7 @@ RDEPEND="
 	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_USEDEP}]
-	dev-ros/rospy[${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
index 6487049432d6..729ec2310351 100644
--- a/dev-ros/rosserial_msgs/Manifest
+++ b/dev-ros/rosserial_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_msgs-0.7.6.ebuild 429 BLAKE2B 50c441d9acd224aeebf5c2e044b1e781715f35ac172cbd0677176689196d8e9febed11745fcb07b6511da35759c1f5fd50b923d64edaf5d8e8db01e3e3a04dae SHA512 3f1bd8bc150590ac0811faa7ebae122085da1ffc6bf02e851fade23275a5b99c0a8d9e313660d3fd2c2741aeaff2f9162105d2dc90be78c86a4941eb36d12e1a
-EBUILD rosserial_msgs-0.7.7.ebuild 429 BLAKE2B 50c441d9acd224aeebf5c2e044b1e781715f35ac172cbd0677176689196d8e9febed11745fcb07b6511da35759c1f5fd50b923d64edaf5d8e8db01e3e3a04dae SHA512 3f1bd8bc150590ac0811faa7ebae122085da1ffc6bf02e851fade23275a5b99c0a8d9e313660d3fd2c2741aeaff2f9162105d2dc90be78c86a4941eb36d12e1a
-EBUILD rosserial_msgs-0.8.0.ebuild 429 BLAKE2B 50c441d9acd224aeebf5c2e044b1e781715f35ac172cbd0677176689196d8e9febed11745fcb07b6511da35759c1f5fd50b923d64edaf5d8e8db01e3e3a04dae SHA512 3f1bd8bc150590ac0811faa7ebae122085da1ffc6bf02e851fade23275a5b99c0a8d9e313660d3fd2c2741aeaff2f9162105d2dc90be78c86a4941eb36d12e1a
-EBUILD rosserial_msgs-9999.ebuild 429 BLAKE2B 50c441d9acd224aeebf5c2e044b1e781715f35ac172cbd0677176689196d8e9febed11745fcb07b6511da35759c1f5fd50b923d64edaf5d8e8db01e3e3a04dae SHA512 3f1bd8bc150590ac0811faa7ebae122085da1ffc6bf02e851fade23275a5b99c0a8d9e313660d3fd2c2741aeaff2f9162105d2dc90be78c86a4941eb36d12e1a
+EBUILD rosserial_msgs-0.8.0.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
+EBUILD rosserial_msgs-9999.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.7.6.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.7.6.ebuild
deleted file mode 100644
index 834f1072d493..000000000000
--- a/dev-ros/rosserial_msgs/rosserial_msgs-0.7.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=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.7.7.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.7.7.ebuild
deleted file mode 100644
index 834f1072d493..000000000000
--- a/dev-ros/rosserial_msgs/rosserial_msgs-0.7.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=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.8.0.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.8.0.ebuild
index 834f1072d493..711a0ec3fdf5 100644
--- a/dev-ros/rosserial_msgs/rosserial_msgs-0.8.0.ebuild
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-0.8.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
index 834f1072d493..711a0ec3fdf5 100644
--- a/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/rosserial_python/Manifest b/dev-ros/rosserial_python/Manifest
index 7b510fcd006a..6aedc2179ddd 100644
--- a/dev-ros/rosserial_python/Manifest
+++ b/dev-ros/rosserial_python/Manifest
@@ -1,18 +1,4 @@
-DIST rosserial-0.7.1.tar.gz 102204 BLAKE2B 86f7bf1387aeef048e97e055a12d6ba94bbfe8e51bd73fa77be9bd9c603f19eb5fa28d461fc00a7614f8a855f3110187d0daf47952b6568b70e851c22002ce5d SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5
-DIST rosserial-0.7.2.tar.gz 143811 BLAKE2B 6c72cf06ba4c3def69c53eeddfb9991322d51e8eba3c5095564d8c5ebde8aca866a5a9e9cecbdecd52fb03e50f398662821e5aa5f85f49e97fc299244fac8d1b SHA512 d6f7250050f68884e943aa4cc59740506fa317ab60973deb25da824d8614a3fb7c16ed5ce2123e0eb181ab906d8f7156c3ba1ea480468a01df45ab682cddc2cd
-DIST rosserial-0.7.3.tar.gz 143866 BLAKE2B a2af4bedb91363e7a4960c1e101ead1213a0d1f7742d7150485dd314742471c5ac07d49498788345a664b21e3157d9c8b198ace01d7835cc19031630b502bcc4 SHA512 3ae2eb7fe525fbcecdb1137c1492a729ec5cac4a57b648f08f02fa348566aaedb64cfc38f255c3872c28ffa46fcf2aa40e951556cc84698f5c4a396af454d5ad
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_python-0.7.1.ebuild 584 BLAKE2B 092729388ecb77ab4b8c994af5f686a4de3e160a44c05e83f7599b6bf24842915cee0ccf1783a078062274c69b83643a76f4c0c14a85882da7a354658cdcb7de SHA512 3e0376f468aa2171b02cf3c0b0eb6f5352f150b1b63e7cd95aaf710589d2f7db10bbc6a218cbef24797ff8eb4bba8a5e30dee37a383a09a8725432ecd4b0a51a
-EBUILD rosserial_python-0.7.2.ebuild 584 BLAKE2B 340c06fd53efa29812c5ee7739c7ddde37367d6b2a39f5e27fd1ca09bbc42c63099441c01be937b62de2161b5e12e4b7b635a90d44b32bdec1ad7c5e7ae500b3 SHA512 3235702aaf5a1b4bbcbd0c02d475aef342a0ca458210938d4b3ac761a95f79d1835cc872397f8e030b350a612e313bb4dc5d1e806a65eb2e4adff7769096bc11
-EBUILD rosserial_python-0.7.3.ebuild 584 BLAKE2B 340c06fd53efa29812c5ee7739c7ddde37367d6b2a39f5e27fd1ca09bbc42c63099441c01be937b62de2161b5e12e4b7b635a90d44b32bdec1ad7c5e7ae500b3 SHA512 3235702aaf5a1b4bbcbd0c02d475aef342a0ca458210938d4b3ac761a95f79d1835cc872397f8e030b350a612e313bb4dc5d1e806a65eb2e4adff7769096bc11
-EBUILD rosserial_python-0.7.4.ebuild 584 BLAKE2B 340c06fd53efa29812c5ee7739c7ddde37367d6b2a39f5e27fd1ca09bbc42c63099441c01be937b62de2161b5e12e4b7b635a90d44b32bdec1ad7c5e7ae500b3 SHA512 3235702aaf5a1b4bbcbd0c02d475aef342a0ca458210938d4b3ac761a95f79d1835cc872397f8e030b350a612e313bb4dc5d1e806a65eb2e4adff7769096bc11
-EBUILD rosserial_python-0.7.5.ebuild 584 BLAKE2B 340c06fd53efa29812c5ee7739c7ddde37367d6b2a39f5e27fd1ca09bbc42c63099441c01be937b62de2161b5e12e4b7b635a90d44b32bdec1ad7c5e7ae500b3 SHA512 3235702aaf5a1b4bbcbd0c02d475aef342a0ca458210938d4b3ac761a95f79d1835cc872397f8e030b350a612e313bb4dc5d1e806a65eb2e4adff7769096bc11
-EBUILD rosserial_python-0.7.6.ebuild 584 BLAKE2B 1334d5d1b20565446c250aac3e38e697c80adcdc992386dd0439cdcb1b6c389e0fd50d52401dfc2114ba4f2f1f2da674f07093f41b8d6882bf3d723074d148ee SHA512 80267da761c7e7539068328ca936fe348892adb4d9ed730a9768854f0c91d35098d3af5ef659b72ac52358797762a640bcd5587fd3fdb5e94f100858e7bb7c74
-EBUILD rosserial_python-0.7.7.ebuild 584 BLAKE2B 1334d5d1b20565446c250aac3e38e697c80adcdc992386dd0439cdcb1b6c389e0fd50d52401dfc2114ba4f2f1f2da674f07093f41b8d6882bf3d723074d148ee SHA512 80267da761c7e7539068328ca936fe348892adb4d9ed730a9768854f0c91d35098d3af5ef659b72ac52358797762a640bcd5587fd3fdb5e94f100858e7bb7c74
-EBUILD rosserial_python-0.8.0.ebuild 581 BLAKE2B db93e27c6cfd4d453309d41207d9cf8bab2644fe0d02e3732375a3649a151b97612155e4854e5e5245d5f31f573e6a5811bc0f81eeba3e90172e57dad8abc38c SHA512 af228346b13fe63a526602d7cb983b93f4577cf8e3a82770418b442c91ff8486acf525c95b6bf17373812441ac535dbabf42944ac588ef7272a8ab8d32fe9c00
-EBUILD rosserial_python-9999.ebuild 584 BLAKE2B 092729388ecb77ab4b8c994af5f686a4de3e160a44c05e83f7599b6bf24842915cee0ccf1783a078062274c69b83643a76f4c0c14a85882da7a354658cdcb7de SHA512 3e0376f468aa2171b02cf3c0b0eb6f5352f150b1b63e7cd95aaf710589d2f7db10bbc6a218cbef24797ff8eb4bba8a5e30dee37a383a09a8725432ecd4b0a51a
+EBUILD rosserial_python-0.8.0.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
+EBUILD rosserial_python-9999.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild
deleted file mode 100644
index 354b3e1020ba..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	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.7.2.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.2.ebuild
deleted file mode 100644
index a543aacef783..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.7.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	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.7.3.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.3.ebuild
deleted file mode 100644
index a543aacef783..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	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.7.4.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.4.ebuild
deleted file mode 100644
index a543aacef783..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.7.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	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.7.5.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.5.ebuild
deleted file mode 100644
index a543aacef783..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.7.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	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.7.6.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.6.ebuild
deleted file mode 100644
index 01787f860da6..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.7.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	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.7.7.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.7.ebuild
deleted file mode 100644
index 01787f860da6..000000000000
--- a/dev-ros/rosserial_python/rosserial_python-0.7.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	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.8.0.ebuild b/dev-ros/rosserial_python/rosserial_python-0.8.0.ebuild
index 62cd44b9a578..2051b6c0c412 100644
--- a/dev-ros/rosserial_python/rosserial_python-0.8.0.ebuild
+++ b/dev-ros/rosserial_python/rosserial_python-0.8.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,8 +14,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
+	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}]
 "
diff --git a/dev-ros/rosserial_python/rosserial_python-9999.ebuild b/dev-ros/rosserial_python/rosserial_python-9999.ebuild
index 354b3e1020ba..2051b6c0c412 100644
--- a/dev-ros/rosserial_python/rosserial_python-9999.ebuild
+++ b/dev-ros/rosserial_python/rosserial_python-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,8 +14,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
+	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}]
 "
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
index 42c604f67fd1..e96618f0021a 100644
--- a/dev-ros/rosserial_server/Manifest
+++ b/dev-ros/rosserial_server/Manifest
@@ -1,5 +1,5 @@
 AUX boost170.patch 2996 BLAKE2B d34ed939d222fa4d9528e8e6a7f3aaa90ebea944e651f7f25d4f254fec3e3b2c655f242fba7e00e315f54f8eb518309ea8f52de2a29c14d2dcdd5ec5c70c1a56 SHA512 4f0742061fdee931c5a934d5816e801bff30664e3a28e3970bf9e3636c2d8a562ff283a246b83bbabf7e4dfa755964e03c6a5b07d7d667583831cd3b6ed67fcc
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_server-0.8.0.ebuild 515 BLAKE2B c3d7da30d2933a83dfc9f848cf1aa559249fa145a30be06b22afdce081e0926eeaf673e3be56f05a2056f8944461fdd3be637c0d390fb07a540b388e378686cf SHA512 a95d1df1ca5f73613d82946bce7053ca77308b91677a6cd4ebfd52a67226994faa771f4b025b0334b15f174a533a6bfb5fc75cd8cf562f796839f6e77a879b27
-EBUILD rosserial_server-9999.ebuild 477 BLAKE2B 9b3dc301b81032dd2a4d9d5046f5659d2531cd94283dde61fe0dc634fc4a60300bd90298334c7168f7c8c7ec5fb0e32856cb2f788974f127e08e6a2243faee9b SHA512 be9ca28d3ce9c5e13a57fc8c3fed5f6e8a3a6decd61d504486034638332b5ed666fb4512c833f6eb9b0e01b866cd2d39c6183d501e47d12fa877057b254568f0
+EBUILD rosserial_server-0.8.0.ebuild 516 BLAKE2B 6884398136dd1046a8a9f1b8af328e8749daf29e85d58d28ace77860891e48913a13b71ca4ef989b577eb0afd05548c1562ef2cf360179b579fdc634152fc67e SHA512 cbdffd7e79726db8730296d421ef81129633f20278edfe828363737d7c55bba6013da79f939bd70fe060f1e7525b6eedba3913259f2abab2623ee3112680d16e
+EBUILD rosserial_server-9999.ebuild 516 BLAKE2B 6884398136dd1046a8a9f1b8af328e8749daf29e85d58d28ace77860891e48913a13b71ca4ef989b577eb0afd05548c1562ef2cf360179b579fdc634152fc67e SHA512 cbdffd7e79726db8730296d421ef81129633f20278edfe828363737d7c55bba6013da79f939bd70fe060f1e7525b6eedba3913259f2abab2623ee3112680d16e
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild b/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
index 37c1c17be5dd..c3d3ee32e16b 100644
--- a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,9 +15,10 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/topic_tools
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
 PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/rosserial_server/rosserial_server-9999.ebuild b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
index db5d71583375..c3d3ee32e16b 100644
--- a/dev-ros/rosserial_server/rosserial_server-9999.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,8 +15,10 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/topic_tools
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/rosserial_tivac/Manifest b/dev-ros/rosserial_tivac/Manifest
index 117aecf29a7d..dd631ad961c2 100644
--- a/dev-ros/rosserial_tivac/Manifest
+++ b/dev-ros/rosserial_tivac/Manifest
@@ -1,16 +1,4 @@
-DIST rosserial-0.7.2.tar.gz 143811 BLAKE2B 6c72cf06ba4c3def69c53eeddfb9991322d51e8eba3c5095564d8c5ebde8aca866a5a9e9cecbdecd52fb03e50f398662821e5aa5f85f49e97fc299244fac8d1b SHA512 d6f7250050f68884e943aa4cc59740506fa317ab60973deb25da824d8614a3fb7c16ed5ce2123e0eb181ab906d8f7156c3ba1ea480468a01df45ab682cddc2cd
-DIST rosserial-0.7.3.tar.gz 143866 BLAKE2B a2af4bedb91363e7a4960c1e101ead1213a0d1f7742d7150485dd314742471c5ac07d49498788345a664b21e3157d9c8b198ace01d7835cc19031630b502bcc4 SHA512 3ae2eb7fe525fbcecdb1137c1492a729ec5cac4a57b648f08f02fa348566aaedb64cfc38f255c3872c28ffa46fcf2aa40e951556cc84698f5c4a396af454d5ad
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_tivac-0.7.2.ebuild 520 BLAKE2B 63149da87be70152190ede7a8f274c199a6d99c8e857dcd2070d761f70ad0055350405a96986b64b8f1e9a8e5fd19c9f83f99c953662bffc2e34398387d2d875 SHA512 f5f2c5a0a12d992aadd6f09cad37413767d210fddfc539c1243a1e87be850fb94a1e2d2f754f4bcb6e418cfe2088144448b6e30d113a68c8bf3a298377327205
-EBUILD rosserial_tivac-0.7.3.ebuild 520 BLAKE2B 63149da87be70152190ede7a8f274c199a6d99c8e857dcd2070d761f70ad0055350405a96986b64b8f1e9a8e5fd19c9f83f99c953662bffc2e34398387d2d875 SHA512 f5f2c5a0a12d992aadd6f09cad37413767d210fddfc539c1243a1e87be850fb94a1e2d2f754f4bcb6e418cfe2088144448b6e30d113a68c8bf3a298377327205
-EBUILD rosserial_tivac-0.7.4.ebuild 520 BLAKE2B 63149da87be70152190ede7a8f274c199a6d99c8e857dcd2070d761f70ad0055350405a96986b64b8f1e9a8e5fd19c9f83f99c953662bffc2e34398387d2d875 SHA512 f5f2c5a0a12d992aadd6f09cad37413767d210fddfc539c1243a1e87be850fb94a1e2d2f754f4bcb6e418cfe2088144448b6e30d113a68c8bf3a298377327205
-EBUILD rosserial_tivac-0.7.5.ebuild 520 BLAKE2B 63149da87be70152190ede7a8f274c199a6d99c8e857dcd2070d761f70ad0055350405a96986b64b8f1e9a8e5fd19c9f83f99c953662bffc2e34398387d2d875 SHA512 f5f2c5a0a12d992aadd6f09cad37413767d210fddfc539c1243a1e87be850fb94a1e2d2f754f4bcb6e418cfe2088144448b6e30d113a68c8bf3a298377327205
-EBUILD rosserial_tivac-0.7.6.ebuild 520 BLAKE2B 8464374322ffa1e25f1a0fa0a3696922187814e2af8b654ecaa58644b58daf6cf03bef0d6e28490d220f766869e1621a1a4dd105bf1a9a8b4a86544a7a4ff660 SHA512 5706eb954f11063ca2543dcd17d1001048c7819cd9dc3e690f9a6e0c504e76dc5dbff11210bb9cfddc54ded85462280c19b6cc34e75c197d77e6942d4adb7ae7
-EBUILD rosserial_tivac-0.7.7.ebuild 520 BLAKE2B 8464374322ffa1e25f1a0fa0a3696922187814e2af8b654ecaa58644b58daf6cf03bef0d6e28490d220f766869e1621a1a4dd105bf1a9a8b4a86544a7a4ff660 SHA512 5706eb954f11063ca2543dcd17d1001048c7819cd9dc3e690f9a6e0c504e76dc5dbff11210bb9cfddc54ded85462280c19b6cc34e75c197d77e6942d4adb7ae7
-EBUILD rosserial_tivac-0.8.0.ebuild 517 BLAKE2B 56b4520d04b9b727025a7c3659bab79f0ca872fa6432b182d5b744c11d98a22e8eae01b6fd3ecb90bf268a72792b578f35bb4bc48a121e3b671868d14ec90628 SHA512 2bb620e86554b21b6a7af62d4dff8cd09deb44c11e22e686d8ddfa40df534897ce79d51864ce0fb8e95ac5b3b0813e7d79e1d26ac7a8471f6399c1f82c60a24e
-EBUILD rosserial_tivac-9999.ebuild 520 BLAKE2B 63149da87be70152190ede7a8f274c199a6d99c8e857dcd2070d761f70ad0055350405a96986b64b8f1e9a8e5fd19c9f83f99c953662bffc2e34398387d2d875 SHA512 f5f2c5a0a12d992aadd6f09cad37413767d210fddfc539c1243a1e87be850fb94a1e2d2f754f4bcb6e418cfe2088144448b6e30d113a68c8bf3a298377327205
+EBUILD rosserial_tivac-0.8.0.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
+EBUILD rosserial_tivac-9999.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.2.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.7.2.ebuild
deleted file mode 100644
index 5d2f2974c2a6..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.3.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.7.3.ebuild
deleted file mode 100644
index 5d2f2974c2a6..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.4.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.7.4.ebuild
deleted file mode 100644
index 5d2f2974c2a6..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.5.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.7.5.ebuild
deleted file mode 100644
index 5d2f2974c2a6..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.6.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.7.6.ebuild
deleted file mode 100644
index 4e2f4a1c714d..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.7.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.7.7.ebuild
deleted file mode 100644
index 4e2f4a1c714d..000000000000
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.7.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.8.0.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.8.0.ebuild
index 633a059710c1..b486bb20bc3c 100644
--- a/dev-ros/rosserial_tivac/rosserial_tivac-0.8.0.ebuild
+++ b/dev-ros/rosserial_tivac/rosserial_tivac-0.8.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,7 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
+	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
index 5d2f2974c2a6..b486bb20bc3c 100644
--- a/dev-ros/rosserial_tivac/rosserial_tivac-9999.ebuild
+++ b/dev-ros/rosserial_tivac/rosserial_tivac-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -15,7 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
+	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
index 43cfd742a510..1996898ea517 100644
--- a/dev-ros/rosserial_windows/Manifest
+++ b/dev-ros/rosserial_windows/Manifest
@@ -1,18 +1,4 @@
-DIST rosserial-0.7.1.tar.gz 102204 BLAKE2B 86f7bf1387aeef048e97e055a12d6ba94bbfe8e51bd73fa77be9bd9c603f19eb5fa28d461fc00a7614f8a855f3110187d0daf47952b6568b70e851c22002ce5d SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5
-DIST rosserial-0.7.2.tar.gz 143811 BLAKE2B 6c72cf06ba4c3def69c53eeddfb9991322d51e8eba3c5095564d8c5ebde8aca866a5a9e9cecbdecd52fb03e50f398662821e5aa5f85f49e97fc299244fac8d1b SHA512 d6f7250050f68884e943aa4cc59740506fa317ab60973deb25da824d8614a3fb7c16ed5ce2123e0eb181ab906d8f7156c3ba1ea480468a01df45ab682cddc2cd
-DIST rosserial-0.7.3.tar.gz 143866 BLAKE2B a2af4bedb91363e7a4960c1e101ead1213a0d1f7742d7150485dd314742471c5ac07d49498788345a664b21e3157d9c8b198ace01d7835cc19031630b502bcc4 SHA512 3ae2eb7fe525fbcecdb1137c1492a729ec5cac4a57b648f08f02fa348566aaedb64cfc38f255c3872c28ffa46fcf2aa40e951556cc84698f5c4a396af454d5ad
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_windows-0.7.1.ebuild 719 BLAKE2B 9d8b45f7920e8dd3235df2d800cfead8a00c54ccf72035eb12c2e613989ae7058e2f056b39063341ef76d1b8aeca71cf1b82dc62d2145e2faf8076df3c135f2d SHA512 dcec16db8d9c53bc11e3aa5b7fcfbcfaa92e43776a20ff5d2adcbd768e14a62fbf467af4eb39f10d030ecb683393343bde4f1b41a2ee9eef15b198f562aba62d
-EBUILD rosserial_windows-0.7.2.ebuild 719 BLAKE2B ab811f1ebe98de265985249f83024736cfefc8d529befdd60428ea821ce555cee6d8627c30925f0ce1f882b6e4c0b647be7f998e2304ccc989795ac240221dc2 SHA512 f9b17770bf4a5a338902765081920bed5448554f01f003cddc737ef60f95bfa8518037fd9eb37938194c2514e04c371dc3ce6ed9a60ba875209eab23ce506229
-EBUILD rosserial_windows-0.7.3.ebuild 719 BLAKE2B ab811f1ebe98de265985249f83024736cfefc8d529befdd60428ea821ce555cee6d8627c30925f0ce1f882b6e4c0b647be7f998e2304ccc989795ac240221dc2 SHA512 f9b17770bf4a5a338902765081920bed5448554f01f003cddc737ef60f95bfa8518037fd9eb37938194c2514e04c371dc3ce6ed9a60ba875209eab23ce506229
-EBUILD rosserial_windows-0.7.4.ebuild 719 BLAKE2B ab811f1ebe98de265985249f83024736cfefc8d529befdd60428ea821ce555cee6d8627c30925f0ce1f882b6e4c0b647be7f998e2304ccc989795ac240221dc2 SHA512 f9b17770bf4a5a338902765081920bed5448554f01f003cddc737ef60f95bfa8518037fd9eb37938194c2514e04c371dc3ce6ed9a60ba875209eab23ce506229
-EBUILD rosserial_windows-0.7.5.ebuild 719 BLAKE2B ab811f1ebe98de265985249f83024736cfefc8d529befdd60428ea821ce555cee6d8627c30925f0ce1f882b6e4c0b647be7f998e2304ccc989795ac240221dc2 SHA512 f9b17770bf4a5a338902765081920bed5448554f01f003cddc737ef60f95bfa8518037fd9eb37938194c2514e04c371dc3ce6ed9a60ba875209eab23ce506229
-EBUILD rosserial_windows-0.7.6.ebuild 719 BLAKE2B 2ec69550e233260e7621e44377c774f8f8b025a4ef7896ee8ab62f86cecafe2d71eb0c6eedb5539cacd7855113d24b4089f0e7fdbfee7ede09d8b8c7e12c1f71 SHA512 7630047b27070bac6397c42dd38e97eacca760f6d4bfe7680ddf519a9a29d3003f63bb9ef434b07ac5f824faef5c7fbaa20bed75a9cc6cf3b0bfeafe30058446
-EBUILD rosserial_windows-0.7.7.ebuild 719 BLAKE2B 2ec69550e233260e7621e44377c774f8f8b025a4ef7896ee8ab62f86cecafe2d71eb0c6eedb5539cacd7855113d24b4089f0e7fdbfee7ede09d8b8c7e12c1f71 SHA512 7630047b27070bac6397c42dd38e97eacca760f6d4bfe7680ddf519a9a29d3003f63bb9ef434b07ac5f824faef5c7fbaa20bed75a9cc6cf3b0bfeafe30058446
-EBUILD rosserial_windows-0.8.0.ebuild 716 BLAKE2B 2a070f04514187d14a83d99d0cdabe30d1a23d530325ff24ac9cec61c22c6268abef52e28cd4a4c115ded00e54dc85b729d940de52f5b1a11fc00f10e3b086d4 SHA512 6f3f2a13aaf861551a6666d15aca3c1f9cdc10bf2cd41854745fc47018f5d7dbfb4b9d19288d00d90ad711edb7db5cd9e802cb9a8361eee230c7692cf980723f
-EBUILD rosserial_windows-9999.ebuild 719 BLAKE2B 9d8b45f7920e8dd3235df2d800cfead8a00c54ccf72035eb12c2e613989ae7058e2f056b39063341ef76d1b8aeca71cf1b82dc62d2145e2faf8076df3c135f2d SHA512 dcec16db8d9c53bc11e3aa5b7fcfbcfaa92e43776a20ff5d2adcbd768e14a62fbf467af4eb39f10d030ecb683393343bde4f1b41a2ee9eef15b198f562aba62d
+EBUILD rosserial_windows-0.8.0.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
+EBUILD rosserial_windows-9999.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild
deleted file mode 100644
index 384c64cf4b17..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.2.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.2.ebuild
deleted file mode 100644
index 737d391193c4..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.7.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.3.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.3.ebuild
deleted file mode 100644
index 737d391193c4..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.7.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.4.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.4.ebuild
deleted file mode 100644
index 737d391193c4..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.7.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.5.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.5.ebuild
deleted file mode 100644
index 737d391193c4..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.6.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.6.ebuild
deleted file mode 100644
index f21eec561660..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.7.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.7.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.7.ebuild
deleted file mode 100644
index f21eec561660..000000000000
--- a/dev-ros/rosserial_windows/rosserial_windows-0.7.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosserial_client[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.8.0.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.8.0.ebuild
index b63ed837d2da..8b3875a023b5 100644
--- a/dev-ros/rosserial_windows/rosserial_windows-0.8.0.ebuild
+++ b/dev-ros/rosserial_windows/rosserial_windows-0.8.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -20,7 +19,7 @@ RDEPEND="
 	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_USEDEP}]
-	dev-ros/rosserial_client[${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
index 384c64cf4b17..8b3875a023b5 100644
--- a/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild
+++ b/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -20,7 +19,7 @@ RDEPEND="
 	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_USEDEP}]
-	dev-ros/rosserial_client[${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
index 0103cb1875ac..c160b68c5437 100644
--- a/dev-ros/rosserial_xbee/Manifest
+++ b/dev-ros/rosserial_xbee/Manifest
@@ -1,18 +1,4 @@
-DIST rosserial-0.7.1.tar.gz 102204 BLAKE2B 86f7bf1387aeef048e97e055a12d6ba94bbfe8e51bd73fa77be9bd9c603f19eb5fa28d461fc00a7614f8a855f3110187d0daf47952b6568b70e851c22002ce5d SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5
-DIST rosserial-0.7.2.tar.gz 143811 BLAKE2B 6c72cf06ba4c3def69c53eeddfb9991322d51e8eba3c5095564d8c5ebde8aca866a5a9e9cecbdecd52fb03e50f398662821e5aa5f85f49e97fc299244fac8d1b SHA512 d6f7250050f68884e943aa4cc59740506fa317ab60973deb25da824d8614a3fb7c16ed5ce2123e0eb181ab906d8f7156c3ba1ea480468a01df45ab682cddc2cd
-DIST rosserial-0.7.3.tar.gz 143866 BLAKE2B a2af4bedb91363e7a4960c1e101ead1213a0d1f7742d7150485dd314742471c5ac07d49498788345a664b21e3157d9c8b198ace01d7835cc19031630b502bcc4 SHA512 3ae2eb7fe525fbcecdb1137c1492a729ec5cac4a57b648f08f02fa348566aaedb64cfc38f255c3872c28ffa46fcf2aa40e951556cc84698f5c4a396af454d5ad
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_xbee-0.7.1.ebuild 662 BLAKE2B 1d1f15084dca9ba108360c608845f1afdd86157d1ae64a38c605cdf3dd5138c80e632e64e7c4d893cdc43d3d16806e9ebc560ee4a6450dbfca2d3319702a757a SHA512 a086303ba9e6fbaff0fbf52bdcc0eb3c33cb53955e3eaf8702b201fd38fc124f5d8d59ead4f979c27c964ff4de2866d76f43ff81db8c4daf72317979ef88861c
-EBUILD rosserial_xbee-0.7.2.ebuild 662 BLAKE2B d5c7fa397e408c28db78b0789e24ed54a382ab90fb3542d8187fcb0a327aba8f6021e583e3905f21659cd1e247f7b9e2fc98d7e87caf0ccf01d330a424557fb9 SHA512 97b6ec6f3eec3c05ef1e41f4e416aa410cc17b40eca65aa88236e9199ed2c410fdbc45280bce666d724b0dba513855dd285bed867529859951ccf64fb74a73aa
-EBUILD rosserial_xbee-0.7.3.ebuild 662 BLAKE2B d5c7fa397e408c28db78b0789e24ed54a382ab90fb3542d8187fcb0a327aba8f6021e583e3905f21659cd1e247f7b9e2fc98d7e87caf0ccf01d330a424557fb9 SHA512 97b6ec6f3eec3c05ef1e41f4e416aa410cc17b40eca65aa88236e9199ed2c410fdbc45280bce666d724b0dba513855dd285bed867529859951ccf64fb74a73aa
-EBUILD rosserial_xbee-0.7.4.ebuild 662 BLAKE2B d5c7fa397e408c28db78b0789e24ed54a382ab90fb3542d8187fcb0a327aba8f6021e583e3905f21659cd1e247f7b9e2fc98d7e87caf0ccf01d330a424557fb9 SHA512 97b6ec6f3eec3c05ef1e41f4e416aa410cc17b40eca65aa88236e9199ed2c410fdbc45280bce666d724b0dba513855dd285bed867529859951ccf64fb74a73aa
-EBUILD rosserial_xbee-0.7.5.ebuild 662 BLAKE2B d5c7fa397e408c28db78b0789e24ed54a382ab90fb3542d8187fcb0a327aba8f6021e583e3905f21659cd1e247f7b9e2fc98d7e87caf0ccf01d330a424557fb9 SHA512 97b6ec6f3eec3c05ef1e41f4e416aa410cc17b40eca65aa88236e9199ed2c410fdbc45280bce666d724b0dba513855dd285bed867529859951ccf64fb74a73aa
-EBUILD rosserial_xbee-0.7.6.ebuild 662 BLAKE2B 337def277bc8147aeb936cf4c3df1f0faed380d733fa4f0d1f419a3c70b862e3520d21a89d0b7118118fa10648014ac36461f43288b56ea4c907692110243a99 SHA512 959f9be4e680171f6e3bb7cd44926d36ac63ac9d77e7a032bb72b2e03d5fb567d501e6269654c3109bbef98bc33b8faeb40ca37eac5b8f7d140f25aa1d080f7b
-EBUILD rosserial_xbee-0.7.7.ebuild 662 BLAKE2B 337def277bc8147aeb936cf4c3df1f0faed380d733fa4f0d1f419a3c70b862e3520d21a89d0b7118118fa10648014ac36461f43288b56ea4c907692110243a99 SHA512 959f9be4e680171f6e3bb7cd44926d36ac63ac9d77e7a032bb72b2e03d5fb567d501e6269654c3109bbef98bc33b8faeb40ca37eac5b8f7d140f25aa1d080f7b
-EBUILD rosserial_xbee-0.8.0.ebuild 659 BLAKE2B 0a5ff9ad11481d31ff7ae5d28e8b63b500b31efbc566006d653085e47a44b98f6b821e1b3e1a550137ee9323c7eb58a624f64b9ade5b8914d2a0b598723dd686 SHA512 a9a201e8ae8cb1fb2d1b1e92eeeb236a18c2520d18d088f630debeac8043114b935fd3dba140c753b13c0db54c4a5107c15478edc9d6017aab17ab04430ca851
-EBUILD rosserial_xbee-9999.ebuild 662 BLAKE2B 1d1f15084dca9ba108360c608845f1afdd86157d1ae64a38c605cdf3dd5138c80e632e64e7c4d893cdc43d3d16806e9ebc560ee4a6450dbfca2d3319702a757a SHA512 a086303ba9e6fbaff0fbf52bdcc0eb3c33cb53955e3eaf8702b201fd38fc124f5d8d59ead4f979c27c964ff4de2866d76f43ff81db8c4daf72317979ef88861c
+EBUILD rosserial_xbee-0.8.0.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
+EBUILD rosserial_xbee-9999.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild
deleted file mode 100644
index e308322f93c5..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	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_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.2.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.2.ebuild
deleted file mode 100644
index 6afcc14a4814..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	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_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.3.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.3.ebuild
deleted file mode 100644
index 6afcc14a4814..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	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_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.4.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.4.ebuild
deleted file mode 100644
index 6afcc14a4814..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	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_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.5.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.5.ebuild
deleted file mode 100644
index 6afcc14a4814..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	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_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.6.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.6.ebuild
deleted file mode 100644
index 4e936b3e9784..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	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_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.7.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.7.ebuild
deleted file mode 100644
index 4e936b3e9784..000000000000
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	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_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.8.0.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.8.0.ebuild
index 74085bbf45a4..aab6d7663008 100644
--- a/dev-ros/rosserial_xbee/rosserial_xbee-0.8.0.ebuild
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-0.8.0.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
+DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
+	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_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
index e308322f93c5..aab6d7663008 100644
--- a/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
+DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
+	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_USEDEP}]
+	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index b130b6f43f44..72af5c006d6f 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,7 +1,6 @@
-AUX yaml.patch 2657 BLAKE2B 16f9cc5cafd8306d06f64370bf334f68038e3b2e7feb6d48110cdddb12e00fb27b8f36492bd6ddca8eb0902da727d371266b3cd65440c82c3b9785c9823e1ad3 SHA512 3b71ccb1b3579bb16c86a0dbbc0708e7417461a91b31d1ab166ed38a3e75f117df355d91d9c1644d9c5da19c29b61ea208e6eed31ae6dfdd74bc6f057b0c1908
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rosservice-1.14.3-r1.ebuild 563 BLAKE2B c8aeda6239e07fa3b92638fe357f7d743b3cd68215ad21296077d904e88dec993059379c69afe878c3a7e3dd9e19729ff577fe93d0117388d1ebc6c0667d5b12 SHA512 873d3e1062c0d25a6931a090ad87f3c64882666b296a39e6700973d558e7949bf4199e35b75df7909f86ebc1bb38cd147bcd211c748e3ace4caad7e13c10a4e6
-EBUILD rosservice-1.15.4.ebuild 526 BLAKE2B 65c0eee5316816509b9d0b5819d52264d8c3242d133b58b4bdd9ccd33b44e2578105e011346398d21673012b1aff05f19ca0f3108f76aa482eed50971d5c5c05 SHA512 d2ec7a759dbeda80e1fe3abae6c8f17cfb7f9f86c63540d449678264d12c30edfb367faf35ff3b2ad5e444c4bff074855f3501e1da7961e077f133b138e3afde
-EBUILD rosservice-9999.ebuild 526 BLAKE2B 65c0eee5316816509b9d0b5819d52264d8c3242d133b58b4bdd9ccd33b44e2578105e011346398d21673012b1aff05f19ca0f3108f76aa482eed50971d5c5c05 SHA512 d2ec7a759dbeda80e1fe3abae6c8f17cfb7f9f86c63540d449678264d12c30edfb367faf35ff3b2ad5e444c4bff074855f3501e1da7961e077f133b138e3afde
+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
+EBUILD rosservice-1.15.7.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
+EBUILD rosservice-1.15.8.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
+EBUILD rosservice-9999.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosservice/files/yaml.patch b/dev-ros/rosservice/files/yaml.patch
deleted file mode 100644
index f5dfcd3553fe..000000000000
--- a/dev-ros/rosservice/files/yaml.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosservice/src/rosservice/__init__.py b/tools/rosservice/src/rosservice/__init__.py
-index 6d58807a4..e6c41a73d 100644
---- a/tools/rosservice/src/rosservice/__init__.py
-+++ b/tools/rosservice/src/rosservice/__init__.py
-@@ -607,7 +607,7 @@ def _rosservice_cmd_call(argv):
-         # convert empty args to YAML-empty strings
-         if arg == '':
-             arg = "''" 
--        service_args.append(yaml.load(arg))
-+        service_args.append(yaml.safe_load(arg))
-     if not service_args and has_service_args(service_name, service_class=service_class):
-         if sys.stdin.isatty():
-             parser.error("Please specify service arguments")
-@@ -650,7 +650,7 @@ def _stdin_yaml_arg():
-                 elif arg.strip() != '---':
-                     buff = buff + arg
-             try:
--                loaded = yaml.load(buff.rstrip())
-+                loaded = yaml.safe_load(buff.rstrip())
-             except Exception as e:
-                 print("Invalid YAML: %s"%str(e), file=sys.stderr)
-             if loaded is not None:
diff --git a/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild b/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild
deleted file mode 100644
index 3183e24923b0..000000000000
--- a/dev-ros/rosservice/rosservice-1.14.3-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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rosservice/rosservice-1.15.4.ebuild b/dev-ros/rosservice/rosservice-1.15.4.ebuild
deleted file mode 100644
index dec58f5c3cba..000000000000
--- a/dev-ros/rosservice/rosservice-1.15.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.15.7.ebuild b/dev-ros/rosservice/rosservice-1.15.7.ebuild
new file mode 100644
index 000000000000..f997c822e5bf
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
new file mode 100644
index 000000000000..f997c822e5bf
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
index dec58f5c3cba..f997c822e5bf 100644
--- a/dev-ros/rosservice/rosservice-9999.ebuild
+++ b/dev-ros/rosservice/rosservice-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,9 +15,9 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
+	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
index d16d3b165781..4180f0b1550a 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rostest-1.13.0.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.1.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.2.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.4.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.5.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.13.6.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.14.2.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
-EBUILD rostest-1.14.3.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
-EBUILD rostest-1.15.4.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
-EBUILD rostest-9999.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rostest-1.15.8.ebuild 739 BLAKE2B 453895ae38b9f9e6a3e2e7512ad64e9c3796a88a9ca571af350e0205e135c20f5a7bfe7efc22d20511cf0ea02da646bc55f34833ca50aa6bf809637bc48bb2e0 SHA512 148e5465bc6de907327105531b669fd30fce4fdeb31de101d3992315272069611bccfa688db08dea45da495b8e2320f1a84420769a439705b0443da9be9e233d
+EBUILD rostest-9999.ebuild 739 BLAKE2B 453895ae38b9f9e6a3e2e7512ad64e9c3796a88a9ca571af350e0205e135c20f5a7bfe7efc22d20511cf0ea02da646bc55f34833ca50aa6bf809637bc48bb2e0 SHA512 148e5465bc6de907327105531b669fd30fce4fdeb31de101d3992315272069611bccfa688db08dea45da495b8e2320f1a84420769a439705b0443da9be9e233d
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostest/rostest-1.13.0.ebuild b/dev-ros/rostest/rostest-1.13.0.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/rostest/rostest-1.13.1.ebuild b/dev-ros/rostest/rostest-1.13.1.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/rostest/rostest-1.13.2.ebuild b/dev-ros/rostest/rostest-1.13.2.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/rostest/rostest-1.13.4.ebuild b/dev-ros/rostest/rostest-1.13.4.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/rostest/rostest-1.13.5.ebuild b/dev-ros/rostest/rostest-1.13.5.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/rostest/rostest-1.13.6.ebuild b/dev-ros/rostest/rostest-1.13.6.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.13.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/rostest/rostest-1.14.2.ebuild b/dev-ros/rostest/rostest-1.14.2.ebuild
deleted file mode 100644
index 1108cd80dccd..000000000000
--- a/dev-ros/rostest/rostest-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/rostest/rostest-1.14.3.ebuild b/dev-ros/rostest/rostest-1.14.3.ebuild
deleted file mode 100644
index c8b1067e86a3..000000000000
--- a/dev-ros/rostest/rostest-1.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostest/rostest-1.15.4.ebuild b/dev-ros/rostest/rostest-1.15.4.ebuild
deleted file mode 100644
index c8b1067e86a3..000000000000
--- a/dev-ros/rostest/rostest-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		${RDEPEND}
-		dev-cpp/gtest
-		dev-ros/rostopic
-	)"
diff --git a/dev-ros/rostest/rostest-1.15.8.ebuild b/dev-ros/rostest/rostest-1.15.8.ebuild
new file mode 100644
index 000000000000..37af233ee567
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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="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:=[threads]
+"
+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
index c8b1067e86a3..37af233ee567 100644
--- a/dev-ros/rostest/rostest-9999.ebuild
+++ b/dev-ros/rostest/rostest-9999.ebuild
@@ -1,33 +1,33 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
-DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
+DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]"
+	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
index f3633182f66e..9b3efb8874e4 100644
--- a/dev-ros/rostime/Manifest
+++ b/dev-ros/rostime/Manifest
@@ -1,32 +1,4 @@
-DIST roscpp_core-0.5.6.tar.gz 31734 BLAKE2B b72e8f7ed04cac701e867cdc9c88ec4435cdf00d484628e19439274f55fb04de3d1cc563f91b3794517573b6639c19f4d00d260caf53c843ff9f3fbb95a80cc2 SHA512 caebca2817721a46c8ce850bc15bdeadb3bf6ad12aeb134b11bdb04da6054eb4056aef8c5194ca4e7fffa3e3f3563faf8e3148eebfba93bc6b5673d5437d977f
-DIST roscpp_core-0.5.7.tar.gz 32006 BLAKE2B d63c6bcf314de4237ed8c08b5af7a1a097b9d5af76b0644124419bb516f08f8c9030e509b9a4dfbd80fd2f1fff35b58e0452293339b0081c4d1cef590e5c05f3 SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe
-DIST roscpp_core-0.6.0.tar.gz 32255 BLAKE2B d184d3d3c05a041c1c027877a314f5bd98515ee02d607cf3575ca939e7ec7d87807bf2ee96717cc5b23971ce297d3bdeb6f78c5883dbb6350ae01ba23ae8246e SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75
-DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023a0241422e463dd8fc12f697604e655f01dfe5ea0142b819aa638903fb94adaec985a0c7c2feb79db886a2b97db18 SHA512 167d3b7bfa048a2c3f7b4239402c9077e1871aa2cc5f60ebab3e5ad3cb5acd94667b4e7de9eb2af2f8dfba74e0d82510f6bb591f7096d99e465f987643b2681a
-DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
-DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
-DIST roscpp_core-0.6.12.tar.gz 35606 BLAKE2B 5f249ce576e046b487a12fc1d598429741329b57f4226a6a0fa7b62e0a5a6fa0716814e0c8cd8a4d4378f8994ca1534530d410a8865d666397328047f12f821d SHA512 a84799ee67cf205c9c304433f70aaf80c8f19eac86bc0c9c3207aa0ae255f33b302b4ad9e37feeb5d95d7e2db9210679871548313612f220e06fef3db2357f89
-DIST roscpp_core-0.6.13.tar.gz 35881 BLAKE2B f1eee242ecbda14de4d1b4f92c4552b249398eea0216300933e0ea73d86bce970e7db375b23d5ecb023e8a8a2e75baec8b7c0a935647143f1ff2a1eaf0bcbd5b SHA512 7d81371c383b8b2ae8d31731f21213ac2c5c4d47ed038890214c9da527f27149ce1deeda4a5e67adaabbfb7ff4a6edc53495cfa50625eeb94089eb7615850d2c
-DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
-DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
-DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
-DIST roscpp_core-0.6.5.tar.gz 34493 BLAKE2B 9804fe6f23192e0e19bfb26e0671ad36189b936701e45755adb0c54e25c1c92dabd6f645bd014451bcd21f45af39be2f1c24727d1231cc52b62caba4d01ca4ff SHA512 32314cac55716b074416fac6665a8dec3a6a64abfac55be709f50b7ca1cbd993797d176bc2aefe2ae8b233b21e8464f330ad31de98bf60edc63149215dcb0cda
-DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
-DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
-DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
-EBUILD rostime-0.5.6.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
-EBUILD rostime-0.5.7.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
-EBUILD rostime-0.6.0.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
-EBUILD rostime-0.6.1.ebuild 429 BLAKE2B cc3affe89fc8cc3d6166feddede76c4062ed16d3be8be38c603c34bd0a994d4d8b814e23741e1816034ef82d7edc6ace4c483b1da8705b2796186d5415fcad4d SHA512 ef8e1d9ccd89a9c3756ade6ce584796d16273b1ec87f7bf67bc84c17fa81468d33c72fe02677f599631fd04a5ec9cf266b10300fa524bb80b9192d2e5962bcd3
-EBUILD rostime-0.6.10.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
-EBUILD rostime-0.6.11.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
-EBUILD rostime-0.6.12.ebuild 426 BLAKE2B f05fbd8bd09bab22104de90c3a5c44f6b57d8006bc8520e9c4916901837d7ff91234b388f7883772ad7dcce06849919f1e1705d78b4139572e7509fbb2d7bb06 SHA512 c4c109836cbe0146a3c17265ca1ef058e644164ecc4ac1b3d08dad07d5c368fb5420166f4f60782155bbe97e1177d941dac8ad9399988c23c41bc23fd3f5d9ed
-EBUILD rostime-0.6.13.ebuild 426 BLAKE2B f05fbd8bd09bab22104de90c3a5c44f6b57d8006bc8520e9c4916901837d7ff91234b388f7883772ad7dcce06849919f1e1705d78b4139572e7509fbb2d7bb06 SHA512 c4c109836cbe0146a3c17265ca1ef058e644164ecc4ac1b3d08dad07d5c368fb5420166f4f60782155bbe97e1177d941dac8ad9399988c23c41bc23fd3f5d9ed
-EBUILD rostime-0.6.2.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
-EBUILD rostime-0.6.3.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
-EBUILD rostime-0.6.4.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
-EBUILD rostime-0.6.5.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
-EBUILD rostime-0.6.7.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
-EBUILD rostime-0.6.8.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
-EBUILD rostime-0.6.9.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
-EBUILD rostime-9999.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
+DIST roscpp_core-0.7.2.tar.gz 35095 BLAKE2B 065f81f514becd2ea1586735c759be79765eeee1c8a9606261ebd2086cf406c87276b143ace4ac43eeb7f8ee6dccc07812c614e6e185f2354d64b1dfe401b849 SHA512 fb04ee37db14d31b7c06ae3484f5aa414563e96a90b820b7d6e23e921bcd831a8bf1d66c723aef65a617b2da92456345cb796271409c8dc155ef1084926659ef
+EBUILD rostime-0.7.2.ebuild 426 BLAKE2B 816abdf2904a321a04e17c7147177338a7fea96cf971a8ccf845bc387c26318a9d57086670f43e1795387296de3be72e09feda079813b5650b84e29f18ab8c83 SHA512 7f9112fe6ecd7b19a8eeea4368a4e105f5f073b48819cb60f042a5e100663ce596b0ebe26774c3d6d55dc4f8ab7ecef9107257b62408ad3d64781faac2c887a4
+EBUILD rostime-9999.ebuild 426 BLAKE2B 816abdf2904a321a04e17c7147177338a7fea96cf971a8ccf845bc387c26318a9d57086670f43e1795387296de3be72e09feda079813b5650b84e29f18ab8c83 SHA512 7f9112fe6ecd7b19a8eeea4368a4e105f5f073b48819cb60f042a5e100663ce596b0ebe26774c3d6d55dc4f8ab7ecef9107257b62408ad3d64781faac2c887a4
 MISC metadata.xml 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/rostime/rostime-0.5.6.ebuild b/dev-ros/rostime/rostime-0.5.6.ebuild
deleted file mode 100644
index d6af114604b5..000000000000
--- a/dev-ros/rostime/rostime-0.5.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.5.7.ebuild b/dev-ros/rostime/rostime-0.5.7.ebuild
deleted file mode 100644
index d6af114604b5..000000000000
--- a/dev-ros/rostime/rostime-0.5.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.0.ebuild b/dev-ros/rostime/rostime-0.6.0.ebuild
deleted file mode 100644
index d6af114604b5..000000000000
--- a/dev-ros/rostime/rostime-0.6.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.1.ebuild b/dev-ros/rostime/rostime-0.6.1.ebuild
deleted file mode 100644
index 2b7af0200043..000000000000
--- a/dev-ros/rostime/rostime-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.10.ebuild b/dev-ros/rostime/rostime-0.6.10.ebuild
deleted file mode 100644
index 6d97b2f7c4f5..000000000000
--- a/dev-ros/rostime/rostime-0.6.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.11.ebuild b/dev-ros/rostime/rostime-0.6.11.ebuild
deleted file mode 100644
index 6d97b2f7c4f5..000000000000
--- a/dev-ros/rostime/rostime-0.6.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.12.ebuild b/dev-ros/rostime/rostime-0.6.12.ebuild
deleted file mode 100644
index 70aeab4aa2c0..000000000000
--- a/dev-ros/rostime/rostime-0.6.12.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.13.ebuild b/dev-ros/rostime/rostime-0.6.13.ebuild
deleted file mode 100644
index 70aeab4aa2c0..000000000000
--- a/dev-ros/rostime/rostime-0.6.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.2.ebuild b/dev-ros/rostime/rostime-0.6.2.ebuild
deleted file mode 100644
index ccd863194982..000000000000
--- a/dev-ros/rostime/rostime-0.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.3.ebuild b/dev-ros/rostime/rostime-0.6.3.ebuild
deleted file mode 100644
index ccd863194982..000000000000
--- a/dev-ros/rostime/rostime-0.6.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.4.ebuild b/dev-ros/rostime/rostime-0.6.4.ebuild
deleted file mode 100644
index ccd863194982..000000000000
--- a/dev-ros/rostime/rostime-0.6.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.5.ebuild b/dev-ros/rostime/rostime-0.6.5.ebuild
deleted file mode 100644
index ccd863194982..000000000000
--- a/dev-ros/rostime/rostime-0.6.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.7.ebuild b/dev-ros/rostime/rostime-0.6.7.ebuild
deleted file mode 100644
index ccd863194982..000000000000
--- a/dev-ros/rostime/rostime-0.6.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.8.ebuild b/dev-ros/rostime/rostime-0.6.8.ebuild
deleted file mode 100644
index 6d97b2f7c4f5..000000000000
--- a/dev-ros/rostime/rostime-0.6.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.6.9.ebuild b/dev-ros/rostime/rostime-0.6.9.ebuild
deleted file mode 100644
index 6d97b2f7c4f5..000000000000
--- a/dev-ros/rostime/rostime-0.6.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/roscpp_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Time and Duration implementations for C++ libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/cpp_common
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/rostime/rostime-0.7.2.ebuild b/dev-ros/rostime/rostime-0.7.2.ebuild
new file mode 100644
index 000000000000..a5f38c7f5a95
--- /dev/null
+++ b/dev-ros/rostime/rostime-0.7.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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="Time and Duration implementations for C++ libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/cpp_common
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/rostime/rostime-9999.ebuild b/dev-ros/rostime/rostime-9999.ebuild
index d6af114604b5..a5f38c7f5a95 100644
--- a/dev-ros/rostime/rostime-9999.ebuild
+++ b/dev-ros/rostime/rostime-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/roscpp_core"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index b344d8045857..c1c9a86bc5c3 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,8 +1,4 @@
-AUX py3.patch 4958 BLAKE2B c441bee4b3ae1095b32aecb9618120d41d2cda53062ba4ce7c85f539840be27ed035a4f3da87f643217a650c1766b6b9c94f48d44116a753ddc6ab44a5a0fd43 SHA512 b576a41c69680df1a388b30b3588ef0a94609b6338820a08deaa2ed3f29b05816bbb68db256cb843ae394f12723674a485e1b933caa2a19729a3c610de5c8345
-AUX yaml.patch 2816 BLAKE2B ecd4c4047f009dcc9c2417efa8a2233220dc002ede217beee75f88af111b1bab26423aba8796027f60e73887c0926e5099fa9db114b8a7f5144e25a5acf04789 SHA512 f3d197fec12c9df46eb488398c3149c36f0b7581a2a2c7ae7052bc0c37ed27302405b1aba81a140463ffe52fd8a9f65789371bbb697e0d09867b0ca02ce35340
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rostopic-1.14.3-r1.ebuild 614 BLAKE2B 53a0cbbe88bf306c7c348c50a16d61c612002c33174c9c1f84fb1d8b066d9bff950a7813d22c8b4cf5261d4dbedce2e60aec443798fccf9755173c9a61b1acc7 SHA512 7367cd95c60c2c8a6c0a97a0c4b31bf1acc357e0036f7a63cb714d8dd6e15140fd89a7ad777cb7aa2e5c93ab03854b2eabd4ff4ecae16708dc0db182f034e1d6
-EBUILD rostopic-1.15.4.ebuild 553 BLAKE2B 0b9508bdf9327727eba2d3e44eb3b14d06d610d915f2199c524cb1e7b40497e0844ce8bfad318bb9052f46c19662dd8db8d67739450a49ce3b5ffac5bb6e4208 SHA512 793194ac2652d09b512cd95cbc2a4531418b11f1d9b119b8bf164af27b90db18938b8cc64a41944afe39fc115baf85c2fb161e60e458605498d0c23ca15c62b3
-EBUILD rostopic-9999.ebuild 553 BLAKE2B 0b9508bdf9327727eba2d3e44eb3b14d06d610d915f2199c524cb1e7b40497e0844ce8bfad318bb9052f46c19662dd8db8d67739450a49ce3b5ffac5bb6e4208 SHA512 793194ac2652d09b512cd95cbc2a4531418b11f1d9b119b8bf164af27b90db18938b8cc64a41944afe39fc115baf85c2fb161e60e458605498d0c23ca15c62b3
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rostopic-1.15.8.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
+EBUILD rostopic-9999.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/files/py3.patch b/dev-ros/rostopic/files/py3.patch
deleted file mode 100644
index 51f5da5aa778..000000000000
--- a/dev-ros/rostopic/files/py3.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py   |  6 +--
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- .../test/test_roslogging_user_logger.py       |  8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py   |  2 +-
- tools/rosmsg/src/rosmsg/__init__.py           |  2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py     | 20 ++++----
- .../test_rostopic_command_line_offline.py     | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/rostopic/test/test_rostopic_command_line_offline.py b/tools/rostopic/test/test_rostopic_command_line_offline.py
-index 5dab1ad16..37a81faaa 100644
---- a/tools/rostopic/test/test_rostopic_command_line_offline.py
-+++ b/tools/rostopic/test/test_rostopic_command_line_offline.py
-@@ -48,9 +48,9 @@ def test_cmd_help(self):
-         cmd = 'rostopic'
- 
-         sub = ['bw', 'echo', 'hz', 'delay', 'info', 'list', 'pub', 'type','find']
--        output = Popen([cmd], stdout=PIPE).communicate()[0]
-+        output = Popen([cmd], stdout=PIPE).communicate()[0].decode()
-         self.assert_('Commands' in output)
--        output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0]
-+        output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0].decode()
-         self.assert_('Commands' in output)
-         # make sure all the commands are in the usage
-         for c in sub:
-@@ -59,16 +59,16 @@ def test_cmd_help(self):
- 
-         for c in sub:
-             output = Popen([cmd, c, '-h'], stdout=PIPE, stderr=PIPE).communicate()
--            self.assert_("usage:" in output[0].lower(), output)
-+            self.assert_("usage:" in output[0].decode().lower(), output)
-             # make sure usage refers to the command
--            self.assert_("%s %s"%(cmd, c) in output[0], output)
-+            self.assert_("%s %s"%(cmd, c) in output[0].decode(), output)
-             
-         # test no args on commands that require args
-         for c in ['bw', 'echo', 'hz', 'delay', 'info', 'pub', 'type', 'find']:
-             output = Popen([cmd, c], stdout=PIPE, stderr=PIPE).communicate()
--            self.assert_("usage:" in output[0].lower() or "usage:" in output[1].lower(), output)
-+            self.assert_("usage:" in output[0].decode().lower() or "usage:" in output[1].decode().lower(), output)
-             # make sure usage refers to the command
--            self.assert_("%s %s"%(cmd, c) in output[1], output)
-+            self.assert_("%s %s"%(cmd, c) in output[1].decode(), output)
-             
-     def test_offline(self):
-         cmd = 'rostopic'
-@@ -80,19 +80,19 @@ def test_offline(self):
- 
-         msg = "ERROR: Unable to communicate with master!\n"
- 
--        output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()
--        self.assert_(output[1].endswith(msg))
--        output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()
--        self.assert_(output[1].endswith(msg))
--        output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()
--        self.assert_(output[1].endswith(msg))
--        output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()
--        self.assert_(output[1].endswith(msg))
--        output = Popen([cmd, 'list'], **kwds).communicate()
--        self.assert_(output[1].endswith(msg))
--        output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()
--        self.assert_(output[1].endswith(msg))
--        output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()
--        self.assert_(output[1].endswith(msg))
--        output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()
--        self.assert_(output[1].endswith(msg))
-+        output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()[1].decode()
-+        self.assert_(output.endswith(msg))
-+        output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()[1].decode()
-+        self.assert_(output.endswith(msg))
-+        output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()[1].decode()
-+        self.assert_(output.endswith(msg))
-+        output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()[1].decode()
-+        self.assert_(output.endswith(msg))
-+        output = Popen([cmd, 'list'], **kwds).communicate()[1].decode()
-+        self.assert_(output.endswith(msg))
-+        output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()[1].decode()
-+        self.assert_(output.endswith(msg))
-+        output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()[1].decode()
-+        self.assert_(output.endswith(msg))
-+        output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()[1].decode()
-+        self.assert_(output.endswith(msg))
diff --git a/dev-ros/rostopic/files/yaml.patch b/dev-ros/rostopic/files/yaml.patch
deleted file mode 100644
index e96337b50546..000000000000
--- a/dev-ros/rostopic/files/yaml.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rostopic/src/rostopic/__init__.py b/tools/rostopic/src/rostopic/__init__.py
-index ad244b0f0..41138562e 100644
---- a/tools/rostopic/src/rostopic/__init__.py
-+++ b/tools/rostopic/src/rostopic/__init__.py
-@@ -1779,7 +1779,7 @@ def _rostopic_cmd_pub(argv):
-     try:
-         pub_args = []
-         for arg in args[2:]:
--            pub_args.append(yaml.load(arg))
-+            pub_args.append(yaml.safe_load(arg))
-     except Exception as e:
-         parser.error("Argument error: "+str(e))
- 
-@@ -1822,7 +1822,7 @@ def bagy_iter():
-         try:
-             with open(filename, 'r') as f:
-                 # load all documents
--                data = yaml.load_all(f)
-+                data = yaml.safe_load_all(f)
-                 for d in data:
-                     yield [d]
-         except yaml.YAMLError as e:
-@@ -2014,7 +2014,7 @@ def stdin_yaml_arg():
- 
-             if arg.strip() == '---': # End of document
-                 try:
--                    loaded = yaml.load(buff.rstrip())
-+                    loaded = yaml.safe_load(buff.rstrip())
-                 except Exception as e:
-                     sys.stderr.write("Invalid YAML: %s\n"%str(e))
-                 if loaded is not None:
diff --git a/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild b/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
deleted file mode 100644
index 1f86a766a1ff..000000000000
--- a/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/rostopic/rostopic-1.15.4.ebuild b/dev-ros/rostopic/rostopic-1.15.4.ebuild
deleted file mode 100644
index 647d292a6d3f..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rostopic/rostopic-1.15.8.ebuild b/dev-ros/rostopic/rostopic-1.15.8.ebuild
new file mode 100644
index 000000000000..c436e4f953a2
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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
index 647d292a6d3f..c436e4f953a2 100644
--- a/dev-ros/rostopic/rostopic-9999.ebuild
+++ b/dev-ros/rostopic/rostopic-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,12 +15,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		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
index ee767ac11e90..d699305a5fc6 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -1,16 +1,6 @@
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
-EBUILD rosunit-1.14.0.ebuild 486 BLAKE2B cc6bef7eb20984ced784051479bc3e571849fcec288064547691d3e51d2a08dff8b2608141a5c3e05c118f009f3884bd6d089abd32249a21ec8763ea93d5b07a SHA512 e1d172a12f45516f8399c07d5f9337b630cf52ee43becd696bb795cbc3ffa4727f66a4d86d706d038e83ed08de1163a9e70ff2ce9d74f7dcd16c30afb321dfe9
-EBUILD rosunit-1.14.1.ebuild 486 BLAKE2B cc6bef7eb20984ced784051479bc3e571849fcec288064547691d3e51d2a08dff8b2608141a5c3e05c118f009f3884bd6d089abd32249a21ec8763ea93d5b07a SHA512 e1d172a12f45516f8399c07d5f9337b630cf52ee43becd696bb795cbc3ffa4727f66a4d86d706d038e83ed08de1163a9e70ff2ce9d74f7dcd16c30afb321dfe9
-EBUILD rosunit-1.14.2.ebuild 486 BLAKE2B cc6bef7eb20984ced784051479bc3e571849fcec288064547691d3e51d2a08dff8b2608141a5c3e05c118f009f3884bd6d089abd32249a21ec8763ea93d5b07a SHA512 e1d172a12f45516f8399c07d5f9337b630cf52ee43becd696bb795cbc3ffa4727f66a4d86d706d038e83ed08de1163a9e70ff2ce9d74f7dcd16c30afb321dfe9
-EBUILD rosunit-1.14.3.ebuild 486 BLAKE2B cc6bef7eb20984ced784051479bc3e571849fcec288064547691d3e51d2a08dff8b2608141a5c3e05c118f009f3884bd6d089abd32249a21ec8763ea93d5b07a SHA512 e1d172a12f45516f8399c07d5f9337b630cf52ee43becd696bb795cbc3ffa4727f66a4d86d706d038e83ed08de1163a9e70ff2ce9d74f7dcd16c30afb321dfe9
-EBUILD rosunit-1.14.4.ebuild 486 BLAKE2B cc6bef7eb20984ced784051479bc3e571849fcec288064547691d3e51d2a08dff8b2608141a5c3e05c118f009f3884bd6d089abd32249a21ec8763ea93d5b07a SHA512 e1d172a12f45516f8399c07d5f9337b630cf52ee43becd696bb795cbc3ffa4727f66a4d86d706d038e83ed08de1163a9e70ff2ce9d74f7dcd16c30afb321dfe9
-EBUILD rosunit-1.14.6.ebuild 486 BLAKE2B cc6bef7eb20984ced784051479bc3e571849fcec288064547691d3e51d2a08dff8b2608141a5c3e05c118f009f3884bd6d089abd32249a21ec8763ea93d5b07a SHA512 e1d172a12f45516f8399c07d5f9337b630cf52ee43becd696bb795cbc3ffa4727f66a4d86d706d038e83ed08de1163a9e70ff2ce9d74f7dcd16c30afb321dfe9
-EBUILD rosunit-1.14.7.ebuild 486 BLAKE2B cc6bef7eb20984ced784051479bc3e571849fcec288064547691d3e51d2a08dff8b2608141a5c3e05c118f009f3884bd6d089abd32249a21ec8763ea93d5b07a SHA512 e1d172a12f45516f8399c07d5f9337b630cf52ee43becd696bb795cbc3ffa4727f66a4d86d706d038e83ed08de1163a9e70ff2ce9d74f7dcd16c30afb321dfe9
-EBUILD rosunit-9999.ebuild 486 BLAKE2B cc6bef7eb20984ced784051479bc3e571849fcec288064547691d3e51d2a08dff8b2608141a5c3e05c118f009f3884bd6d089abd32249a21ec8763ea93d5b07a SHA512 e1d172a12f45516f8399c07d5f9337b630cf52ee43becd696bb795cbc3ffa4727f66a4d86d706d038e83ed08de1163a9e70ff2ce9d74f7dcd16c30afb321dfe9
+DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
+DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+EBUILD rosunit-1.15.5.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
+EBUILD rosunit-1.15.6.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
+EBUILD rosunit-9999.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosunit/rosunit-1.14.0.ebuild b/dev-ros/rosunit/rosunit-1.14.0.ebuild
deleted file mode 100644
index cbdab3560566..000000000000
--- a/dev-ros/rosunit/rosunit-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosunit/rosunit-1.14.1.ebuild b/dev-ros/rosunit/rosunit-1.14.1.ebuild
deleted file mode 100644
index cbdab3560566..000000000000
--- a/dev-ros/rosunit/rosunit-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosunit/rosunit-1.14.2.ebuild b/dev-ros/rosunit/rosunit-1.14.2.ebuild
deleted file mode 100644
index cbdab3560566..000000000000
--- a/dev-ros/rosunit/rosunit-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosunit/rosunit-1.14.3.ebuild b/dev-ros/rosunit/rosunit-1.14.3.ebuild
deleted file mode 100644
index cbdab3560566..000000000000
--- a/dev-ros/rosunit/rosunit-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosunit/rosunit-1.14.4.ebuild b/dev-ros/rosunit/rosunit-1.14.4.ebuild
deleted file mode 100644
index cbdab3560566..000000000000
--- a/dev-ros/rosunit/rosunit-1.14.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosunit/rosunit-1.14.6.ebuild b/dev-ros/rosunit/rosunit-1.14.6.ebuild
deleted file mode 100644
index cbdab3560566..000000000000
--- a/dev-ros/rosunit/rosunit-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosunit/rosunit-1.14.7.ebuild b/dev-ros/rosunit/rosunit-1.14.7.ebuild
deleted file mode 100644
index cbdab3560566..000000000000
--- a/dev-ros/rosunit/rosunit-1.14.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit-testing package for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosunit/rosunit-1.15.5.ebuild b/dev-ros/rosunit/rosunit-1.15.5.ebuild
new file mode 100644
index 000000000000..198f80e39504
--- /dev/null
+++ b/dev-ros/rosunit/rosunit-1.15.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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
new file mode 100644
index 000000000000..198f80e39504
--- /dev/null
+++ b/dev-ros/rosunit/rosunit-1.15.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 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-9999.ebuild b/dev-ros/rosunit/rosunit-9999.ebuild
index cbdab3560566..198f80e39504 100644
--- a/dev-ros/rosunit/rosunit-9999.ebuild
+++ b/dev-ros/rosunit/rosunit-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
@@ -16,9 +15,9 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
 "
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index c77003c89686..1ada29e80ce4 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD roswtf-1.13.0.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.1.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.2.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.4.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.5.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
-EBUILD roswtf-1.13.6.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
-EBUILD roswtf-1.14.2.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
-EBUILD roswtf-1.14.3.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
-EBUILD roswtf-1.15.4.ebuild 659 BLAKE2B b1818147b4f5824cbc501af4fa3ef2f6a5ac631bad99074ac3181b448c028319136cba5a9a45fc191aedeae600cbbcc7fd42408cd4168081602177d018e6cfa8 SHA512 123f30422b3413eceb996f6ee2ba4ceb6803752212cc0119b921b31751a31741da11c634e3cdcd29179f8ec88639942988aec9c2c28f8ad87f9b1469636e8691
-EBUILD roswtf-9999.ebuild 662 BLAKE2B f6ccaffa46e840f520e1bd63befdbab04d52c240055e63e28be2793904cff438ad64082558ca361855afcd5b2ecca94a4ef610a2406bb8ba42b5c8ddfdc72f09 SHA512 b3afa27d6bc9e241f10f67a9ae876123db28a5960a4d069b95f790901565285814b16604c98777339ec805d1f7f0fdde98eabf47f394aabad3a6d69eaacd29b5
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD roswtf-1.15.8.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
+EBUILD roswtf-9999.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roswtf/roswtf-1.13.0.ebuild b/dev-ros/roswtf/roswtf-1.13.0.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.13.1.ebuild b/dev-ros/roswtf/roswtf-1.13.1.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.13.2.ebuild b/dev-ros/roswtf/roswtf-1.13.2.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.13.4.ebuild b/dev-ros/roswtf/roswtf-1.13.4.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.13.5.ebuild b/dev-ros/roswtf/roswtf-1.13.5.ebuild
deleted file mode 100644
index beab39855484..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.13.6.ebuild b/dev-ros/roswtf/roswtf-1.13.6.ebuild
deleted file mode 100644
index 396feee7b7a8..000000000000
--- a/dev-ros/roswtf/roswtf-1.13.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.14.2.ebuild b/dev-ros/roswtf/roswtf-1.14.2.ebuild
deleted file mode 100644
index 396feee7b7a8..000000000000
--- a/dev-ros/roswtf/roswtf-1.14.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.14.3.ebuild b/dev-ros/roswtf/roswtf-1.14.3.ebuild
deleted file mode 100644
index 396feee7b7a8..000000000000
--- a/dev-ros/roswtf/roswtf-1.14.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.15.4.ebuild b/dev-ros/roswtf/roswtf-1.15.4.ebuild
deleted file mode 100644
index ceae0cb87c1d..000000000000
--- a/dev-ros/roswtf/roswtf-1.15.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for diagnosing issues with a running ROS system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/roswtf/roswtf-1.15.8.ebuild b/dev-ros/roswtf/roswtf-1.15.8.ebuild
new file mode 100644
index 000000000000..e6c601a37116
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 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
index 56857f7f1b57..e6c601a37116 100644
--- a/dev-ros/roswtf/roswtf-9999.ebuild
+++ b/dev-ros/roswtf/roswtf-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,13 +15,32 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
+	$(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_USEDEP}]
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-util/rosinstall[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		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
index 2f7d1fefab44..f2cac61abb6b 100644
--- a/dev-ros/rotate_recovery/Manifest
+++ b/dev-ros/rotate_recovery/Manifest
@@ -1,10 +1,4 @@
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
-DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
-EBUILD rotate_recovery-1.16.1.ebuild 619 BLAKE2B 5723dbe95ee96665120dbcb68cd68c695ac184ba7385f1c807d275c0a942c5dff6f4718c41273e9a443d393b799065dea6908e204b595954cddc43e0704a1595 SHA512 90d51fe0c9b43cbfa3c346d409ec5b7e1fd86e405fb0696c9be1d577a799d60264cb4db8ff9bed3f92b3ac8e9d299143cd56c651f4ae23452583f665c444a20c
-EBUILD rotate_recovery-1.16.2.ebuild 760 BLAKE2B 2e5378e83e91a8c6cc30e86a00eb8e1990da41cc6bed2afa1504e881c4a610e585d0de77c79ded7272870676e63c646531ebac94579e52b1d7199792312807d7 SHA512 d3fea07c581de06f3c5febd5ed6f37ce3d266cb0bc277311f371d65f42082354ae053813fd0c73993466b693e70420c8bccf01550a40b46c5663a0de45ae0092
-EBUILD rotate_recovery-1.16.3.ebuild 757 BLAKE2B 5e676f5defb57ac17ca8b9ad741cc39100b9a83ced4dbec8246ee3c01f33c10cdfba4af61b8d273daa4e7242963de6b1570cd249baf308b653f152b7cfb55a54 SHA512 e753f0085a148e0ef59f522b3b1ea8f56c2472756c95aaa1520cfccc47c2e2dc721adacf3327e73a351e307abe16c2dbe9c756bbd4b4cb3c5f8cda060fd86145
-EBUILD rotate_recovery-1.16.6.ebuild 757 BLAKE2B 2a92a8bd6bf98c1f28f21c17082045c80f15d1483791ee33dcd5a916da2a0abd48594907dc97722a91867f331fbcb6828d60e84209faea409da465116677dcaf SHA512 9e24cac6b028ff938fc9813da7ca2ef8daecc129dbf8443b959c48d12d5ce722f719629054a3c0c538c09d773d770b00120edcd60b5f1df4b3a9a52835a16d7a
-EBUILD rotate_recovery-9999.ebuild 760 BLAKE2B 2e5378e83e91a8c6cc30e86a00eb8e1990da41cc6bed2afa1504e881c4a610e585d0de77c79ded7272870676e63c646531ebac94579e52b1d7199792312807d7 SHA512 d3fea07c581de06f3c5febd5ed6f37ce3d266cb0bc277311f371d65f42082354ae053813fd0c73993466b693e70420c8bccf01550a40b46c5663a0de45ae0092
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+EBUILD rotate_recovery-1.17.0.ebuild 739 BLAKE2B 08cc4d3b70f7ccb672b4edac5cd84272c59499b202b60bdb185c7e954853e9c67ca2903f51bd50c12d21eaa16a5492ab02af9f0d418f3a82db399289cf0c2de4 SHA512 ec926673895d206ee1908e24ca5f91237fa153b46389e40b7b6b40674eb29846804087dd8937322eae3fee7c8901e8b85a790b7191e7b57adbc25c1a828f8c14
+EBUILD rotate_recovery-9999.ebuild 739 BLAKE2B 08cc4d3b70f7ccb672b4edac5cd84272c59499b202b60bdb185c7e954853e9c67ca2903f51bd50c12d21eaa16a5492ab02af9f0d418f3a82db399289cf0c2de4 SHA512 ec926673895d206ee1908e24ca5f91237fa153b46389e40b7b6b40674eb29846804087dd8937322eae3fee7c8901e8b85a790b7191e7b57adbc25c1a828f8c14
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.16.1.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.16.1.ebuild
deleted file mode 100644
index 149998080211..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-1.16.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-ros/base_local_planner
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.16.2.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.16.2.ebuild
deleted file mode 100644
index 18ba50b0f71e..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-1.16.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.16.3.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.16.3.ebuild
deleted file mode 100644
index cb2089298da7..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-1.16.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.16.6.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.16.6.ebuild
deleted file mode 100644
index ea3d43a4f5d7..000000000000
--- a/dev-ros/rotate_recovery/rotate_recovery-1.16.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/base_local_planner
-	dev-ros/costmap_2d
-	dev-cpp/eigen:3
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/nav_core-1.16
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.17.0.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.17.0.ebuild
new file mode 100644
index 000000000000..06340ad401d2
--- /dev/null
+++ b/dev-ros/rotate_recovery/rotate_recovery-1.17.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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="Recovery behavior that attempts performing a 360 degree rotation of the robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/nav_core-1.16
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild b/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild
index 18ba50b0f71e..06340ad401d2 100644
--- a/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild
+++ b/dev-ros/rotate_recovery/rotate_recovery-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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 to clear space by performing a 360 degree rotation of the robot"
+DESCRIPTION="Recovery behavior that attempts performing a 360 degree rotation of the robot"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/rqt_action/Manifest b/dev-ros/rqt_action/Manifest
index ccb872bee027..44df9be95eb0 100644
--- a/dev-ros/rqt_action/Manifest
+++ b/dev-ros/rqt_action/Manifest
@@ -1,4 +1,4 @@
 DIST rqt_action-0.4.9.tar.gz 3288 BLAKE2B dab54459bae9975007c50e947d4e8ae6783ce653edc5132636d8a8edc02f55d832ad33910f7daec1c6ff139a4313b96dec64221ef296d6834dbbbdd43fa9cc66 SHA512 e412fe23bca87f2fc55a858ddc153ecfd6fcf7bdc60334d09285e3d44ab6d2cc52680f29d3bfd4fe9ad5bc334c595b311fcea5e835223dd61c19fd0de0489afc
-EBUILD rqt_action-0.4.9.ebuild 492 BLAKE2B 27271157608e13dbf6fe4582712a99b50c5c2c62c8ece6922b270564f761e0d9ac1b5a5a41762188be597cdb6781ac5596fc405a7a2b11d004881cacb2e13091 SHA512 89cda35a955c3fef8184abe5a9e57d187c531d385ee538812e6bf165d174dc95406bef6a6fc75c12f3fc6c6528544c35aa4f37e9681f11a6e74be8b4d073bab3
-EBUILD rqt_action-9999.ebuild 492 BLAKE2B 27271157608e13dbf6fe4582712a99b50c5c2c62c8ece6922b270564f761e0d9ac1b5a5a41762188be597cdb6781ac5596fc405a7a2b11d004881cacb2e13091 SHA512 89cda35a955c3fef8184abe5a9e57d187c531d385ee538812e6bf165d174dc95406bef6a6fc75c12f3fc6c6528544c35aa4f37e9681f11a6e74be8b4d073bab3
+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 342 BLAKE2B 620942e8e6c98f9cd2873d37c5983abad214b94afd52b4de803491e4d49bf777ed5b99ccad97f4cc11481022e276f733197ca995b6c8aea024b88fe9026be984 SHA512 d68ea776973eee1600ca75e3cec47e4db57d8f14f0b2ac796276d48763f71c513ac1deebfbe6e76261fd5af8f394981c05dd9dcf3b47c7b0029a46443cf10d1c
diff --git a/dev-ros/rqt_action/rqt_action-0.4.9.ebuild b/dev-ros/rqt_action/rqt_action-0.4.9.ebuild
index d368b9658f68..a3246d99959f 100644
--- a/dev-ros/rqt_action/rqt_action-0.4.9.ebuild
+++ b/dev-ros/rqt_action/rqt_action-0.4.9.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_action"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,8 +14,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	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
index d368b9658f68..a3246d99959f 100644
--- a/dev-ros/rqt_action/rqt_action-9999.ebuild
+++ b/dev-ros/rqt_action/rqt_action-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_action"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,8 +14,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	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
index 9dc0f023855e..d7dd37ce9ede 100644
--- a/dev-ros/rqt_bag/Manifest
+++ b/dev-ros/rqt_bag/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_bag-0.4.11.tar.gz 50276 BLAKE2B b393c935701a713b462b8035c765c6b4570a95447c846dfb052ddd4d4e4c2aba407dde96c584fdc85d58cf2eb1d7b290c34cf337beb425225aa629bc8555154f SHA512 d345d4a1900b06bdf7649e0123780ad33f116dffe832f3492029ba3a25843984014cb2c7ac2d848df7c4c9683f14c14d3f9acb528e4ed04a12d3dd017b5df9c1
-DIST rqt_bag-0.4.12.tar.gz 50403 BLAKE2B dd6825e29fe919a1749f18d0fe22cd3e65b9a4469fcbd21ad48b39afa37fcdb82d2a69651cb297effa06d61006e27727fd4e68b531929c38e8f9018c05eca5d6 SHA512 575ad0322423f26e663149f7cb12208de64a64f813f9dfc16b168d10396cf7b06d69bbcd50262b0d55fc1e188e63943de7a995eec3bcacd65d67f92e0714afb1
-EBUILD rqt_bag-0.4.11.ebuild 640 BLAKE2B c891c932127aa8bdfd21181696a8977594acc73a5192f333a42aec6c0fb21772ddbddc659790c16bef47831b37576a49db1fb77ee5a08bc57b651bda34fd3797 SHA512 4a9f521b12f0fc9ae808c73a8041b6667be01836eb3b9a1c2ca7e198e473928d5fa99bc7ee306fb137b64aa321083289fa7d5b0474a8428d86679b41e116ae05
-EBUILD rqt_bag-0.4.12.ebuild 640 BLAKE2B 707f34b9a7a4f0a0f04da3cad7aad98f9aa7f588495358fb3b1989580655e07129dd75cf29f82850271e897d1639941a73ffc8a3a805459b0f5f917c51b907bc SHA512 e2e38d24864bbe7d21177720ea7df8edaefb495ee015892cf4153ade8c95efa2436f1aa2233e520f7486cf8c8993222bdb314bf9ca4283624480383b6c4eec8b
-EBUILD rqt_bag-9999.ebuild 640 BLAKE2B c891c932127aa8bdfd21181696a8977594acc73a5192f333a42aec6c0fb21772ddbddc659790c16bef47831b37576a49db1fb77ee5a08bc57b651bda34fd3797 SHA512 4a9f521b12f0fc9ae808c73a8041b6667be01836eb3b9a1c2ca7e198e473928d5fa99bc7ee306fb137b64aa321083289fa7d5b0474a8428d86679b41e116ae05
+DIST rqt_bag-0.4.13.tar.gz 51027 BLAKE2B 1a65935847c28dbb88ee897b4066620c3d1d83e2f33de7f8a93417ebd8924a572476c24756daaab7ec4c481a2b963fc552ec4a8b9030a1a847c1663b2e9229f7 SHA512 d92511e98c83f821fe967c8f8a4f19b31b03c464996ab3ee10c4d6c5dd61c8d2f65562a683e3d44dcddca862db69a5f850b361231c2a548edc71d6fa861326fd
+EBUILD rqt_bag-0.4.13.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
+EBUILD rqt_bag-9999.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
 MISC metadata.xml 339 BLAKE2B 0ab275c9533eaf810c3fd33f5fcfbab2de7d7258604b431cc7a90a5ac63127bf048188835d89237de809b314fc5bff2a3afbea2dae6a7299ada7dbb0183ec262 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.11.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.11.ebuild
deleted file mode 100644
index 9131e47b8514..000000000000
--- a/dev-ros/rqt_bag/rqt_bag-0.4.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.12.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.12.ebuild
deleted file mode 100644
index c2de8e98991b..000000000000
--- a/dev-ros/rqt_bag/rqt_bag-0.4.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild
new file mode 100644
index 000000000000..51bedaaa5154
--- /dev/null
+++ b/dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild
@@ -0,0 +1,25 @@
+# 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/rqt_bag-9999.ebuild b/dev-ros/rqt_bag/rqt_bag-9999.ebuild
index 9131e47b8514..51bedaaa5154 100644
--- a/dev-ros/rqt_bag/rqt_bag-9999.ebuild
+++ b/dev-ros/rqt_bag/rqt_bag-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,11 +15,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
+	$(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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${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
index 7f989fe97593..c2e8f20ca3ca 100644
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ b/dev-ros/rqt_bag_plugins/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_bag-0.4.11.tar.gz 50276 BLAKE2B b393c935701a713b462b8035c765c6b4570a95447c846dfb052ddd4d4e4c2aba407dde96c584fdc85d58cf2eb1d7b290c34cf337beb425225aa629bc8555154f SHA512 d345d4a1900b06bdf7649e0123780ad33f116dffe832f3492029ba3a25843984014cb2c7ac2d848df7c4c9683f14c14d3f9acb528e4ed04a12d3dd017b5df9c1
-DIST rqt_bag-0.4.12.tar.gz 50403 BLAKE2B dd6825e29fe919a1749f18d0fe22cd3e65b9a4469fcbd21ad48b39afa37fcdb82d2a69651cb297effa06d61006e27727fd4e68b531929c38e8f9018c05eca5d6 SHA512 575ad0322423f26e663149f7cb12208de64a64f813f9dfc16b168d10396cf7b06d69bbcd50262b0d55fc1e188e63943de7a995eec3bcacd65d67f92e0714afb1
-EBUILD rqt_bag_plugins-0.4.11.ebuild 840 BLAKE2B 799d8d9dfacafd2a3b4553937b88088d8f89f8e8a6567900f78a44781adad99dec8275a35efd63c7398d388b7d3c6076d45ab0cd2d57ad39d3d86b17f66be4dc SHA512 57bc4cf92d4875605b96db4a12829488d75aea356f304a715ac3c9047c7d0367c97451fb7f53c8c9c1bbc389daaae99fa50242010c413447127289ddee8b9588
-EBUILD rqt_bag_plugins-0.4.12.ebuild 840 BLAKE2B 75a65bb192455179965848daa27024e8bd4c47332181aa5b8bc1e91d678017cf1ce873dd7368e076e2cd5de986d16aedb59b3877cc9d98405c4103e2cf2e80de SHA512 7eba789b71ca67321051714ddcf6f6fa46c64785d01c3d0d98d76115e1d4916620d05be40e862db6d9a55b9a6c10f0166dfe68bfd00009e322f7a24bc6b8e472
-EBUILD rqt_bag_plugins-9999.ebuild 840 BLAKE2B 799d8d9dfacafd2a3b4553937b88088d8f89f8e8a6567900f78a44781adad99dec8275a35efd63c7398d388b7d3c6076d45ab0cd2d57ad39d3d86b17f66be4dc SHA512 57bc4cf92d4875605b96db4a12829488d75aea356f304a715ac3c9047c7d0367c97451fb7f53c8c9c1bbc389daaae99fa50242010c413447127289ddee8b9588
+DIST rqt_bag-0.4.13.tar.gz 51027 BLAKE2B 1a65935847c28dbb88ee897b4066620c3d1d83e2f33de7f8a93417ebd8924a572476c24756daaab7ec4c481a2b963fc552ec4a8b9030a1a847c1663b2e9229f7 SHA512 d92511e98c83f821fe967c8f8a4f19b31b03c464996ab3ee10c4d6c5dd61c8d2f65562a683e3d44dcddca862db69a5f850b361231c2a548edc71d6fa861326fd
+EBUILD rqt_bag_plugins-0.4.13.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
+EBUILD rqt_bag_plugins-9999.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
 MISC metadata.xml 339 BLAKE2B 0ab275c9533eaf810c3fd33f5fcfbab2de7d7258604b431cc7a90a5ac63127bf048188835d89237de809b314fc5bff2a3afbea2dae6a7299ada7dbb0183ec262 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.11.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.11.ebuild
deleted file mode 100644
index 48735760362d..000000000000
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-PYTHON_COMPAT=( python2_7 )
-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}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_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-0.4.12.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.12.ebuild
deleted file mode 100644
index 0f850d2d8e5f..000000000000
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-PYTHON_COMPAT=( python2_7 )
-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}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_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-0.4.13.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.13.ebuild
new file mode 100644
index 000000000000..f0c32428d755
--- /dev/null
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.13.ebuild
@@ -0,0 +1,30 @@
+# 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_bag_plugins/rqt_bag_plugins-9999.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
index 48735760362d..f0c32428d755 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -17,14 +16,14 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${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}]
 "
diff --git a/dev-ros/rqt_console/Manifest b/dev-ros/rqt_console/Manifest
index 06c2b0bad7d3..bda297a829df 100644
--- a/dev-ros/rqt_console/Manifest
+++ b/dev-ros/rqt_console/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_console-0.4.8.tar.gz 26946 BLAKE2B fcfb17681d26611e782e87173d93d4644ca96fd4fb765e547252d12f3ffb7bf25df8cde2b19acbb2e240d4c1bc305a2a371682e1e81df35a006da2540c15c8e4 SHA512 9674898ef33397d59554b20980c45ae4cc04be019a2f039eedd401ccd6f774e9f6e4130c1aad9bb953d39f47a971fe0514853d2be8be05cc53d6d8c203054813
-EBUILD rqt_console-0.4.7.ebuild 677 BLAKE2B 48c8362bcd8af7cb7d79bd087811eb67ff00014825a7ce79d42b0ab04416aa98b92b321391d423ae2c83b933d8d5da07201a1f7066c4cc1dffecdc2145a87969 SHA512 bada5fc2ff098ef6f45f22698b2a9fb773667891587eafa80f4a840296f43621f27e684f48721fc612437369c0ea51278222be4b47edf25ea09d36d00be9256c
-EBUILD rqt_console-0.4.8.ebuild 653 BLAKE2B d168e80df9acac734e0eb045533c69d35a9001509e7826722bdc39495ffcfb5f7c781ee1a3a17a4d6ccb225ea2f51c672807a95a2eeaae8ba0fef4ee6e264262 SHA512 c2f8b211f2240cc14d57502f64fee34346092a3d17c2554a7863fa28e3aaf1d4cf6574c73653208e7aa259b3f6f48fb945affdf2dd099bc0b187820012c01bae
-EBUILD rqt_console-9999.ebuild 653 BLAKE2B d168e80df9acac734e0eb045533c69d35a9001509e7826722bdc39495ffcfb5f7c781ee1a3a17a4d6ccb225ea2f51c672807a95a2eeaae8ba0fef4ee6e264262 SHA512 c2f8b211f2240cc14d57502f64fee34346092a3d17c2554a7863fa28e3aaf1d4cf6574c73653208e7aa259b3f6f48fb945affdf2dd099bc0b187820012c01bae
+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 343 BLAKE2B be092a072e973109779ffe75bb1b4561b1cc1ca19fdc7509a27b75f467dfa008c0f3b8e970f9483b76ffe34d3c1a99aecf3de76903e6ea679f3958e15e902db9 SHA512 7146d73d4cb17aebb82ec521988681dfee861a36c66fefd21c47f30f1ffda11670f6c802fd4f433101eb5f498000f47f648c3b13cde71916b9115a50b6814bf3
diff --git a/dev-ros/rqt_console/rqt_console-0.4.11.ebuild b/dev-ros/rqt_console/rqt_console-0.4.11.ebuild
new file mode 100644
index 000000000000..2f17c1d3201b
--- /dev/null
+++ b/dev-ros/rqt_console/rqt_console-0.4.11.ebuild
@@ -0,0 +1,25 @@
+# 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-0.4.7.ebuild b/dev-ros/rqt_console/rqt_console-0.4.7.ebuild
deleted file mode 100644
index 8a81c3235c5b..000000000000
--- a/dev-ros/rqt_console/rqt_console-0.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and filtering ROS messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_logger_level[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_console/rqt_console-0.4.8.ebuild b/dev-ros/rqt_console/rqt_console-0.4.8.ebuild
deleted file mode 100644
index eefcdaa3e26c..000000000000
--- a/dev-ros/rqt_console/rqt_console-0.4.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_console"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and filtering ROS messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_logger_level[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_console/rqt_console-9999.ebuild b/dev-ros/rqt_console/rqt_console-9999.ebuild
index eefcdaa3e26c..2f17c1d3201b 100644
--- a/dev-ros/rqt_console/rqt_console-9999.ebuild
+++ b/dev-ros/rqt_console/rqt_console-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_console"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_logger_level[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	$(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
index 40db017f37fc..85faecf628c6 100644
--- a/dev-ros/rqt_controller_manager/Manifest
+++ b/dev-ros/rqt_controller_manager/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD rqt_controller_manager-0.14.2.ebuild 444 BLAKE2B 8e17fabd016fe6becd7bea25962f907e2702f8db1665f5d94fae42b57b69f5cfc8bfa171c1dcea860c25c88e330badcdbc3eea2bbf957486b5b772dbee1114c3 SHA512 5852f5b38161ddf68dd2b80e4040cef61208035c29c3d4a5d7474aa769dfdb82b67562ed431bfba2302b0aa73daeb98e0238d0dcf2d0595dc876d695bc9a09a1
-EBUILD rqt_controller_manager-0.15.0.ebuild 444 BLAKE2B 8e17fabd016fe6becd7bea25962f907e2702f8db1665f5d94fae42b57b69f5cfc8bfa171c1dcea860c25c88e330badcdbc3eea2bbf957486b5b772dbee1114c3 SHA512 5852f5b38161ddf68dd2b80e4040cef61208035c29c3d4a5d7474aa769dfdb82b67562ed431bfba2302b0aa73daeb98e0238d0dcf2d0595dc876d695bc9a09a1
-EBUILD rqt_controller_manager-0.15.1.ebuild 441 BLAKE2B aabffe5b4421a3af947eb871694fc1cc89e763cbf03a3db3a7e59b4a7b71b36c70c917a0852096c22ea44c6a1c3f025165e7155c373eab2d0cfb7974028f54da SHA512 ed55e398d6af030542ba6c9b2b67af721fa3c804bb81326834228a5902a31be4eaba9558f36fdc3bb467e9b84670ea789dc47d30e39357bffe1f064d579142c5
-EBUILD rqt_controller_manager-9999.ebuild 444 BLAKE2B 3eed2feed983eb9d243723b27a3fea120d04e36d0c02b394f48f60e0ddbc211cfd3ade6286099419f6f158e077933f0b00d13d50f4eb13a4bcc7cde95a3203f1 SHA512 9ea5d8749c95f19ea690aa1d2bd2cc5d8a07f3cb2986a0b294fc9283ac35a16fb172ad2862d0d089ffab443a15eacb993f94625f7b7e1fb9ef7adec49eb986fa
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD rqt_controller_manager-0.19.1.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
+EBUILD rqt_controller_manager-9999.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.14.2.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.14.2.ebuild
deleted file mode 100644
index 3f327270d905..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.0.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.0.ebuild
deleted file mode 100644
index 3f327270d905..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild
deleted file mode 100644
index c5e66c00d1f2..000000000000
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.15.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="RQT control manager plugin"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..235e5e6a6f49
--- /dev/null
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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-9999.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild
index 63a0aca8be84..235e5e6a6f49 100644
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/controller_manager[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	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
index 2e6e81b37465..93b1e208ffef 100644
--- a/dev-ros/rqt_dep/Manifest
+++ b/dev-ros/rqt_dep/Manifest
@@ -1,8 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_dep-0.4.8.tar.gz 12398 BLAKE2B c44a245163e198d60ce030425861a7088432ba4fd5dabb697c0f3644a233bb5b48e6be6f759de4f2f62ca4cb87a99d01eea50446afb9c71cded78e15c5aa45d8 SHA512 b56f1b78ab80feeef3965586d5b67d5342113e9ec2ccc2964c255bcf06b311b112346d2fe48f4cf5c92c97c396917d915999c36b46279be98e3be30b0a4212dd
-DIST rqt_dep-0.4.9.tar.gz 12506 BLAKE2B aa5e70cbb2341410a549441ecf7d7b1b06cc8263112523c32433ad1a86e3f5db963f0215c2f7ea241f0466a463551c717400093e010cab6831968967b2df429c SHA512 4f23f9414bd461ca3086a1e81318ba7282ebe29b3edf019413bbb12ded6f2812254931a0a39cb1632f62bf1655b1af621042232615e2dacacb5eee7dd2b7edf0
-EBUILD rqt_dep-0.4.7.ebuild 675 BLAKE2B 1d6ed10eba23376a4b445fafd54863705e4c0d4a2841af9aa071836cde7afb91550f35a4e84728765fac1858fcd12cd7c54d3a9a36c4b5436cad3eecdd31d360 SHA512 b7f2703bc313d166b39f30ad736df4690b045a3467c573be0d9fce7eaf5817b0360f2bb8bfa0317873cf9376a8fc8a0e46e50b91e8b0fd5cd70b8de5d4648095
-EBUILD rqt_dep-0.4.8.ebuild 647 BLAKE2B 689f77b5fccdab4dd642c44c0228f06f073e3de946a51ee0444885c37e58c581f3deba50ba7aa27ea0faa9edc3e59859637ba15a57e1a89f8cffcfb696c7a0a6 SHA512 2e46cf58f4bc4dca6df3d945e40e43ebc7e667fd8f1a4e086fbd1284310dc120bb60bcbb7aef9963ee451184391f8d35dd5a0920dd91a81716557a618ddfb795
-EBUILD rqt_dep-0.4.9.ebuild 647 BLAKE2B 5008fe10f5ca15da17bdb887f12b8e56b67f8ff87bf8fb67ecc3b48c31457253f38c72784fe3764bfa8f0c08c98128a11f38ed006deafd23c6bcfe9e37642d7f SHA512 59c67c079dffd1269111eb93e3e8d2eeb877ea379fbe57dd5e4266a53b6d74356b133c009c5ac2df00bfe50ab756bc70e958317ab34273f5de7f47ad61366629
-EBUILD rqt_dep-9999.ebuild 647 BLAKE2B 689f77b5fccdab4dd642c44c0228f06f073e3de946a51ee0444885c37e58c581f3deba50ba7aa27ea0faa9edc3e59859637ba15a57e1a89f8cffcfb696c7a0a6 SHA512 2e46cf58f4bc4dca6df3d945e40e43ebc7e667fd8f1a4e086fbd1284310dc120bb60bcbb7aef9963ee451184391f8d35dd5a0920dd91a81716557a618ddfb795
+DIST rqt_dep-0.4.10.tar.gz 12730 BLAKE2B dfb0624433086a005f3a0c85dc9e5ff92e018a47d541a039a29f9b39bcf1bd99a99ef1abac847b73b643ad043f8732ecb2f34c8adbb128e95339d1625a8527ba SHA512 6cd590e991a786f3017956a25fc8a977ab581ee931710637a9b4e4cff5f2f863e67c1923dbaf66ad203ae12e484a124d822ccbdc7dde57856e4011e6cc722221
+EBUILD rqt_dep-0.4.10.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
+EBUILD rqt_dep-9999.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
 MISC metadata.xml 339 BLAKE2B 88e2a45dbf383c5addb2bc4ad4d83ec4b75ce5eaa525f40422964e12df5a35b402cc5b36d3a579ae37608c3d9ee17bcdda88e605cce24b85edaa103c47da0245 SHA512 9634570bb6226eea78ab642d0645516e9c523e4669fbd42b1a375f3f56e37ce9a87dff464fcc0c956c21606066bd71378ab4dc11a7590282ac8b011223d1ec96
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild
new file mode 100644
index 000000000000..0f0d8315777a
--- /dev/null
+++ b/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild
@@ -0,0 +1,28 @@
+# 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_dep/rqt_dep-0.4.7.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.7.ebuild
deleted file mode 100644
index c6feb5ba6f29..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-0.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.8.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.8.ebuild
deleted file mode 100644
index da5568842166..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-0.4.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_dep"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.9.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.9.ebuild
deleted file mode 100644
index 35bba3cb5001..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-0.4.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_dep"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_dep/rqt_dep-9999.ebuild b/dev-ros/rqt_dep/rqt_dep-9999.ebuild
index da5568842166..0f0d8315777a 100644
--- a/dev-ros/rqt_dep/rqt_dep-9999.ebuild
+++ b/dev-ros/rqt_dep/rqt_dep-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_dep"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,15 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	$(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? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	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
index e5e86487e4e1..50c6bdccbeab 100644
--- a/dev-ros/rqt_graph/Manifest
+++ b/dev-ros/rqt_graph/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_graph-0.4.10.tar.gz 18455 BLAKE2B 930f2c7bc5d1797eae06e9d37e9f1268a503ddda3bf28adda47779b5879d578353e77e773e7c4417e670870effa6c6a39b5844f19bb101ba6f3733604514e704 SHA512 a37483ed15dc1f1d1492e53d26252a3db6771a1ecf47469a33314c9d17aef88d2e68a5acdca24e412e1d2409c31311ea2f2983aa54b6a5e3b5de5c11b6ab1191
-DIST rqt_graph-0.4.9.tar.gz 15857 BLAKE2B 52201faed0ec636dc15a7a7067d19d29f72dca4e98412614a24d6e5f38d916f6cf194fa2b11f84ed0d9476a53f0ad3fdcff807b851286f192c5ee1332033d997 SHA512 21d1395f272f38bb27f7549c865a9e2b4ac5d9267c50dbbaf02016b509b6fab08526c35a87f500788bad094e605d89f925baf939742e78f37d615fedcb04776e
-EBUILD rqt_graph-0.4.10.ebuild 794 BLAKE2B 0005e27a142b3b692f7dba6a012aaaa7c97dd2954ab1df244dce00ba2467e23ec5f1c57a0d4caedb8f72757a04dfae97e26749be4b4336f8e63cd90ea0789015 SHA512 ade1ebf56d89d3f7965c6b428dfc58ea0cef86232cc77c505eb6b7d530ee404562b2ff5696d835b8f762896a1d781038512be1db612ab45cd32d1bb5cd31850f
-EBUILD rqt_graph-0.4.9.ebuild 794 BLAKE2B cba021c39b36a41bca6f0f9f2d269a7407c5186b90ceb3a58d8cf49d864a46e269cefdfa79a6bf8b0b84f8cb08f08f28e3bb8cf90f549260e24023e5b9a299ae SHA512 d55d44962d6efaff6e67e752a866ef3ad49ead7ea55ee4ad62945e0242ba6264082a78b587b5ef89ce1f85fa5096849c0693c5e42d5f2f08ab098d157325048e
-EBUILD rqt_graph-9999.ebuild 794 BLAKE2B cba021c39b36a41bca6f0f9f2d269a7407c5186b90ceb3a58d8cf49d864a46e269cefdfa79a6bf8b0b84f8cb08f08f28e3bb8cf90f549260e24023e5b9a299ae SHA512 d55d44962d6efaff6e67e752a866ef3ad49ead7ea55ee4ad62945e0242ba6264082a78b587b5ef89ce1f85fa5096849c0693c5e42d5f2f08ab098d157325048e
+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 341 BLAKE2B 060e33c2b6381ab2f650e89494f89c30ce46628290ecf2894ef4173844e43c7f7d909e144af779af247abfa3324affaf160bb25bc70f92a7261db202552d9759 SHA512 94542a537503e17832e10f98462d73a3a0c0cf0fc0d7083198b5509cf44a2743c243b79ff23b4067b6db2593d9bd1b69d406bb23ddec41dc681ffd39c25c8593
diff --git a/dev-ros/rqt_graph/rqt_graph-0.4.10.ebuild b/dev-ros/rqt_graph/rqt_graph-0.4.10.ebuild
deleted file mode 100644
index a40a5c1b0a81..000000000000
--- a/dev-ros/rqt_graph/rqt_graph-0.4.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_graph"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS computation graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild b/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild
new file mode 100644
index 000000000000..74ebe47da37f
--- /dev/null
+++ b/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild
@@ -0,0 +1,29 @@
+# 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-0.4.9.ebuild b/dev-ros/rqt_graph/rqt_graph-0.4.9.ebuild
deleted file mode 100644
index 1f2bff4c39fc..000000000000
--- a/dev-ros/rqt_graph/rqt_graph-0.4.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_graph"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS computation graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_graph/rqt_graph-9999.ebuild b/dev-ros/rqt_graph/rqt_graph-9999.ebuild
index 1f2bff4c39fc..74ebe47da37f 100644
--- a/dev-ros/rqt_graph/rqt_graph-9999.ebuild
+++ b/dev-ros/rqt_graph/rqt_graph-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_graph"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,16 +14,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	$(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_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${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
index bfe0ae9f0b70..35e6ec1d14eb 100644
--- a/dev-ros/rqt_gui/Manifest
+++ b/dev-ros/rqt_gui/Manifest
@@ -1,5 +1,5 @@
 AUX gentoo.patch 765 BLAKE2B 0b0e46dae38aaf5f1bdce5e599b33cdbeff7ed8440f1537b31b559018a0a996cac7a66cdd1ae8935463b37b52a27e933669bd03a4f9617f0ba4de2665e223a4d SHA512 9d34f4e375c08c1b635359e1e9ec178577533e8f8aae99d0071c805a1765da11a4554a51d75ca524798a2d5ad121d4adb5392b9ad3a5f0704168b2bec2c7a38d
-DIST rqt-0.5.0.tar.gz 120992 BLAKE2B 645d53ec7070fc5a40760bedc556328e26a16dea7b2990ad0512bc372cb346d545dbea42689b4c39039f17abc4920d5059e5b9a25ac7b77f8b5e5cc02100c5ac SHA512 5c91fe9bce5a7cb0cdc54b42667488d30c33bd57afd30cc8f2047b91b7aa7b8afd936090bfc76be5dbc8c6497623c1be4340e061503f5a65bc94faaad810597e
-EBUILD rqt_gui-0.5.0.ebuild 521 BLAKE2B ef6a0b1bbfeef081e4932b12f42e4ce9691fa5154c1a8b1332f52ef78f8743ada915297ea4333c73115e64f4c55758d152069140853f9ce8763df1b92978e20d SHA512 2054cb2a9b035b57fec2bacc6a966d3bcb9e1dd7f7519ade118eddb5ddc863dc8dbb5e568f2f6354d3344ef26b2acbdba64e03b647436a9bd160e590cf6a2c33
-EBUILD rqt_gui-9999.ebuild 521 BLAKE2B ef6a0b1bbfeef081e4932b12f42e4ce9691fa5154c1a8b1332f52ef78f8743ada915297ea4333c73115e64f4c55758d152069140853f9ce8763df1b92978e20d SHA512 2054cb2a9b035b57fec2bacc6a966d3bcb9e1dd7f7519ade118eddb5ddc863dc8dbb5e568f2f6354d3344ef26b2acbdba64e03b647436a9bd160e590cf6a2c33
+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 335 BLAKE2B 132c01d79a583ad6be876acab7644c890ccd31d44ee3ec46644eb005b56042ba1e687239dead37b4e592536493e82a74bfd22a99661a3945dfdf79448e9ca450 SHA512 d861666a6188e5bce041f76eedc1c3c18c8f1a185b5481e16f57481d7836f4fd71e9fb04b6f0c58c0cf4f5f77595e7675e2761699efdb2f697ec76cd6d0941f4
diff --git a/dev-ros/rqt_gui/rqt_gui-0.5.0.ebuild b/dev-ros/rqt_gui/rqt_gui-0.5.0.ebuild
deleted file mode 100644
index d0dd4b63ffeb..000000000000
--- a/dev-ros/rqt_gui/rqt_gui-0.5.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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Main to start an 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_USEDEP}]
-	dev-libs/boost:="
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/rqt_gui/rqt_gui-0.5.2.ebuild b/dev-ros/rqt_gui/rqt_gui-0.5.2.ebuild
new file mode 100644
index 000000000000..893e49443842
--- /dev/null
+++ b/dev-ros/rqt_gui/rqt_gui-0.5.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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
index d0dd4b63ffeb..893e49443842 100644
--- a/dev-ros/rqt_gui/rqt_gui-9999.ebuild
+++ b/dev-ros/rqt_gui/rqt_gui-9999.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/rqt"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Main to start an instance of the ROS integrated graphical user interface provided by qt_gui"
+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_USEDEP}]
+	>=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
index 0a4eed6213e7..c859b0fc6876 100644
--- a/dev-ros/rqt_gui_cpp/Manifest
+++ b/dev-ros/rqt_gui_cpp/Manifest
@@ -1,4 +1,4 @@
-DIST rqt-0.5.0.tar.gz 120992 BLAKE2B 645d53ec7070fc5a40760bedc556328e26a16dea7b2990ad0512bc372cb346d545dbea42689b4c39039f17abc4920d5059e5b9a25ac7b77f8b5e5cc02100c5ac SHA512 5c91fe9bce5a7cb0cdc54b42667488d30c33bd57afd30cc8f2047b91b7aa7b8afd936090bfc76be5dbc8c6497623c1be4340e061503f5a65bc94faaad810597e
-EBUILD rqt_gui_cpp-0.5.0-r1.ebuild 553 BLAKE2B 0dd5e8c35c2c84333aa6baaf1b388df1ffc5804eb5d46927adeb8f18da31008efd0534858e5bcfbe1bc4cb89ca4659b5ac6b2f7fdbb06c710fb6e2a817ae49c0 SHA512 416b0fd379111c82512fb351187a00f1fd5d7fda79253765d73930cd23d5fbfc39d04a8eb52616c83abbacf8e29975077761523d649e0878ff5bdd2ce2495458
-EBUILD rqt_gui_cpp-9999.ebuild 553 BLAKE2B 0dd5e8c35c2c84333aa6baaf1b388df1ffc5804eb5d46927adeb8f18da31008efd0534858e5bcfbe1bc4cb89ca4659b5ac6b2f7fdbb06c710fb6e2a817ae49c0 SHA512 416b0fd379111c82512fb351187a00f1fd5d7fda79253765d73930cd23d5fbfc39d04a8eb52616c83abbacf8e29975077761523d649e0878ff5bdd2ce2495458
+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 335 BLAKE2B 132c01d79a583ad6be876acab7644c890ccd31d44ee3ec46644eb005b56042ba1e687239dead37b4e592536493e82a74bfd22a99661a3945dfdf79448e9ca450 SHA512 d861666a6188e5bce041f76eedc1c3c18c8f1a185b5481e16f57481d7836f4fd71e9fb04b6f0c58c0cf4f5f77595e7675e2761699efdb2f697ec76cd6d0941f4
diff --git a/dev-ros/rqt_gui_cpp/rqt_gui_cpp-0.5.0-r1.ebuild b/dev-ros/rqt_gui_cpp/rqt_gui_cpp-0.5.0-r1.ebuild
deleted file mode 100644
index cdb3089d9038..000000000000
--- a/dev-ros/rqt_gui_cpp/rqt_gui_cpp-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-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-0.5.2.ebuild b/dev-ros/rqt_gui_cpp/rqt_gui_cpp-0.5.2.ebuild
new file mode 100644
index 000000000000..1ce1bdc8377b
--- /dev/null
+++ b/dev-ros/rqt_gui_cpp/rqt_gui_cpp-0.5.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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
index cdb3089d9038..1ce1bdc8377b 100644
--- a/dev-ros/rqt_gui_cpp/rqt_gui_cpp-9999.ebuild
+++ b/dev-ros/rqt_gui_cpp/rqt_gui_cpp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/rqt"
 KEYWORDS="~amd64"
diff --git a/dev-ros/rqt_gui_py/Manifest b/dev-ros/rqt_gui_py/Manifest
index 1a7a585396b8..b12a7ed24654 100644
--- a/dev-ros/rqt_gui_py/Manifest
+++ b/dev-ros/rqt_gui_py/Manifest
@@ -1,6 +1,4 @@
-DIST rqt-0.3.2.tar.gz 96823 BLAKE2B 65d63ba2adb7d62a2b11bda20a170b3b91c25afea8b13ea658b879d134db391408bd559102a3dae3f9d8469f8c8fddbae13998b39fb58d58cd865b4817afc3c4 SHA512 0a1400b1b18e0e6374fd61801378df83d022687a90b3e0067ec70c490018ed9429b9fd5345caa7bc6236dedec099198457507988aa594d876cc6991a03b33916
-DIST rqt-0.5.0.tar.gz 120992 BLAKE2B 645d53ec7070fc5a40760bedc556328e26a16dea7b2990ad0512bc372cb346d545dbea42689b4c39039f17abc4920d5059e5b9a25ac7b77f8b5e5cc02100c5ac SHA512 5c91fe9bce5a7cb0cdc54b42667488d30c33bd57afd30cc8f2047b91b7aa7b8afd936090bfc76be5dbc8c6497623c1be4340e061503f5a65bc94faaad810597e
-EBUILD rqt_gui_py-0.3.2.ebuild 510 BLAKE2B 4a63c1b9b7b3ea1ac0a2e5d5d0d51bd3dfd0bf50c18b9f52e8e7a03d4b763ad0104746609cd1ca548e25121fd36fafd581de9ecc6bd6dac38e36adbd27ae7f45 SHA512 f818eddeecc8a4ba42b9b74b0c465e72b1c95bdcd7d1a3f5d98342e0498f80f23ce90205aa0d70a7765ad9de6b7eb6d3dfa5de31a2f2c265c2c7f4255812a3a0
-EBUILD rqt_gui_py-0.5.0.ebuild 510 BLAKE2B 4a63c1b9b7b3ea1ac0a2e5d5d0d51bd3dfd0bf50c18b9f52e8e7a03d4b763ad0104746609cd1ca548e25121fd36fafd581de9ecc6bd6dac38e36adbd27ae7f45 SHA512 f818eddeecc8a4ba42b9b74b0c465e72b1c95bdcd7d1a3f5d98342e0498f80f23ce90205aa0d70a7765ad9de6b7eb6d3dfa5de31a2f2c265c2c7f4255812a3a0
-EBUILD rqt_gui_py-9999.ebuild 510 BLAKE2B 4a63c1b9b7b3ea1ac0a2e5d5d0d51bd3dfd0bf50c18b9f52e8e7a03d4b763ad0104746609cd1ca548e25121fd36fafd581de9ecc6bd6dac38e36adbd27ae7f45 SHA512 f818eddeecc8a4ba42b9b74b0c465e72b1c95bdcd7d1a3f5d98342e0498f80f23ce90205aa0d70a7765ad9de6b7eb6d3dfa5de31a2f2c265c2c7f4255812a3a0
+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 335 BLAKE2B 132c01d79a583ad6be876acab7644c890ccd31d44ee3ec46644eb005b56042ba1e687239dead37b4e592536493e82a74bfd22a99661a3945dfdf79448e9ca450 SHA512 d861666a6188e5bce041f76eedc1c3c18c8f1a185b5481e16f57481d7836f4fd71e9fb04b6f0c58c0cf4f5f77595e7675e2761699efdb2f697ec76cd6d0941f4
diff --git a/dev-ros/rqt_gui_py/rqt_gui_py-0.3.2.ebuild b/dev-ros/rqt_gui_py/rqt_gui_py-0.3.2.ebuild
deleted file mode 100644
index 9f317ef2e8cc..000000000000
--- a/dev-ros/rqt_gui_py/rqt_gui_py-0.3.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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	>=dev-ros/rqt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_gui_py/rqt_gui_py-0.5.0.ebuild b/dev-ros/rqt_gui_py/rqt_gui_py-0.5.0.ebuild
deleted file mode 100644
index 9f317ef2e8cc..000000000000
--- a/dev-ros/rqt_gui_py/rqt_gui_py-0.5.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=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	>=dev-ros/rqt_gui-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..d34926edc393
--- /dev/null
+++ b/dev-ros/rqt_gui_py/rqt_gui_py-0.5.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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
index 9f317ef2e8cc..d34926edc393 100644
--- a/dev-ros/rqt_gui_py/rqt_gui_py-9999.ebuild
+++ b/dev-ros/rqt_gui_py/rqt_gui_py-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/rqt"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,8 +15,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	>=dev-ros/rqt_gui-0.3.0[${PYTHON_USEDEP}]
+	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
index 240b338890cf..a5dd505bfa38 100644
--- a/dev-ros/rqt_image_view/Manifest
+++ b/dev-ros/rqt_image_view/Manifest
@@ -1,4 +1,4 @@
 DIST rqt_image_view-0.4.15.tar.gz 14817 BLAKE2B 00c196bac88eb18f039e88e34d9a943a8e5b052f038682297ecf4c1a31bbb3f25b28a252a6034b774186518a33684f82d94fe89ec2cf6a9449aa961dd2b60435 SHA512 347abc44f930ca2a2d72ed9b8a3c825caf23e0643c80a394c8f74b4452d9549bab8ecc91cf5231d8d51b4be345f3c44783a266cd22c0b1197d3376698b849989
-EBUILD rqt_image_view-0.4.15.ebuild 617 BLAKE2B d1a32388fa92eb33d94839ef5b11d4990e58b260ddf148e50f229608c36cade2b30fec986d19134ce7ba4760698c0c7c5bfbf3da6f05a5e6ace72bf81dcbb190 SHA512 11d7f513a4f13d7152b621e509ebe8b540856385cac84c437dff125aa37a124250fb8e40a241f4501c1c272d88f3316d0ac9ae59986865a1dd443780bb1e0efb
-EBUILD rqt_image_view-9999.ebuild 617 BLAKE2B d1a32388fa92eb33d94839ef5b11d4990e58b260ddf148e50f229608c36cade2b30fec986d19134ce7ba4760698c0c7c5bfbf3da6f05a5e6ace72bf81dcbb190 SHA512 11d7f513a4f13d7152b621e509ebe8b540856385cac84c437dff125aa37a124250fb8e40a241f4501c1c272d88f3316d0ac9ae59986865a1dd443780bb1e0efb
+EBUILD rqt_image_view-0.4.15.ebuild 631 BLAKE2B f8e01de0c3e023c5564b5310558dae31143c45b607702988b6c8de59f85ca67de30b602144a995e992a86ab5ef27b5fdec227fe4ede6deb57448f2d7fed433e2 SHA512 301800eb5b1a8e527505269b703593f531ef84fb9ec88ada2c05ed105598dec3345e6bf48c55a32b012f9eea3b6171b016c8e0aa85bb6fd6734c108b98bf9b3f
+EBUILD rqt_image_view-9999.ebuild 631 BLAKE2B f8e01de0c3e023c5564b5310558dae31143c45b607702988b6c8de59f85ca67de30b602144a995e992a86ab5ef27b5fdec227fe4ede6deb57448f2d7fed433e2 SHA512 301800eb5b1a8e527505269b703593f531ef84fb9ec88ada2c05ed105598dec3345e6bf48c55a32b012f9eea3b6171b016c8e0aa85bb6fd6734c108b98bf9b3f
 MISC metadata.xml 346 BLAKE2B a79e94b137d03773101db1b1312e511a6b3d489b49cbf26b3b5e890dc3970ea8425985cb04ad705ed7e0f9bc8c18bf07f5f5aa328b359d37c4ceac3e36516f3a SHA512 dd45aa50e58a93d0f1fb637248f842b21d39547ac94d4e183ad110515fc2f9ac6f325d8f894c6103a5366d791cd8765291f2b9c6ac74761fdc5f83220297013e
diff --git a/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild b/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild
index b6226cbe972d..6ed30f7ba659 100644
--- a/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild
+++ b/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild
@@ -14,10 +14,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
 	media-libs/opencv:=
 	dev-ros/image_transport
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	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
diff --git a/dev-ros/rqt_image_view/rqt_image_view-9999.ebuild b/dev-ros/rqt_image_view/rqt_image_view-9999.ebuild
index b6226cbe972d..6ed30f7ba659 100644
--- a/dev-ros/rqt_image_view/rqt_image_view-9999.ebuild
+++ b/dev-ros/rqt_image_view/rqt_image_view-9999.ebuild
@@ -14,10 +14,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
 	media-libs/opencv:=
 	dev-ros/image_transport
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	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
diff --git a/dev-ros/rqt_launch/Manifest b/dev-ros/rqt_launch/Manifest
index 52bc87b35bd4..af7d01aae742 100644
--- a/dev-ros/rqt_launch/Manifest
+++ b/dev-ros/rqt_launch/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
 DIST rqt_launch-0.4.8.tar.gz 11471 BLAKE2B 8a96bd774449ffd8988bdde6c2be5cde3b69d819c94eb59ed8be4e179839da9b1eaa959174307481dfe438a5a300665ca1154f500c40a6d2546b6e83f163c2cb SHA512 83a40eca2c2282f2e5e397332b5b61b60ac27312b31ad21c21f03243e1b28961d96ba93f4e8c5043e05791c85d1fa88fee461f4b457934fcb68e47a60239cc89
-EBUILD rqt_launch-0.4.7.ebuild 640 BLAKE2B a3667d36c433847296b2888329c4157758534e81d4c29f99581fc6cd65125220537f6e50e2a8e40391868c177ef02c2d1cd8090e068d8dd3db5a45de025faf84 SHA512 fdae6703445a299d115b55b9f1f41fc7091acbcec72843d62cd4ce2b3405895d4614f51562d7ab3e0214ce62687ab8106bdf3a8c869aadb78688936c1605385c
-EBUILD rqt_launch-0.4.8.ebuild 615 BLAKE2B c6e3a99d4e91e706a62b5ba74f73bb921956fbdc3dcf4645ce1efd0910cef6043b32cb2ca198848785f55b5e00b4419748f5335aab1e05879540070fdbc6e59f SHA512 a24af39949bdd265887a2210f52a828153c92266ef2f36c6d43c0af78482d462088ff7c60a9e06669564497f47a67996574f372dea354ef699eda6dc25c8fe15
-EBUILD rqt_launch-9999.ebuild 615 BLAKE2B c6e3a99d4e91e706a62b5ba74f73bb921956fbdc3dcf4645ce1efd0910cef6043b32cb2ca198848785f55b5e00b4419748f5335aab1e05879540070fdbc6e59f SHA512 a24af39949bdd265887a2210f52a828153c92266ef2f36c6d43c0af78482d462088ff7c60a9e06669564497f47a67996574f372dea354ef699eda6dc25c8fe15
+EBUILD rqt_launch-0.4.8.ebuild 633 BLAKE2B f6d805fd8533bd751bfba0fe241bc86f711098ff4705f50c674b09a64734feca3ed152c0ebc00aecf33c37416417ed9f79253379f7a8a88bc3c22457eeb6aaeb SHA512 0f9f7d1e2fa2ca4a097c2961f43b61dec14683306bb08ff41c45c332dc7d4c383a3842f356e27563d9723a92153f69358099dc1318ad026afd33668e181d7a9e
+EBUILD rqt_launch-9999.ebuild 633 BLAKE2B f6d805fd8533bd751bfba0fe241bc86f711098ff4705f50c674b09a64734feca3ed152c0ebc00aecf33c37416417ed9f79253379f7a8a88bc3c22457eeb6aaeb SHA512 0f9f7d1e2fa2ca4a097c2961f43b61dec14683306bb08ff41c45c332dc7d4c383a3842f356e27563d9723a92153f69358099dc1318ad026afd33668e181d7a9e
 MISC metadata.xml 342 BLAKE2B fae2903c0945afe03caecb1c3464346a871500c9e3d117cc4b91fa69cfcc6932e255064b90ce5996b242e56279f862e248b9fc87ccead7c0d3ec163810393bda SHA512 aad741d410634982fb90b906e217598f08f8ca899c8d23cc67c5d955e8c81d1d414c3d7c01b98d0b50b8fac94ac08e089f62b6d27001733f18d50c75e73f94ea
diff --git a/dev-ros/rqt_launch/rqt_launch-0.4.7.ebuild b/dev-ros/rqt_launch/rqt_launch-0.4.7.ebuild
deleted file mode 100644
index 5a46284024dd..000000000000
--- a/dev-ros/rqt_launch/rqt_launch-0.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Easy view of .launch files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_launch/rqt_launch-0.4.8.ebuild b/dev-ros/rqt_launch/rqt_launch-0.4.8.ebuild
index 17b433a783ae..3a4d4bd89d35 100644
--- a/dev-ros/rqt_launch/rqt_launch-0.4.8.ebuild
+++ b/dev-ros/rqt_launch/rqt_launch-0.4.8.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_launch"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	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
index 17b433a783ae..3a4d4bd89d35 100644
--- a/dev-ros/rqt_launch/rqt_launch-9999.ebuild
+++ b/dev-ros/rqt_launch/rqt_launch-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_launch"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslaunch[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	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
index 5afadca739e7..617e3b46629c 100644
--- a/dev-ros/rqt_logger_level/Manifest
+++ b/dev-ros/rqt_logger_level/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_logger_level-0.4.8.tar.gz 5963 BLAKE2B e3c419ce761c6bd841005e728c7866275f9a3e3212d809bc50484902ad0dbcaa79f165a2afe01546d6ecd25110068be90d3a0f2325eb56ef847ea2163a9dbae4 SHA512 e07f1a46ac29697be0b6f6e94c0948670d3c20190be8abd5ea17b9f6bc09ba06c03ef1b12adfeb2e3de6dc55dccc988c8fab48efda390b7194568f374d7353d1
-EBUILD rqt_logger_level-0.4.7.ebuild 622 BLAKE2B e39325eb733c8fc94517ece320d0051eb0f0a888ba4d1d7a589d089f1e5d4ddd3f1c81095cb335cee770142252b42138db97764dd023e1c4f5cd0ad19f5b6b9f SHA512 48c344b0e8e594ba0a8c6d9d3b4e0359c0fe7b8c6c25591cfa9120889c9bb9bbce499496073fdd75611a2e17e89a1be1674e2ff0b21348f969bbbb8b6b3558ad
-EBUILD rqt_logger_level-0.4.8.ebuild 603 BLAKE2B 003f557c615c37227a45c0f8e7c7d5aca5aa42c60637768ce31da54e32638c6f4b7efef5f531ac03aa527ab0d0538f711079406be1461a854123021c79996650 SHA512 b04902489ac8e0c1be8de63468e58472825fadd0830c8d713cebef1280aa911b77802f4dde13ad189f6b7ce08be7e6c957e90cf8b1db48c11eebcf6be065a660
-EBUILD rqt_logger_level-9999.ebuild 603 BLAKE2B 003f557c615c37227a45c0f8e7c7d5aca5aa42c60637768ce31da54e32638c6f4b7efef5f531ac03aa527ab0d0538f711079406be1461a854123021c79996650 SHA512 b04902489ac8e0c1be8de63468e58472825fadd0830c8d713cebef1280aa911b77802f4dde13ad189f6b7ce08be7e6c957e90cf8b1db48c11eebcf6be065a660
+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 348 BLAKE2B 7562bc3abe6bb44c051f96d7847e834adaff167706771457a08c1ff289a7d76cbd538aa2ed08c53cb9c5cfdd167f1950c9830c2021b8c120830dbd97bdac89aa SHA512 edd740d0ff161f4c8a7fe3e2f0da50fd57e083a2a14a6bba13cbf6ee9c6e7280b00045ec70dda10ed136e587c3338912eb802eb5692fdb07d849656fd96c9fe6
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
new file mode 100644
index 000000000000..6c0c5dcb45ec
--- /dev/null
+++ b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.11.ebuild
@@ -0,0 +1,24 @@
+# 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-0.4.7.ebuild b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.7.ebuild
deleted file mode 100644
index c918c3dde571..000000000000
--- a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for configuring the logger level of ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.8.ebuild b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.8.ebuild
deleted file mode 100644
index d22dedfc81a7..000000000000
--- a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_logger_level"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for configuring the logger level of ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_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
index d22dedfc81a7..6c0c5dcb45ec 100644
--- a/dev-ros/rqt_logger_level/rqt_logger_level-9999.ebuild
+++ b/dev-ros/rqt_logger_level/rqt_logger_level-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_logger_level"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,11 +14,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	$(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
index 8ac8f2a85c81..c31b448faaeb 100644
--- a/dev-ros/rqt_moveit/Manifest
+++ b/dev-ros/rqt_moveit/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_moveit-0.5.7.tar.gz 8000 BLAKE2B 699216c0058b6e22930b4bd0459757d420415285ca5900520802889347b0256d3d8eee5f8f3a4bdbbfe45371ec607e7c9d6b3b0e3d82adbfc1d64bff0c5a4c44 SHA512 3103723389aa9ff891d245fbdf1e7eb157973dee25e4ff2530d147bf72385dcec716418db1a32ef0a2bcaf0940cfa36e95334293cc93baa1c6e6c97dabe2e403
-DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 BLAKE2B 68a6643fef3c101ddbc0ae6a66d7fed3ec2fd7bc811947487946084bd6c93e564e11693941ef336b6d5428f926b0c297ccff845056e3f123320fba176ffe00cf SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51
-EBUILD rqt_moveit-0.5.6.ebuild 653 BLAKE2B 78f3fe5797c0a4f338b119304777823e0483d3d3d8132c58778fcd6188083372bbbcf75316a3dde2b608fef7cd047f5031fe32e0b4ea094becc0b9b7b52346ec SHA512 030ea41cdbc4152c57285642c5b0bae4d7d8019aeb7f2cc99383240b36b2d0dc4329d569268617f8d808b882fdae84c33895803dbcba68fa5265e6dea66a143b
-EBUILD rqt_moveit-0.5.7.ebuild 629 BLAKE2B 7be03d50440fb7d1bdc3fcd32f8bf19c73b2191ca8d95869705be8daa290dd7e69041d91d610a3dadeeae5279f6281852f4e51e67ad014583839ae0866bb75cc SHA512 4b3b7762e308a50e5765e592e3cd7f5f6595c0929a608deaa491b3ff3d237d2b10695f815a81eb4f1eec64ec007f16d926b258bd5b2f1beb3aa1eda3772b0240
-EBUILD rqt_moveit-9999.ebuild 629 BLAKE2B 7be03d50440fb7d1bdc3fcd32f8bf19c73b2191ca8d95869705be8daa290dd7e69041d91d610a3dadeeae5279f6281852f4e51e67ad014583839ae0866bb75cc SHA512 4b3b7762e308a50e5765e592e3cd7f5f6595c0929a608deaa491b3ff3d237d2b10695f815a81eb4f1eec64ec007f16d926b258bd5b2f1beb3aa1eda3772b0240
+DIST rqt_moveit-0.5.9.tar.gz 8158 BLAKE2B 088ba6a64e642e3548f84eb48598af73d7ae2589fd3eeed129bbc2b66a120765b43adedde79dff6d5823785f4024b878d361a650d56539ac40eeec5c48cb12ec SHA512 6e177a67eafcfbc9b79c1c3dadfbeda89d5fbeebd9cc5e62da99c324feaf0a4ca77134c295c9d96afdca2d1049bee80a60c08166167b3bd8f3886c86acb4a1c9
+EBUILD rqt_moveit-0.5.9.ebuild 647 BLAKE2B 3605e38bf34f1db0f60da4134561cfc620e1e1b687c26f0eeaf3ae5fde7a49b5797a03c0aec5a321dbf1bcaa7b86485610a6d802ce32b2a556f652215d2a4769 SHA512 a5a65999654c248df2663ff2301e2017bcb097bf3843e6e221f3bc67627096f408c3abe762180af91a6511676ec1af5f78ec733342cc596ae780d2ea64de5c0c
+EBUILD rqt_moveit-9999.ebuild 647 BLAKE2B 3605e38bf34f1db0f60da4134561cfc620e1e1b687c26f0eeaf3ae5fde7a49b5797a03c0aec5a321dbf1bcaa7b86485610a6d802ce32b2a556f652215d2a4769 SHA512 a5a65999654c248df2663ff2301e2017bcb097bf3843e6e221f3bc67627096f408c3abe762180af91a6511676ec1af5f78ec733342cc596ae780d2ea64de5c0c
 MISC metadata.xml 342 BLAKE2B 28be9c5eb5f662b36748125d58ba25402b41595ecbafa8d228e4380ea892d421208fe2055504e2a28f59a946e90c8f98125b9acef1b482424766c16d2759fd47 SHA512 bd0620b319ae70f9b5c2f2269cebed013b18597a28e9b515b37b705daf97357fc8862d289c792fa93cd2b4e5b995db53a4623bd4942951008aea7127964654a9
diff --git a/dev-ros/rqt_moveit/rqt_moveit-0.5.6.ebuild b/dev-ros/rqt_moveit/rqt_moveit-0.5.6.ebuild
deleted file mode 100644
index c879b217a9e9..000000000000
--- a/dev-ros/rqt_moveit/rqt_moveit-0.5.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assists monitoring tasks for MoveIt! motion planner"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_topic[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_moveit/rqt_moveit-0.5.7.ebuild b/dev-ros/rqt_moveit/rqt_moveit-0.5.7.ebuild
deleted file mode 100644
index 11c6884465d0..000000000000
--- a/dev-ros/rqt_moveit/rqt_moveit-0.5.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_moveit"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Assists monitoring tasks for MoveIt! motion planner"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_topic[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_moveit/rqt_moveit-0.5.9.ebuild b/dev-ros/rqt_moveit/rqt_moveit-0.5.9.ebuild
new file mode 100644
index 000000000000..a6a3f9d5a672
--- /dev/null
+++ b/dev-ros/rqt_moveit/rqt_moveit-0.5.9.ebuild
@@ -0,0 +1,25 @@
+# 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_moveit/rqt_moveit-9999.ebuild b/dev-ros/rqt_moveit/rqt_moveit-9999.ebuild
index 11c6884465d0..a6a3f9d5a672 100644
--- a/dev-ros/rqt_moveit/rqt_moveit-9999.ebuild
+++ b/dev-ros/rqt_moveit/rqt_moveit-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_moveit"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_topic[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${PYTHON_USEDEP}]
+	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
index 984c4cd7fedb..3823279a5e79 100644
--- a/dev-ros/rqt_msg/Manifest
+++ b/dev-ros/rqt_msg/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_msg-0.4.8.tar.gz 6806 BLAKE2B de53b4025006ce38324f00afa80c4b437a80f0313b0814e60c8b2edee9695461cc33675e6a8c9aa52cda44eb79f2f7486eb90fe28727113eaf03b0cd3d905063 SHA512 d1598315f8cccdc83059046d0bbbd5fe970e4a2981f08cc9e3841fae12b85ca3f907a1509b024809ebf3834f8a2e40b7ed26ce39b2e1638d120ea5a749dd715e
-EBUILD rqt_msg-0.4.7.ebuild 758 BLAKE2B 2fa5abebc3f358922ba428df28f84b4fefda004ef09dc7d27249a6a2652db6cfbb5497f03a900a79cdd8148ca4a09cd03c18368f817f6282ca3464494213c454 SHA512 571ec91bf002ecbac397ed4e74adf88bd39bc5b90748acd8e841f8a765fcb12f8f95542dc37f66a5b8dad0ca4f419e62aa9f64d870fd9a638e2dbdc2382709ef
-EBUILD rqt_msg-0.4.8.ebuild 730 BLAKE2B 2b5e67a176ebd1b58a8448ae4d526b7113fdd5070808f5018b680dfba8ec935b5ee804f50b2e9b0cf309a3194be4664e7b91841ef4563ac7d95826f72956ff32 SHA512 140dd1afae8e2c6bb831401f89c9dea7bd498fb5fc95594b9f722565ab1af279947a09de685f34e54fc51c02f1e74760eef97c1f20d236fecb1ce9b4ec211bb0
-EBUILD rqt_msg-9999.ebuild 730 BLAKE2B 2b5e67a176ebd1b58a8448ae4d526b7113fdd5070808f5018b680dfba8ec935b5ee804f50b2e9b0cf309a3194be4664e7b91841ef4563ac7d95826f72956ff32 SHA512 140dd1afae8e2c6bb831401f89c9dea7bd498fb5fc95594b9f722565ab1af279947a09de685f34e54fc51c02f1e74760eef97c1f20d236fecb1ce9b4ec211bb0
+DIST rqt_msg-0.4.9.tar.gz 6920 BLAKE2B 5187c050972045401f76546f3e5abc9cfd9fd58d2a42cc0ae317e0f689ca7c3b73ae6f160777510a522670cd03d2553e195157ea51af81c73334c99f705c619c SHA512 a0d36bf30dbd3582d93c3d89d495b4b5aa25d76895b61eed70cc8878ced43e407a72d593e8b38194522d56cbfc2a5622c30179116dcd86de4d3e7b49dc24a9ff
+EBUILD rqt_msg-0.4.9.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
+EBUILD rqt_msg-9999.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
 MISC metadata.xml 339 BLAKE2B acb4a2863a4c506310686a1977f1637d738296860abaa3c3b3be8978e292ed4308fc2b6ced16161320f705b1d38558182861fcd273c8d43ed8472ea58856bf71 SHA512 0b20862cd86ae1fa79707986d39c0f33008fd7848fe9dafb0323dea6ebfa75634fd05befe068b72927d7188448ea2f3471cc0b78fad36a87b895b2b59d5ed726
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.7.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.7.ebuild
deleted file mode 100644
index 4f958e5b9a99..000000000000
--- a/dev-ros/rqt_msg/rqt_msg-0.4.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.8.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.8.ebuild
deleted file mode 100644
index 01361aa919a8..000000000000
--- a/dev-ros/rqt_msg/rqt_msg-0.4.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_msg"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild
new file mode 100644
index 000000000000..d88c80ad96cd
--- /dev/null
+++ b/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild
@@ -0,0 +1,27 @@
+# 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_msg/rqt_msg-9999.ebuild b/dev-ros/rqt_msg/rqt_msg-9999.ebuild
index 01361aa919a8..d88c80ad96cd 100644
--- a/dev-ros/rqt_msg/rqt_msg-9999.ebuild
+++ b/dev-ros/rqt_msg/rqt_msg-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_msg"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,14 +14,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	$(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
index 6d861db7637b..145e1a89f508 100644
--- a/dev-ros/rqt_nav_view/Manifest
+++ b/dev-ros/rqt_nav_view/Manifest
@@ -1,6 +1,4 @@
 DIST rqt_nav_view-0.5.7.tar.gz 7261 BLAKE2B 7da874ab19dfa5d08da04b6cf1a38e7e3528cdcb303d7415654d091cde3858a04c97178bc43a3f7e7357203e69ed08068062d261510075aefabed2d0641b7874 SHA512 a8c4544bc4bd11a7e2d7a60786033c82206c3e4ac822c7d72199af465c7d8488584906906b2a3e124b271171717256c1412697b1ac0dcf02c8c5bcd3faae232e
-DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 BLAKE2B 68a6643fef3c101ddbc0ae6a66d7fed3ec2fd7bc811947487946084bd6c93e564e11693941ef336b6d5428f926b0c297ccff845056e3f123320fba176ffe00cf SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51
-EBUILD rqt_nav_view-0.5.6.ebuild 766 BLAKE2B 956b3aec07887d064377fe714c9e833e81d695b2cf025ce36a6d4f96c43aaedb0653656e6a2e67f8878f51a7361e802c559cc5fe891fe2d608e7b2d52eeaf49f SHA512 864ace62378adb2c41b678c688cde7021c42471e0a563f524248ae0ed008fbae686c771efc8382e796e3e4eae205c58f160b0df9f74f074177420d3566c8232d
-EBUILD rqt_nav_view-0.5.7.ebuild 744 BLAKE2B 0741b772d670088f97df59c4fcc369fa36e7a3e74a8d691456ed34ece1edd8e0c5b9d6a317ab3149e67a966f9f2e8123a1f44921e4e8e36808c2c95c01fbf394 SHA512 8b25e278136788b9eb5b3f64bcfad3e82b705117f706d3db804652b88801748085fddbafbdecbc95869be3ae1d0d7a94ff91209554769fc9855accb464e7bc0e
-EBUILD rqt_nav_view-9999.ebuild 744 BLAKE2B 0741b772d670088f97df59c4fcc369fa36e7a3e74a8d691456ed34ece1edd8e0c5b9d6a317ab3149e67a966f9f2e8123a1f44921e4e8e36808c2c95c01fbf394 SHA512 8b25e278136788b9eb5b3f64bcfad3e82b705117f706d3db804652b88801748085fddbafbdecbc95869be3ae1d0d7a94ff91209554769fc9855accb464e7bc0e
+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 344 BLAKE2B 351ede3f92984dea66815c905946c73d908e0270efdde5728f09bb87b054ceb47c7f07ef741b6fb1d5347ea54683aefbc7735b9a4a14437c75b73e2de0555cd5 SHA512 e91ab6bdeba466c3a406bf5275fbe01ccd3b6301cb98c6e7f057a5068514e8629ce24957e1af0994ab8b4729b67012847d7be3c6bee695e04bd9250300536720
diff --git a/dev-ros/rqt_nav_view/rqt_nav_view-0.5.6.ebuild b/dev-ros/rqt_nav_view/rqt_nav_view-0.5.6.ebuild
deleted file mode 100644
index 910922082d50..000000000000
--- a/dev-ros/rqt_nav_view/rqt_nav_view-0.5.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-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_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
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
index 3d2eb643f259..3056a083f3d7 100644
--- 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
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_nav_view"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,12 +16,12 @@ IUSE=""
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/tf[${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
index 3d2eb643f259..3056a083f3d7 100644
--- a/dev-ros/rqt_nav_view/rqt_nav_view-9999.ebuild
+++ b/dev-ros/rqt_nav_view/rqt_nav_view-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_nav_view"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,12 +16,12 @@ IUSE=""
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/tf[${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
index 2b911db7dc31..94445d999e42 100644
--- a/dev-ros/rqt_plot/Manifest
+++ b/dev-ros/rqt_plot/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_plot-0.4.8.tar.gz 19153 BLAKE2B 300ab2d7b27dddcad1403bd10aae46406b95aa00f80ac55bd479241deeef746720db5f03dc62957500774ddaa97379902441363c8e590d34c032a25f8d6ebbf9 SHA512 c06a5c0990ee071c20f278c44456404b9f9b7e211b16aa5d670ccffcbf6cd69f24d2c30e930c99c97b4288b996138a73243f877656dcfcf960c4684df3deaf5d
-EBUILD rqt_plot-0.4.8.ebuild 897 BLAKE2B 5e65e7f437cb9e918469d723cc4ac270cacb88c487ca85890d31848043f81ec2650e48d9540af6d93416eb6acd6b5f67d2b2fa251b192b2ef22c6692c5f8d507 SHA512 32ab396cd10f1ff962967e04f3d78de91c8cc335bf2b53fccc8459cc3bb47da24e91e9ec168de2a35c74c778f80f024627bd70d61265f07082f22b81bcd7ec4e
-EBUILD rqt_plot-9999.ebuild 897 BLAKE2B 5e65e7f437cb9e918469d723cc4ac270cacb88c487ca85890d31848043f81ec2650e48d9540af6d93416eb6acd6b5f67d2b2fa251b192b2ef22c6692c5f8d507 SHA512 32ab396cd10f1ff962967e04f3d78de91c8cc335bf2b53fccc8459cc3bb47da24e91e9ec168de2a35c74c778f80f024627bd70d61265f07082f22b81bcd7ec4e
+DIST rqt_plot-0.4.12.tar.gz 19862 BLAKE2B b98e9d3c5862674997e6e6792332beae945a798eadb8ca0fd5b9d105fa04e6fe9a36033d48535d1918b5f3ab6d40cc5c3e0babae7e55079f013f4acd998dbdbc SHA512 adb20495b1c7402fda5685afe300d25ea7117fbe540025588c0fc30bf5791f408286a8ba9101dafd97d88a11e5561cd0f1b8c35e868bf979b6c5833b3c9f85e6
+EBUILD rqt_plot-0.4.12.ebuild 1026 BLAKE2B 147f73f1513eb2b0fb0277838264cae156c1f50e13ec4576632b8096bd30f1a4c6f366cb125cba80e91615077b2ca405a17438e6af931dfeef933d32a458dc5b SHA512 471f7cd60e7af6a9c2b6eff17c59ddb88ad99aabff2fcba46a8c567f2aadfe91e480467168248dda80688f2a366e0eec14f945b140d8be1b179de664c2cfb357
+EBUILD rqt_plot-9999.ebuild 1026 BLAKE2B 147f73f1513eb2b0fb0277838264cae156c1f50e13ec4576632b8096bd30f1a4c6f366cb125cba80e91615077b2ca405a17438e6af931dfeef933d32a458dc5b SHA512 471f7cd60e7af6a9c2b6eff17c59ddb88ad99aabff2fcba46a8c567f2aadfe91e480467168248dda80688f2a366e0eec14f945b140d8be1b179de664c2cfb357
 MISC metadata.xml 340 BLAKE2B ee1e844a5600f4b8d81b5fcba490547da1428d73df295887987360255cce0c90530dd36f6d6cc3b49c7348e1c8f59196c8d812f18b211aa0ae1afc6437058c99 SHA512 50ba9ca4bdbaea86622fdf825491641172ee07f413fed602f8aad0f5f8e3b0dcfdbb88100863a53b9d550dd9d3b038462873b06b8a3012280a57ffe3b35e3421
diff --git a/dev-ros/rqt_plot/rqt_plot-0.4.12.ebuild b/dev-ros/rqt_plot/rqt_plot-0.4.12.ebuild
new file mode 100644
index 000000000000..84ec25dcda92
--- /dev/null
+++ b/dev-ros/rqt_plot/rqt_plot-0.4.12.ebuild
@@ -0,0 +1,31 @@
+# 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_plot/rqt_plot-0.4.8.ebuild b/dev-ros/rqt_plot/rqt_plot-0.4.8.ebuild
deleted file mode 100644
index 845689ab2731..000000000000
--- a/dev-ros/rqt_plot/rqt_plot-0.4.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_plot"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin visualizing numeric values in a 2D plot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pyqtgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_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
index 845689ab2731..84ec25dcda92 100644
--- a/dev-ros/rqt_plot/rqt_plot-9999.ebuild
+++ b/dev-ros/rqt_plot/rqt_plot-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_plot"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,18 +14,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pyqtgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	$(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
index b444ba8662c1..8a95c2d140c6 100644
--- a/dev-ros/rqt_pose_view/Manifest
+++ b/dev-ros/rqt_pose_view/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_pose_view-0.5.8.tar.gz 8299 BLAKE2B 6e8207b9d424c86871c274844251bafbfbb09789ce074cdd1d0e9b2c40361c473fdc2c3536b064eb06d6445f4eecba3aa1f380fe7f358a2eb68a1c2f7d385f70 SHA512 a3a53989c4fe73e6dfebea7e2f01fcd807faa0f011f452208ddb3df1be84939e7b1e26430a098f8b3a6554b781c9b0bf962ed0d115932dae5bc144225926f50b
-EBUILD rqt_pose_view-0.5.8.ebuild 754 BLAKE2B 758cc1afac80721aa8c3695c850ab4484403c1b53a0879a5ac57faf26fd9cf516758a26ad8567770eba4e2b3f80da44fb4ce7a8cc5c1e216677c004c0a60733f SHA512 f3729c92e30107e8574e10b6c02720221b2f30646bf1ef367b8a480320df849cb17bf3f72052ebe0719167eb5d17e5a38cea5d3ffb9eaf3c351e3a9d4290759b
-EBUILD rqt_pose_view-9999.ebuild 754 BLAKE2B 758cc1afac80721aa8c3695c850ab4484403c1b53a0879a5ac57faf26fd9cf516758a26ad8567770eba4e2b3f80da44fb4ce7a8cc5c1e216677c004c0a60733f SHA512 f3729c92e30107e8574e10b6c02720221b2f30646bf1ef367b8a480320df849cb17bf3f72052ebe0719167eb5d17e5a38cea5d3ffb9eaf3c351e3a9d4290759b
+DIST rqt_pose_view-0.5.10.tar.gz 8508 BLAKE2B 39436926caa82a6ffd15161429081f2c101da802b802ebf798b3e474d0b977dce58d0ed00da87674ad1c2dfbab1c0e58a49b83b1c93163b1dc6c731c7fb4de19 SHA512 53874a7782ba8338accda84643a8103d23de24b175a6ec373ac7cbbbc3f158c08dc07ad8d82755a06da80740f3354759c076e082bfef081fc5d403c16e420ced
+EBUILD rqt_pose_view-0.5.10.ebuild 824 BLAKE2B 44c14e4297f6ddf62fbb9f0f0d4d8a64a02ac6f8538d5bfd2a8392a14539a8d58efc919b49ab8a784d20f96868fd3308145c051144e277845fa447cabf85d9a8 SHA512 5a6285018588f9d7d52f4524d9b537f3e48b08eb0c1f991a10b638708f270166da3137a1e81d39ec5b46644484e0c0a4945f04d52a657f0b170c6362ac0719de
+EBUILD rqt_pose_view-9999.ebuild 824 BLAKE2B 44c14e4297f6ddf62fbb9f0f0d4d8a64a02ac6f8538d5bfd2a8392a14539a8d58efc919b49ab8a784d20f96868fd3308145c051144e277845fa447cabf85d9a8 SHA512 5a6285018588f9d7d52f4524d9b537f3e48b08eb0c1f991a10b638708f270166da3137a1e81d39ec5b46644484e0c0a4945f04d52a657f0b170c6362ac0719de
 MISC metadata.xml 345 BLAKE2B 0e6b4a4d3b8d1ff17491fe1cd16adb738771381f2e6d1279f68cc826f0931575864a63e6d2fa36af6a3897016125bce96df83ed43f5ef11df47cb955c0667ba0 SHA512 774daed773f2070d016eb616daa80e65f300c69ab1d436edf5aab5cc256f7e2ebdadf66a3c0fc5571ddb3dc496fd7353eed9dbf85cae48ae4f468dd4be95f22d
diff --git a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.10.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.10.ebuild
new file mode 100644
index 000000000000..903a748d5bfa
--- /dev/null
+++ b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.10.ebuild
@@ -0,0 +1,28 @@
+# 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_pose_view/rqt_pose_view-0.5.8.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.8.ebuild
deleted file mode 100644
index f4b93343f49c..000000000000
--- a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_pose_view"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing 3D poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_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
index f4b93343f49c..903a748d5bfa 100644
--- a/dev-ros/rqt_pose_view/rqt_pose_view-9999.ebuild
+++ b/dev-ros/rqt_pose_view/rqt_pose_view-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_pose_view"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,14 +15,14 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${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
index 237f3713e92e..6ebd675251d6 100644
--- a/dev-ros/rqt_publisher/Manifest
+++ b/dev-ros/rqt_publisher/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_publisher-0.4.8.tar.gz 10391 BLAKE2B 558aef7e411dcf500fe3bf1a76985dd63c9f4b1936dd878fad22a61aab03206a10325f81329cfba24105cd041e28b389da009ceabd559c55b68e6b4411c8aae1 SHA512 87a325c9599b68171f5e014524946ab0a311872035c8b23a7234f17854d7e7f91916a6db856331b5e9958d098197b55a2e799a5b0d232bb32dd420acd070421e
-EBUILD rqt_publisher-0.4.7.ebuild 747 BLAKE2B 136e5d7efce4fcca79a1c629628cf1bb845f96b7d2b1c651b52db77a895792ee9510c08a9b982bc163b2306baef4bbfd697d598a3de74e5fc93fcaa59a4353bb SHA512 e33938c765d1562a8ab2fed03b941e43c25e0015fd7ffcd7c393d09188f3fb82fa874fee0bfd661d2a687f9c0fc1a101538780b2408976e0b4692e1f989cdf85
-EBUILD rqt_publisher-0.4.8.ebuild 725 BLAKE2B 43e0ed68f81ad401bb1455e040809f3363bd68dbd4389594492c23b93fe7df3d76b712282b890d650453496209b07124a933bcbe0cf42c15e3f0bc0f3b904450 SHA512 a5e9edd38ed24ce1fa4d33409ab881451c372daeb110b104ea25d8709d919b4677f38b1152e7ed5e3cb2233ef6046787a6d7aca08a4e4a23a5d1d2ad7b371072
-EBUILD rqt_publisher-9999.ebuild 725 BLAKE2B 43e0ed68f81ad401bb1455e040809f3363bd68dbd4389594492c23b93fe7df3d76b712282b890d650453496209b07124a933bcbe0cf42c15e3f0bc0f3b904450 SHA512 a5e9edd38ed24ce1fa4d33409ab881451c372daeb110b104ea25d8709d919b4677f38b1152e7ed5e3cb2233ef6046787a6d7aca08a4e4a23a5d1d2ad7b371072
+DIST rqt_publisher-0.4.9.tar.gz 10662 BLAKE2B aa5911433152237e1a0c11b382ca825bee1f4309fccd9b674f0ca7a24215fa94515bbae3c29afad5ce9f8b0f0afc254e92b36cfccd0687980562771e73a3a4d2 SHA512 5828edebe19bbb0e771628ba53e73d5c6a2c58d7b54cd278c956bb926f51e17662d2bbb4d4000aa85140ee33612917a8e3f95a203dd97c1abba6d0f495000adb
+EBUILD rqt_publisher-0.4.9.ebuild 769 BLAKE2B 9486a720d528505fce4ccca7d4a09760c184783edaababc513b42503da39993da9e8ba80a5abfb8e33c4007ae4706a92a47c4a94a2d561c8d313e43b16b76b89 SHA512 d21e0a36a12e3549d96529a78023546da818ee460a5b786f4a07f8da5e88f24fbef3f38965aab5c2a5729ab56503d265df6b51562f1842ee6eae514b04e06b22
+EBUILD rqt_publisher-9999.ebuild 769 BLAKE2B 9486a720d528505fce4ccca7d4a09760c184783edaababc513b42503da39993da9e8ba80a5abfb8e33c4007ae4706a92a47c4a94a2d561c8d313e43b16b76b89 SHA512 d21e0a36a12e3549d96529a78023546da818ee460a5b786f4a07f8da5e88f24fbef3f38965aab5c2a5729ab56503d265df6b51562f1842ee6eae514b04e06b22
 MISC metadata.xml 345 BLAKE2B 64fc91bbd538f31ef418ae121fafc1ce9cb7cf8f5372883954025473563996800c4ebb5a04126ad897eab0f3393a477eac23d58fe1a702c915b6354c67f47e0f SHA512 8483076bb71220bf91931889a48412b23865e964fbf05182b726e498add7bfddfab59c2cf56161ad39af79628bfbb69be25e18a2aa7535b97bfbdada7dd21cb6
diff --git a/dev-ros/rqt_publisher/rqt_publisher-0.4.7.ebuild b/dev-ros/rqt_publisher/rqt_publisher-0.4.7.ebuild
deleted file mode 100644
index c205c17bfb7c..000000000000
--- a/dev-ros/rqt_publisher/rqt_publisher-0.4.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for publishing arbitrary messages with fixed or computed field values"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_publisher/rqt_publisher-0.4.8.ebuild b/dev-ros/rqt_publisher/rqt_publisher-0.4.8.ebuild
deleted file mode 100644
index b4dc8d08ed02..000000000000
--- a/dev-ros/rqt_publisher/rqt_publisher-0.4.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_publisher"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for publishing arbitrary messages with fixed or computed field values"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_publisher/rqt_publisher-0.4.9.ebuild b/dev-ros/rqt_publisher/rqt_publisher-0.4.9.ebuild
new file mode 100644
index 000000000000..5320800e2fde
--- /dev/null
+++ b/dev-ros/rqt_publisher/rqt_publisher-0.4.9.ebuild
@@ -0,0 +1,26 @@
+# 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_publisher/rqt_publisher-9999.ebuild b/dev-ros/rqt_publisher/rqt_publisher-9999.ebuild
index b4dc8d08ed02..5320800e2fde 100644
--- a/dev-ros/rqt_publisher/rqt_publisher-9999.ebuild
+++ b/dev-ros/rqt_publisher/rqt_publisher-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_publisher"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,13 +14,13 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	$(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
index 9cc565a49dca..11da6ca7664e 100644
--- a/dev-ros/rqt_py_common/Manifest
+++ b/dev-ros/rqt_py_common/Manifest
@@ -1,6 +1,4 @@
-DIST rqt-0.5.0.tar.gz 120992 BLAKE2B 645d53ec7070fc5a40760bedc556328e26a16dea7b2990ad0512bc372cb346d545dbea42689b4c39039f17abc4920d5059e5b9a25ac7b77f8b5e5cc02100c5ac SHA512 5c91fe9bce5a7cb0cdc54b42667488d30c33bd57afd30cc8f2047b91b7aa7b8afd936090bfc76be5dbc8c6497623c1be4340e061503f5a65bc94faaad810597e
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-EBUILD rqt_py_common-0.4.7.ebuild 628 BLAKE2B 62a01fbe0f63a31efc91153b13ec583a518b10e4cfd8d94c25d4d75606e0736947c705255978b27274b4cab0fc581e3f6efd482618843cea2fc329aece671ac5 SHA512 dca103c5244abd9bb1cbeb79acccd4d5a65dcc1469f2c98724b52b2857f08dc44420c591c3b6d8fcec2ddbd06f289159760b7da89b3e70f073a31fadf79ab8b4
-EBUILD rqt_py_common-0.5.0.ebuild 613 BLAKE2B d2b87a923203a15f78aaeedcac770b298da4fdb6e2ef0e29c929f909ef5b540b7384b778cded7bdb08475f59b13db42163967272952b36b840998a204a50248a SHA512 ff8f377586d9cf7a14bd0a3224479c37713c303f0487de830822bba29c6b74763e685c4dd1390a6d6105c3f78a7174b889522d6b629a890130e18f347a360299
-EBUILD rqt_py_common-9999.ebuild 613 BLAKE2B d2b87a923203a15f78aaeedcac770b298da4fdb6e2ef0e29c929f909ef5b540b7384b778cded7bdb08475f59b13db42163967272952b36b840998a204a50248a SHA512 ff8f377586d9cf7a14bd0a3224479c37713c303f0487de830822bba29c6b74763e685c4dd1390a6d6105c3f78a7174b889522d6b629a890130e18f347a360299
+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 335 BLAKE2B 132c01d79a583ad6be876acab7644c890ccd31d44ee3ec46644eb005b56042ba1e687239dead37b4e592536493e82a74bfd22a99661a3945dfdf79448e9ca450 SHA512 d861666a6188e5bce041f76eedc1c3c18c8f1a185b5481e16f57481d7836f4fd71e9fb04b6f0c58c0cf4f5f77595e7675e2761699efdb2f697ec76cd6d0941f4
diff --git a/dev-ros/rqt_py_common/rqt_py_common-0.4.7.ebuild b/dev-ros/rqt_py_common/rqt_py_common-0.4.7.ebuild
deleted file mode 100644
index e027b886f6d8..000000000000
--- a/dev-ros/rqt_py_common/rqt_py_common-0.4.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for rqt plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_common/rqt_py_common-0.5.0.ebuild b/dev-ros/rqt_py_common/rqt_py_common-0.5.0.ebuild
deleted file mode 100644
index bb0ac4b8ba23..000000000000
--- a/dev-ros/rqt_py_common/rqt_py_common-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for rqt plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..7f032e6025de
--- /dev/null
+++ b/dev-ros/rqt_py_common/rqt_py_common-0.5.2.ebuild
@@ -0,0 +1,31 @@
+# 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
index bb0ac4b8ba23..7f032e6025de 100644
--- a/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild
+++ b/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
+# Tests have messages
+CATKIN_HAS_MESSAGES=yes
 
 inherit ros-catkin
 
@@ -16,11 +17,15 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	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}]
+	)
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_console/Manifest b/dev-ros/rqt_py_console/Manifest
index eaa669b36eb6..908bad822652 100644
--- a/dev-ros/rqt_py_console/Manifest
+++ b/dev-ros/rqt_py_console/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_py_console-0.4.8.tar.gz 5370 BLAKE2B 8538fed59cbf23454ba2aefe0e0293c39023b312dd1d42d86c3e83bb8f63110e95a596cf1e7fc162d6b9feed9fa360f628e5a60fd7bcb09d88a43f915c7c25e6 SHA512 8b041648778a7bfb6407d7cc6600a94013ebaf87b072688de308564f1a11f7fcf93e1c0f3b9f67f1d4eef981a455d5fb4e0a694852a914335e640ba421835ab4
-EBUILD rqt_py_console-0.4.7.ebuild 628 BLAKE2B 82d486f806ebb28816de20b66715cf5e1ee75f0f13a254138d99ad7492c4fbf23ca00f3eefb7d993b2b3bb5fcb56a6164d70257db5027818811154c59998b269 SHA512 0f33f3052402c40b74fbd4a496fc4825fb7d45500e34c9cde4f1cd561389c5597b508faea93edc70b103b05ca4075694fabaf6f0e3b0a0b94fa82e0512ae834b
-EBUILD rqt_py_console-0.4.8.ebuild 607 BLAKE2B dad2f4fd3a1a34c946c258910bffdf4b07f352cd33fdc75755f222178ca321ab590fe3e5b4b65f8a5f67d4ba38ffb9db825950a20c4f4f4c754de674aa674bbc SHA512 ce7ab977fd54f1795c238a4918abc21c4635ff9c7270384bd1cf57589e1e207210bbe55ca31096dab509960218da1f7d947f29024ecfa3495bc84af259ec7254
-EBUILD rqt_py_console-9999.ebuild 607 BLAKE2B dad2f4fd3a1a34c946c258910bffdf4b07f352cd33fdc75755f222178ca321ab590fe3e5b4b65f8a5f67d4ba38ffb9db825950a20c4f4f4c754de674aa674bbc SHA512 ce7ab977fd54f1795c238a4918abc21c4635ff9c7270384bd1cf57589e1e207210bbe55ca31096dab509960218da1f7d947f29024ecfa3495bc84af259ec7254
+DIST rqt_py_console-0.4.9.tar.gz 5523 BLAKE2B 6cd717e2311a913179eb3257d504494f9aa03d91a3f5416c3df80c43299aaee9ddb044692331f4b5317a16d8fd9900087b729bfd40cd01d8584d4e6163c0d2e7 SHA512 74f66797752c863f1204548fee0dec5e83a1e168c5e0063b7d7e56a4fe543d4c9f1f559accecea42a4e0390c74c13c11056867d361616c4beb962fe5abb75a11
+EBUILD rqt_py_console-0.4.9.ebuild 637 BLAKE2B 77e4ed1b48ae9073f7980c96aab255ce931e919de2dfe9684944f7efddd652f1f5bce83ea12c967721d2bfffe3a6738295a1bcf607de64d69334c2e4730659ab SHA512 61cf5bcf9f4607fd28537972825503f53f3497a0d3def0ce9c46fe030c99c613a18eaeaa0dc9f341673b0a2119675bbf65ce3202e92c674c7110ffd74a830d54
+EBUILD rqt_py_console-9999.ebuild 637 BLAKE2B 77e4ed1b48ae9073f7980c96aab255ce931e919de2dfe9684944f7efddd652f1f5bce83ea12c967721d2bfffe3a6738295a1bcf607de64d69334c2e4730659ab SHA512 61cf5bcf9f4607fd28537972825503f53f3497a0d3def0ce9c46fe030c99c613a18eaeaa0dc9f341673b0a2119675bbf65ce3202e92c674c7110ffd74a830d54
 MISC metadata.xml 346 BLAKE2B b161c9a69ca70a509d52e7944fd08411f14a1cd414e7e7b2f8c33e73a32a60c6256251e6f3f7400e450ed454f9f4c36e9f189d81fae535c106df178f7bbfb8ea SHA512 a49aa6af8d730d2eb71df70b58570704a8f9b0b800c44b02e695732b2e318818c073973664882986b23b743b7fe039e9dd30d3b43e918b7ba4732114c69c4bfa
diff --git a/dev-ros/rqt_py_console/rqt_py_console-0.4.7.ebuild b/dev-ros/rqt_py_console/rqt_py_console-0.4.7.ebuild
deleted file mode 100644
index 3b828779aa24..000000000000
--- a/dev-ros/rqt_py_console/rqt_py_console-0.4.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin providing an interactive Python console"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_console/rqt_py_console-0.4.8.ebuild b/dev-ros/rqt_py_console/rqt_py_console-0.4.8.ebuild
deleted file mode 100644
index aa8cb2ad8c01..000000000000
--- a/dev-ros/rqt_py_console/rqt_py_console-0.4.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_py_console"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin providing an interactive Python console"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_console/rqt_py_console-0.4.9.ebuild b/dev-ros/rqt_py_console/rqt_py_console-0.4.9.ebuild
new file mode 100644
index 000000000000..46f53c8850d9
--- /dev/null
+++ b/dev-ros/rqt_py_console/rqt_py_console-0.4.9.ebuild
@@ -0,0 +1,24 @@
+# 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_py_console/rqt_py_console-9999.ebuild b/dev-ros/rqt_py_console/rqt_py_console-9999.ebuild
index aa8cb2ad8c01..46f53c8850d9 100644
--- a/dev-ros/rqt_py_console/rqt_py_console-9999.ebuild
+++ b/dev-ros/rqt_py_console/rqt_py_console-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_py_console"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,11 +14,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_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}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_reconfigure/Manifest b/dev-ros/rqt_reconfigure/Manifest
index 34d55ebfafb6..88ffa83f39dc 100644
--- a/dev-ros/rqt_reconfigure/Manifest
+++ b/dev-ros/rqt_reconfigure/Manifest
@@ -1,8 +1,4 @@
-DIST rqt_reconfigure-0.4.10.tar.gz 28210 BLAKE2B d37984dcd896532b8bca53d01012d19a33f1715e398c531d4e7ddb70011aac2372011f3304350a6f57fc8b4fd6568507ca5fa329f86bb99b9f8fdcb903b7e4ea SHA512 9f40fdde439b070e21d8c0e636c1f2b5499f8f77f4ee4bfe6a373fca85f42adf5e34d096a8d9f5642d0b987dae9c182719cb93468a785bdf43c9cd82abe882c2
-DIST rqt_reconfigure-0.4.8.tar.gz 27937 BLAKE2B c18d7bd646ebd6c19f2c8eb14093f9761b3e4dcfbd0f3989e7e45e230cfb40b402bc87016bd877433357d00ca03deb13ecee502a41332b79da0367faa4f4d7f8 SHA512 0ed02c9429974cfb598371923440dfa3b2ea00018898bb404f0301d1573d6162f61c7628edbf2b9517a9104d8dfbc63f31257a58ad3abf859165231159f794d2
-DIST rqt_reconfigure-0.4.9.tar.gz 28120 BLAKE2B 91064b3a07d80c0d51178dbab882319326a03a00d648f14a6b160b008075bb59bc32c3f47e0ec1650b27ea1fe53e0bc92197d3dd7baf2bda5fcf75b77c3d5665 SHA512 20898a74d4b43442ab15890bdef8ccc62129fa2786d7c99515120eea90175a318ffaf75986b5b5b1ae5664548461a636ba15577b9a94084826272a4411162ac3
-EBUILD rqt_reconfigure-0.4.10.ebuild 655 BLAKE2B 3aa0450116f59085150a4d24c882e1c0939a97139f5620dc23aa024fb850182cf3875ba212edb7d3d5afd4308e1dab450886dbb821fe03c33d21c8f0fe7a95cd SHA512 e583f30d38fb8a5d972c83e93bf6146ad5e55824b55367c89732394c9ed433f10ea239bd2f0a3538fcf4c8dbf189deff6c9a06d0685085ee5c86bc524e81a4da
-EBUILD rqt_reconfigure-0.4.8.ebuild 655 BLAKE2B 40c952636cce4b3143957b73c3aa4de285d9cb17c072769e2ff618756b61ec10d44c3a68eb686539710944a9ddea996e9b92e2d5482ac7ea694906f45465038b SHA512 ae8663b9615445394b265dcbd5e1212273568b467230594b3e7a041509b3544d9bfb0f1d441aefb2aa88273a9e5baeacfa1e7763d6dbd58e35f72f53b3f82740
-EBUILD rqt_reconfigure-0.4.9.ebuild 655 BLAKE2B 3aa0450116f59085150a4d24c882e1c0939a97139f5620dc23aa024fb850182cf3875ba212edb7d3d5afd4308e1dab450886dbb821fe03c33d21c8f0fe7a95cd SHA512 e583f30d38fb8a5d972c83e93bf6146ad5e55824b55367c89732394c9ed433f10ea239bd2f0a3538fcf4c8dbf189deff6c9a06d0685085ee5c86bc524e81a4da
-EBUILD rqt_reconfigure-9999.ebuild 655 BLAKE2B 40c952636cce4b3143957b73c3aa4de285d9cb17c072769e2ff618756b61ec10d44c3a68eb686539710944a9ddea996e9b92e2d5482ac7ea694906f45465038b SHA512 ae8663b9615445394b265dcbd5e1212273568b467230594b3e7a041509b3544d9bfb0f1d441aefb2aa88273a9e5baeacfa1e7763d6dbd58e35f72f53b3f82740
+DIST rqt_reconfigure-0.5.3.tar.gz 31439 BLAKE2B 2af1c2e0fd4c8b57ff0af077bc112198fd9454a11e715492c6ab38c1b3a52833d8257f9a64ebc4ed9e030c09b6154c312969844b3e6200f7a28047a4e1bd03c9 SHA512 c8986dde4094e62b29f0f8699af2ca7cd2b477f34c6e65ae5943162a5d3de7b06a4cc93bdfacfc44f3ea9b750e415cf77f1d5d11c9307bcc13f636378d0a3fc8
+EBUILD rqt_reconfigure-0.5.3.ebuild 703 BLAKE2B a80dc16b6871ed704ecca22a56d6da58f9948b267abf494dbfb5e36d71fe8b610988636885b68efa165b60138be91f8b5cc19020abbfeb581e57bd6d0d119f71 SHA512 c65ffd1692ea623654cba5060d002dfce52f784c01644dd76847a92fc2fba5e990c7c283efa64d643f7d4917fd93f135c3123125051c7b60bd3f598046e3f728
+EBUILD rqt_reconfigure-9999.ebuild 703 BLAKE2B a80dc16b6871ed704ecca22a56d6da58f9948b267abf494dbfb5e36d71fe8b610988636885b68efa165b60138be91f8b5cc19020abbfeb581e57bd6d0d119f71 SHA512 c65ffd1692ea623654cba5060d002dfce52f784c01644dd76847a92fc2fba5e990c7c283efa64d643f7d4917fd93f135c3123125051c7b60bd3f598046e3f728
 MISC metadata.xml 347 BLAKE2B 1ff3265b37380e28dd01d7f2ff2c6f2e373717f608c586e88fb7a6a4827d8a345e7181017ba7b2e03b6e1ca5b97960bbcb3a0f38c583510e3ca4ec96988ff2d0 SHA512 bc289c092d712b968ff74ac6e7d92545892a158442b31aba95afd99224a34c993c86e1a65bdbc0043381ee01f051309d35cd216f6316073f81b186dabaedb5ea
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.10.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.10.ebuild
deleted file mode 100644
index 00637e917afc..000000000000
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.8.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.8.ebuild
deleted file mode 100644
index 990d0892323d..000000000000
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.9.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.9.ebuild
deleted file mode 100644
index 00637e917afc..000000000000
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.3.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.3.ebuild
new file mode 100644
index 000000000000..475a03749044
--- /dev/null
+++ b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.3.ebuild
@@ -0,0 +1,28 @@
+# 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_reconfigure"
+
+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}
+	test? (
+		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
index 990d0892323d..475a03749044 100644
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild
+++ b/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure"
+DESCRIPTION="Provides the way to view and edit the parameters from dynamic_reconfigure"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	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}
+	test? (
+		dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]
+	)
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_dashboard/Manifest b/dev-ros/rqt_robot_dashboard/Manifest
index fc30c9d1ed3f..d2284251772d 100644
--- a/dev-ros/rqt_robot_dashboard/Manifest
+++ b/dev-ros/rqt_robot_dashboard/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_robot_dashboard-0.5.7.tar.gz 2050284 BLAKE2B 6dd5b3126296e057f7a190da07dfcadd4a84cb6d67c300f29b9932c593a370caad64586ca3d68a63556ba7258efeaa1932c02da91243688f90eaf49c4e401711 SHA512 59251f0e0935ef4c38ce41a162cffac1c5b8fd6cf24a01144a6d4001c6ef353b0b0c15dc50f0e83e0b80dfba64f2ec4f92c079e6804d18cbb37713af6ba1ed51
-DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 BLAKE2B 68a6643fef3c101ddbc0ae6a66d7fed3ec2fd7bc811947487946084bd6c93e564e11693941ef336b6d5428f926b0c297ccff845056e3f123320fba176ffe00cf SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51
-EBUILD rqt_robot_dashboard-0.5.6.ebuild 775 BLAKE2B 48b551ce07eee1f26b925d48ba75ae13cfa24856c38f00659a70b100c96b8060238e70415a3d51a02f930d521a10428efa71679d70340676007d47bc5c8d85e9 SHA512 be0302adb770e8e52db9914f28779b432bb9d9ac7345148ebd036dedf0f7a585a347c68c76896384e9a54b75402cc847ce6979df4773b74f9c42638130d3f98c
-EBUILD rqt_robot_dashboard-0.5.7.ebuild 760 BLAKE2B 9d43598f87bc1c1c867a4fd65c47b48f9db96db4787e065123515df5bfb228b96e18b7a38afb7a9713bfb13f462ab2cf404804d90b4ffdf321849ec8df2c12bb SHA512 bce974588b790eee0f37ee7f7ab6586870c6847566fc74d710e19a6f8ccc21249cc63aad32e6d05209d26f01f000a59c7131f17c9d5c353b0cb6aa80a6c453c1
-EBUILD rqt_robot_dashboard-9999.ebuild 760 BLAKE2B 9d43598f87bc1c1c867a4fd65c47b48f9db96db4787e065123515df5bfb228b96e18b7a38afb7a9713bfb13f462ab2cf404804d90b4ffdf321849ec8df2c12bb SHA512 bce974588b790eee0f37ee7f7ab6586870c6847566fc74d710e19a6f8ccc21249cc63aad32e6d05209d26f01f000a59c7131f17c9d5c353b0cb6aa80a6c453c1
+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 351 BLAKE2B 8a8170ae539c04f712d6b410375fefd4847a276c0efaa6389d07033f87551519413aba497dd5d32f316604093b8c1168ed622eb12bf4d0070dcc68ee6ba37c06 SHA512 736575e5562aba19ae1cff1fbbf4e3c70de09cbc1aa4e6086f289eb54dda83bfa43636414a86dc191dc72e98e2f7fcf817545a9e18ddc82065169f93ab906917
diff --git a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.6.ebuild b/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.6.ebuild
deleted file mode 100644
index 8848ec027eee..000000000000
--- a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-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_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_nav_view[${PYTHON_USEDEP}]
-	dev-ros/rqt_robot_monitor[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.7.ebuild b/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.7.ebuild
deleted file mode 100644
index 3b129005e878..000000000000
--- a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_dashboard"
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_nav_view[${PYTHON_USEDEP}]
-	dev-ros/rqt_robot_monitor[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..0ecc74fb3c1e
--- /dev/null
+++ b/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-0.5.8.ebuild
@@ -0,0 +1,27 @@
+# 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
index 3b129005e878..0ecc74fb3c1e 100644
--- a/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-9999.ebuild
+++ b/dev-ros/rqt_robot_dashboard/rqt_robot_dashboard-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_dashboard"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,13 +15,13 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_nav_view[${PYTHON_USEDEP}]
-	dev-ros/rqt_robot_monitor[${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
index 590c2365268f..25c24581dea6 100644
--- a/dev-ros/rqt_robot_monitor/Manifest
+++ b/dev-ros/rqt_robot_monitor/Manifest
@@ -1,8 +1,4 @@
-DIST rqt_robot_monitor-0.5.7.tar.gz 13928 BLAKE2B 82d48383c4ea3acb088a81d170d3c0bad671b037c69e9a4e05efe4f73ce6d38c95abf4e1d4ad548f77e8bfb25277e60c841c672c82f3b54c25fba5e8bed03b04 SHA512 769f0a99253395bfa6dd3eabd08344fcf8d82efd29545bdcae9b9077851cced60678d3ed5fc96e29377208787edd3eb080b62c25c810f60dd3bfaa6785f1aa1c
-DIST rqt_robot_monitor-0.5.8.tar.gz 14150 BLAKE2B a90797b2aa1e4a1a5833ea7a6a7652ca9174f243e875e642784861449fac56a56ad0c611c1d7b65e86e2a4619f9cf5eb7d90eb9d2ac231f5db45614f497f3b7d SHA512 5eac271da5dbb9c9ce33875cc6ec5af2557816121aa0e36d6643df90b8e3286db9a3006f9135757597fd9da06ac9273daf1108356ac2f0515bf7bb5be51858dd
-DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 BLAKE2B 68a6643fef3c101ddbc0ae6a66d7fed3ec2fd7bc811947487946084bd6c93e564e11693941ef336b6d5428f926b0c297ccff845056e3f123320fba176ffe00cf SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51
-EBUILD rqt_robot_monitor-0.5.6.ebuild 834 BLAKE2B 7f11801424c87c99658c82a24a5323c43d27f502a59dbb7fd039975dc6ca0380312bd0558d76d5b69d19dd7dd179c06abafc97e23dabe1fb29de325acbad1d4e SHA512 8ce17dee6c2d1c75f2981d243507c0103314a9b60bbd6b2a4107ade5fed2e22384f52ef6f38127c7da9d58e8a1b618971bfe78469069607deca74201c5236aca
-EBUILD rqt_robot_monitor-0.5.7.ebuild 817 BLAKE2B 8cc83c1828952b14e6562dd9b235e828d57daa562d49918d003ca1a19e626cad1b8a232d4c16862be16032b750871d5b220e02e61e95f97702b70e020fdb62d4 SHA512 a2fa376e20e4213fc6b6709e574c6fef37cb0660ab4afb0cf8cbd929deb947ceffb58f9094237de73fa4043efd230be5a26b0310a2e0556f8367365693455fd8
-EBUILD rqt_robot_monitor-0.5.8.ebuild 817 BLAKE2B 8cc83c1828952b14e6562dd9b235e828d57daa562d49918d003ca1a19e626cad1b8a232d4c16862be16032b750871d5b220e02e61e95f97702b70e020fdb62d4 SHA512 a2fa376e20e4213fc6b6709e574c6fef37cb0660ab4afb0cf8cbd929deb947ceffb58f9094237de73fa4043efd230be5a26b0310a2e0556f8367365693455fd8
-EBUILD rqt_robot_monitor-9999.ebuild 817 BLAKE2B 8cc83c1828952b14e6562dd9b235e828d57daa562d49918d003ca1a19e626cad1b8a232d4c16862be16032b750871d5b220e02e61e95f97702b70e020fdb62d4 SHA512 a2fa376e20e4213fc6b6709e574c6fef37cb0660ab4afb0cf8cbd929deb947ceffb58f9094237de73fa4043efd230be5a26b0310a2e0556f8367365693455fd8
+DIST rqt_robot_monitor-0.5.12.tar.gz 14917 BLAKE2B 8864165fc491bad7a77e12a769d63e5b404d02cd96ef4dfa33c87ed9e2417ba4bd9a0dfc0cf53507c32e5216e16c8b9f89ee4bb5e762fa4049d846f98d0872c4 SHA512 f354e30a85d6bf8e3f15bbd7b97051b02a3348b37a559a53c8942f5939525e046295f5c6e03902850b137dc705bfad94b5e2fd0554ecfe32e24296c2656ee1b5
+EBUILD rqt_robot_monitor-0.5.12.ebuild 845 BLAKE2B 383aa16befa5d9bdfe89644a275d7afdfd373c1382228ec61c7ff06c0560f97ae5b20db6f25a6e5964773b15f228e6f19f480ce787c3468e3f6d7fbdf63736b8 SHA512 dfee20b821d73999a195c3a06694d579097acbe70bb79a5d73ebaae31a0db522c20a41bbcb7d2fd70c72fdca65ec354295bec5ae80a979350e78f843a51c90ab
+EBUILD rqt_robot_monitor-9999.ebuild 845 BLAKE2B 383aa16befa5d9bdfe89644a275d7afdfd373c1382228ec61c7ff06c0560f97ae5b20db6f25a6e5964773b15f228e6f19f480ce787c3468e3f6d7fbdf63736b8 SHA512 dfee20b821d73999a195c3a06694d579097acbe70bb79a5d73ebaae31a0db522c20a41bbcb7d2fd70c72fdca65ec354295bec5ae80a979350e78f843a51c90ab
 MISC metadata.xml 349 BLAKE2B 6019f392e319c3986723ef46e8c93a47ca404f177fb455c2bae087a6b392eb0b9d5a8561d1d064721109397a67246b8e43d495a0b0c32d49204e554de3d6208e SHA512 5bfd04997cfd615160f709201b7a5585e501ff3b1f861f46cad14b0fac73c6fc44e6dc1eb92c90a2dfa3fcfb948cbbd8d8bdb7bdf1a6de2f835eda65ede1181d
diff --git a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild
new file mode 100644
index 000000000000..a0787380331e
--- /dev/null
+++ b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild
@@ -0,0 +1,28 @@
+# 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-0.5.6.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.6.ebuild
deleted file mode 100644
index 4f6c90737779..000000000000
--- a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Displays diagnostics_agg topics 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_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.7.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.7.ebuild
deleted file mode 100644
index c510a0e991c0..000000000000
--- a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_monitor"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Displays diagnostics_agg topics 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_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.8.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.8.ebuild
deleted file mode 100644
index c510a0e991c0..000000000000
--- a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_monitor"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Displays diagnostics_agg topics 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_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_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
index c510a0e991c0..a0787380331e 100644
--- a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-9999.ebuild
+++ b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-9999.ebuild
@@ -1,29 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_monitor"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Displays diagnostics_agg topics messages that are published by diagnostic_aggregator"
+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_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_bag[${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
index 94fd4b175d97..cdafae0c9de1 100644
--- a/dev-ros/rqt_robot_steering/Manifest
+++ b/dev-ros/rqt_robot_steering/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_robot_steering-0.5.8.tar.gz 6449 BLAKE2B 90c7707672bf2ef58d5f26bbe68798edd264e6574b38a4e636cc2fe7e452abe530f5287d119500bf359a124a7a7f66ef4b8192952adafd37272e0be6a25ed8f3 SHA512 25c7715c0fc4123249f7ae7489e34ba357c5c07827c687b88a59e30823cc9a111e82a7cfa6917253555607a84d69f45f6e2069b45bdac1d428c1fc920c8cb73d
-DIST rqt_robot_steering-0.5.9.tar.gz 6567 BLAKE2B a9c6b153ea26944f06bbf60076f2fef8c47030e28347efa809431525ea6314895f60a3160c6c8b7214cfb3cc0116dff6f5f3eccf31575b10bca80ac8180e3cc6 SHA512 123622048c02b7f6cd77f97ac83f31414be0f67745f47084903c1a4a2a41b9de0f1def02a22594b76d7d78c5c8c4eb800a05c075abb5aea549874ddc2bbb5dde
-EBUILD rqt_robot_steering-0.5.8.ebuild 588 BLAKE2B 4d6dcedd34c7c24f3edfa78fc0f083bf481e1109f5455caec260df3b019c630f8d3d3522a91cbbf04465a096222aa49ab4efb7406fb793dd2d9e2cf729d2fc50 SHA512 b12ebcb3ed59f0f17cc63301f4057290e347dac256ea782de3038cbf36a7a88332a4b4c04e247c8e58a12550651717b5687c3b41fc4159d35698147307e98f2e
-EBUILD rqt_robot_steering-0.5.9.ebuild 588 BLAKE2B 3317ab042ab4c73132cc2b88cd0227cd45d9d0da5da9b76fc1ec768f97cee2cac154add673564f7430c904c7acac2dd04029137f19754c5d8a94e2dc8b868716 SHA512 453a43cabab11831550043b2dd8e1df68a326f56acead232a33c3eb768b5d4126ce2101eb3cd6e248ba005164c51a556b02df095124e8030d176c04102eb8d73
-EBUILD rqt_robot_steering-9999.ebuild 588 BLAKE2B 4d6dcedd34c7c24f3edfa78fc0f083bf481e1109f5455caec260df3b019c630f8d3d3522a91cbbf04465a096222aa49ab4efb7406fb793dd2d9e2cf729d2fc50 SHA512 b12ebcb3ed59f0f17cc63301f4057290e347dac256ea782de3038cbf36a7a88332a4b4c04e247c8e58a12550651717b5687c3b41fc4159d35698147307e98f2e
+DIST rqt_robot_steering-0.5.11.tar.gz 6740 BLAKE2B ef31454ba68b8be60b8c14bf86a5d70925a5e47380a307680a838aa8bb54b8fbdacc4637acea494fe6e7de329d59b4f298c3ac2187d0b73b78849d51b8471423 SHA512 3011745f93c0778d9fabf4032219372b4a4d109968800cb044c2518c78c83f48057b2a3d2fe56aaeb253bc4f27933aa6bb0499c4c49cddce9eea4966337ed6c7
+EBUILD rqt_robot_steering-0.5.11.ebuild 604 BLAKE2B 78a25688c870543a1f80064194cc99abc95e731eaa0d93d1ea9fb1343978538e8816f0ee5fa60a365b4971e9da8818caa344edee152fd7f5f58343bdbecbc4f2 SHA512 c795894933eea730883ff0dd3fd3f38b9d2d29bc9992229e2e8dce297128360c6804e72b304d7f2e5ebedc41e5b72deacd372cabcd7177f7be0195f3aa5f0cbb
+EBUILD rqt_robot_steering-9999.ebuild 604 BLAKE2B 78a25688c870543a1f80064194cc99abc95e731eaa0d93d1ea9fb1343978538e8816f0ee5fa60a365b4971e9da8818caa344edee152fd7f5f58343bdbecbc4f2 SHA512 c795894933eea730883ff0dd3fd3f38b9d2d29bc9992229e2e8dce297128360c6804e72b304d7f2e5ebedc41e5b72deacd372cabcd7177f7be0195f3aa5f0cbb
 MISC metadata.xml 350 BLAKE2B ecb22d931eec2a9dfe62fbb7169905b921ebf6da5ed247611331a4f459afd0eb72b133efedfac300042b9032bb5a150f9052b04e8bbd9fe551a602187f05fb5b SHA512 47e26558ff516f790cea41312c4d0ee293a86c437339026479985be2b6b7e6294d865aa895129d93f456cccb8d867886a7a1a9b190a15e9aeda4c5799bc5fa6f
diff --git a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.11.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.11.ebuild
new file mode 100644
index 000000000000..c20ddb8f846d
--- /dev/null
+++ b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.11.ebuild
@@ -0,0 +1,23 @@
+# 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_robot_steering/rqt_robot_steering-0.5.8.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.8.ebuild
deleted file mode 100644
index 4e1e8da7698f..000000000000
--- a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_steering"
-PYTHON_COMPAT=( python2_7 )
-
-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}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.9.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.9.ebuild
deleted file mode 100644
index b300ebead1f4..000000000000
--- a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_steering"
-PYTHON_COMPAT=( python2_7 )
-
-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}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_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
index 4e1e8da7698f..c20ddb8f846d 100644
--- a/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild
+++ b/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_steering"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,9 +15,9 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${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
index 205efb76e75a..fb84b7461ccc 100644
--- a/dev-ros/rqt_runtime_monitor/Manifest
+++ b/dev-ros/rqt_runtime_monitor/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 BLAKE2B 68a6643fef3c101ddbc0ae6a66d7fed3ec2fd7bc811947487946084bd6c93e564e11693941ef336b6d5428f926b0c297ccff845056e3f123320fba176ffe00cf SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51
-DIST rqt_runtime_monitor-0.5.7.tar.gz 6804 BLAKE2B 3187b62393c4c61237a892d059a25e32502f44149ddea099209e3d124cf31f1473caa5aba6f33c08b533af54c0e4b589887fd768a3a28603f524b7b3e589b289 SHA512 9ef7fcb3678cde54e9c6484d9fff9b03000f730100ab64edeb5a70bd412970c43a73ef62d14b8ff047ccf9bce23535a30d3551e36074e64618fd8256ac515206
-EBUILD rqt_runtime_monitor-0.5.6.ebuild 629 BLAKE2B bf3974c4592876b5eb4c9898e5d32d4830ff7c3fe7e295a648bd029a64c88c1a6ba7d23b08f9814864345066630257116d810ce0d3b9c8e5c27047410d3e4af7 SHA512 44c2d4eb42ab844c6b9836182cc306b1fd54c60a4aa42a3799458d522aead34da35455dfc7c61d486b7c6e4f2fcc39d56d0ac70463ddef4af7578ec4013d31ac
-EBUILD rqt_runtime_monitor-0.5.7.ebuild 614 BLAKE2B f75b67e9d896733e3b2028f4c40c79125d02b7f31323fd5c856ef9d496fc6be05d7cc9628eebc73b1f43a5d87cf11b37237cfee08a7a6659c17dbc388f71c38e SHA512 0147591d848e2ccbd657ba1f9f85bfb2d456eca07f21822788a56097d54a2d219d541bc85ea20fe4a92ef69092d600e67e6c00863348d73a9ee33c405366a974
-EBUILD rqt_runtime_monitor-9999.ebuild 614 BLAKE2B f75b67e9d896733e3b2028f4c40c79125d02b7f31323fd5c856ef9d496fc6be05d7cc9628eebc73b1f43a5d87cf11b37237cfee08a7a6659c17dbc388f71c38e SHA512 0147591d848e2ccbd657ba1f9f85bfb2d456eca07f21822788a56097d54a2d219d541bc85ea20fe4a92ef69092d600e67e6c00863348d73a9ee33c405366a974
+DIST rqt_runtime_monitor-0.5.8.tar.gz 6899 BLAKE2B 62babadaca55ba6bbd4cdca9f1b1e716e95539bf5ab4132f8f3344adc9b557ded5061f5f4ba6eb9aa97ef32ca647646450a5ac6688abe2fe85f6f4837a6d9ec1 SHA512 d0c73dab65553be6dc5a2bb098266ea1e4b65ff8cd933777f11b894fea247eacd3f4bdb0b3ec373c012b10ca36b17e09b49617415f005921d14e9cb6a6af7fae
+EBUILD rqt_runtime_monitor-0.5.8.ebuild 637 BLAKE2B 94ad53d4be80ee8de9755b5ff94804a9768cbccda2fed8ef6008d1442954635f20218b01a0e37116e918097fdf797ca9844bd87bb940e2f5b3c07220276448f8 SHA512 1500ad24cacbb54f4921e87e70cb47c498aab25d7dd4b98068e21875d4ba639ccdcfb344340d86d76491cd48534a2ebdd3752154a13313384dd3662b9fab3617
+EBUILD rqt_runtime_monitor-9999.ebuild 637 BLAKE2B 94ad53d4be80ee8de9755b5ff94804a9768cbccda2fed8ef6008d1442954635f20218b01a0e37116e918097fdf797ca9844bd87bb940e2f5b3c07220276448f8 SHA512 1500ad24cacbb54f4921e87e70cb47c498aab25d7dd4b98068e21875d4ba639ccdcfb344340d86d76491cd48534a2ebdd3752154a13313384dd3662b9fab3617
 MISC metadata.xml 351 BLAKE2B 85adf905d433b2678752fe3469b6c6e44e8161c1064846283ebd0554e42a51f82ab2e89c7597e630baa8337b0d7d4901dc70a39d7340ccec5b267946c1e2fdeb SHA512 a532ef4a335611ffe8fc2f79b4bb1f3de29f500fcd52a6067b3ad17cbd44f4037aaa7b5c8c0dde04f56039692c25f2f146ff72f62e968786a8e7f8840c174244
diff --git a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.6.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.6.ebuild
deleted file mode 100644
index 236c41dc929b..000000000000
--- a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin viewing DiagnosticsArray messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.7.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.7.ebuild
deleted file mode 100644
index 6661912b0eac..000000000000
--- a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_runtime_monitor"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin viewing DiagnosticsArray messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.8.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.8.ebuild
new file mode 100644
index 000000000000..f15b3cdd299d
--- /dev/null
+++ b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.8.ebuild
@@ -0,0 +1,24 @@
+# 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_runtime_monitor/rqt_runtime_monitor-9999.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-9999.ebuild
index 6661912b0eac..f15b3cdd299d 100644
--- a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-9999.ebuild
+++ b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_runtime_monitor"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,10 +15,10 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${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
index 41b24d1f7a71..522bbe58451a 100644
--- a/dev-ros/rqt_rviz/Manifest
+++ b/dev-ros/rqt_rviz/Manifest
@@ -1,8 +1,4 @@
-DIST rqt_rviz-0.5.8.tar.gz 5633 BLAKE2B c7d3c9888186911f39afe9ec23f7deb8c3da9590a7ee74e8b168ff4deae44d9021d152e41c013d0bc43a43795e70325a63b731887b59e83d585b2cd6176f1476 SHA512 ea2d06cf5da74de6ed8cd59bea586e0c963f1ce077fcb05638d53b0fd28e7ffde7bd265976efd0743ecdb86451fdba610f0b305170630ac910ecc9ab8590499c
-DIST rqt_rviz-0.5.9.tar.gz 5650 BLAKE2B 53d54266bd0dcade1d834e41918fc628f59cff4acf5e25852527f421bd4d887c7beceeade060670963cb3c6dd6fdd1882727e6b659704360e35205683b1209c8 SHA512 911d25d13f90c4b54f0ff0d51fb59d560faf2aea07e88396587e3e32c175a33ebddb4264d9a60d74281ba77401fe39d6486567c37ef5f3e0637350183e1aadd1
-DIST rqt_rviz-0.6.0.tar.gz 7217 BLAKE2B aff5fee2e3fb5576c4f5c119e1c231266129add24aa9747b618ad977174e377e4f7853cbb3cd00a24364a554261362e089ee074336602e7939b33e4201d1f70d SHA512 47de1c8911dca6dcda79220002170cff789cb7b735c92cbe2ba17570c1f50e54a39ee2fc1688e243f3dce78c3a0aeeae67e7c2a6b283485c719dbe1b772cd028
-EBUILD rqt_rviz-0.5.8-r1.ebuild 546 BLAKE2B e521b130df811341f8e0588194d24f05173c40fd05d88609cfdcaae34d83bbfdbf441a6191581708814a5e94bb31ad0cef1bba29d7458ef19d7ad19a78840e55 SHA512 51a67f41bded7b15c115d50b26f0660b6a4ee31a63f5543996350a363f999196ebee56389e5cc9ba0f92ccc8e1cee50a014e6f794f0f31ec181567aab638790d
-EBUILD rqt_rviz-0.5.9.ebuild 546 BLAKE2B 8d3c6a3ce4c83c63ff11583cfd8f4ddfdec7fc8d8ef8f167c63695bc6127b67675060b4bc1eb7e82542519e36910c427dc68f286fd71ffe92f279686e8c70dfc SHA512 6cc7f0bf9a6487018a32ca721b4134047c1b782ee87177a709db48a06de11b50208a3c92c2c0260a417d351980adcb8ddc4a065f3c6076b9c11c4f79d09d7017
-EBUILD rqt_rviz-0.6.0.ebuild 546 BLAKE2B 8d3c6a3ce4c83c63ff11583cfd8f4ddfdec7fc8d8ef8f167c63695bc6127b67675060b4bc1eb7e82542519e36910c427dc68f286fd71ffe92f279686e8c70dfc SHA512 6cc7f0bf9a6487018a32ca721b4134047c1b782ee87177a709db48a06de11b50208a3c92c2c0260a417d351980adcb8ddc4a065f3c6076b9c11c4f79d09d7017
-EBUILD rqt_rviz-9999.ebuild 546 BLAKE2B e521b130df811341f8e0588194d24f05173c40fd05d88609cfdcaae34d83bbfdbf441a6191581708814a5e94bb31ad0cef1bba29d7458ef19d7ad19a78840e55 SHA512 51a67f41bded7b15c115d50b26f0660b6a4ee31a63f5543996350a363f999196ebee56389e5cc9ba0f92ccc8e1cee50a014e6f794f0f31ec181567aab638790d
+DIST rqt_rviz-0.6.1.tar.gz 7455 BLAKE2B b4f64e076c584e741640fb23a337e43b1b81b9898a75acf52ad946272551f8b47cfb91156952fbbd474a247ad218e78cf2656a5a896bf366236e6c791c0b382b SHA512 e9281603bab5ac7b71870e769eb6648945f33e2f2f5c320d506a51d4c5e7f5a680edd6133532e28b8b829d023404290f5bb65565fa5b87f6299cdda2c6a9e73b
+EBUILD rqt_rviz-0.6.1.ebuild 529 BLAKE2B b269fd2402f60dfb8e6d84c293faaf5cfaf56696e9cdafa7ee7b4c8d0b8fb21222b920f16306b2f551be02109a4037845932fd337a5bc54ae5b4a6ace7dedfe6 SHA512 631e9128f4462460af3bff1cb3e6b91198947763135df23a50d175ea0ee282276369ad68c6c8f789177ebdab3be521604a1871c70a17d5b365de661eadabd085
+EBUILD rqt_rviz-9999.ebuild 529 BLAKE2B b269fd2402f60dfb8e6d84c293faaf5cfaf56696e9cdafa7ee7b4c8d0b8fb21222b920f16306b2f551be02109a4037845932fd337a5bc54ae5b4a6ace7dedfe6 SHA512 631e9128f4462460af3bff1cb3e6b91198947763135df23a50d175ea0ee282276369ad68c6c8f789177ebdab3be521604a1871c70a17d5b365de661eadabd085
 MISC metadata.xml 340 BLAKE2B 4172ee0043191333587f0531f753f03f9aceed8cf29a81ac12b6833adb1be0a1583a542ad97775b0bc19e2ea4ba87edda2654eef085c49285b5ce2176daa2303 SHA512 81d265770fdf37279c8d815459f7b365d1bff1e8d18758565adecba21599878edfa3be3a0bcfed0afe1157fb373edc4e0f3087aadffd1736569be937538115da
diff --git a/dev-ros/rqt_rviz/rqt_rviz-0.5.8-r1.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.5.8-r1.ebuild
deleted file mode 100644
index 3de20369e57a..000000000000
--- a/dev-ros/rqt_rviz/rqt_rviz-0.5.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin embedding RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/pluginlib[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_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-0.5.9.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.5.9.ebuild
deleted file mode 100644
index 53f536b4de7c..000000000000
--- a/dev-ros/rqt_rviz/rqt_rviz-0.5.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin embedding RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/pluginlib[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_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-0.6.0.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.6.0.ebuild
deleted file mode 100644
index 53f536b4de7c..000000000000
--- a/dev-ros/rqt_rviz/rqt_rviz-0.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin embedding RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/pluginlib[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_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-0.6.1.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.6.1.ebuild
new file mode 100644
index 000000000000..86e0acc0c884
--- /dev/null
+++ b/dev-ros/rqt_rviz/rqt_rviz-0.6.1.ebuild
@@ -0,0 +1,26 @@
+# 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_rviz/rqt_rviz-9999.ebuild b/dev-ros/rqt_rviz/rqt_rviz-9999.ebuild
index 3de20369e57a..86e0acc0c884 100644
--- a/dev-ros/rqt_rviz/rqt_rviz-9999.ebuild
+++ b/dev-ros/rqt_rviz/rqt_rviz-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,8 +15,8 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=
-	dev-ros/pluginlib[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	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
diff --git a/dev-ros/rqt_service_caller/Manifest b/dev-ros/rqt_service_caller/Manifest
index d3dd59f269c3..1be797c3da7e 100644
--- a/dev-ros/rqt_service_caller/Manifest
+++ b/dev-ros/rqt_service_caller/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_service_caller-0.4.8.tar.gz 6986 BLAKE2B 0e7d6d79ad7a17d3ee125ae89eaa788a199350fba94fc4debb4704e32a3cc29009416c2881da47a0f3c9387fc53c85cd00fe4954ec55741df715ca3fdea0c013 SHA512 5dc9761e5a1196e1c2a7b1123e34f888d7a088f61de9733e4031969da377d97b34ebb6d97bfe6a65edf8e86f61d81993e9e5127c137d8570c6c2896728b28a60
-EBUILD rqt_service_caller-0.4.7.ebuild 580 BLAKE2B 0f57ebc64720e43f192e3d16ffea5c2e3c3eb12156a8f609b88da70e4fd9a9c2461c3e5bde00cf42488e3a80a795ef762a03527b8254444fbfe82454c9708a07 SHA512 70a464b1680e2d5112cb5038e9fa9e6d14c34590b214e80c1742551046e67e6d7b78563310f41da9d2846b11c29e62c0c2a96cd2017b7f79bad0004c05e95cb7
-EBUILD rqt_service_caller-0.4.8.ebuild 563 BLAKE2B 7aeb081265cef3003508f2ad430e1877762db5aa9a60b48619f188e719dc61a46fb23b5e40430086601ed66af05235a0284509fbd86c0b930071cd362968f757 SHA512 c249ab6f5c586c9906ce9342681758200379ffa6909ac7cb790b45f99d34ff33a780e7a5471f1dfb66a334dcb9d23418e6c24eaf05c1afb41bc21c4dc9bb648a
-EBUILD rqt_service_caller-9999.ebuild 563 BLAKE2B 7aeb081265cef3003508f2ad430e1877762db5aa9a60b48619f188e719dc61a46fb23b5e40430086601ed66af05235a0284509fbd86c0b930071cd362968f757 SHA512 c249ab6f5c586c9906ce9342681758200379ffa6909ac7cb790b45f99d34ff33a780e7a5471f1dfb66a334dcb9d23418e6c24eaf05c1afb41bc21c4dc9bb648a
+DIST rqt_service_caller-0.4.9.tar.gz 7287 BLAKE2B fb65fc9375ca5690ef82c31949a4157d2f6dac420e7d3c62aa4e9abb9fd6ff370e8edc41fa5e1181d0dc35b58b3663a5f0225e2ba23d14f657bcac236c8cc4b3 SHA512 803c5803236bff6e482753aa994adbc60492aec92696c09ac49538601eb42d79b781e80e92fc3e528ab8767338e799252d51418708dbdfdc71314aada39e5259
+EBUILD rqt_service_caller-0.4.9.ebuild 586 BLAKE2B a56f23f70f70d55d125cee3a8acb14ebef9158be8f7d6452d8f0193143d50de8be5c71837c9fbfc0282bd5b8dd32f26b82971b567023b257eec659667d71fcf1 SHA512 1b65b030ce144ac25bd9167f7a3b4e49a0a06a70a077186b7715dafd8f870bbf630c95260b872a5d7d70baaa9bfdd26b351f2f0937b1ecf54d3b4657050b4342
+EBUILD rqt_service_caller-9999.ebuild 586 BLAKE2B a56f23f70f70d55d125cee3a8acb14ebef9158be8f7d6452d8f0193143d50de8be5c71837c9fbfc0282bd5b8dd32f26b82971b567023b257eec659667d71fcf1 SHA512 1b65b030ce144ac25bd9167f7a3b4e49a0a06a70a077186b7715dafd8f870bbf630c95260b872a5d7d70baaa9bfdd26b351f2f0937b1ecf54d3b4657050b4342
 MISC metadata.xml 350 BLAKE2B 4cc51a8225389126a5fc973fd489a13347a71275f7b759499b7761d0f176666f690614e873af4172df5bd56622589bba378d7777f01c6b77c5e3e6f150ab2bef SHA512 1b2e245248e936b9fddb4738972a70eb7df62244938f671517bceeb952d50956b8de74072d05421d274291baf3a3803a4a1c4d47f1c5bc3ff81def938be01a27
diff --git a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.7.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.7.ebuild
deleted file mode 100644
index c7de903d6eee..000000000000
--- a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for calling arbitrary services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.8.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.8.ebuild
deleted file mode 100644
index 326bdae36968..000000000000
--- a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_service_caller"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for calling arbitrary services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.9.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.9.ebuild
new file mode 100644
index 000000000000..68e3fdbd40e2
--- /dev/null
+++ b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.9.ebuild
@@ -0,0 +1,23 @@
+# 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_service_caller/rqt_service_caller-9999.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-9999.ebuild
index 326bdae36968..68e3fdbd40e2 100644
--- a/dev-ros/rqt_service_caller/rqt_service_caller-9999.ebuild
+++ b/dev-ros/rqt_service_caller/rqt_service_caller-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_service_caller"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,10 +14,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	$(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
index 1e2733caa94a..c7c0ef8f5e2e 100644
--- a/dev-ros/rqt_shell/Manifest
+++ b/dev-ros/rqt_shell/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_shell-0.4.8.tar.gz 6810 BLAKE2B 9156ee96f716ee74613ea048dc21e9f9653b14eba3064d05cb3fc2f24f3ea189a9908cb42c1adbf132747ddc71adbf8d002721d3b94f192c72c9c6a02fadeb21 SHA512 c71653fc8f50f9c67b963b3e6ba018d8730c749f0274051e891c9bea19fcd337186838fa9dfc7152cff6a2cf0921aee6aa4b27d7c209888759c80993fbcf9257
-DIST rqt_shell-0.4.9.tar.gz 6860 BLAKE2B 58a9e7d31786e94cd3d4370c647497af2ba15ee18c0c36b510f02828fac5491928eab7afcd183e46dbcd379579cc288bce334770b601f9a697021961c048e360 SHA512 105a8f0a9a5549f5abe57ff3f48c3d6c9621eedb676db9afe9980aba20bbeca58736e0eef4df86a46862e8c56bf11f2b439ccb2bafb3e3e1eaee76899e956c47
-EBUILD rqt_shell-0.4.8.ebuild 553 BLAKE2B ebe8e1cbb3daf673c3eb338f2ab31aab910266c732f8a9b3b22c1cc409ae14c2e3050a7ee24d39ea4d9ea8bc15c410d7498bd92d3f79601e1d6181a46e3951de SHA512 eadb0db4a3a72e989fce914e5f8a99466052c20d9eb6a6baa4209175ca1371848ed3d3a75beb60a92427552123d8525b029f7636dfefb9fda49cfdca989ee13c
-EBUILD rqt_shell-0.4.9.ebuild 553 BLAKE2B ebe8e1cbb3daf673c3eb338f2ab31aab910266c732f8a9b3b22c1cc409ae14c2e3050a7ee24d39ea4d9ea8bc15c410d7498bd92d3f79601e1d6181a46e3951de SHA512 eadb0db4a3a72e989fce914e5f8a99466052c20d9eb6a6baa4209175ca1371848ed3d3a75beb60a92427552123d8525b029f7636dfefb9fda49cfdca989ee13c
-EBUILD rqt_shell-9999.ebuild 553 BLAKE2B ebe8e1cbb3daf673c3eb338f2ab31aab910266c732f8a9b3b22c1cc409ae14c2e3050a7ee24d39ea4d9ea8bc15c410d7498bd92d3f79601e1d6181a46e3951de SHA512 eadb0db4a3a72e989fce914e5f8a99466052c20d9eb6a6baa4209175ca1371848ed3d3a75beb60a92427552123d8525b029f7636dfefb9fda49cfdca989ee13c
+DIST rqt_shell-0.4.10.tar.gz 6966 BLAKE2B 51e42222083ec64cdd991f9a3b0096bca19cd4b7f9083a4286d7ded0f2695382c132edd90af47c59c69e1ed1f9e35e5ade4469c40e8a072855d63f17ac4f0da9 SHA512 7562ac0aba35ad75dc884a81a737669e473516cdbc3c7207657d6fb24ea82aacb340eee68eed346fed57bca33bc878008fdd4569d6113df2609012dfedcaecc6
+EBUILD rqt_shell-0.4.10.ebuild 576 BLAKE2B 38a6240bfe600dc4a283a20a1a8f1c3a02a009d96e696455a7391d27016f293fb13dae6c39e606a821f0e79bf29630f57055bdc880a198e8563ca90117edcedc SHA512 67ebfd21a2515d63c6f8bcca5081fff4de821105620cc9f25a1df185a7b760fac39ed3ebcbcce0c4b751b08875262d115df5199bb8b339e731f2b6725c42072a
+EBUILD rqt_shell-9999.ebuild 576 BLAKE2B 38a6240bfe600dc4a283a20a1a8f1c3a02a009d96e696455a7391d27016f293fb13dae6c39e606a821f0e79bf29630f57055bdc880a198e8563ca90117edcedc SHA512 67ebfd21a2515d63c6f8bcca5081fff4de821105620cc9f25a1df185a7b760fac39ed3ebcbcce0c4b751b08875262d115df5199bb8b339e731f2b6725c42072a
 MISC metadata.xml 341 BLAKE2B 37d602b430bbbbedaa984412c5773768475f9c29aa636896dc923729aab5536ac5effe75aaa207d3ef3aef85d6ecc9e009be0c705115bc39b46ee6e99e7ddd7e SHA512 ff2e33aac7330f2c74a047d052ecf393f7d04ce951a573ba799951be199291c028fd37f13aed3e2a2485cd0688b76ba0e4baa655576a68010aecffc9e7b4b206
diff --git a/dev-ros/rqt_shell/rqt_shell-0.4.10.ebuild b/dev-ros/rqt_shell/rqt_shell-0.4.10.ebuild
new file mode 100644
index 000000000000..8e1d4bb5ae68
--- /dev/null
+++ b/dev-ros/rqt_shell/rqt_shell-0.4.10.ebuild
@@ -0,0 +1,23 @@
+# 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_shell/rqt_shell-0.4.8.ebuild b/dev-ros/rqt_shell/rqt_shell-0.4.8.ebuild
deleted file mode 100644
index 7cf7b1be6b20..000000000000
--- a/dev-ros/rqt_shell/rqt_shell-0.4.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_shell"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin providing an interactive shell"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_shell/rqt_shell-0.4.9.ebuild b/dev-ros/rqt_shell/rqt_shell-0.4.9.ebuild
deleted file mode 100644
index 7cf7b1be6b20..000000000000
--- a/dev-ros/rqt_shell/rqt_shell-0.4.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_shell"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin providing an interactive shell"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_shell/rqt_shell-9999.ebuild b/dev-ros/rqt_shell/rqt_shell-9999.ebuild
index 7cf7b1be6b20..8e1d4bb5ae68 100644
--- a/dev-ros/rqt_shell/rqt_shell-9999.ebuild
+++ b/dev-ros/rqt_shell/rqt_shell-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_shell"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,10 +14,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_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/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
index 94c414e391a7..6c14dbcf7ea8 100644
--- a/dev-ros/rqt_srv/Manifest
+++ b/dev-ros/rqt_srv/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
 DIST rqt_srv-0.4.8.tar.gz 3518 BLAKE2B 9a6a592c611ac01d3aedb3c211bfe629b0eccae9c5081b8872fbe2af77b4750b152ce18bea15fa47ed979533648bea51690bdb68585624920b71b2d7c090f06e SHA512 dc3712e3f84d3baae7ccddf55a64b3543698dabb828273a2cd99af06fb8d6155941c277ac48023aa37eff2873d11cf150f2b4e2fc616d01576703f69f5a4289e
-EBUILD rqt_srv-0.4.7.ebuild 581 BLAKE2B 6c4f4322ae676fc98b16ede314f4634c47d9954eba623db58f6bcba47c4c93bf043d867f2d4bf98f0acee94827f096a2482dfa9ebee270b27ab35a08589d49ce SHA512 2173422f65de2bdaffe275f6e19d857a0b38fbd40aff3b321caa5126ac503843cac378d29565c9b0549b014966ec64619ece3950dfff2fc1eb726a2953363ccf
-EBUILD rqt_srv-0.4.8.ebuild 553 BLAKE2B 8d60086548624e42deb525891d50826106178fa3927e7be21c6cfeceb2f97155eb4bd0139b731cf1b457cf8e1766960cd6f7daf847ee675857d3f05543f12558 SHA512 47cec6b2af8711d962d2b9dfd990df0543bc8be63b880d95cd2bcf67ba7934f15249d07ea5744bcbcbe88552c1e3319400908a08bd9b39381db69c886770d228
-EBUILD rqt_srv-9999.ebuild 553 BLAKE2B 8d60086548624e42deb525891d50826106178fa3927e7be21c6cfeceb2f97155eb4bd0139b731cf1b457cf8e1766960cd6f7daf847ee675857d3f05543f12558 SHA512 47cec6b2af8711d962d2b9dfd990df0543bc8be63b880d95cd2bcf67ba7934f15249d07ea5744bcbcbe88552c1e3319400908a08bd9b39381db69c886770d228
+EBUILD rqt_srv-0.4.8.ebuild 557 BLAKE2B 628b12c13742dc1d55fb32af5a66810c11aff1462c688440d6a45889f7c0c98da56b642e0139f7f4029bba32a0198d0f6d7e9463e44b66e9875baf17b36efd28 SHA512 c1494231b631bba4f93240ef17f86ed917a3a390cf44b7c79a06501c1bca998fc0c02ea76abb1e01c45f8ec962babd4d69b58b94f1ff734f46b964350f529dca
+EBUILD rqt_srv-9999.ebuild 557 BLAKE2B 628b12c13742dc1d55fb32af5a66810c11aff1462c688440d6a45889f7c0c98da56b642e0139f7f4029bba32a0198d0f6d7e9463e44b66e9875baf17b36efd28 SHA512 c1494231b631bba4f93240ef17f86ed917a3a390cf44b7c79a06501c1bca998fc0c02ea76abb1e01c45f8ec962babd4d69b58b94f1ff734f46b964350f529dca
 MISC metadata.xml 339 BLAKE2B 0eb9310139bad173fe8a8189d38a07b6b515c15b8a8e4539112ece7f26d2b24f1e30feb0ddb50a3a2170af13e495f89eebb58456e160f995216ac8d8eff06a64 SHA512 885828f3661bc17a6fbe23243df8fd984e595c6b83d11f5139f1e3140bc4095bef3e348212c101de50b890ec9f11fb185644fb50902c6a0d4191de9ac110b6e7
diff --git a/dev-ros/rqt_srv/rqt_srv-0.4.7.ebuild b/dev-ros/rqt_srv/rqt_srv-0.4.7.ebuild
deleted file mode 100644
index cc00bc0f3de4..000000000000
--- a/dev-ros/rqt_srv/rqt_srv-0.4.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_srv/rqt_srv-0.4.8.ebuild b/dev-ros/rqt_srv/rqt_srv-0.4.8.ebuild
index 38363091706c..03edbbca41b5 100644
--- a/dev-ros/rqt_srv/rqt_srv-0.4.8.ebuild
+++ b/dev-ros/rqt_srv/rqt_srv-0.4.8.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_srv"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,10 +14,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_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_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
index 38363091706c..03edbbca41b5 100644
--- a/dev-ros/rqt_srv/rqt_srv-9999.ebuild
+++ b/dev-ros/rqt_srv/rqt_srv-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_srv"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,10 +14,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_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_msg[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_tf_tree/Manifest b/dev-ros/rqt_tf_tree/Manifest
index a9b2c9707b0d..3627c0272f56 100644
--- a/dev-ros/rqt_tf_tree/Manifest
+++ b/dev-ros/rqt_tf_tree/Manifest
@@ -1,8 +1,5 @@
-DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 BLAKE2B 68a6643fef3c101ddbc0ae6a66d7fed3ec2fd7bc811947487946084bd6c93e564e11693941ef336b6d5428f926b0c297ccff845056e3f123320fba176ffe00cf SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51
-DIST rqt_tf_tree-0.5.7.tar.gz 8021 BLAKE2B 7fd327011a89c08894e6c66f02ffbf3144d66eb62c3b1a4a297466fea21536e1cb7685f9db27ee7ba31a39af9d36684c0cdd2036d874837fd7e570eec1413b2d SHA512 024a38d446288e620728210a3de1569d93dafc3040c600a2de5359f3d6fef6074700562e8ff0c5cb2571cc0abef8db3e7071994d6ec916fea336ae1b8d267140
-DIST rqt_tf_tree-0.5.8.tar.gz 8111 BLAKE2B b4cb996f5d6b4366345d2434bf95117c7f25b50a99f7a8c4a2422710821ddc1c7c354f544365e4bd78eab80fe46cb4c14fe78e843e91f35af410c458a4bc54d5 SHA512 6bfbb692da82edbbbcae90bdba8b69f0023b7b5b9e67c64a33864be3ec8359ee87922b7957dfff9ba4db6febb07e3106f9742e89bacfc31d85ef4e0db34c02bc
-EBUILD rqt_tf_tree-0.5.6.ebuild 818 BLAKE2B 580b2771100357b760e843d2ceebd74f18b0017c9ca139fae2aa9ac2ae5ba1734430f65d859282628abd6ccc317368815346adfb01dba7b4a65b1208b9c2f6c3 SHA512 7be454a44c8ba0b1334b06bcc1000e75ed0af9c491e71de6c2368770253b1a25b950d4c541de87b94fb1fab2ca6d40412d7902848d9387da38d007a291e9e01f
-EBUILD rqt_tf_tree-0.5.7.ebuild 795 BLAKE2B 48d4eeb59cbd3c46878dae02746b3490dd9c357a81a91e676d19e56b7340e7bed1815c027173102d84da0a14bcfd517b46aabee10b453cbc68ee7f40aa523fd5 SHA512 01c8356a0da415254c09b0f506548d9af55eb79d6e3e552c9edfccef9a32fe097b69df82192b1c35c85cbe6e9ac22b5396d74875663e28cf9b4a7e0c94056fa1
-EBUILD rqt_tf_tree-0.5.8.ebuild 795 BLAKE2B 48d4eeb59cbd3c46878dae02746b3490dd9c357a81a91e676d19e56b7340e7bed1815c027173102d84da0a14bcfd517b46aabee10b453cbc68ee7f40aa523fd5 SHA512 01c8356a0da415254c09b0f506548d9af55eb79d6e3e552c9edfccef9a32fe097b69df82192b1c35c85cbe6e9ac22b5396d74875663e28cf9b4a7e0c94056fa1
-EBUILD rqt_tf_tree-9999.ebuild 795 BLAKE2B 48d4eeb59cbd3c46878dae02746b3490dd9c357a81a91e676d19e56b7340e7bed1815c027173102d84da0a14bcfd517b46aabee10b453cbc68ee7f40aa523fd5 SHA512 01c8356a0da415254c09b0f506548d9af55eb79d6e3e552c9edfccef9a32fe097b69df82192b1c35c85cbe6e9ac22b5396d74875663e28cf9b4a7e0c94056fa1
+AUX yaml.patch 626 BLAKE2B b6fddb180dc4a058e2bc7691f875d8b5eca4191a78d1bf4656aa9792f63caf2a6be1b39342f406a0bf0298903df04e9498693edcfdb4f726545f1527ccde6256 SHA512 05dedc11ab9f5c249ab7eefa28f2abb7bbf9fdea66fc81fe10892afc590360bd251385b936d8a987150b75b74a088aff51c02bd2ce94d87a0cd5b43b051827aa
+DIST rqt_tf_tree-0.6.1.tar.gz 8469 BLAKE2B 0ff1291f982ba0338b75997df868f623682007cbff29b90465aef550463ab8082ca1c068fe4cbca3cfa4a5b46c132cfef089af948300a7e8f1f919933cc1ade6 SHA512 22441bd7313c250f786060d09eb170a42b85ec5414b24be2db1ecdb6d1336acef6a879513793f6a60ddd875ca7fbd1c6b0ac2bde759968440c6c638c62c6c89b
+EBUILD rqt_tf_tree-0.6.1.ebuild 895 BLAKE2B 1284f4d9e1da5ef37cbad13ef0c3bee4ef4040091895de85f995211688146d03fae8dec00f0d16703e7bd5a6c9a2fcaaf9a7f4bf82a9d6ba56d344f6b04ebcc7 SHA512 836bac913c95f3a3393bd273758b2cfe58b901788a395076f44e0fd7118549fef55bf06edf451c54e92f2e6d15985acfdca1fd943989482975e7e5c7e47d6084
+EBUILD rqt_tf_tree-9999.ebuild 895 BLAKE2B 1284f4d9e1da5ef37cbad13ef0c3bee4ef4040091895de85f995211688146d03fae8dec00f0d16703e7bd5a6c9a2fcaaf9a7f4bf82a9d6ba56d344f6b04ebcc7 SHA512 836bac913c95f3a3393bd273758b2cfe58b901788a395076f44e0fd7118549fef55bf06edf451c54e92f2e6d15985acfdca1fd943989482975e7e5c7e47d6084
 MISC metadata.xml 343 BLAKE2B 91fa5f7b77b6bf54278e18b894d5c45bf8f10d7cf8b575f1bd46739ef2ccb479c1790f0101f3d38508e978b8f3f86216189ce58ac87d46e30ddcb0ac865016fa SHA512 2d95857675c40435840997f90568071873801c690e386ff1ba5eaeabf31ce1d157b7eeb9f15126979da1939923924718f6a1397c0e18213cab236e98daefd869
diff --git a/dev-ros/rqt_tf_tree/files/yaml.patch b/dev-ros/rqt_tf_tree/files/yaml.patch
new file mode 100644
index 000000000000..c1435cc59ab6
--- /dev/null
+++ b/dev-ros/rqt_tf_tree/files/yaml.patch
@@ -0,0 +1,13 @@
+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/rqt_tf_tree-0.5.6.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.6.ebuild
deleted file mode 100644
index 5f0946534ae6..000000000000
--- a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-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}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.7.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.7.ebuild
deleted file mode 100644
index acd62217748c..000000000000
--- a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_tf_tree"
-PYTHON_COMPAT=( python2_7 )
-
-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}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.8.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.8.ebuild
deleted file mode 100644
index acd62217748c..000000000000
--- a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.5.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_tf_tree"
-PYTHON_COMPAT=( python2_7 )
-
-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}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild
new file mode 100644
index 000000000000..29eb0bd0e67a
--- /dev/null
+++ b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild
@@ -0,0 +1,30 @@
+# 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
index acd62217748c..29eb0bd0e67a 100644
--- a/dev-ros/rqt_tf_tree/rqt_tf_tree-9999.ebuild
+++ b/dev-ros/rqt_tf_tree/rqt_tf_tree-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_tf_tree"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,15 +15,16 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${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_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+	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
index 0d1146b6c63b..057b526f7ef3 100644
--- a/dev-ros/rqt_top/Manifest
+++ b/dev-ros/rqt_top/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_top-0.4.8.tar.gz 6407 BLAKE2B 1f0f5588011571d761dea6595770d9777baba29cd285d9331c69df1976f37135b4e3d0b51f7ad69e4ed6caec48c2722a92f63c6ccc7a030630bed6f403c287d2 SHA512 feef0e3430ee547f3f1a8a799c632fe0c1b7c4f380aaaa96ff58814ca791cf68082f2cb92763d7660f302034759f807e1bdf2995a1b7c87bb3beb9b2cb072b2e
-EBUILD rqt_top-0.4.7.ebuild 532 BLAKE2B 2102d7402c9b25d908c49e27b278623779c8414ca6cde3a4f5b7db27e2842a19415ebe19c92ca6eb676d74f4908c80860c0955d7e993f1a4c4f2ce781d874d5e SHA512 84fdc603dc3ebb2d4ee172565acc8b79b4cdfeb721c2fc1c56972fa74fdf87f4a08497ca9e87499da31a3be6d9f1bb7593b7e5e66bdfea9e783c4c14a7cb2cf3
-EBUILD rqt_top-0.4.8.ebuild 504 BLAKE2B 1924e7b52fb5214aaf755ecd43190aed87e8839b0be32bb02a18b5dea239e0f8c79fbacb326867e2967f44da9ed5d7ffa0fea4f2e40e9caaee0756bb7b2a8111 SHA512 fb6b44f04f0c5fa965a85a7f97cf86efbca3edf4a3a73e69965381f1d6123beec60cccc5398a6aad01e4030077329c2469944b16424a0704da5838a0354dc60d
-EBUILD rqt_top-9999.ebuild 504 BLAKE2B 1924e7b52fb5214aaf755ecd43190aed87e8839b0be32bb02a18b5dea239e0f8c79fbacb326867e2967f44da9ed5d7ffa0fea4f2e40e9caaee0756bb7b2a8111 SHA512 fb6b44f04f0c5fa965a85a7f97cf86efbca3edf4a3a73e69965381f1d6123beec60cccc5398a6aad01e4030077329c2469944b16424a0704da5838a0354dc60d
+DIST rqt_top-0.4.9.tar.gz 6507 BLAKE2B 4c0fd53073a91e45de7fdc27c037c002976da0d5bc8d1e6f85d1d50d2c821b9a96968ed4189b2c17e6bbdc2ca0b4eab55e70f5f86bd24a18d32986ba153028e6 SHA512 42eb45d0a4ac271be150ee67fc1b0911a977ae636f4fec90240bec83ac024543ab9dec194f69c46873122efcf64f7c1a43328afbcde3e41f56274a87e8bc0b77
+EBUILD rqt_top-0.4.9.ebuild 520 BLAKE2B 69f6b7b448850c8021078fe43de32d904c165fd09633a5de0263cd524b17b1ac61ee48ec575d86c73fde894fcb606c731e7e51fb54a1e06d1454337f2bafcd20 SHA512 8c54187fdf31f5e8b48774314bec119952c3236bfb7d1860c1f60dd8c6e9d6e0d203ba1a7098b32a6bfe01d43f3ca6e74f474f0e879ce9c5b4bf4f371f82dca2
+EBUILD rqt_top-9999.ebuild 520 BLAKE2B 69f6b7b448850c8021078fe43de32d904c165fd09633a5de0263cd524b17b1ac61ee48ec575d86c73fde894fcb606c731e7e51fb54a1e06d1454337f2bafcd20 SHA512 8c54187fdf31f5e8b48774314bec119952c3236bfb7d1860c1f60dd8c6e9d6e0d203ba1a7098b32a6bfe01d43f3ca6e74f474f0e879ce9c5b4bf4f371f82dca2
 MISC metadata.xml 339 BLAKE2B 2ba9b45f7390efddf6043ca229f7ad5c4b5f1630e2dc6cec28cddb9bba0f35731421972fac8e1d82b095e133503fa4c53127bd323fc20be2bade7f1de2368ee9 SHA512 b988663d3571ef8b2a6825063c37526249e53cec0b32924eec6c8a55205cfc2501747281ecbdfceaf9ad9693dcd913582091d8493be963c7dd1471c612644368
diff --git a/dev-ros/rqt_top/rqt_top-0.4.7.ebuild b/dev-ros/rqt_top/rqt_top-0.4.7.ebuild
deleted file mode 100644
index b3a157cf4210..000000000000
--- a/dev-ros/rqt_top/rqt_top-0.4.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="RQT plugin for monitoring ROS processes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_top/rqt_top-0.4.8.ebuild b/dev-ros/rqt_top/rqt_top-0.4.8.ebuild
deleted file mode 100644
index 820eade78b5b..000000000000
--- a/dev-ros/rqt_top/rqt_top-0.4.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_top"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="RQT plugin for monitoring ROS processes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_top/rqt_top-0.4.9.ebuild b/dev-ros/rqt_top/rqt_top-0.4.9.ebuild
new file mode 100644
index 000000000000..1ef0fdf3d25e
--- /dev/null
+++ b/dev-ros/rqt_top/rqt_top-0.4.9.ebuild
@@ -0,0 +1,22 @@
+# 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_top/rqt_top-9999.ebuild b/dev-ros/rqt_top/rqt_top-9999.ebuild
index 820eade78b5b..1ef0fdf3d25e 100644
--- a/dev-ros/rqt_top/rqt_top-9999.ebuild
+++ b/dev-ros/rqt_top/rqt_top-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_top"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,9 +14,9 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	$(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
index 4656e774419f..af13e2ca6402 100644
--- a/dev-ros/rqt_topic/Manifest
+++ b/dev-ros/rqt_topic/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_topic-0.4.10.tar.gz 8907 BLAKE2B 92343432ddf3b2bd9dff600f088935ca6bceac0239f2818b9a5601a2702bac52c13526571c0be454c41dfe14f2d6baab48e6f95f004c233f474d5fc6ac943423 SHA512 d16c882091d7d2f5701a399faca4dfd5331bbf66b84222cfafcdfc8b362ccff667b9d13bfc2143d41b5d2261b98dde4e0e967c7123ec06b390c80b846a4beae0
-DIST rqt_topic-0.4.9.tar.gz 8794 BLAKE2B c239e6a54bdcbe4bc2c55bd08a74d523399478ba19b2502f9f75038e2fa7ff949f3e0fd76ec25a3443a037f975eb04625fe37e7fa51240022cac28d979337ebb SHA512 ca7b9a9459406dbafcf58b23fe6695b7f5627326cf0c5f2b5d5bb61475c34200181d4702270a6bad59e23ea0706463e15839624d128f063db167cc5fb60182b9
-EBUILD rqt_topic-0.4.10.ebuild 620 BLAKE2B caad682985e0f871f8317cd2026a774d24b6ac11380bd39ac246de2f37450a2b573e92ac146948927d271aa8a2cbc2951b5ab47d9f82e990bbbff9b053435625 SHA512 bd69c03e965bd8ea1cf591be49f826b7fda0b8d5c1d7f5b8ca0566eec1754457db271f2778ed4e1ee1ac834a02e13e2984c839cc2edde5b5d1610c33c40a930a
-EBUILD rqt_topic-0.4.9.ebuild 620 BLAKE2B caad682985e0f871f8317cd2026a774d24b6ac11380bd39ac246de2f37450a2b573e92ac146948927d271aa8a2cbc2951b5ab47d9f82e990bbbff9b053435625 SHA512 bd69c03e965bd8ea1cf591be49f826b7fda0b8d5c1d7f5b8ca0566eec1754457db271f2778ed4e1ee1ac834a02e13e2984c839cc2edde5b5d1610c33c40a930a
-EBUILD rqt_topic-9999.ebuild 620 BLAKE2B caad682985e0f871f8317cd2026a774d24b6ac11380bd39ac246de2f37450a2b573e92ac146948927d271aa8a2cbc2951b5ab47d9f82e990bbbff9b053435625 SHA512 bd69c03e965bd8ea1cf591be49f826b7fda0b8d5c1d7f5b8ca0566eec1754457db271f2778ed4e1ee1ac834a02e13e2984c839cc2edde5b5d1610c33c40a930a
+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 341 BLAKE2B 712951d9154df7294a560ebaebf9a2b5dffb344496533d99fc33559103e09e1f362ec4038adbbedc8022999f10037a302c740c8723d1431e8045dbe143e58b2b SHA512 ce655ab4c0bb16df2aa621fecc2007c580b556a95b9a40e28d8b74f76bd4605e0c731d7c4424573af5262f1094a0175b8e7ce61b0487679e2ce067e483327130
diff --git a/dev-ros/rqt_topic/rqt_topic-0.4.10.ebuild b/dev-ros/rqt_topic/rqt_topic-0.4.10.ebuild
deleted file mode 100644
index bf621ebec809..000000000000
--- a/dev-ros/rqt_topic/rqt_topic-0.4.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_topic"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying debug information about ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild b/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild
new file mode 100644
index 000000000000..e99b6145b05f
--- /dev/null
+++ b/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild
@@ -0,0 +1,24 @@
+# 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-0.4.9.ebuild b/dev-ros/rqt_topic/rqt_topic-0.4.9.ebuild
deleted file mode 100644
index bf621ebec809..000000000000
--- a/dev-ros/rqt_topic/rqt_topic-0.4.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_topic"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying debug information about ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_topic/rqt_topic-9999.ebuild b/dev-ros/rqt_topic/rqt_topic-9999.ebuild
index bf621ebec809..e99b6145b05f 100644
--- a/dev-ros/rqt_topic/rqt_topic-9999.ebuild
+++ b/dev-ros/rqt_topic/rqt_topic-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_topic"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,11 +14,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${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}]
+	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
index f367b2241817..57edff1b49f4 100644
--- a/dev-ros/rqt_web/Manifest
+++ b/dev-ros/rqt_web/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_web-0.4.8.tar.gz 5929 BLAKE2B 26dacb0bb0546b4d36f9ff111ba6ac14a9f8436371bc40bef9406b027a38ad186915103a7a32f9289f27b7b537a0911384592c44c442c10dd5f26bab8400a340 SHA512 11bba520039d4cf51f0ab9ae35d9cea2ea0a757f52d87bf5b57ec8264ec7b4cf0d912c958dac7a01cc3479e643b0334a26053cf4dea31b6ec1d932ed4d566d26
-EBUILD rqt_web-0.4.7.ebuild 560 BLAKE2B 66d9af60dfcc585656e406d3031fc5330d62c7dd1c7c2e0db935ae3e4cf8a6373b287a659cf0fc0cf67ce50616c953efbf072189183b54af0134396e5b943d42 SHA512 337ef1a35eac14b547ac40d061420c3a65e436baf1f9d63731505d336f8ea8c437ea7db89ee014a40bdcebc90f5018946d3075e41c16a350995454d86ffa95fa
-EBUILD rqt_web-0.4.8.ebuild 532 BLAKE2B 1186167ce064e3ef93d38bbdbb5c1883cf5252b779b691941e82c82bf0a12073aa543c70c6cec3859c2310d2d49c1253b081b3ad681f4fa74986ea810284e297 SHA512 d3e6d50094defc6e8d32eb43643608d9f5d1e3e9b201e68f2f9e990ffc21f0c9bae8c5a098692b65828774d050454b5839e921ab525a7fe0936cb74f08d8c41b
-EBUILD rqt_web-9999.ebuild 532 BLAKE2B 1186167ce064e3ef93d38bbdbb5c1883cf5252b779b691941e82c82bf0a12073aa543c70c6cec3859c2310d2d49c1253b081b3ad681f4fa74986ea810284e297 SHA512 d3e6d50094defc6e8d32eb43643608d9f5d1e3e9b201e68f2f9e990ffc21f0c9bae8c5a098692b65828774d050454b5839e921ab525a7fe0936cb74f08d8c41b
+DIST rqt_web-0.4.9.tar.gz 6055 BLAKE2B 4366be2be307c4a565a8eced30144e094d7bb1958d09c313d81771bba8eb8911fc625809a3f43344cdd3c171a2484de1b66f04f34c4e07e90ac95710fd2639de SHA512 c6b67e34e9bb844d9eea17accf570b439b58f4665ecca3625c520b4546b958404b257025d79ce06833ebfcecce029c88bb375b7271df19a351a6692c35a0ab8f
+EBUILD rqt_web-0.4.9.ebuild 555 BLAKE2B 205a357c9326b7b1c6b0cfccee5752955cee49d815e3466ff52721c33ba9f86079b4ec4d197bc4b29abdb15521a3e0942ae41dbe587ef2bcf41695de1d0a7372 SHA512 a4a23a3fb7008a3e5df093377a6dfab81877d1fe813ae13944b4edb1bfed78bcae8b0f1adfff64f3cb7b8e3d72d726dc2d642ebcd72308f73748b1c14a15a877
+EBUILD rqt_web-9999.ebuild 555 BLAKE2B 205a357c9326b7b1c6b0cfccee5752955cee49d815e3466ff52721c33ba9f86079b4ec4d197bc4b29abdb15521a3e0942ae41dbe587ef2bcf41695de1d0a7372 SHA512 a4a23a3fb7008a3e5df093377a6dfab81877d1fe813ae13944b4edb1bfed78bcae8b0f1adfff64f3cb7b8e3d72d726dc2d642ebcd72308f73748b1c14a15a877
 MISC metadata.xml 339 BLAKE2B 404fb427a6076397a1ea41e275bfa3c921e48140b5a418e0c00e7898dff5633a314385e2b1594b88b100b61e897f2a0c1f8056e028ab0316607fa1d5aec3ab11 SHA512 e5bf773a7f2deff19d4041ee2f8374be10f1fa6ff57ee94c7d455ffcbb9ae09046ba2907346c19f9a47a0726c9f225e9f170ae7a2cf3da53e97569a9d3df1523
diff --git a/dev-ros/rqt_web/rqt_web-0.4.7.ebuild b/dev-ros/rqt_web/rqt_web-0.4.7.ebuild
deleted file mode 100644
index 57716793e6bf..000000000000
--- a/dev-ros/rqt_web/rqt_web-0.4.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple web content viewer for rqt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_web/rqt_web-0.4.8.ebuild b/dev-ros/rqt_web/rqt_web-0.4.8.ebuild
deleted file mode 100644
index d36e43c52ba4..000000000000
--- a/dev-ros/rqt_web/rqt_web-0.4.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_web"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Simple web content viewer for rqt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_web/rqt_web-0.4.9.ebuild b/dev-ros/rqt_web/rqt_web-0.4.9.ebuild
new file mode 100644
index 000000000000..60b0b9016d48
--- /dev/null
+++ b/dev-ros/rqt_web/rqt_web-0.4.9.ebuild
@@ -0,0 +1,23 @@
+# 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/rqt_web/rqt_web-9999.ebuild b/dev-ros/rqt_web/rqt_web-9999.ebuild
index d36e43c52ba4..60b0b9016d48 100644
--- a/dev-ros/rqt_web/rqt_web-9999.ebuild
+++ b/dev-ros/rqt_web/rqt_web-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_web"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,10 +14,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
+	$(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
index c499ce877a6e..2fbf1581c653 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,6 +1,4 @@
-DIST rviz-1.13.6.tar.gz 5096543 BLAKE2B f51750803ca2e133dd225de5b28bf3730b89fd6df9650b662fdbf9ab28551eaadbbd8bab50fd17e8a980702fc9d162ea41b1a3319c14309fdcb15714b8103e3c SHA512 d9f462cf25cc1386a6bfad4dee27e6963ba15e3714f7556df6f79db7eeaa1b43f60461630e6e8d354fd0c56755b7a2b8b38d98fcee4343dd30559a771b0cd157
-DIST rviz-1.14.0.tar.gz 5118043 BLAKE2B 2f5236c3b8bcb0421ebbbc76648ad421b38ad0cb4c6b2c107ef0532c2a84a1c2430b4c648ff6facc634c3247dd8dcb62dd4fe787bbe5c4c5db5a904380b11dc3 SHA512 7ab3d8b751268b6e76fb39184ba0f245cc19b45ef1bb59fa74ada594b12ec2c9c7024a91005a946c0b2c0d977442a8e64570837ab80a10b762729d3f5840411b
-EBUILD rviz-1.13.6-r1.ebuild 1723 BLAKE2B bc99acf8f0f6c783486467d9e7f7305c96150e8137f62a2e0719eaf1a7d99391f4589e693943d51a487e63778cc904fa99afc08a7d28a9a12c43958934606301 SHA512 4a4e0858aded3a6300e281ebcba7caf4ba5e8c0ee215d1e9e02524e758b2c003934277d5e4f10dd59d911838a78fbdcaacc1da98e6acd8a50b712ce7b483ea58
-EBUILD rviz-1.14.0.ebuild 1715 BLAKE2B 13f47a63badc18199c2c88ff83d22a23188bb8344ff6575f3be301f16a46b3b4c95122b4ccc155d797a6eb14bfe2e1b6591f3b0cabf47440c9b8c3f0d1901964 SHA512 a2f5c144f4011e349e79fcc073964b3ee2f9ea3281ec3eafebf91670812eedd2d1b03701420f063a710c57fe7d367dc9f387c4c43a6531b9ce60f41c51545563
-EBUILD rviz-9999.ebuild 1715 BLAKE2B 13f47a63badc18199c2c88ff83d22a23188bb8344ff6575f3be301f16a46b3b4c95122b4ccc155d797a6eb14bfe2e1b6591f3b0cabf47440c9b8c3f0d1901964 SHA512 a2f5c144f4011e349e79fcc073964b3ee2f9ea3281ec3eafebf91670812eedd2d1b03701420f063a710c57fe7d367dc9f387c4c43a6531b9ce60f41c51545563
+DIST rviz-1.14.1.tar.gz 5119463 BLAKE2B c318c84d47fe4579b5554f073d013bb21189c2bff6edb286aea737837e67683a457ffaa0af1c05f1aedd96336689a0975fb8e72fb09af5bd8904bc29e1ee994b SHA512 deefb4f35bc301df2eca310104100c5d01d41a5c5c0204e59519faa8ba6c04efbce5304d1507804d5a42ca904086ea22891cd448b9d5e0d500fe9a7c9be94863
+EBUILD rviz-1.14.1.ebuild 1799 BLAKE2B 46a2b6080400308093b570ef37d74024c8c735d44b72de1390ae161684d5f1c2dc9cb8fc11b97e6e5b01237ec23486d99bf963256a252983f2c061263ca5b151 SHA512 389a7bc6f931d5c6889ab99555d825084c0ea14512dc668cc8fe0a49136195f4266f839633bf07eddeca3927ad0c12d68ff7aa9148cb15c155eba3fb40ff7eb1
+EBUILD rviz-9999.ebuild 1799 BLAKE2B 46a2b6080400308093b570ef37d74024c8c735d44b72de1390ae161684d5f1c2dc9cb8fc11b97e6e5b01237ec23486d99bf963256a252983f2c061263ca5b151 SHA512 389a7bc6f931d5c6889ab99555d825084c0ea14512dc668cc8fe0a49136195f4266f839633bf07eddeca3927ad0c12d68ff7aa9148cb15c155eba3fb40ff7eb1
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.13.6-r1.ebuild b/dev-ros/rviz/rviz-1.13.6-r1.ebuild
deleted file mode 100644
index 1e9f682c7ffe..000000000000
--- a/dev-ros/rviz/rviz-1.13.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 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/rviz"
-KEYWORDS="~amd64"
-
-inherit ros-catkin virtualx
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	<dev-games/ogre-1.10:=[-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
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
-
-src_test() {
-	virtx ros-catkin_src_test
-}
diff --git a/dev-ros/rviz/rviz-1.14.0.ebuild b/dev-ros/rviz/rviz-1.14.0.ebuild
deleted file mode 100644
index 4c97b1574bab..000000000000
--- a/dev-ros/rviz/rviz-1.14.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 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/rviz"
-KEYWORDS=""
-
-inherit ros-catkin virtualx
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	<dev-games/ogre-1.10:=[-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
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
-
-src_test() {
-	virtx ros-catkin_src_test
-}
diff --git a/dev-ros/rviz/rviz-1.14.1.ebuild b/dev-ros/rviz/rviz-1.14.1.ebuild
new file mode 100644
index 000000000000..219df40698dd
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.14.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 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/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:=[threads]
+	media-libs/assimp
+	<dev-games/ogre-1.10:=[-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
+	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/rosbag[${PYTHON_SINGLE_USEDEP}]
+	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
+"
+
+src_test() {
+	virtx ros-catkin_src_test
+}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 4c97b1574bab..219df40698dd 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -4,7 +4,10 @@
 EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS=""
+KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit ros-catkin virtualx
 
@@ -33,38 +36,38 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/message_filters
 	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosconsole
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	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/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
+	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_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
+BDEPEND="
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+"
 
 src_test() {
 	virtx ros-catkin_src_test
diff --git a/dev-ros/rviz_imu_plugin/Manifest b/dev-ros/rviz_imu_plugin/Manifest
index a3313c20b00f..1c9c052434c9 100644
--- a/dev-ros/rviz_imu_plugin/Manifest
+++ b/dev-ros/rviz_imu_plugin/Manifest
@@ -1,8 +1,4 @@
-DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
-DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
-DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
-EBUILD rviz_imu_plugin-1.1.5-r1.ebuild 469 BLAKE2B 0f5068d4d4d812f3062ecd046884843c26a47a3c653b68cca70da3d3cd0b7e58e5d0def78a5365df0a6c2b5413504bcf3c3b09764b66c45b65aa5a294ed80071 SHA512 cb48900eae0268b9fc85e9b630da9e6b2d2eaee769279061012ceb8a2196c63d97afd010c9b1340c44369b604152d85147300ede6da6289bfc0ac0c90b4d4d62
-EBUILD rviz_imu_plugin-1.2.0.ebuild 469 BLAKE2B b5a5d6f9e05a3313ea31023d5bec80a35464fd4373156a11b2047a5c8ce29ab80ecb47df59e6962db97703ab72e20f1fa81c68b94a70cda6330a9e3fb6a45d30 SHA512 0efdcfd8766151e774db18ceeb8f8fcae833d7e699f75b4088517f1f344034247e5d19c53f08d762e261b82f2e36309ff0bcf7a84525fc34b2b4d3270e0442d5
-EBUILD rviz_imu_plugin-1.2.1.ebuild 466 BLAKE2B 53847bdd20178a98b7c16978cd6169dcb7047de54520b1df859b03dc8004f273339c6650b2b1bbbfbcabe94e7e0bda288224ddb6f1337e845e7e510d1d1ca5d0 SHA512 b460b6f6ac90c4267f4f101f897198cd8249c9acb571170b23e1a1a835fb069b8b8245dadd2c859a2c9c5162312a963f47e788f1ef393953bcc0d8fbe9e7c827
-EBUILD rviz_imu_plugin-9999.ebuild 469 BLAKE2B 0f5068d4d4d812f3062ecd046884843c26a47a3c653b68cca70da3d3cd0b7e58e5d0def78a5365df0a6c2b5413504bcf3c3b09764b66c45b65aa5a294ed80071 SHA512 cb48900eae0268b9fc85e9b630da9e6b2d2eaee769279061012ceb8a2196c63d97afd010c9b1340c44369b604152d85147300ede6da6289bfc0ac0c90b4d4d62
+DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+EBUILD rviz_imu_plugin-1.2.2.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
+EBUILD rviz_imu_plugin-9999.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.1.5-r1.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.1.5-r1.ebuild
deleted file mode 100644
index 7f0d0fc9cd92..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/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.0.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.0.ebuild
deleted file mode 100644
index 0c243ce8c89e..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/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.1.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.1.ebuild
deleted file mode 100644
index f6636224b446..000000000000
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/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.2.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild
new file mode 100644
index 000000000000..93876d505729
--- /dev/null
+++ b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild
@@ -0,0 +1,26 @@
+# 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-9999.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
index 7f0d0fc9cd92..93876d505729 100644
--- a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
+++ b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
 KEYWORDS="~amd64"
diff --git a/dev-ros/rviz_plugin_tutorials/Manifest b/dev-ros/rviz_plugin_tutorials/Manifest
index eb330b782809..24aef36f5e34 100644
--- a/dev-ros/rviz_plugin_tutorials/Manifest
+++ b/dev-ros/rviz_plugin_tutorials/Manifest
@@ -1,10 +1,4 @@
-DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
-DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
-DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-EBUILD rviz_plugin_tutorials-0.10.1-r4.ebuild 485 BLAKE2B 66b0981eaa7c9c6c68080f2d95ab1716177cdef66cca4707136cbbb615dd5d182df90141af46ae600f85cbe2cde6ca4f111d230bc5918391043e449f564b2b13 SHA512 d31845c711675a6b21145b40abe1265f4e0993304baf68811ca60997d1764bc7cb0686893c79bfdc82170d93a15f0732cc624dd14208bdb0d02aaf0b784a4b90
-EBUILD rviz_plugin_tutorials-0.10.2.ebuild 485 BLAKE2B 006d43fcd28dcea0c19489210fa8f59b7636d17c331302f4071194bed98fcf3c3c38afba36d4c5547ac7ef0cf24e6983d1eb0092fb1f60166446ba1b4ac22c46 SHA512 733dd923bf39dd41c91f9a27c5d6c362362cefd631007c55fc09865c3a1ed70a3d48707e0394dbc84c39a45dc0e0e7f90e49e280caae67abec0a6128f7037dcb
-EBUILD rviz_plugin_tutorials-0.10.3.ebuild 485 BLAKE2B 006d43fcd28dcea0c19489210fa8f59b7636d17c331302f4071194bed98fcf3c3c38afba36d4c5547ac7ef0cf24e6983d1eb0092fb1f60166446ba1b4ac22c46 SHA512 733dd923bf39dd41c91f9a27c5d6c362362cefd631007c55fc09865c3a1ed70a3d48707e0394dbc84c39a45dc0e0e7f90e49e280caae67abec0a6128f7037dcb
-EBUILD rviz_plugin_tutorials-0.11.0.ebuild 482 BLAKE2B 6137da8d50fc8b59698db896c57052a6294254cb0f6781dafc2b4aa7cfd7bda5fbc478bce463bfab739644e1c03b293f20e197605c2abe080a04b3a5c4e627a8 SHA512 26845a42bf0c37f1b435c8b2abda5449bfbb34e6a3315b31f47dc3d6085c727c0b8c05c7a889ec22594b4cb29fc8ed7e47090c27ff5438366b276e1185074ba8
-EBUILD rviz_plugin_tutorials-9999.ebuild 485 BLAKE2B 66b0981eaa7c9c6c68080f2d95ab1716177cdef66cca4707136cbbb615dd5d182df90141af46ae600f85cbe2cde6ca4f111d230bc5918391043e449f564b2b13 SHA512 d31845c711675a6b21145b40abe1265f4e0993304baf68811ca60997d1764bc7cb0686893c79bfdc82170d93a15f0732cc624dd14208bdb0d02aaf0b784a4b90
+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 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r4.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r4.ebuild
deleted file mode 100644
index 32ef17f584fc..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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-0.10.2.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.2.ebuild
deleted file mode 100644
index 1e7aa88d9e30..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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-0.10.3.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.3.ebuild
deleted file mode 100644
index 1e7aa88d9e30..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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-0.11.0.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild
index e57aebdcdd14..b6065822cd59 100644
--- 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
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
index 32ef17f584fc..b6065822cd59 100644
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/rviz_python_tutorial/Manifest b/dev-ros/rviz_python_tutorial/Manifest
index 3fdf1ee549e7..4ac36520c70f 100644
--- a/dev-ros/rviz_python_tutorial/Manifest
+++ b/dev-ros/rviz_python_tutorial/Manifest
@@ -1,12 +1,4 @@
-DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
-DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
-DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 DIST visualization_tutorials-0.11.0.tar.gz 429489 BLAKE2B d4558a15b696ba05ed156a64ab2c0ad7229314f73d2823c0a46f53132801619d28fc5c68f5d8e0f3e2cadb7bb5078b3518da87ea18940432760b20bddeda578d SHA512 78ebe536a3a209fb0c61fb7dbc0aa115b5f4e6297303b1fc03740402decea719077037a90f4c45a0f6ece95e3578d6dad1095a0b1f0a90c136b738d0350aac9b
-DIST visualization_tutorials-0.9.2.tar.gz 428117 BLAKE2B f25320fa80b12a8a5499d505af369c33362e7f085de3846478b6376fc49e4e2502f07ded6c9e1025224d7b2418d78c87933b2d93b66ad2865eb45581384df24f SHA512 4a2b323e74725dbb77fbba6405d39246a89b170c66dec78288c4461d70c419efc3197eed5867f68305e490552d0480525153f98a64a3025efddc367db824ca53
-EBUILD rviz_python_tutorial-0.10.1.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
-EBUILD rviz_python_tutorial-0.10.2.ebuild 452 BLAKE2B 7cb142425b38933b78c712a3de1f919647f00a7074cf234bb321c929cca089c7b35d10fbc5c85e88d6685a0bf562fec48c859fa4d1e40d61783a553b8b1803f2 SHA512 d0d18eb2f5b0602c9653261de0a2c3e1dc6014e29245b7a50f0518d444e711becf17af97029fdfcfa695760f9a735264b9a0d89eff1a17189aeac0bf2297b9c5
-EBUILD rviz_python_tutorial-0.10.3.ebuild 452 BLAKE2B 7cb142425b38933b78c712a3de1f919647f00a7074cf234bb321c929cca089c7b35d10fbc5c85e88d6685a0bf562fec48c859fa4d1e40d61783a553b8b1803f2 SHA512 d0d18eb2f5b0602c9653261de0a2c3e1dc6014e29245b7a50f0518d444e711becf17af97029fdfcfa695760f9a735264b9a0d89eff1a17189aeac0bf2297b9c5
-EBUILD rviz_python_tutorial-0.11.0.ebuild 449 BLAKE2B 8679cb260460b75e866d5efcc5e7b488e419718abaff9d1241bdd7f0a7820006e8598c9e0ad33d32c07fdd8a9803477ccc8eb34fe635d094aa85f120510a4259 SHA512 95da05a00f84eabc768d10a02c6a1b479c6c845b2021b2c05c1fd75f1684fad2265490c97814eb20582aebdc0bcb88ee578edc4a59a1cfcd97d592ef54a19b38
-EBUILD rviz_python_tutorial-0.9.2.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
-EBUILD rviz_python_tutorial-9999.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
+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 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.1.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.1.ebuild
deleted file mode 100644
index 0f81c43773ff..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild
deleted file mode 100644
index 0f3ef919f175..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild
deleted file mode 100644
index 0f3ef919f175..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]"
-DEPEND="${RDEPEND}"
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
index 2e6384a388d7..4cda6202a37c 100644
--- 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
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,5 +13,5 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rviz[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rviz[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.9.2.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.9.2.ebuild
deleted file mode 100644
index 0f81c43773ff..000000000000
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.9.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_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
index 0f81c43773ff..4cda6202a37c 100644
--- a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild
+++ b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,5 +13,5 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rviz[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rviz[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/self_test/Manifest b/dev-ros/self_test/Manifest
index 6f5a58bf6f4d..9c5238d071a4 100644
--- a/dev-ros/self_test/Manifest
+++ b/dev-ros/self_test/Manifest
@@ -1,14 +1,8 @@
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.8.8.tar.gz 508404 BLAKE2B 9bf90d268ac23d0007133ddc5f2ac0d6ba445265b9cde19271d43274316af3ce734947a1a8a6226491c59e142a36e9f547edb996c797fec6ecaf143afa2c7363 SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef
-DIST diagnostics-1.8.9.tar.gz 525881 BLAKE2B 6de75f5fa961da199daab1a6ae1c2b34b0edbd70c09e58f7384c76f9dd0c3a51cc8b0f20688dbdcafe164ade3a0e3bdc894064cc269f6b8fb0e31faa6f4d9654 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD self_test-1.8.10.ebuild 465 BLAKE2B a5aad2726b233131331e309a6c23a906535f08dbc365c33515d34bc533cab445309231ea4e5189343d9987b8947cb2984404536ccb6f96418ce4bf782fc9983d SHA512 9baea4802e0e0b28548f5cb68b39e86ef32a0efaaae566465cb3b87ec511344ccdcf701e75f7c135c8f86ca2fcab4b30065e92b7020c9a193d95d285d365ef3e
-EBUILD self_test-1.8.8.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
-EBUILD self_test-1.8.9.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
-EBUILD self_test-1.9.0.ebuild 465 BLAKE2B 9bbb52cdfd989148345f8feea974c3562302702bde48d5dd4b10e73e3aad531186553613e821e73703a5f99ae8513e3354273389c003044f4470509e8c4233a4 SHA512 91bb83ba6bbb711667f115de8b59c7c67cb130779ad040b2b6f6349466b0fc8129749d098c08a02536babc8f7f8cd2492a00a35ff3b5ab21d04df3a1fcd2d016
-EBUILD self_test-1.9.2.ebuild 465 BLAKE2B 9bbb52cdfd989148345f8feea974c3562302702bde48d5dd4b10e73e3aad531186553613e821e73703a5f99ae8513e3354273389c003044f4470509e8c4233a4 SHA512 91bb83ba6bbb711667f115de8b59c7c67cb130779ad040b2b6f6349466b0fc8129749d098c08a02536babc8f7f8cd2492a00a35ff3b5ab21d04df3a1fcd2d016
-EBUILD self_test-1.9.3.ebuild 465 BLAKE2B 3818c10c15897497f44bbff4342113532ecce420d64f87621e58cc166a465f1da2e4066bde01742e357b2afa70bee29df66ec0d62f762083ea8f718d40ec738a SHA512 69b013df58f1d1c53af91a31ae34e6cd2e4888392c958907f50e86c6b431ee0a8cc60c862e278d09dd0d703382ce88eb26e6a4bfec200cbd7436e995b24e59cc
-EBUILD self_test-9999.ebuild 465 BLAKE2B e3bdb7edb258d01c1ea086e253166d05b83dbf0a7bd88940e269f35f33478d410c6e4e56944fa48b3ea7f86ced5dec60703d8adf25e16bf380a9bf5c5ef800c7 SHA512 b226692a78a29a877ba8986009e3bc505e2176c641a0100c059e1df483f62327a3da651c2bb89ea92f98b09dfeb72924f52c5b562502b4f5d1c82cd78925859d
+DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+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.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
+EBUILD self_test-1.9.4.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
+EBUILD self_test-1.9.6.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
+EBUILD self_test-9999.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/self_test/self_test-1.10.1.ebuild b/dev-ros/self_test/self_test-1.10.1.ebuild
new file mode 100644
index 000000000000..508f8474c698
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.10.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/roscpp
+	dev-ros/rostest
+	dev-libs/boost:=[threads]
+"
+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.8.10.ebuild b/dev-ros/self_test/self_test-1.8.10.ebuild
deleted file mode 100644
index 2f2fb6b266c6..000000000000
--- a/dev-ros/self_test/self_test-1.8.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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_msgs
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.8.8.ebuild b/dev-ros/self_test/self_test-1.8.8.ebuild
deleted file mode 100644
index 9d24c5969971..000000000000
--- a/dev-ros/self_test/self_test-1.8.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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_msgs
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.8.9.ebuild b/dev-ros/self_test/self_test-1.8.9.ebuild
deleted file mode 100644
index 9d24c5969971..000000000000
--- a/dev-ros/self_test/self_test-1.8.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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_msgs
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.9.0.ebuild b/dev-ros/self_test/self_test-1.9.0.ebuild
deleted file mode 100644
index a3bbb51a443c..000000000000
--- a/dev-ros/self_test/self_test-1.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.9.2.ebuild b/dev-ros/self_test/self_test-1.9.2.ebuild
deleted file mode 100644
index a3bbb51a443c..000000000000
--- a/dev-ros/self_test/self_test-1.9.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.9.3.ebuild b/dev-ros/self_test/self_test-1.9.3.ebuild
deleted file mode 100644
index 4be6495b629d..000000000000
--- a/dev-ros/self_test/self_test-1.9.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/diagnostics"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot self-test node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs
-	dev-ros/diagnostic_updater
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )"
diff --git a/dev-ros/self_test/self_test-1.9.4.ebuild b/dev-ros/self_test/self_test-1.9.4.ebuild
new file mode 100644
index 000000000000..508f8474c698
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/roscpp
+	dev-ros/rostest
+	dev-libs/boost:=[threads]
+"
+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.ebuild b/dev-ros/self_test/self_test-1.9.6.ebuild
new file mode 100644
index 000000000000..508f8474c698
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.9.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/roscpp
+	dev-ros/rostest
+	dev-libs/boost:=[threads]
+"
+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
index 9d24c5969971..508f8474c698 100644
--- a/dev-ros/self_test/self_test-9999.ebuild
+++ b/dev-ros/self_test/self_test-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,11 +14,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/diagnostic_msgs
 	dev-ros/diagnostic_updater
 	dev-ros/roscpp
 	dev-ros/rostest
 	dev-libs/boost:=[threads]
 "
 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
index 98be74d30090..625026052393 100644
--- a/dev-ros/sensor_msgs/Manifest
+++ b/dev-ros/sensor_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD sensor_msgs-1.12.5.ebuild 604 BLAKE2B 5fe485da8a62c62d29b1aa57ebe51a425b2492bd0ab4612a9162c70cddc7074a34d58d13a44d8870355c2172844196198986dfb326e34ce2eb8220a35156cb77 SHA512 8c495252f111f9f467417d88da7a13510395428dedb9aa2cfaa39d66ae9b992b95e1e1ecd9fad416427247b3f694f9aec924afc5360008c94f3a6626bb29cf86
-EBUILD sensor_msgs-1.12.6.ebuild 604 BLAKE2B 5fe485da8a62c62d29b1aa57ebe51a425b2492bd0ab4612a9162c70cddc7074a34d58d13a44d8870355c2172844196198986dfb326e34ce2eb8220a35156cb77 SHA512 8c495252f111f9f467417d88da7a13510395428dedb9aa2cfaa39d66ae9b992b95e1e1ecd9fad416427247b3f694f9aec924afc5360008c94f3a6626bb29cf86
-EBUILD sensor_msgs-1.12.7.ebuild 604 BLAKE2B 5fe485da8a62c62d29b1aa57ebe51a425b2492bd0ab4612a9162c70cddc7074a34d58d13a44d8870355c2172844196198986dfb326e34ce2eb8220a35156cb77 SHA512 8c495252f111f9f467417d88da7a13510395428dedb9aa2cfaa39d66ae9b992b95e1e1ecd9fad416427247b3f694f9aec924afc5360008c94f3a6626bb29cf86
-EBUILD sensor_msgs-9999.ebuild 604 BLAKE2B 5fe485da8a62c62d29b1aa57ebe51a425b2492bd0ab4612a9162c70cddc7074a34d58d13a44d8870355c2172844196198986dfb326e34ce2eb8220a35156cb77 SHA512 8c495252f111f9f467417d88da7a13510395428dedb9aa2cfaa39d66ae9b992b95e1e1ecd9fad416427247b3f694f9aec924afc5360008c94f3a6626bb29cf86
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD sensor_msgs-1.13.0.ebuild 561 BLAKE2B 76325bc750b51027805fd67c23c0b0d843a7418d99334ddd384840d593b1c4de7ffdaf4b52963f4dbbcfab2d2daa84d6ceb21a25164ed9e87195ceaf109f7cc6 SHA512 cd916b8e427bdd568940be9aed1a9ec9b47abb5d1a9b3e2ec6a8434cf521c61eda1b293ac114293f0a1f5512aa369ac2069b13329037bee59b0aaa9f50365c19
+EBUILD sensor_msgs-9999.ebuild 561 BLAKE2B 76325bc750b51027805fd67c23c0b0d843a7418d99334ddd384840d593b1c4de7ffdaf4b52963f4dbbcfab2d2daa84d6ceb21a25164ed9e87195ceaf109f7cc6 SHA512 cd916b8e427bdd568940be9aed1a9ec9b47abb5d1a9b3e2ec6a8434cf521c61eda1b293ac114293f0a1f5512aa369ac2069b13329037bee59b0aaa9f50365c19
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.12.5.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.12.5.ebuild
deleted file mode 100644
index 99a3cc4151ad..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.12.6.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.12.6.ebuild
deleted file mode 100644
index 99a3cc4151ad..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.12.7.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.12.7.ebuild
deleted file mode 100644
index 99a3cc4151ad..000000000000
--- a/dev-ros/sensor_msgs/sensor_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..aff165c07cee
--- /dev/null
+++ b/dev-ros/sensor_msgs/sensor_msgs-1.13.0.ebuild
@@ -0,0 +1,22 @@
+# 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-9999.ebuild b/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
index 99a3cc4151ad..aff165c07cee 100644
--- a/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
+++ b/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
+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_USEDEP}] )
+	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] )
 "
 RDEPEND="${RDEPEND}"
diff --git a/dev-ros/settlerlib/Manifest b/dev-ros/settlerlib/Manifest
index e4370b07541e..1790d262891e 100644
--- a/dev-ros/settlerlib/Manifest
+++ b/dev-ros/settlerlib/Manifest
@@ -1,5 +1,4 @@
-AUX gcc6.patch 537 BLAKE2B 21a31c5a9131e68c7b5acd22fac5d942daf7421416ea59b53d416041ef2300c1b0ce1d0d89a5268139cb83d98080db58544ad2679403f65fcc9a06cf97c61ba4 SHA512 d2de51575d8b6a16de4c72be2c1ac20a9a7383071036312954f375db22b403c8095113550d1a2de9dcff8dcac5ecb86c6f78e6a711ed9a2547a7870c82571d0b
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD settlerlib-0.10.14.ebuild 576 BLAKE2B c8d0e867a13328a1ab7043546839287e23128270d3e80e80d44fbc1c2148976e314eb1cf95cf1d100076fe30df2bce8e3b04dcdd5d8f69024d72f8bda13d5c27 SHA512 2d1e2618c5c4482f1800f45b58cea22be26655620204d78c440ed394279e106ffa5a6676b534e4e31114ee7d886d6574d310c92073c931385ef6f992b88ae13c
-EBUILD settlerlib-9999.ebuild 539 BLAKE2B a9e6046c7f43fdd917d6835514c654a792a3cef1a778dee410a55881cbdab5934ca00bd2c65520cf6071f1a7ca88c4658178143343e31f60b508905a93896115 SHA512 a156bb532ad1a8856b1889c68136190c8596868b65bdc767c265f418b027fae52787a87f923b9ead5204d1bd02e6157eaff784f601a2e5826aa3a58f65dc04a9
+EBUILD settlerlib-0.10.14.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
+EBUILD settlerlib-9999.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/settlerlib/files/gcc6.patch b/dev-ros/settlerlib/files/gcc6.patch
deleted file mode 100644
index 4fe3a03fbe5e..000000000000
--- a/dev-ros/settlerlib/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: settlerlib/CMakeLists.txt
-===================================================================
---- settlerlib.orig/CMakeLists.txt
-+++ settlerlib/CMakeLists.txt
-@@ -9,7 +9,7 @@ catkin_package(DEPENDS Boost calibration
- )
- 
- # common commands for building c++ executables and libraries
--include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
-+include_directories(${catkin_INCLUDE_DIRS})
- include_directories(include)
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/settlerlib/
-         DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
diff --git a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild b/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
index b012573d0e1c..8279f8dc7bae 100644
--- a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
+++ b/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Helper functions and routines to help creating a settler for a specific sensor channel"
+DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rosconsole
 	dev-ros/rostime
 "
 DEPEND="${RDEPEND}
+	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/settlerlib/settlerlib-9999.ebuild b/dev-ros/settlerlib/settlerlib-9999.ebuild
index d55b85a8406d..8279f8dc7bae 100644
--- a/dev-ros/settlerlib/settlerlib-9999.ebuild
+++ b/dev-ros/settlerlib/settlerlib-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/calibration"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Helper functions and routines to help creating a settler for a specific sensor channel"
+DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	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
index 206a5c6d1694..be33fe5c05d6 100644
--- a/dev-ros/shape_msgs/Manifest
+++ b/dev-ros/shape_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD shape_msgs-1.12.5.ebuild 526 BLAKE2B 772661f7594c97d6fa54045ecf6509a8f511176c7edaef9809301428284810ea315ae936d1277b6917dcd4e45b0ed21608b15eab120ccde35e25b85a64d2777e SHA512 36e4401ed60ff408ff54b4b719068f5c7e7a442561d8f9d941324a771271116b9cafad7186aa224475b252d106831f28aff0761b8ca1f957debb1c8cf5b40270
-EBUILD shape_msgs-1.12.6.ebuild 526 BLAKE2B 772661f7594c97d6fa54045ecf6509a8f511176c7edaef9809301428284810ea315ae936d1277b6917dcd4e45b0ed21608b15eab120ccde35e25b85a64d2777e SHA512 36e4401ed60ff408ff54b4b719068f5c7e7a442561d8f9d941324a771271116b9cafad7186aa224475b252d106831f28aff0761b8ca1f957debb1c8cf5b40270
-EBUILD shape_msgs-1.12.7.ebuild 526 BLAKE2B 772661f7594c97d6fa54045ecf6509a8f511176c7edaef9809301428284810ea315ae936d1277b6917dcd4e45b0ed21608b15eab120ccde35e25b85a64d2777e SHA512 36e4401ed60ff408ff54b4b719068f5c7e7a442561d8f9d941324a771271116b9cafad7186aa224475b252d106831f28aff0761b8ca1f957debb1c8cf5b40270
-EBUILD shape_msgs-9999.ebuild 526 BLAKE2B 772661f7594c97d6fa54045ecf6509a8f511176c7edaef9809301428284810ea315ae936d1277b6917dcd4e45b0ed21608b15eab120ccde35e25b85a64d2777e SHA512 36e4401ed60ff408ff54b4b719068f5c7e7a442561d8f9d941324a771271116b9cafad7186aa224475b252d106831f28aff0761b8ca1f957debb1c8cf5b40270
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD shape_msgs-1.13.0.ebuild 478 BLAKE2B 438d32c87d5ed97472bc22e145fab4ac30c15c145b2616c7ea07594c634987de3eb0ab38dec55525b8a7fb8b9b0ac2a0e4948445ce7047b460c3e8e508267fdd SHA512 c28e23d4e19fddfd55e54dbe53433a2b5f199a7d322a5d7b916ee19750e4bcda5ecade89cdcb8c788073bb793f42ccc052e90228cc1cc37e3ce9f64c074c5bea
+EBUILD shape_msgs-9999.ebuild 478 BLAKE2B 438d32c87d5ed97472bc22e145fab4ac30c15c145b2616c7ea07594c634987de3eb0ab38dec55525b8a7fb8b9b0ac2a0e4948445ce7047b460c3e8e508267fdd SHA512 c28e23d4e19fddfd55e54dbe53433a2b5f199a7d322a5d7b916ee19750e4bcda5ecade89cdcb8c788073bb793f42ccc052e90228cc1cc37e3ce9f64c074c5bea
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/shape_msgs/shape_msgs-1.12.5.ebuild b/dev-ros/shape_msgs/shape_msgs-1.12.5.ebuild
deleted file mode 100644
index 800d87f00161..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes, such as 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.12.6.ebuild b/dev-ros/shape_msgs/shape_msgs-1.12.6.ebuild
deleted file mode 100644
index 800d87f00161..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes, such as 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.12.7.ebuild b/dev-ros/shape_msgs/shape_msgs-1.12.7.ebuild
deleted file mode 100644
index 800d87f00161..000000000000
--- a/dev-ros/shape_msgs/shape_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for defining shapes, such as 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.0.ebuild b/dev-ros/shape_msgs/shape_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..824dbef9db8a
--- /dev/null
+++ b/dev-ros/shape_msgs/shape_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/shape_msgs/shape_msgs-9999.ebuild
index 800d87f00161..824dbef9db8a 100644
--- a/dev-ros/shape_msgs/shape_msgs-9999.ebuild
+++ b/dev-ros/shape_msgs/shape_msgs-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Messages for defining shapes, such as simple solid object primitives, planes, and meshes"
+DESCRIPTION="Messages for defining shapes: simple solid object primitives, planes, and meshes"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/shape_tools/Manifest b/dev-ros/shape_tools/Manifest
deleted file mode 100644
index ae817a7815d3..000000000000
--- a/dev-ros/shape_tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST shape_tools-0.2.1.tar.gz 3684 BLAKE2B bdc92056d3c92595243cd33c49c846fc91eb43576be2f4fac190eb09fa19695e7976496c3d4c6f036197666441cce6f92351648aa5a89a98377fa44d9d2d5cc8 SHA512 4d6da49528518776cb51ace908f0f0326b31b2928f0cb8ae0b12bcb0c1fdac99cbcd71f6bd3324d6aecc38a68a10012535b914a2349925eab1487eed8e1bede3
-EBUILD shape_tools-0.2.1.ebuild 637 BLAKE2B d3cfa9e3323105cc317349dd6749f4d0c20d8526edb5b99af81fe146475627fb90bbba8c5efbcbd95281686ec2e9f615e1b1492860799efd6f6f409513769307 SHA512 fb9b123810ef682917c6a148da59da3cbd85b82fee188bc89c23500a184b1ac2b98e81017abb067c960a028aee5d8d645c56d428f7260eb5150144c7c79f8c27
-EBUILD shape_tools-9999.ebuild 637 BLAKE2B d3cfa9e3323105cc317349dd6749f4d0c20d8526edb5b99af81fe146475627fb90bbba8c5efbcbd95281686ec2e9f615e1b1492860799efd6f6f409513769307 SHA512 fb9b123810ef682917c6a148da59da3cbd85b82fee188bc89c23500a184b1ac2b98e81017abb067c960a028aee5d8d645c56d428f7260eb5150144c7c79f8c27
-MISC metadata.xml 338 BLAKE2B af43f88379647e32b43627f2eee8d72a9bc3d42e4f1d73becd4a11c3921125486adf8f1cc61f247e9ffd96399991a51e1d32d67c313cb0c4ab6f9cdfacfa6e90 SHA512 cca0c8e2c77b741038575027d78d2520671d9ae820f74e69ef5913f7f7e12402e6643db4969c51bb932fb92e71a8cc19a0aab1c7719eb46b2eb966afd3e21651
diff --git a/dev-ros/shape_tools/metadata.xml b/dev-ros/shape_tools/metadata.xml
deleted file mode 100644
index fe1e16a33855..000000000000
--- a/dev-ros/shape_tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-planning/shape_tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild
deleted file mode 100644
index be5d89f8bd96..000000000000
--- a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-planning/shape_tools"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for operating on shape messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
-		-i CMakeLists.txt \
-		|| die
-}
diff --git a/dev-ros/shape_tools/shape_tools-9999.ebuild b/dev-ros/shape_tools/shape_tools-9999.ebuild
deleted file mode 100644
index be5d89f8bd96..000000000000
--- a/dev-ros/shape_tools/shape_tools-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-planning/shape_tools"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for operating on shape messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
-		-i CMakeLists.txt \
-		|| die
-}
diff --git a/dev-ros/smach/Manifest b/dev-ros/smach/Manifest
index 938bbb908bde..f0c2029fa81d 100644
--- a/dev-ros/smach/Manifest
+++ b/dev-ros/smach/Manifest
@@ -1,4 +1,4 @@
-DIST executive_smach-2.0.1.tar.gz 42032 BLAKE2B 9271515a67436cd4873d4df5d1abae586af9ae856f9c90904732382e4824bd0bb23c820cd761017532604cde4c7c07ed4a98465b3267319dbc00b61b2d028dea SHA512 88be9ad6a0ec1e82e1592d26621fbbfe24e45640266f369cd03f192649bfd865e5a4ea576cf665161c0f89805e67b38b8b64b62a054ca1e217b99d8284f3b32a
-EBUILD smach-2.0.1.ebuild 413 BLAKE2B ee547e323bf5d5d6ff9009f3ac52b15771ebd713451f82cf6d578120ab7f9bea14233c2f19b072de562c88e41c575ebe231cf4a4a42b880773f240252a04739d SHA512 416ce343e90c984c12c597620d871d6154547584cbcdd0e92e157e2b6b5ffb27da3aa635f901869d62e902f8b58b5e0442a87e7321a07a49a4843016ca1f1198
-EBUILD smach-9999.ebuild 413 BLAKE2B ee547e323bf5d5d6ff9009f3ac52b15771ebd713451f82cf6d578120ab7f9bea14233c2f19b072de562c88e41c575ebe231cf4a4a42b880773f240252a04739d SHA512 416ce343e90c984c12c597620d871d6154547584cbcdd0e92e157e2b6b5ffb27da3aa635f901869d62e902f8b58b5e0442a87e7321a07a49a4843016ca1f1198
+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 333 BLAKE2B 9464368a741c4058fe2563c0a8a575e29bf8a74c43430a6c6f7be286419f675a560290c95d2afdf6e942843e233680e86886237a43ebe8d36136ebd36b4feb04 SHA512 c5e649958133658717bd4d1723953187a4c9626c7a1143fa784bc10ef533165bcb386248a42e20e9c1f7de4147e34c5a09f1009c5c65a78e2ed8fa0ccfc56165
diff --git a/dev-ros/smach/smach-2.0.1.ebuild b/dev-ros/smach/smach-2.0.1.ebuild
deleted file mode 100644
index 31bf99833587..000000000000
--- a/dev-ros/smach/smach-2.0.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=5
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-2.5.0.ebuild b/dev-ros/smach/smach-2.5.0.ebuild
new file mode 100644
index 000000000000..194897b43b81
--- /dev/null
+++ b/dev-ros/smach/smach-2.5.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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
index 31bf99833587..194897b43b81 100644
--- a/dev-ros/smach/smach-9999.ebuild
+++ b/dev-ros/smach/smach-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/executive_smach"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/smach_msgs/Manifest b/dev-ros/smach_msgs/Manifest
index 9ae29a5fc751..b318462fcfd7 100644
--- a/dev-ros/smach_msgs/Manifest
+++ b/dev-ros/smach_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST executive_smach-2.0.1.tar.gz 42032 BLAKE2B 9271515a67436cd4873d4df5d1abae586af9ae856f9c90904732382e4824bd0bb23c820cd761017532604cde4c7c07ed4a98465b3267319dbc00b61b2d028dea SHA512 88be9ad6a0ec1e82e1592d26621fbbfe24e45640266f369cd03f192649bfd865e5a4ea576cf665161c0f89805e67b38b8b64b62a054ca1e217b99d8284f3b32a
-EBUILD smach_msgs-2.0.1.ebuild 492 BLAKE2B c2ddd96dbafa632ac7a22d55933cb77a9dd2734d1ba4ead84af5561182eca8ecddf6e597895fdc15936aeadc14b8319f4195b30377dbd21cf78c8ab5db7ce392 SHA512 d746d8cb8ac00865955a20be94edd7316d9be0343cb49162a0ed54c69b20aef915b57188be6977e72d62a785ea7e947584a8a47ab76ea060bb9fee61bbf939f9
-EBUILD smach_msgs-9999.ebuild 492 BLAKE2B c2ddd96dbafa632ac7a22d55933cb77a9dd2734d1ba4ead84af5561182eca8ecddf6e597895fdc15936aeadc14b8319f4195b30377dbd21cf78c8ab5db7ce392 SHA512 d746d8cb8ac00865955a20be94edd7316d9be0343cb49162a0ed54c69b20aef915b57188be6977e72d62a785ea7e947584a8a47ab76ea060bb9fee61bbf939f9
+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 333 BLAKE2B 9464368a741c4058fe2563c0a8a575e29bf8a74c43430a6c6f7be286419f675a560290c95d2afdf6e942843e233680e86886237a43ebe8d36136ebd36b4feb04 SHA512 c5e649958133658717bd4d1723953187a4c9626c7a1143fa784bc10ef533165bcb386248a42e20e9c1f7de4147e34c5a09f1009c5c65a78e2ed8fa0ccfc56165
diff --git a/dev-ros/smach_msgs/smach_msgs-2.0.1.ebuild b/dev-ros/smach_msgs/smach_msgs-2.0.1.ebuild
deleted file mode 100644
index 20cd3b0f678e..000000000000
--- a/dev-ros/smach_msgs/smach_msgs-2.0.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=5
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-2.5.0.ebuild b/dev-ros/smach_msgs/smach_msgs-2.5.0.ebuild
new file mode 100644
index 000000000000..43513fe5132f
--- /dev/null
+++ b/dev-ros/smach_msgs/smach_msgs-2.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
index 20cd3b0f678e..43513fe5132f 100644
--- a/dev-ros/smach_msgs/smach_msgs-9999.ebuild
+++ b/dev-ros/smach_msgs/smach_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/executive_smach"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
diff --git a/dev-ros/smach_ros/Manifest b/dev-ros/smach_ros/Manifest
index b41260e775cc..f31fb5b27b63 100644
--- a/dev-ros/smach_ros/Manifest
+++ b/dev-ros/smach_ros/Manifest
@@ -1,6 +1,4 @@
-DIST executive_smach-2.0.0.tar.gz 39920 BLAKE2B 556e142927c5bdae710d575b03dbcd6f17151446264d8ff8e8978fd1d45222b1e5e8d9d8967cda8848101b8371b1738cffab638beb4d295437d314c2f399207c SHA512 e1970128f2a49e92e99821922351cb62c64d4367781397f6f6b3c20691c2712824edabe4e4a67264fe48555f3b0c8d1f1fd7bc8820fb6f5937f7c6a22815c601
-DIST executive_smach-2.0.1.tar.gz 42032 BLAKE2B 9271515a67436cd4873d4df5d1abae586af9ae856f9c90904732382e4824bd0bb23c820cd761017532604cde4c7c07ed4a98465b3267319dbc00b61b2d028dea SHA512 88be9ad6a0ec1e82e1592d26621fbbfe24e45640266f369cd03f192649bfd865e5a4ea576cf665161c0f89805e67b38b8b64b62a054ca1e217b99d8284f3b32a
-EBUILD smach_ros-2.0.0.ebuild 793 BLAKE2B 11603e66dd2d6601c7ab1ec5cf665667bef12fc5a8bd0fda067188b4e6c20a363de8cff8b936d4a85aa798a20c2ec91eb2b00e8bb2673f65b0759aceadd8c20d SHA512 e7051f2a5d375aa56c570cac30f8d0a1b9e6dfb33cd7732b484a8c4dcdd5513261143c579ec06f44ac21a8752a3ad05ea21caeac697aa601ae3f698b0daf3f99
-EBUILD smach_ros-2.0.1.ebuild 793 BLAKE2B 3bac339e753c23a87c590587e297597eed0828718b761ccabe308e88fa0188f941a84ec031278c2d5d0e739bd62e4cccb4b6f963501ab78acb3847bde4c0a34f SHA512 214de774ce0996f2544b54aa5c11c5924fe91622ff36d624ff8b795c23559d56fea814996cf42deaeb1206102f1904d76fbbd7330fc388dc9b71f9abf28729ad
-EBUILD smach_ros-9999.ebuild 793 BLAKE2B 11603e66dd2d6601c7ab1ec5cf665667bef12fc5a8bd0fda067188b4e6c20a363de8cff8b936d4a85aa798a20c2ec91eb2b00e8bb2673f65b0759aceadd8c20d SHA512 e7051f2a5d375aa56c570cac30f8d0a1b9e6dfb33cd7732b484a8c4dcdd5513261143c579ec06f44ac21a8752a3ad05ea21caeac697aa601ae3f698b0daf3f99
+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 333 BLAKE2B 9464368a741c4058fe2563c0a8a575e29bf8a74c43430a6c6f7be286419f675a560290c95d2afdf6e942843e233680e86886237a43ebe8d36136ebd36b4feb04 SHA512 c5e649958133658717bd4d1723953187a4c9626c7a1143fa784bc10ef533165bcb386248a42e20e9c1f7de4147e34c5a09f1009c5c65a78e2ed8fa0ccfc56165
diff --git a/dev-ros/smach_ros/smach_ros-2.0.0.ebuild b/dev-ros/smach_ros/smach_ros-2.0.0.ebuild
deleted file mode 100644
index e2c6774ebe00..000000000000
--- a/dev-ros/smach_ros/smach_ros-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/actionlib[${PYTHON_USEDEP}]
-	dev-ros/smach[${PYTHON_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}"
diff --git a/dev-ros/smach_ros/smach_ros-2.0.1.ebuild b/dev-ros/smach_ros/smach_ros-2.0.1.ebuild
deleted file mode 100644
index d3df8eeab34e..000000000000
--- a/dev-ros/smach_ros/smach_ros-2.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/executive_smach"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/actionlib[${PYTHON_USEDEP}]
-	dev-ros/smach[${PYTHON_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}"
diff --git a/dev-ros/smach_ros/smach_ros-2.5.0.ebuild b/dev-ros/smach_ros/smach_ros-2.5.0.ebuild
new file mode 100644
index 000000000000..ad6de87c90ae
--- /dev/null
+++ b/dev-ros/smach_ros/smach_ros-2.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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
index e2c6774ebe00..ad6de87c90ae 100644
--- a/dev-ros/smach_ros/smach_ros-9999.ebuild
+++ b/dev-ros/smach_ros/smach_ros-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/executive_smach"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,14 +15,19 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/actionlib[${PYTHON_USEDEP}]
-	dev-ros/smach[${PYTHON_USEDEP}]
+	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
index bdf4666ae2e5..8dfb6e46562e 100644
--- a/dev-ros/smclib/Manifest
+++ b/dev-ros/smclib/Manifest
@@ -1,12 +1,4 @@
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD smclib-1.7.19.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-1.8.0.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-1.8.1.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-1.8.2.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-1.8.3.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
-EBUILD smclib-9999.ebuild 432 BLAKE2B 8935d0c605be371d4f47e88008b9d372f9f4ec692bdcefe85c322c83e5881aea4794a5770a91d82c564a4654f4d2e97ddaddf0e2874fcfed9c1a12d8a4bf3c34 SHA512 ec29ee323fbd5346a31b15479f261a1763a56b8e632153e06428943e4212c72329976031e9dfcefc1a181e35bcc6e8c4029fb5c01d6156b743f9dd05f07f102b
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD smclib-1.8.5.ebuild 367 BLAKE2B 9daf6abe03aa5f84efd4c4aa74dd2d34f6b70addd1d02382ce4c937878d6d05215d5c8b8ffac98ddd99d88ff66e2241ac739552aa0acdcb78a387b750b51e882 SHA512 1b72233830837618182fd169132da5282b52a719cb09f4d6b37aae8b367bc0cdefef4fc1cceff74199dab6cff46f02c7d1745e59288e2132b04115995ab8e823
+EBUILD smclib-9999.ebuild 367 BLAKE2B 9daf6abe03aa5f84efd4c4aa74dd2d34f6b70addd1d02382ce4c937878d6d05215d5c8b8ffac98ddd99d88ff66e2241ac739552aa0acdcb78a387b750b51e882 SHA512 1b72233830837618182fd169132da5282b52a719cb09f4d6b37aae8b367bc0cdefef4fc1cceff74199dab6cff46f02c7d1745e59288e2132b04115995ab8e823
 MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/smclib/smclib-1.7.19.ebuild b/dev-ros/smclib/smclib-1.7.19.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.7.19.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (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.0.ebuild b/dev-ros/smclib/smclib-1.8.0.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.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=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (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.1.ebuild b/dev-ros/smclib/smclib-1.8.1.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.8.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=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (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.2.ebuild b/dev-ros/smclib/smclib-1.8.2.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.8.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=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (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.3.ebuild b/dev-ros/smclib/smclib-1.8.3.ebuild
deleted file mode 100644
index fde15ce7faf0..000000000000
--- a/dev-ros/smclib/smclib-1.8.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=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit ros-catkin
-
-DESCRIPTION="The State Machine Compiler (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.5.ebuild b/dev-ros/smclib/smclib-1.8.5.ebuild
new file mode 100644
index 000000000000..eb5955f865ee
--- /dev/null
+++ b/dev-ros/smclib/smclib-1.8.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 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
index fde15ce7faf0..eb5955f865ee 100644
--- a/dev-ros/smclib/smclib-9999.ebuild
+++ b/dev-ros/smclib/smclib-9999.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/bond_core"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
-DESCRIPTION="The State Machine Compiler (SMC) converts the description of a state machine into source code"
+DESCRIPTION="The SMC converts the description of a state machine into source code"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/stage_ros/Manifest b/dev-ros/stage_ros/Manifest
index 885cef7d23ea..f15ee89da23a 100644
--- a/dev-ros/stage_ros/Manifest
+++ b/dev-ros/stage_ros/Manifest
@@ -1,8 +1,4 @@
-AUX fltk.patch 1980 BLAKE2B e20ddc6695a2148a6bbb8e548a6f7676e7d9c34dd6a6f3667b5d523a4a23ca4bfc9529a9636b27752910da9b8605173a5f6e247d6510c66ee8fe8075a82fed2b SHA512 3d75b1181387e14f307704707f324792aa1ae932fc683926b1c88f2123ac18562f8e96aed634980707396bd367a8a6bd19af3ddd1ccaa7cafd0a7c1aa86558b9
-AUX stageconfig.patch 1780 BLAKE2B 9b9900a7f0bb83c90244b1720038cb2388b807af182fcf9a78aeefaf56801270b43779402762c31cb66a50bb13789409cd819a1430b1389779d328803fdbb101 SHA512 049e646983d8cb7bbb586b9f2bd7c89db7b94ed6d105b4f1208a4847317d338323b9fbd9e868733c90e2179788216aa872e90ec8d9990fda3b0560132329021a
-DIST stage_ros-1.7.5.tar.gz 58903 BLAKE2B 7bc31dc806560c3286cbc6b112d7e1af41429931ef88f2b85b460669ed5fc1e219c62ab1d733bf9a6ce311783ecfc865117e02890e53d80352b981daca481c8d SHA512 ce4e46f04d4440932f548ccb97745d421dbb5be41ead46df0f45a02e002c2ab672281277ad9835f8c40c001b823873299952b25d6758639a682b19ae470b9511
 DIST stage_ros-1.8.0.tar.gz 59891 BLAKE2B a70708ce0e30418116a1b7b4a2f6b9bfa1e8f03b6562013f51a49e3a349ab0d7d8c090f61d620e4ef7c8d2e19f77165c04b05fb5ceeab061e9d88895cbb6eef7 SHA512 d953e819d1955e7b1f0ca5a3d91e5b052b485045c057ecfe210e8b31dd3b4aa3418ac642dbad87ce8925e74295661a9fee9b10d826c2b1a2a17f8ec478a87927
-EBUILD stage_ros-1.7.5.ebuild 699 BLAKE2B 12108b64c61004fbb2cfb999d86b997f2312251e891e0cbac1d8b18ad00a974e80a9c87860cc496d049409e48fae710da359c926a7313f5c75fe9b6f7fa82284 SHA512 89e47f1cf9e01af029dba9eb968bef560ccc6f4f9ae67e9ba6478b88b0f0b51f20f2bc925425e47bec3619ab59d34c2d7eead4d7b8216c9caf915065dad9d8ea
-EBUILD stage_ros-1.8.0.ebuild 638 BLAKE2B 70f66aae7197118049ff409c0b43483c02057cc7132eda9671c8f3570878ad3939a351216ab62b2402f98c093d9361ebbab55b5e8a1c44a83bbdd0fcfa0b7029 SHA512 d6320a5011b9ffb70f7102c2dc51671e39726e17e39cef242f97401ee7d6524f99877eacb69253e74f190d8dae78403e83fbebfc7e0aebcf0ce763ca86b47295
-EBUILD stage_ros-9999.ebuild 638 BLAKE2B 70f66aae7197118049ff409c0b43483c02057cc7132eda9671c8f3570878ad3939a351216ab62b2402f98c093d9361ebbab55b5e8a1c44a83bbdd0fcfa0b7029 SHA512 d6320a5011b9ffb70f7102c2dc51671e39726e17e39cef242f97401ee7d6524f99877eacb69253e74f190d8dae78403e83fbebfc7e0aebcf0ce763ca86b47295
+EBUILD stage_ros-1.8.0.ebuild 647 BLAKE2B a9c73810ed26c7d34560acf52e4beaf684a0f699f3447f837d1046f055899261eecefe340c687e581f6aa80720957b6bb896bbede67f1e9d3d1930634bb32309 SHA512 9d2006852d99fb12fb7dc2486d365e0edb066a998caef04253d46fc719ca5df4723ce78fedee868e948d109196a3abe6588d7ea85121431013bd4d5a0bb9fa62
+EBUILD stage_ros-9999.ebuild 647 BLAKE2B a9c73810ed26c7d34560acf52e4beaf684a0f699f3447f837d1046f055899261eecefe340c687e581f6aa80720957b6bb896bbede67f1e9d3d1930634bb32309 SHA512 9d2006852d99fb12fb7dc2486d365e0edb066a998caef04253d46fc719ca5df4723ce78fedee868e948d109196a3abe6588d7ea85121431013bd4d5a0bb9fa62
 MISC metadata.xml 338 BLAKE2B be113ba641978d842732dba943269bfbecda305f280a1e594e66e80432987e754f04e83f1da5a94ba941e21900bd626f7dbfd0371dfd68077cd6f74b5531aab6 SHA512 60d3c473f35f325bd591eb4b81993b474b9477904362c8459266eed6c4da08c0bfdcf46deb8c9ab77dd28f11a07870374da80c49469b6a824d3d467d23455b7c
diff --git a/dev-ros/stage_ros/files/fltk.patch b/dev-ros/stage_ros/files/fltk.patch
deleted file mode 100644
index 3e7dc2582944..000000000000
--- a/dev-ros/stage_ros/files/fltk.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit c62d2b2e64e3d36cac91fbd656db8f69b7c42dc5
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Wed Sep 23 14:58:50 2015 +0200
-
-    Revert "Remove all references to FLTK/Fluid"
-    
-    This reverts commit 933f2bf0b776ee028aaa4b58a382101d81fb042e.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7ddd2c7..f709ea5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,12 +14,27 @@ find_package(catkin REQUIRED
- 
- find_package(Boost REQUIRED COMPONENTS system thread)
- 
-+find_package(FLTK REQUIRED)
-+if(FLTK_FOUND)
-+  # FindFLTK.cmake doesn't populate FLTK_INCLUDE_DIRS on some systems,
-+  # so we try to use FLTK_INCLUDE_DIR if we need to.
-+  if("${FLTK_INCLUDE_DIRS}" STREQUAL "")
-+    set(FLTK_INCLUDE_DIRS "${FLTK_INCLUDE_DIR}")
-+  endif()
-+  message(status "FLTK_LIBRARIES=" ${FLTK_LIBRARIES})
-+  message(status "FLTK_INCLUDE_DIR=" ${FLTK_INCLUDE_DIR})
-+  message(status "FLTK_INCLUDE_DIRS=" ${FLTK_INCLUDE_DIRS})
-+else()
-+  message(fatal_error "FLTK not found...aborting!")
-+endif()
-+
- set(Stage_DIR cmake)
- find_package(Stage REQUIRED)
- 
- include_directories(
-   ${catkin_INCLUDE_DIRS}
-   ${Boost_INCLUDE_DIRS}
-+  ${FLTK_INCLUDE_DIRS}
-   ${Stage_INCLUDE_DIRS}
- )
- 
-@@ -34,6 +49,7 @@ endif()
- target_link_libraries(stageros
-   ${catkin_LIBRARIES}
-   ${Boost_LIBRARIES}
-+  ${FLTK_LIBRARIES}
-   ${Stage_LIBRARIES}
-   ${${PROJECT_NAME}_extra_libs}
- )
-diff --git a/package.xml b/package.xml
-index 8803254..fde1a64 100644
---- a/package.xml
-+++ b/package.xml
-@@ -17,6 +17,7 @@
-   <buildtool_depend>catkin</buildtool_depend>
- 
-   <build_depend>boost</build_depend>
-+  <build_depend>libfltk-dev</build_depend>
-   <build_depend>geometry_msgs</build_depend>
-   <build_depend>nav_msgs</build_depend>
-   <build_depend>roscpp</build_depend>
-@@ -28,6 +29,7 @@
-   <build_depend>tf</build_depend>
- 
-   <run_depend>boost</run_depend>
-+  <run_depend>fluid</run_depend>
-   <run_depend>geometry_msgs</run_depend>
-   <run_depend>nav_msgs</run_depend>
-   <run_depend>roscpp</run_depend>
diff --git a/dev-ros/stage_ros/files/stageconfig.patch b/dev-ros/stage_ros/files/stageconfig.patch
deleted file mode 100644
index baadba4ec10c..000000000000
--- a/dev-ros/stage_ros/files/stageconfig.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit 7e9a04fef3b02510017d0ea3bbea047c32a408b1
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Wed Sep 23 14:55:50 2015 +0200
-
-    Revert "Use upstream stage-config.cmake"
-    
-    This reverts commit 55700196507b44ea577233747de25dbf271cdef8.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 89c433d..7ddd2c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,12 +14,13 @@ find_package(catkin REQUIRED
- 
- find_package(Boost REQUIRED COMPONENTS system thread)
- 
--find_package(stage REQUIRED)
-+set(Stage_DIR cmake)
-+find_package(Stage REQUIRED)
- 
- include_directories(
-   ${catkin_INCLUDE_DIRS}
-   ${Boost_INCLUDE_DIRS}
--  ${STAGE_INCLUDE_DIRS}
-+  ${Stage_INCLUDE_DIRS}
- )
- 
- catkin_package()
-@@ -33,7 +34,7 @@ endif()
- target_link_libraries(stageros
-   ${catkin_LIBRARIES}
-   ${Boost_LIBRARIES}
--  ${STAGE_LIBRARIES}
-+  ${Stage_LIBRARIES}
-   ${${PROJECT_NAME}_extra_libs}
- )
- if(catkin_EXPORTED_TARGETS)
-diff --git a/cmake/StageConfig.cmake b/cmake/StageConfig.cmake
-new file mode 100644
-index 0000000..118e41c
---- /dev/null
-+++ b/cmake/StageConfig.cmake
-@@ -0,0 +1,30 @@
-+# - Try to find Stage
-+#
-+# Once done this will define
-+#
-+#  Stage_FOUND - system has Stage
-+#  Stage_INCLUDE_DIRS - the Stage include directory
-+#  Stage_LIBRARIES - the Stage libraries
-+#
-+# Written by William Woodall <william@osrfoundation.org>
-+#
-+
-+find_package(PkgConfig)
-+pkg_check_modules(PC_Stage stage)
-+
-+find_library(Stage_LIBRARIES
-+  NAMES ${PC_Stage_LIBRARIES}
-+  PATHS ${PC_Stage_LIBRARY_DIRS}
-+)
-+
-+set(Stage_INCLUDE_DIRS ${PC_Stage_INCLUDE_DIRS})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Stage
-+	DEFAULT_MSG
-+	Stage_LIBRARIES Stage_INCLUDE_DIRS
-+)
-+
-+mark_as_advanced(Stage_LIBRARIES Stage_INCLUDE_DIRS)
-+
-+set(Stage_FOUND ${STAGE_FOUND})
diff --git a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild b/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
deleted file mode 100644
index 748bdbbb4c6d..000000000000
--- a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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:=[threads]
-	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
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )
-	virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/stageconfig.patch" "${FILESDIR}/fltk.patch" )
diff --git a/dev-ros/stage_ros/stage_ros-1.8.0.ebuild b/dev-ros/stage_ros/stage_ros-1.8.0.ebuild
index 3cdc7cdc4d1c..42b77b4d1dfd 100644
--- a/dev-ros/stage_ros/stage_ros-1.8.0.ebuild
+++ b/dev-ros/stage_ros/stage_ros-1.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
 KEYWORDS="~amd64"
@@ -24,8 +24,10 @@ RDEPEND="
 	dev-ros/tf
 	x11-libs/fltk
 	>=sci-electronics/Stage-4.3:=
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-ros/rostest )
+"
+BDEPEND="
 	virtual/pkgconfig"
diff --git a/dev-ros/stage_ros/stage_ros-9999.ebuild b/dev-ros/stage_ros/stage_ros-9999.ebuild
index 3cdc7cdc4d1c..42b77b4d1dfd 100644
--- a/dev-ros/stage_ros/stage_ros-9999.ebuild
+++ b/dev-ros/stage_ros/stage_ros-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
 KEYWORDS="~amd64"
@@ -24,8 +24,10 @@ RDEPEND="
 	dev-ros/tf
 	x11-libs/fltk
 	>=sci-electronics/Stage-4.3:=
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-ros/rostest )
+"
+BDEPEND="
 	virtual/pkgconfig"
diff --git a/dev-ros/std_msgs/Manifest b/dev-ros/std_msgs/Manifest
index 8282a76663ab..f3463c570cc0 100644
--- a/dev-ros/std_msgs/Manifest
+++ b/dev-ros/std_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST std_msgs-0.5.11.tar.gz 6551 BLAKE2B d1ad69b21dd51272bd98a59d746d272c8b46628cb65688b1cb83c45fbc3e2ef3978916fe3830ef957f1ac6ae9478a30989664fb50d36a3c4b9187d6a1b8b533e SHA512 6cc7cdc4964c29e650d6dccbbd49095dc54a735e6e468e224179ad5a371b1f16a384f43b863c94f256fb2538fed5fd25967c5bd07b2d72ee31e997e1ac04fa7b
-DIST std_msgs-0.5.12.tar.gz 6545 BLAKE2B 4905063f43b280211366d8a5f6d8d6071398bbdac5c04ecaa62e0b118df892c757b1d2ca03b6748ed788e79a0e38b81856349199ab634108e19f75ec0c388962 SHA512 adfb561e39b64f5caf23a5be05e796dd13b16a748925f3c3fd8a5a69651b8268ea6767331ca4512d147edd4d284334d33291908e913bb6dd856e5a5d107150a7
-EBUILD std_msgs-0.5.11.ebuild 374 BLAKE2B 4a676748cd0aff3388fa74dc117a6f66ad9fe231bca57d1376aa4f375f941b3f246773a2e218e4d1a71180b012654d83f3e1ebc18ee8920b0089d3b06b752ad6 SHA512 7efe42685ab8a3023c757cad8a19bbae1dc8182e5e4715aaf1f100382017c72992bbef827bc97be9335808ee5c2742e3f6cb95e98ac1c229670d3f1e07887a31
-EBUILD std_msgs-0.5.12.ebuild 374 BLAKE2B 4a676748cd0aff3388fa74dc117a6f66ad9fe231bca57d1376aa4f375f941b3f246773a2e218e4d1a71180b012654d83f3e1ebc18ee8920b0089d3b06b752ad6 SHA512 7efe42685ab8a3023c757cad8a19bbae1dc8182e5e4715aaf1f100382017c72992bbef827bc97be9335808ee5c2742e3f6cb95e98ac1c229670d3f1e07887a31
-EBUILD std_msgs-9999.ebuild 374 BLAKE2B 4a676748cd0aff3388fa74dc117a6f66ad9fe231bca57d1376aa4f375f941b3f246773a2e218e4d1a71180b012654d83f3e1ebc18ee8920b0089d3b06b752ad6 SHA512 7efe42685ab8a3023c757cad8a19bbae1dc8182e5e4715aaf1f100382017c72992bbef827bc97be9335808ee5c2742e3f6cb95e98ac1c229670d3f1e07887a31
+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 326 BLAKE2B 4b680ab2eb28397e602d23f97d16fd19b8530c9f9f36944a164a7dac2a9967775aa745c00d9848c4f9c5146323e51defedf82f30be0203c7ff96025e7462ecba SHA512 7849e2c2fc3e1d8ab8abf940aec65b4eea8adfabb974abd0990bef7a1b807ee6feda3a7a33922c3ebe90e447266256f816d9cebce91ce0c902a12c9f82d02c40
diff --git a/dev-ros/std_msgs/std_msgs-0.5.11.ebuild b/dev-ros/std_msgs/std_msgs-0.5.11.ebuild
deleted file mode 100644
index 02372598ccc3..000000000000
--- a/dev-ros/std_msgs/std_msgs-0.5.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/std_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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-0.5.12.ebuild b/dev-ros/std_msgs/std_msgs-0.5.12.ebuild
deleted file mode 100644
index 02372598ccc3..000000000000
--- a/dev-ros/std_msgs/std_msgs-0.5.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/std_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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-0.5.13.ebuild b/dev-ros/std_msgs/std_msgs-0.5.13.ebuild
new file mode 100644
index 000000000000..175f7b9d6ed4
--- /dev/null
+++ b/dev-ros/std_msgs/std_msgs-0.5.13.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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
index 02372598ccc3..175f7b9d6ed4 100644
--- a/dev-ros/std_msgs/std_msgs-9999.ebuild
+++ b/dev-ros/std_msgs/std_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/std_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ${SCM} ros-catkin
 
diff --git a/dev-ros/std_srvs/Manifest b/dev-ros/std_srvs/Manifest
index d60b9b839890..7114b5ffdd15 100644
--- a/dev-ros/std_srvs/Manifest
+++ b/dev-ros/std_srvs/Manifest
@@ -1,4 +1,4 @@
-DIST ros_comm_msgs-1.11.2.tar.gz 2482 BLAKE2B 886f0bbbb00b0a291ba32ade834e466e03063087e0feaed9d7edbebb2871bc6ec314b4259bb728e662138384d455d5bbec5df49c5b1b6a448e98339cb3516ab7 SHA512 4750e234725b3cad8e2deb681f827e2f979f50bdfc0fccf4100288d2f663a68561f363702340b4569572837462cf6578f51213362d18b9694f6952fdcede1e6e
-EBUILD std_srvs-1.11.2.ebuild 397 BLAKE2B 03df24f3e5d574f8bbd299cd42d7811cf4ed0d812e19f8e8de20b2c8f201fd0f7f78a132c7e7ff470ab143392e4a464ed95b3ec66ea96dd45ca23bd75f4b86ab SHA512 9d54b326b4f9a8600e228092b7fc538b1f0e9504bc162e15a57b87182d4e92efa2b9dc7932547cdabfb35aeeb905bfc7e935a5e37eb866ad7873501f50f528ee
-EBUILD std_srvs-9999.ebuild 397 BLAKE2B 03df24f3e5d574f8bbd299cd42d7811cf4ed0d812e19f8e8de20b2c8f201fd0f7f78a132c7e7ff470ab143392e4a464ed95b3ec66ea96dd45ca23bd75f4b86ab SHA512 9d54b326b4f9a8600e228092b7fc538b1f0e9504bc162e15a57b87182d4e92efa2b9dc7932547cdabfb35aeeb905bfc7e935a5e37eb866ad7873501f50f528ee
+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 331 BLAKE2B bb21abfb707c7a52640eeb013b04df43dd72b32d8f048207f2d0d0e23732dd2c5727a3bfbc6a1a84d7c4885ba560e15b1dcca0089b1a0e301d2491cc117b9c5d SHA512 365791913afec69e27e8c220acd643eb6ac8e13419a04d38a672a9ba50e696719563b246207abe70a1b945e42c1b61c3348f543f4d7a66b0b6cf62668769cf64
diff --git a/dev-ros/std_srvs/std_srvs-1.11.2.ebuild b/dev-ros/std_srvs/std_srvs-1.11.2.ebuild
deleted file mode 100644
index 884134e47a0b..000000000000
--- a/dev-ros/std_srvs/std_srvs-1.11.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=5
-
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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-1.11.3.ebuild b/dev-ros/std_srvs/std_srvs-1.11.3.ebuild
new file mode 100644
index 000000000000..52fdbcd95ba5
--- /dev/null
+++ b/dev-ros/std_srvs/std_srvs-1.11.3.ebuild
@@ -0,0 +1,19 @@
+# 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
index 884134e47a0b..52fdbcd95ba5 100644
--- a/dev-ros/std_srvs/std_srvs-9999.ebuild
+++ b/dev-ros/std_srvs/std_srvs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/ros_comm_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/stereo_image_proc/Manifest b/dev-ros/stereo_image_proc/Manifest
index 9015839bec67..beacc4b72f1f 100644
--- a/dev-ros/stereo_image_proc/Manifest
+++ b/dev-ros/stereo_image_proc/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD stereo_image_proc-1.12.22-r1.ebuild 747 BLAKE2B c261006449b87dafd168ab81b5cd5391beffa44bd3a276ae50fbf2554865fa28d1abe945b3ba6a206ac46653d2371d0e9be37a864c705becabdde5a0fe8f8760 SHA512 d566dfb75d9bddff8a6b3cf18a79cb067469720bdc0206495e5b14e0ff2ec9460e973970d08a97c14915760eac924cc1ceddc0ca089b391812b7176453bae3a6
-EBUILD stereo_image_proc-1.12.23.ebuild 747 BLAKE2B e1b45ffc21bfdc2a06f87bfdd71de506b8379b6b17b6ee4b3d0fcb7b89e31346e955174698ba037f8de2adfee5f1df0db8221b408954be1a2b9106f1f8dcaba4 SHA512 1e0e9a8373864a500588ec2e78e76400fc8b39b8af80644e4392f75a6c05c56a12d3ccd2c6aef96c6679d2e0873a45ac13f4c92d0e269312a714eae245c05088
-EBUILD stereo_image_proc-1.13.0.ebuild 744 BLAKE2B a723f23aa38a6cb34c99d2ad820d4250d6d6d19319d4a6dcaf75739b308d56e7b5780d091761d95a9e2705af81caafeabddc327c49d5b69220a136f8bd0d2571 SHA512 d5de26a40f7f11feed5ef9f0cf3900c3997822bdb32bb89195ce74d1f2a32a73f8b91579b68d62999cc43db69ea5e4cedb34eae593ccb1482fdbff92192e2e09
-EBUILD stereo_image_proc-9999.ebuild 747 BLAKE2B c261006449b87dafd168ab81b5cd5391beffa44bd3a276ae50fbf2554865fa28d1abe945b3ba6a206ac46653d2371d0e9be37a864c705becabdde5a0fe8f8760 SHA512 d566dfb75d9bddff8a6b3cf18a79cb067469720bdc0206495e5b14e0ff2ec9460e973970d08a97c14915760eac924cc1ceddc0ca089b391812b7176453bae3a6
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD stereo_image_proc-1.15.2.ebuild 717 BLAKE2B 02d2170546fc55efc6ce112e8650f1d8f19bb792796366c241e86337a10b3a9dec575253b064e4f77a0e1e1ed2ab15e035200bc5b9be3b80134e524d19f73a73 SHA512 3ffaf962ef233f1abb375d6f4834af13f1be9aa1bfa90019c3a2efa20e161555ea0657b4c76ae33790fcc0068633cc427ad60f30d8b1c88f9f6eae30f2ee7e51
+EBUILD stereo_image_proc-9999.ebuild 717 BLAKE2B 02d2170546fc55efc6ce112e8650f1d8f19bb792796366c241e86337a10b3a9dec575253b064e4f77a0e1e1ed2ab15e035200bc5b9be3b80134e524d19f73a73 SHA512 3ffaf962ef233f1abb375d6f4834af13f1be9aa1bfa90019c3a2efa20e161555ea0657b4c76ae33790fcc0068633cc427ad60f30d8b1c88f9f6eae30f2ee7e51
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.22-r1.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.22-r1.ebuild
deleted file mode 100644
index 85c2ee4ab95f..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild
deleted file mode 100644
index feab50d5cf8f..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild
deleted file mode 100644
index 7b954876330c..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2.ebuild
new file mode 100644
index 000000000000..ff207309d3ff
--- /dev/null
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-1.15.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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="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:=[threads]
+	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
index 85c2ee4ab95f..ff207309d3ff 100644
--- a/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -22,10 +21,11 @@ RDEPEND="
 	dev-ros/image_transport
 	dev-ros/message_filters
 	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	media-libs/opencv:=
 	dev-libs/boost:=[threads]
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+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
index be5f88fbbf4c..53b7d9616a9b 100644
--- a/dev-ros/stereo_msgs/Manifest
+++ b/dev-ros/stereo_msgs/Manifest
@@ -1,12 +1,4 @@
-DIST common_msgs-1.12.3.tar.gz 55960 BLAKE2B 448892dae7b2a399d0ba9964830875dc18af19920b4f346b4dd22176e023f895a105cc63f72a6440d9743743b5e082a96e88a077f3bfdb947e130468a8de0a15 SHA512 5c7a7362bb1024409c6da3e228e86d701a8df111481ddb831967b6eb447a32da5108ba7421509896628055ddeb2045441ec625178119aebf53a95cd933939cb7
-DIST common_msgs-1.12.4.tar.gz 58764 BLAKE2B 0cc1bdcf59882b3ba54683f1254aa7dd0d3bb61aa7cc1e1a27295fc31281badcda14c2ffb1231e2a6ffcdd43d3c386255b0ddebf1534711e7ccad475d98c4e06 SHA512 4605264f44dcaf6d970be9278de7433fa933d96eb9e4e6355b417c8f4a378eec03106414f3d9ca22cd7960435b2da714c76d40dfc8073dd887038cbecda7bf28
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD stereo_msgs-1.12.3.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-1.12.4.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-1.12.5.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-1.12.6.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-1.12.7.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
-EBUILD stereo_msgs-9999.ebuild 488 BLAKE2B d95f6dbfb677f1eb3581c5866dffabe864f32b858c51f69df18af605eafec996337d385fb360c7bb93483cd0845ae1ccd0fc4bed2a516b3c9a7ae540e70dd2ac SHA512 1034ffb7aba3114b1a96c7d6b020445d6211f7b01b393cbcf4e8cc29c87e884f52e32a4bf647920f3876eae9b030925b8cf5adb072d8cfcbed7a22dab2d31f6a
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD stereo_msgs-1.13.0.ebuild 460 BLAKE2B 93fa5c003de0f86b0ddbae4bfa155b7678445eb0306d6cd8f92b097b12a1fb6e0d4c7defcc5041179e4dac2a224d248e8b130fe25363cdb1d1d97bd2e2349f01 SHA512 0e4299c33327decc91386aa54698d44966e7484ad960b485b9337b29478fdc2111fed3b179b86f81e7a02c7a4adf94daf178b6d668a8b4002ada0b9f79552019
+EBUILD stereo_msgs-9999.ebuild 460 BLAKE2B 93fa5c003de0f86b0ddbae4bfa155b7678445eb0306d6cd8f92b097b12a1fb6e0d4c7defcc5041179e4dac2a224d248e8b130fe25363cdb1d1d97bd2e2349f01 SHA512 0e4299c33327decc91386aa54698d44966e7484ad960b485b9337b29478fdc2111fed3b179b86f81e7a02c7a4adf94daf178b6d668a8b4002ada0b9f79552019
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.12.3.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.3.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.12.4.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.4.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.12.5.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.5.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.12.6.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.6.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.12.7.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.7.ebuild
deleted file mode 100644
index e52d3c2cb983..000000000000
--- a/dev-ros/stereo_msgs/stereo_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.0.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..1154173356b6
--- /dev/null
+++ b/dev-ros/stereo_msgs/stereo_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild
index e52d3c2cb983..1154173356b6 100644
--- a/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild
+++ b/dev-ros/stereo_msgs/stereo_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
 
diff --git a/dev-ros/test_bond/Manifest b/dev-ros/test_bond/Manifest
index eaee437ba457..aae52d5c6606 100644
--- a/dev-ros/test_bond/Manifest
+++ b/dev-ros/test_bond/Manifest
@@ -1,12 +1,4 @@
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
-DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-DIST bond_core-1.8.2.tar.gz 32541 BLAKE2B d2c3000dcd92399f8349f9fbcffbfb432f6f98128365296071ce478c41e9754def757ab26cc89a7e00a0c503ae037792cf494ab53a315fe95de9a56803b2d1ab SHA512 6cb0d5f7af42d1e558772a06ec62a8f31ec8716c72c4d04927301b222de0a67df246e288e777d2ebc9c78000d3bd0c4efe494ea184beb3c906343e83e443c844
-DIST bond_core-1.8.3.tar.gz 32831 BLAKE2B d0c71488436340eff92930006d995ecdd0e98248606b3a6588b36a057584ccc325f751cc170443d21212138bfca2d34c47bd88d4a8a0b719cce81de7bab3218f SHA512 9f9bb71b431199582a36da6ec53806f25fd28fcdfe42e34d60a759f07de98ec86e3f156bc95dc218f3c517e66be426fc30510e111ade9459dfefd74a9555943a
-EBUILD test_bond-1.7.19.ebuild 501 BLAKE2B 01e191ed44b134747afdd317cf7088ee64bff403d164d96f37a9fd74dc1b9223f949978db7bee74a95eec692b500a8ef73ecf87806b850432662a956ddef3463 SHA512 720f2ccd6319db2dced55a83d8786517c89bafa84beaee49a91ed188403c07a454030c620ff47d9db906c6f6393608f66f1dba788ba0aafa68a20aa4341e4056
-EBUILD test_bond-1.8.0.ebuild 501 BLAKE2B 01e191ed44b134747afdd317cf7088ee64bff403d164d96f37a9fd74dc1b9223f949978db7bee74a95eec692b500a8ef73ecf87806b850432662a956ddef3463 SHA512 720f2ccd6319db2dced55a83d8786517c89bafa84beaee49a91ed188403c07a454030c620ff47d9db906c6f6393608f66f1dba788ba0aafa68a20aa4341e4056
-EBUILD test_bond-1.8.1.ebuild 501 BLAKE2B 01e191ed44b134747afdd317cf7088ee64bff403d164d96f37a9fd74dc1b9223f949978db7bee74a95eec692b500a8ef73ecf87806b850432662a956ddef3463 SHA512 720f2ccd6319db2dced55a83d8786517c89bafa84beaee49a91ed188403c07a454030c620ff47d9db906c6f6393608f66f1dba788ba0aafa68a20aa4341e4056
-EBUILD test_bond-1.8.2.ebuild 501 BLAKE2B 8124fe0307809de6db388ee411f1304c308e2472e5e63dc37f5daf76faf43b6b910ce9297a5bdb831ac6be99ff0499ec0fa4d2140d261e38cd89355aae2bcb77 SHA512 7fd9dec1d65db88bf8f5a2faf6cfe5b6f58301a5963928b98f7208e4f62b328079c4a44dfc433d70610428d3fe71765d70f16b4ffcf43c5558b8981bc0d81643
-EBUILD test_bond-1.8.3.ebuild 501 BLAKE2B 8124fe0307809de6db388ee411f1304c308e2472e5e63dc37f5daf76faf43b6b910ce9297a5bdb831ac6be99ff0499ec0fa4d2140d261e38cd89355aae2bcb77 SHA512 7fd9dec1d65db88bf8f5a2faf6cfe5b6f58301a5963928b98f7208e4f62b328079c4a44dfc433d70610428d3fe71765d70f16b4ffcf43c5558b8981bc0d81643
-EBUILD test_bond-9999.ebuild 501 BLAKE2B 01e191ed44b134747afdd317cf7088ee64bff403d164d96f37a9fd74dc1b9223f949978db7bee74a95eec692b500a8ef73ecf87806b850432662a956ddef3463 SHA512 720f2ccd6319db2dced55a83d8786517c89bafa84beaee49a91ed188403c07a454030c620ff47d9db906c6f6393608f66f1dba788ba0aafa68a20aa4341e4056
+DIST bond_core-1.8.5.tar.gz 33713 BLAKE2B c18d77ac0d8ccf717dc5eba28ae560d4ce07aa7e4b077be5c38f46bccfe5b9fc218f47b72a553605e6c25d2b79e15decfceab5ce8ad8b211c6b1a91ab05cf7ba SHA512 544c0abc2e77debc984fdf6941b8f44b2a77b37ee50b4fd27418a296e8c489f445285358e32cc723d47a75bf0e289c9d49133a096efdbed26a0a058f3ea06609
+EBUILD test_bond-1.8.5.ebuild 573 BLAKE2B 649e47d71d398681a58a737333f17a649e48be58a45c96a60a1367d1b69dcc0e0bde4de1aac3f24dedbfc9b062ddd239cafdd8de42bea6291e4c2cf7ab3de0d0 SHA512 b3119efbc7feaefba028d234df671ee3263f67ef28022c8609efe1821b44951a907e7c6f1b5ccfec15eaeefed2f15cd599afc30258c3f6eed3604b10255d404d
+EBUILD test_bond-9999.ebuild 573 BLAKE2B 649e47d71d398681a58a737333f17a649e48be58a45c96a60a1367d1b69dcc0e0bde4de1aac3f24dedbfc9b062ddd239cafdd8de42bea6291e4c2cf7ab3de0d0 SHA512 b3119efbc7feaefba028d234df671ee3263f67ef28022c8609efe1821b44951a907e7c6f1b5ccfec15eaeefed2f15cd599afc30258c3f6eed3604b10255d404d
 MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/test_bond/test_bond-1.7.19.ebuild b/dev-ros/test_bond/test_bond-1.7.19.ebuild
deleted file mode 100644
index f016538e397b..000000000000
--- a/dev-ros/test_bond/test_bond-1.7.19.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.0.ebuild b/dev-ros/test_bond/test_bond-1.8.0.ebuild
deleted file mode 100644
index f016538e397b..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.1.ebuild b/dev-ros/test_bond/test_bond-1.8.1.ebuild
deleted file mode 100644
index f016538e397b..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.2.ebuild b/dev-ros/test_bond/test_bond-1.8.2.ebuild
deleted file mode 100644
index 0853d20f14d8..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.3.ebuild b/dev-ros/test_bond/test_bond-1.8.3.ebuild
deleted file mode 100644
index 0853d20f14d8..000000000000
--- a/dev-ros/test_bond/test_bond-1.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for bond, bondpy and bondcpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/test_bond/test_bond-1.8.5.ebuild b/dev-ros/test_bond/test_bond-1.8.5.ebuild
new file mode 100644
index 000000000000..cd85cdd267fc
--- /dev/null
+++ b/dev-ros/test_bond/test_bond-1.8.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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
index f016538e397b..cd85cdd267fc 100644
--- a/dev-ros/test_bond/test_bond-9999.ebuild
+++ b/dev-ros/test_bond/test_bond-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/bond_core"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,9 +16,14 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/bondcpp
-	dev-ros/bondpy[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
+	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
index 65c34990c7c5..584dd91e583a 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -1,5 +1,9 @@
 AUX gcc6.patch 487 BLAKE2B 9301c9e8e22bb780ea2d91a0055fc0f2f03af1ce3fefeb3bf8c5d53d544f1b73b5420a3cf510c6adc71a615ddfea2894c9ff1fbc4655a403b5b599753a25727e SHA512 20b0cf8ed7774493fa0626fd89932368d6bcbb50e4719cbd29c58012d5bd60357392984959452f8ba12266c54cbd8d825d972de2a3f46f067bda164868d32f86
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD test_diagnostic_aggregator-1.9.3.ebuild 492 BLAKE2B e8945f4e168fe32a7410c274dd196039445a8d8755bb6f1199371f011ce89e251eec7e6270767e5b083ea1271127a907620a3fd5b035cc60029f299b2136f291 SHA512 f93e6e1110111f3c3b1dfcc322bb0ed1c895dec96fb837075be6b09a1b4220d7de411c00a284293c45cc8e57d335239db0e9d54cb2e26b17a808190aa09c3b63
-EBUILD test_diagnostic_aggregator-9999.ebuild 492 BLAKE2B e8945f4e168fe32a7410c274dd196039445a8d8755bb6f1199371f011ce89e251eec7e6270767e5b083ea1271127a907620a3fd5b035cc60029f299b2136f291 SHA512 f93e6e1110111f3c3b1dfcc322bb0ed1c895dec96fb837075be6b09a1b4220d7de411c00a284293c45cc8e57d335239db0e9d54cb2e26b17a808190aa09c3b63
+DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+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.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 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
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
new file mode 100644
index 000000000000..fcaf935a3f4e
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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.3.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
deleted file mode 100644
index cabd94dbe35a..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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" )
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
new file mode 100644
index 000000000000..fcaf935a3f4e
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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
new file mode 100644
index 000000000000..fcaf935a3f4e
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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
index cabd94dbe35a..fcaf935a3f4e 100644
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -23,3 +23,9 @@ RDEPEND="
 "
 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
index 3adf5fc31c3b..b2470eb0f907 100644
--- a/dev-ros/test_nodelet/Manifest
+++ b/dev-ros/test_nodelet/Manifest
@@ -1,5 +1,5 @@
 AUX gcc6.patch 487 BLAKE2B 30f0092f37d10831053ac74ecabf13d591e4da145772e4b42b352bc9d7299f013737b64ab8f88145100d6490f5a7b3041780d11dc45fea62ae4264be05ceec43 SHA512 1258e607c9fdd0a645e3396186408be7628ba53b6b1994a00552be48b65b413038818cb414ccf521c404a80373094059d0478f859540dff23141f14b50cfaeb3
-DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD test_nodelet-1.9.16.ebuild 504 BLAKE2B 65eabdd094e840c726088dee8b949b2f0d8a79f3f53acaebcf85996c3baadaae5c9387094bd6bf04a0d5eecdcec2a56bbda0b78b18e86b5a108525759c7c52d6 SHA512 a0d0ebad0beec555f3473af4b09c9f7883da40f1e548590498313883cf8d122bf8e89ca0a68752a08f405bd53610ebbc5f6f91696523685aa13858dd7515993d
-EBUILD test_nodelet-9999.ebuild 504 BLAKE2B cf186f4ec5d269d59c3733f0234e9ffb28d2a57397ed8b8dc58378addb8ce0765eab20a883a8f9c1662abb101af6380f879b107c30748034ede5a662fc3d073f SHA512 9d041b275321de71de748d6d4961e71fe2831024609f7d0005279d542ba8d9750737341b120fac34e8f3b13111814f76b02a7cdb3068531f84616bfee8405299
+DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+EBUILD test_nodelet-1.10.0.ebuild 661 BLAKE2B 595be0457dd39d3dd9c8bb2f7f2ebc132afd5fa01c5261ac2c92c88ff38f212f6cd23c4ebb5e87cc4f620174ccdf914b907cdbdcc865252f8a10cc476edd5b91 SHA512 5eb9ebd871b693186ca890150faec461880cd3194fe0efc05142c38e9d8d4995dce7ba91af43806b7f295560cdabaef0faa02ebca2a4bebfc9564f1cd0b00ee3
+EBUILD test_nodelet-9999.ebuild 661 BLAKE2B 595be0457dd39d3dd9c8bb2f7f2ebc132afd5fa01c5261ac2c92c88ff38f212f6cd23c4ebb5e87cc4f620174ccdf914b907cdbdcc865252f8a10cc476edd5b91 SHA512 5eb9ebd871b693186ca890150faec461880cd3194fe0efc05142c38e9d8d4995dce7ba91af43806b7f295560cdabaef0faa02ebca2a4bebfc9564f1cd0b00ee3
 MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
diff --git a/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild b/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild
new file mode 100644
index 000000000000..2ce8ca8b3e39
--- /dev/null
+++ b/dev-ros/test_nodelet/test_nodelet-1.10.0.ebuild
@@ -0,0 +1,34 @@
+# 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.9.16.ebuild b/dev-ros/test_nodelet/test_nodelet-1.9.16.ebuild
deleted file mode 100644
index 862a47a4e0af..000000000000
--- a/dev-ros/test_nodelet/test_nodelet-1.9.16.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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" )
diff --git a/dev-ros/test_nodelet/test_nodelet-9999.ebuild b/dev-ros/test_nodelet/test_nodelet-9999.ebuild
index 417f82f9839e..2ce8ca8b3e39 100644
--- a/dev-ros/test_nodelet/test_nodelet-9999.ebuild
+++ b/dev-ros/test_nodelet/test_nodelet-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/nodelet_core"
 KEYWORDS="~amd64 ~arm"
@@ -26,3 +26,9 @@ 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_topic_tools/Manifest b/dev-ros/test_nodelet_topic_tools/Manifest
index cc23b002d0cc..be1d4e725a9e 100644
--- a/dev-ros/test_nodelet_topic_tools/Manifest
+++ b/dev-ros/test_nodelet_topic_tools/Manifest
@@ -1,4 +1,4 @@
-DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD test_nodelet_topic_tools-1.9.16.ebuild 483 BLAKE2B 4342a75139f1b8a1a63e75ebeb28a83f96cc6365b8e5154d029cb822d3c4501f1b83924168ee6097a33500d3aaeac87868982e64efbca0beaad726386f17093a SHA512 3aa3b01464f484c451aa4c89be3625941639a7bd880a5338242b071c8cfec57ff5d16b3092eba4cbe0bfc8fb870c0c91ddc2206582d8d3da351087b0c0c04be4
-EBUILD test_nodelet_topic_tools-9999.ebuild 483 BLAKE2B 986b83f9ab8950fa96dc16915f752f5054932c006c1d6ff2ea4edfdfc6d1755bbac58c47f47e382ffdb303b5226df005ba22080b52ae38384617c4851ffd5753 SHA512 76e71767e26ac4bae271ab0e3ac8604beaabab9b7a915fe5fac66dcc96b36f7a27c981e30577846d85c6f75324494cc9b7846c8e0fd7a70b0940f0cee91be1ed
+DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+EBUILD test_nodelet_topic_tools-1.10.0.ebuild 640 BLAKE2B ba812673c51c8259e7f9b3c0b5a2662b7fec59cfad254df3fe226e8ca24c1fb0c4ece51c1937c9d2695eb03a42588694f96738e405c1a459eb607ffa789b6cbd SHA512 76a177318ea678dae135bb59a86d7f099dccaa7b631f3b1d06fb1de5f3033051b6f789f7a0906adb4517dbf21415107b91109e92ef65f9551856e792666752b9
+EBUILD test_nodelet_topic_tools-9999.ebuild 640 BLAKE2B ba812673c51c8259e7f9b3c0b5a2662b7fec59cfad254df3fe226e8ca24c1fb0c4ece51c1937c9d2695eb03a42588694f96738e405c1a459eb607ffa789b6cbd SHA512 76a177318ea678dae135bb59a86d7f099dccaa7b631f3b1d06fb1de5f3033051b6f789f7a0906adb4517dbf21415107b91109e92ef65f9551856e792666752b9
 MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
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
new file mode 100644
index 000000000000..26a96d22d94f
--- /dev/null
+++ b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.0.ebuild
@@ -0,0 +1,31 @@
+# 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
+"
+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.9.16.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.9.16.ebuild
deleted file mode 100644
index d482731b49c0..000000000000
--- a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.9.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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
-"
-DEPEND="${RDEPEND}"
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
index ac166713248f..26a96d22d94f 100644
--- 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/nodelet_core"
 KEYWORDS="~amd64 ~arm"
@@ -23,3 +23,9 @@ RDEPEND="
 	dev-ros/rostest
 "
 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
index 64167379a716..687dace6499a 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1,20 +1,74 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosbag-1.13.0.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.1.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.2.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.4.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.5.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
-EBUILD test_rosbag-1.13.6.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
-EBUILD test_rosbag-1.14.2.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
-EBUILD test_rosbag-1.14.3.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
-EBUILD test_rosbag-1.15.4.ebuild 837 BLAKE2B b90afd9f723ff6e4d1be048aac2cdedb5cb32d24b060d29085dea31dda9b0d892d7a5b009fac78f56a89b5c426716fe890158841f549cbef1de85380583b7208 SHA512 8d006d83727ffc89945962a2b1e549028417a3caa20ab47b6e530d3b9adb188c3814986fd72b333d20fc0ee819b7e0e91f69e71a814f6f1c24315eae5a7bb101
-EBUILD test_rosbag-9999.ebuild 840 BLAKE2B 4ea77fe53b2287de2f68558340968b0833871953aea2008574e1f85395ce8c35d7169c612fff9f66579119aa1f80f42d5a10806b3321fd0edd9fff7795b4f5f8 SHA512 f094d1f6268deb2b18ca04e0d1098eccb889e9e40337f947392a36c603b2ffd111cb0968187e2ceb8aa77f7dec772c00f0d5d1660ff3e1b85476c5939a33e6ba
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST test_rosbag-1.15.8-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
+DIST test_rosbag-1.15.8-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
+DIST test_rosbag-1.15.8-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
+DIST test_rosbag-1.15.8-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
+DIST test_rosbag-1.15.8-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
+DIST test_rosbag-1.15.8-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
+DIST test_rosbag-1.15.8-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
+DIST test_rosbag-1.15.8-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
+DIST test_rosbag-1.15.8-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
+DIST test_rosbag-1.15.8-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
+DIST test_rosbag-1.15.8-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
+DIST test_rosbag-1.15.8-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
+DIST test_rosbag-1.15.8-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
+DIST test_rosbag-1.15.8-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
+DIST test_rosbag-1.15.8-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
+DIST test_rosbag-1.15.8-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
+DIST test_rosbag-1.15.8-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
+DIST test_rosbag-1.15.8-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
+DIST test_rosbag-1.15.8-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
+DIST test_rosbag-1.15.8-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
+DIST test_rosbag-1.15.8-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
+DIST test_rosbag-1.15.8-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
+DIST test_rosbag-1.15.8-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
+DIST test_rosbag-1.15.8-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
+DIST test_rosbag-1.15.8-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
+DIST test_rosbag-1.15.8-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
+DIST test_rosbag-1.15.8-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
+DIST test_rosbag-1.15.8-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
+DIST test_rosbag-1.15.8-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
+DIST test_rosbag-1.15.8-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
+DIST test_rosbag-1.15.8-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
+DIST test_rosbag-1.15.8-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
+DIST test_rosbag-1.15.8-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
+DIST test_rosbag-1.15.8-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
+DIST test_rosbag-1.15.8-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.8.ebuild 2436 BLAKE2B 20fe1864e638a94568a06e323082356e18297f6ecf0cf041092ccbc027f40ab2c209260194a6d69a7aa0f57fd621da5827d1b975d187596e19c84d1169b38657 SHA512 773d00d67cba50371a20cf0120414bc0fd5ce3a7ab2c7100b519ebe63506610653551c516c75b0925f1a012eb599070255ca164b2fc02834f799ec11a78f4cd5
+EBUILD test_rosbag-9999.ebuild 2436 BLAKE2B 20fe1864e638a94568a06e323082356e18297f6ecf0cf041092ccbc027f40ab2c209260194a6d69a7aa0f57fd621da5827d1b975d187596e19c84d1169b38657 SHA512 773d00d67cba50371a20cf0120414bc0fd5ce3a7ab2c7100b519ebe63506610653551c516c75b0925f1a012eb599070255ca164b2fc02834f799ec11a78f4cd5
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.0.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.0.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.1.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.1.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.2.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.2.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.4.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.4.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.5.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.5.ebuild
deleted file mode 100644
index 81cdc86fbdf5..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild
deleted file mode 100644
index e1c884997333..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.14.2.ebuild b/dev-ros/test_rosbag/test_rosbag-1.14.2.ebuild
deleted file mode 100644
index e1c884997333..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.14.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild b/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild
deleted file mode 100644
index e1c884997333..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.14.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild
deleted file mode 100644
index 9d9775c4523e..000000000000
--- a/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_generation
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_USEDEP}]
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[threads]
-		app-arch/bzip2
-		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)
-"
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.8.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.8.ebuild
new file mode 100644
index 000000000000..6b6c0a839d19
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.8.ebuild
@@ -0,0 +1,104 @@
+# Copyright 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"
+
+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/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[threads]
+		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
index 09da85f90f2f..6b6c0a839d19 100644
--- a/dev-ros/test_rosbag/test_rosbag-9999.ebuild
+++ b/dev-ros/test_rosbag/test_rosbag-9999.ebuild
@@ -1,15 +1,53 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
 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"
@@ -17,14 +55,23 @@ 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_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/topic_tools[${PYTHON_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}
@@ -32,8 +79,26 @@ DEPEND="${RDEPEND}
 		dev-libs/boost[threads]
 		app-arch/bzip2
 		dev-ros/rosout
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
+		$(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
index 2969f93bc036..8d3a9708f86f 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosbag_storage-1.13.0.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.1.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.2.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.4.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.5.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
-EBUILD test_rosbag_storage-1.13.6.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
-EBUILD test_rosbag_storage-1.14.2.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
-EBUILD test_rosbag_storage-1.14.3.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
-EBUILD test_rosbag_storage-1.15.4.ebuild 449 BLAKE2B 4b94b391be588c89ac4f24e0939631d7ccad33effd2d60db1718731c6fe6f21c66b0437092700fd8db0a3a64c8c810c81e03e23579894530e5d66af65e0256b4 SHA512 e0a5f4d95e37c39889d853d663304c579f2f57503a6ff18dc1d2fce483b14246af3938b2fae68ebcd73260f0c62ac0444fb5a6a32c1bb0f358abfbb169a2f88e
-EBUILD test_rosbag_storage-9999.ebuild 452 BLAKE2B 77d6739d14ac2a65205f3fb708f2876a5ac77cb1d5dd398d77418ad90295a431c0184711d6bba55780c8249690fd870170b2bf492134c88879ab8b71ce6ef643 SHA512 5da1d0e29a39475966df57aa6f820e053b3cd4873d9ce88803956c52fd3a3a14773b618c57a5621831cc5b505380658c4881a23fe16a656f0f3ba1215b9a07e8
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD test_rosbag_storage-1.15.8.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
+EBUILD test_rosbag_storage-9999.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.0.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.0.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-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.13.1.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.1.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-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.13.2.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.2.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-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.13.4.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.4.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-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.13.5.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.5.ebuild
deleted file mode 100644
index a722298546d1..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-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.13.6.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.6.ebuild
deleted file mode 100644
index 31f2c38f62c9..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-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.14.2.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.2.ebuild
deleted file mode 100644
index 31f2c38f62c9..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-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.14.3.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.3.ebuild
deleted file mode 100644
index 31f2c38f62c9..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-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.4.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.4.ebuild
deleted file mode 100644
index 8f9c485914bb..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=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.8.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.8.ebuild
new file mode 100644
index 000000000000..9b630af5d5f8
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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-9999.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
index d2c8c31a7a75..258d31bf3e94 100644
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
@@ -17,6 +17,7 @@ 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
index 8610b8f14a07..cd4330808e80 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,7 +1,7 @@
-AUX boost.patch 1046 BLAKE2B f74c7018f277fa2cb525f68602599127eba9fa43cd29b706960de70c3757f9e4e22a3491f3f2d549a0c20abcdf70051449765bc0bad24bfb018a96b5f30022be SHA512 9391547e16815bd065bb467f13468c020006aaac0e49b6b86505ea3aefc110a2a342b47cf3c235fd5522d9881a8c9c85e142c15f00e4b1a627c6be9516738d37
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_roscpp-1.14.3-r1.ebuild 721 BLAKE2B 2cfdd691aedc99cda218504cacc6eeffcc96c75eed937fca3d5c2c04235363cc7a876ac87f6af5f1c318616aecb6c4838ea9d970bb2ce5991eb488175cd334bc SHA512 cf2c48391e89b87a39e3d368907a711a7ed7b470ce6ddcb676bd83dfe21df9c66d060c238307b333a38f3221ddc1a1e0d0cbb3614f7609120a60b4b0e8706622
-EBUILD test_roscpp-1.15.4.ebuild 683 BLAKE2B 1b890234f56dcc228bb2d1846de3c9a52bd4083634fafbf433daabcef6a388c5a6f59df7a9c820b4edf8d79f900b3f51b06514315cb9e62c0e271cf68e66a32b SHA512 c0dd1645817bfadae0ba1865cc219802378fbaaf0782d03784f3d14857ebade42c2380578bba87814e31b38ea0c10706e35d7712b399c2b0515eb5a150328b5b
-EBUILD test_roscpp-9999.ebuild 686 BLAKE2B 913ebd162894a4839ac240006a07f9007384d8066f71fcbef889b020b1283e5d528edc297e9f81497a984e152b6d0f1d91149bbaf0cdb437b2a6074ea51b9326 SHA512 88523b4bd636f6c066a7132bb0509c92cdfbfdbf24db72adef2c4461358c31c40f5c4f7db655aecbc41766429b50f73f1c7e247b7a956fefe2184e9079cd8df8
+AUX tests.patch 512 BLAKE2B 1744807e87cdf18c3c2d74e971828a3f34986f2aff6c17e663e464a7ad522abdbaf96f20771c0f699ef24a5afd572a4a6431a7f21b851e95408e1c7c57032694 SHA512 2f923f01f7b5c869ff1279e6cb1d82f0699388c16caa615b84dd6b3f914355a79ffddb55491bea227980404ff85b3663f51c84e242d5540e3c88f10d912cdca7
+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
+EBUILD test_roscpp-1.15.7.ebuild 669 BLAKE2B 70791b7e565532c36eb3e6120c1a32824bfcfd46b14e141231f3909ebef51544cec10871114ed60707f42097a78091f48d48f90d65e4c406ae3273bca07161c6 SHA512 36cd0566c4887c7e7545610c83c11501a83a8d120006bf03b7b14f91cf221df1297efe10cc49abd0d8d2fa811542491091a87c1dddee77ab8032f5e2edd15612
+EBUILD test_roscpp-1.15.8.ebuild 796 BLAKE2B f70d279c5a51d662fd400a2950cdf7b4e76ad06194363b33bc25dfadda7c4e80c9fd71603c500fdc16d6f7642d6b61454840f28c0ed6e84388c729a697b1e1f6 SHA512 be11987a97ce19777f720e6f6ab7cff2b4babf28ab34938572e50caf4b8f5346ad051345325282ebef4c63ba5c11edb2d16cc68dc5cfa8edca198ef831b2e916
+EBUILD test_roscpp-9999.ebuild 796 BLAKE2B f70d279c5a51d662fd400a2950cdf7b4e76ad06194363b33bc25dfadda7c4e80c9fd71603c500fdc16d6f7642d6b61454840f28c0ed6e84388c729a697b1e1f6 SHA512 be11987a97ce19777f720e6f6ab7cff2b4babf28ab34938572e50caf4b8f5346ad051345325282ebef4c63ba5c11edb2d16cc68dc5cfa8edca198ef831b2e916
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roscpp/files/boost.patch b/dev-ros/test_roscpp/files/boost.patch
deleted file mode 100644
index 41bac154d6ce..000000000000
--- a/dev-ros/test_roscpp/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
-Author: Maarten de Vries <maarten@de-vri.es>
-Date:   Thu Jan 31 00:58:29 2019 +0100
-
-    Remove signals from find_package(Boost COMPONENTS ...) (#1580)
-    
-    The packages use signals2, not signals. Only boost libraries with
-    compiled code should be passed to find_package(Boost COMPONENTS ...),
-    and the signals2 library has always been header only.
-    
-    Boost 1.69 has removed the deprecated signals library, so the otherwise
-    useless but harmless `signals` component now breaks the build.
-
-diff --git a/test/test_roscpp/CMakeLists.txt b/test/test_roscpp/CMakeLists.txt
-index 519767362..01c3d6672 100644
---- a/test/test_roscpp/CMakeLists.txt
-+++ b/test/test_roscpp/CMakeLists.txt
-@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS
- )
- 
- if(CATKIN_ENABLE_TESTING)
--  find_package(Boost REQUIRED COMPONENTS signals filesystem system)
-+  find_package(Boost REQUIRED COMPONENTS filesystem system)
- 
-   include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
- 
diff --git a/dev-ros/test_roscpp/files/tests.patch b/dev-ros/test_roscpp/files/tests.patch
new file mode 100644
index 000000000000..80c18962dee0
--- /dev/null
+++ b/dev-ros/test_roscpp/files/tests.patch
@@ -0,0 +1,12 @@
+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/test_roscpp-1.14.3-r1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild
deleted file mode 100644
index 8e988cf0c461..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild
deleted file mode 100644
index e1720ee72889..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.15.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild
new file mode 100644
index 000000000000..d1b28ba0acaa
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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 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:=[threads]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild
new file mode 100644
index 000000000000..39bfc4bf09a4
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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 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:=[threads]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_roscpp/test_roscpp-9999.ebuild b/dev-ros/test_roscpp/test_roscpp-9999.ebuild
index 13637bb57f1f..39bfc4bf09a4 100644
--- a/dev-ros/test_roscpp/test_roscpp-9999.ebuild
+++ b/dev-ros/test_roscpp/test_roscpp-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
@@ -20,8 +19,8 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=[threads]
 	test? (
@@ -29,3 +28,9 @@ DEPEND="${RDEPEND}
 	)
 "
 REQUIRED_USE="test? ( ros_messages_cxx )"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index 9e448054f960..a2b1a935487a 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,20 +1,6 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosgraph-1.13.0.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.1.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.2.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.4.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.5.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.6.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.14.2.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.14.3.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.15.4.ebuild 435 BLAKE2B a4e168d4de8994d37ce04b1835d22097a9d734aaff1ca12f9763eb62fe337ecf676b350ea5ccc4a388bcb59c40b04be37758cf7407648549887d0a79d708a48a SHA512 4a8b4124d0bf813e4ff89083806efab24654bee7a69ce7cbac71eba94ac2c1b07dbfb6f48a4526d8b665f8d7af660cb43d7c230e9ea353d1c974e911b8158806
-EBUILD test_rosgraph-9999.ebuild 438 BLAKE2B 7f9b25d24b5cab1d71ca26dc80adc38743677d4794e97dc06d8f9c8f40e0cbe42824928f279078bd7c8ea0fac89d17a331f22ced085397a58232be41de424422 SHA512 6a7779f57141d8c72a97e36d73411f5241b3839ff8d1a3d102314fee9192ff6ff637ae86918723a4fa1b8e5dc2523c6a8907ec655f3ec6f5e3abb25533f3a780
+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
+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-9999.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.1.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.1.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild
deleted file mode 100644
index 065166144a2e..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild
new file mode 100644
index 000000000000..17776e85e11b
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 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
new file mode 100644
index 000000000000..71104c076e50
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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
index 03ab95277675..71104c076e50 100644
--- a/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
+++ b/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,12 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+	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
index 1382823011e9..473a28319086 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,20 +1,4 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_roslaunch-1.13.0.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.1.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.2.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.4.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.5.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
-EBUILD test_roslaunch-1.13.6.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
-EBUILD test_roslaunch-1.14.2.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
-EBUILD test_roslaunch-1.14.3.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
-EBUILD test_roslaunch-1.15.4.ebuild 480 BLAKE2B 07c6a5c1689ac56bb03e2326db4191cc308a632564bc0692cc3f5f8ac2ccff1f82aa5a2751a2a46d0f621af683eff60bf15f02cb08817cc0fdf532c459b7bee0 SHA512 a42224296a3a238a47be9a58184d80be676f80f35c2548952a696f107dd9de4154158318ded251cbc32f1de794869dca110cfbc0b33780f347df7120d0e69ae3
-EBUILD test_roslaunch-9999.ebuild 483 BLAKE2B 30e75a9862ea977d4aaf8f4429e35ec20ecc5999219c3d783b27f96de7ccaa18af6bbcf664611eda1b56933e3247b0e37dff999bb8532d8cc4f9586ba60afb72 SHA512 4d6f106652d163dcade1a720e50fe7ef7d3f219f9196128fc044b19fc98c8a4d183c5933d9aa8a152959f331f0b17fd1f8ff67c34f8c875b532d25af5a39e180
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD test_roslaunch-1.15.8.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
+EBUILD test_roslaunch-9999.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.0.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.0.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.1.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.1.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.2.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.2.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.4.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.4.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.5.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.5.ebuild
deleted file mode 100644
index e18f5a97cb79..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild
deleted file mode 100644
index 04a9794a2d44..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.14.2.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.14.2.ebuild
deleted file mode 100644
index 04a9794a2d44..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.14.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild
deleted file mode 100644
index 04a9794a2d44..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.14.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild
deleted file mode 100644
index 719c7c480b7b..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild
new file mode 100644
index 000000000000..3ebd0d435c48
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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
index 0ebaf6fed5c2..3ebd0d435c48 100644
--- a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
+++ b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,9 +16,14 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	test? (
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
+		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
index 66666f8e948f..4e87932c80a1 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2213 BLAKE2B 28dc462a0861c30a9916dd3a42a44a78b411fdb81f2ae8e646f0fb6fe8f1653e5ffcb8a23d6e96bebcebb9073413496338d18cdfd94a25fe54564702e0f86687 SHA512 0cc5bc3627d012b82b5a07a1c24bc997c7c9a9a388cec32732e6b33f2d4e619eeb2f9c404f050ff129592235a73ffe27c2b63b1985108150a2033d504d37b246
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_roslib_comm-1.14.3-r1.ebuild 590 BLAKE2B b7451505b22995f0bc79b667e066fadf17ce14e1abac26bf65f72f5cf0af30726a4090f2417ea1f9fb1c48114b6c916333bdbbc688b4949c4ff77dea17e3d305 SHA512 56b579a588a93dcd88cbad7235a281c98219a291bf8b0de1313a97a2ae82342328ba186a12475f48cccfde8232191bd2efb7dc1433b71cc3c9ca428edf89694a
-EBUILD test_roslib_comm-1.15.4.ebuild 553 BLAKE2B c7c70b96915ca3aa2ee80b41dc992c7a099da29dbc8989511c99f7e1ea9f68d9c3505f5de8d1a3041a6d880025a5ebd425dd8370dc2ff8accfb979183ab029ef SHA512 edd4175c5b2594ec0da4fc551e4a86a946b07a668554d35c77a2a205c679729cd3ffac92a1a61d819112bc56a86b4a20e59b73b12a30bfb8342dae42ebfe4361
-EBUILD test_roslib_comm-9999.ebuild 556 BLAKE2B 500e11a34be014312a1e6432df777843bafb425e09d976cf3c7e4aa86eb8a8c1f085f76d48841aad243b97f1fdf87b79fbdd84b2294089bb6520701923c92939 SHA512 34db49c0d2de9f563da46e1ec3b87a0b4adfe9b99e6b6bbfce2b2b176320ce6f27d9f05c8c47346d07088b23d9f7771a56b7f346bbefc340c8ff5d116523def8
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD test_roslib_comm-1.15.8.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
+EBUILD test_roslib_comm-9999.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslib_comm/files/yaml.patch b/dev-ros/test_roslib_comm/files/yaml.patch
deleted file mode 100644
index a72173c32b8a..000000000000
--- a/dev-ros/test_roslib_comm/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/test/test_roslib_comm/test/test_roslib_message.py b/test/test_roslib_comm/test/test_roslib_message.py
-index 3d4e7a6fa..288cc375b 100644
---- a/test/test_roslib_comm/test/test_roslib_message.py
-+++ b/test/test_roslib_comm/test/test_roslib_message.py
-@@ -61,7 +61,7 @@ def test_strify_message(self):
-         def roundtrip(m):
-             yaml_text = strify_message(m)
-             print(yaml_text)
--            loaded = yaml.load(yaml_text) 
-+            loaded = yaml.safe_load(yaml_text) 
-             print("loaded", loaded)
-             new_inst = m.__class__()
-             if loaded is not None:
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild
deleted file mode 100644
index 4790aa7d9cba..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild
deleted file mode 100644
index ae126d32d92f..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.8.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.8.ebuild
new file mode 100644
index 000000000000..d53ce85e7df6
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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
index 6e3cc6e9db0c..d53ce85e7df6 100644
--- a/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
@@ -9,8 +9,6 @@ ROS_SUBDIR=test/${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit ros-catkin
 
 DESCRIPTION="Unit tests for roslib"
@@ -20,5 +18,15 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
+	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
index 884fb3c15fb7..2417c1bb3d6f 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,9 +1,4 @@
-AUX empty.patch 389 BLAKE2B 7ff08d2bd3cc7c14a4e93cc2ff4a89029f8e922f545c707d14b604a207170a1bbe8f0321c64882d6cc0f614670a8fe6f173e787c7b672a60afb1f8a3a289fe11 SHA512 c6ae83e53ec66fe390647e04c0ddf4ab8a7fcd20dfc6ab4c26012011f8033d3f5120f05eb7f6a71da361592058bcea521ca7839f3158c2fb63b68961c01ef9e6
-AUX py3.patch 2361 BLAKE2B 778987cf4fa20faf2bc883f6715f6c05a0631037bcab799e73e842c18ca1aa2cdbe1ac483d1e160a41eb24c6cac17ae9aff7c14ab86813d348281191948445b2 SHA512 f4f53a5caed1a11c1d0619d2f9a883fc30c35f4f431461074a4e1c79b478be41de7702299fa10ab0c187662aaa1531f184a3748a6944c9eb44130899b0222d6c
-AUX yaml.patch 2233 BLAKE2B 174e7417282c07960ddb76381f79d4cae9ccfd3c9c99add5f0e5dfa610b84fb437b8d6410937bfe048640e082fba23c0544df1dbfd5422b74d9500b5f21468e2 SHA512 ef38c5408dc694bef305746f31b6e0a2b5711968dd5f54a290d5d7eec4c09631fd5773a22443d7c02bc0ef5e275986c7b3755d9acbfa971085e2b67e37f53103
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosmaster-1.14.3-r2.ebuild 782 BLAKE2B 55c8a2d6a8323107a49e6877989a037a57e9e7807816fdef4d57c0a458909df2fee6d689d27d5fe8ed8142bd4fe4b3732f4019ecc90dfc24950d175d12733649 SHA512 6c280c81ac9c8fe6d362fc34ad9c119adef908be96dbffa0f8fe272f7b344b1aef573a698238b1f3cae01390d98830ed54d44ac1768b8c12f6ce2b213dc2a402
-EBUILD test_rosmaster-1.15.4.ebuild 695 BLAKE2B 0b710c893ec0d6a12650e6f35e53589b855c12bd736c3fc84dc054bce00079baf84b28fc34b823d67b6f59bec368bececf4743dc31cc91d0c3ab249f431a5adb SHA512 3cf4cf844c95f5e275da51f0650763b0cdd2d4c8dcf9e1485a5cf6fb4854703b1a220d2c900f97ae1c5e7068562eca67e6f3f325bb855e632c68be5d664932e8
-EBUILD test_rosmaster-9999.ebuild 698 BLAKE2B d5b4d4a9029b5fb5d967a146d22f056f48bab5c55d71db031322feadd8dbd11cccd46dfb8bba77bf70328e24b329e3bdb7df824c9706f30c5dd7e40f1d5c9eb0 SHA512 99dc926c24a752cedb957d9322d1f9a76ca3eb1855ef485ba81fe12fcca2641ecebc960279dbc04739a14cdb77e807cc012233419d6d7c7466b4778c2f5d9498
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD test_rosmaster-1.15.8.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
+EBUILD test_rosmaster-9999.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/files/empty.patch b/dev-ros/test_rosmaster/files/empty.patch
deleted file mode 100644
index 8ec371c917c0..000000000000
--- a/dev-ros/test_rosmaster/files/empty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: test_rosmaster/CMakeLists.txt
-===================================================================
---- test_rosmaster.orig/CMakeLists.txt
-+++ test_rosmaster/CMakeLists.txt
-@@ -10,6 +10,7 @@ if(CATKIN_ENABLE_TESTING)
-     String.msg
-     Arrays.msg
-     CompositeA.msg CompositeB.msg Composite.msg
-+    Empty.msg
-     Embed.msg Floats.msg Simple.msg
-     RosmsgA.msg
-     RosmsgB.msg
diff --git a/dev-ros/test_rosmaster/files/py3.patch b/dev-ros/test_rosmaster/files/py3.patch
deleted file mode 100644
index 579d24f9f0b5..000000000000
--- a/dev-ros/test_rosmaster/files/py3.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows  | 2 +-
- test/test_rosmaster/test/nodes/testMaster          | 2 +-
- test/test_rosmaster/test/nodes/testSlave           | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py        | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py             | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py           | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/test/test_rosmaster/test/nodes/testAllCommonFlows b/test/test_rosmaster/test/nodes/testAllCommonFlows
-index 4d3e053f8..a22ffb8d8 100755
---- a/test/test_rosmaster/test/nodes/testAllCommonFlows
-+++ b/test/test_rosmaster/test/nodes/testAllCommonFlows
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
- 
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
-   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
- location of your ROS install.\n"""
-   sys.exit(-1)
-diff --git a/test/test_rosmaster/test/nodes/testMaster b/test/test_rosmaster/test/nodes/testMaster
-index f3ec36be4..4dca1cb4a 100755
---- a/test/test_rosmaster/test/nodes/testMaster
-+++ b/test/test_rosmaster/test/nodes/testMaster
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
- 
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
-   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
- location of your ROS install.\n"""
-   sys.exit(-1)
-diff --git a/test/test_rosmaster/test/nodes/testSlave b/test/test_rosmaster/test/nodes/testSlave
-index cf70af08b..f8ea7cb47 100755
---- a/test/test_rosmaster/test/nodes/testSlave
-+++ b/test/test_rosmaster/test/nodes/testSlave
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
- 
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
-   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
- location of your ROS install.\n"""
-   sys.exit(-1)
diff --git a/dev-ros/test_rosmaster/files/yaml.patch b/dev-ros/test_rosmaster/files/yaml.patch
deleted file mode 100644
index 2eb9c086b7e4..000000000000
--- a/dev-ros/test_rosmaster/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/test/test_rosmaster/test/client_verification/test_slave_api.py b/test/test_rosmaster/test/client_verification/test_slave_api.py
-index 63d919c72..8614c045d 100755
---- a/test/test_rosmaster/test/client_verification/test_slave_api.py
-+++ b/test/test_rosmaster/test/client_verification/test_slave_api.py
-@@ -106,7 +106,7 @@ def __init__(self, *args, **kwds):
-     def load_profile(self, filename):
-         import yaml
-         with open(filename) as f:
--            d = yaml.load(f)
-+            d = yaml.safe_load(f)
-         self.required_pubs = d.get('pubs', {})
-         self.required_subs = d.get('subs', {})
-         
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
deleted file mode 100644
index d09c050ee2a7..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/empty.patch" "${FILESDIR}/py3.patch" )
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild
deleted file mode 100644
index ea88573de821..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.8.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.8.ebuild
new file mode 100644
index 000000000000..6a163fb0f0ad
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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
index aec1968cf2c2..6a163fb0f0ad 100644
--- a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
+++ b/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
 CATKIN_HAS_MESSAGES=yes
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit ros-catkin
 
 DESCRIPTION="Unit tests for rosmaster"
@@ -17,15 +15,20 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
+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_USEDEP}] )
+	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}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index 80a4a8a83e80..e510a02cecbc 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,7 +1,6 @@
-AUX yaml.patch 3286 BLAKE2B ff83da906b271b957a63e89b26b7ab8b30abf8464635ac773a23d86a82d304ad09fcb9f78eba4f599655231ba59bb509fa89f146529f927742480eb4b777ca37 SHA512 85c1674cc7de77b08e8f632df97e772a325b5595086153690a289f8c2f33e9392ade4a17ab198969baf21f17f2e0414df4aefc2eb758866fa0da2ffe069f5ed0
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosparam-1.14.3.ebuild 537 BLAKE2B ee1b480b906b2606b85c128dfe22e364187bb6866606623bb524e82d2be666bb59d5da501493dfe7fd0933a1c2037cc406802bd9fd2d020b2edce336b5a0dcb4 SHA512 7f6700c3584b8500757db238544252360b1426b7a1b863b15f33fde7a50f87e52f3915181df6db8ea80d7e8a353b1003bc0ca29c0689bfdf83ee2460349eb85e
-EBUILD test_rosparam-1.15.4.ebuild 500 BLAKE2B c4e62babd10d7dda9da6769b5094c763759ff9afa3d05b5fc54b26c17bb19feca8d202de279541a38aa7625acff8815c95670ff2912b08f1094d764c6de1a282 SHA512 d5ae65e1cf92443d496a116e2829a4d5fbccc36980c47fad6c6879995714c772567b88f49b5c5a49e778ae3379d06f747621558eae6503ae87232713e5cb0148
-EBUILD test_rosparam-9999.ebuild 503 BLAKE2B e065bfcfa421c3de64ad8840a544eb4f427c3b2753b38b64960b51e4a9f432d7d3a6e8f2f4ef5303e47c0005e533deea5f34cd63369febb1f05ea3ac0bfb460f SHA512 a36d13dae004b782d566d5c7edf5ebe551c6e6a4d5213904824b1ccacfb61b24c437d01765fe96d584ffcc497fee7a3a630c3bbd45d0849fd0b460289ba8a654
+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
+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-9999.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosparam/files/yaml.patch b/dev-ros/test_rosparam/files/yaml.patch
deleted file mode 100644
index 48f2c1d5bb19..000000000000
--- a/dev-ros/test_rosparam/files/yaml.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/test/test_rosparam/test/check_rosparam.py b/test/test_rosparam/test/check_rosparam.py
-index 52ed976b5..fe8c03fb4 100755
---- a/test/test_rosparam/test/check_rosparam.py
-+++ b/test/test_rosparam/test/check_rosparam.py
-@@ -227,7 +227,7 @@ def test_rosparam_get(self):
-         with fakestdout() as b:
-             rosparam.yamlmain([cmd, 'get', "g1"])
-             import yaml
--            d = yaml.load(b.getvalue())
-+            d = yaml.safe_load(b.getvalue())
-             self.assertEquals(d['float'], 10.0)
-             self.assertEquals(d['int'], 10.0)
-             self.assertEquals(d['string'], "g1-foo-value")
-@@ -346,18 +346,18 @@ def test_rosparam_dump(self):
-         import yaml
-         with open(f_out) as b:
-             with open(f) as b2:
--                self.assertEquals(yaml.load(b.read()), yaml.load(b2.read()))
-+                self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read()))
- 
-         rosparam.yamlmain([cmd, 'dump', '-v', f_out, 'rosparam_dump'])                
-         with open(f_out) as b:
-             with open(f) as b2:
--                self.assertEquals(yaml.load(b.read()), yaml.load(b2.read()))
-+                self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read()))
- 
-         # yaml file and std_out should be the same
-         with fakestdout() as b:
-             rosparam.yamlmain([cmd, 'dump'])
-             with open(f) as b2:
--                self.assertEquals(yaml.load(b.getvalue())['rosparam_dump'], yaml.load(b2.read()))
-+                self.assertEquals(yaml.safe_load(b.getvalue())['rosparam_dump'], yaml.safe_load(b2.read()))
- 
-     def test_fullusage(self):
-         import rosparam
diff --git a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild b/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
deleted file mode 100644
index 9deec865fa13..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild
deleted file mode 100644
index 5193bcbb1300..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild
new file mode 100644
index 000000000000..16022d629a45
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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
new file mode 100644
index 000000000000..712bc9fd620e
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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
index 3a0084ca2436..712bc9fd620e 100644
--- a/dev-ros/test_rosparam/test_rosparam-9999.ebuild
+++ b/dev-ros/test_rosparam/test_rosparam-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
 CATKIN_HAS_MESSAGES=yes
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit ros-catkin
 
 DESCRIPTION="Unit tests for rosparam"
@@ -19,8 +17,13 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
+		$(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
index bef3d7bf4c91..906344117124 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,8 +1,4 @@
-AUX py3-2.patch 2077 BLAKE2B 76b3289eb5a54e085d8ed2b687b70f53c047625a9b4216f4972f62702604192996b89d0469a5d927515c510f00a032919b40b9cd76db8e9e011c61fc37c50e28 SHA512 8b554bbc2a38e3d64a88e05921a8e0ed8271126e86f85f04bf0903224304a25df07530614435247a861b193c0a02a2fd0280488696f9196e6f3bf88b8e89da9e
-AUX py3.patch 1169 BLAKE2B e73fa2afdde33f8fc921118b4bc1189b5f976a2dcc56f498890e1925c698b975c38dec6c6be24f7269e0dce83d2630eaba89b9aa925c249037720d15928d7a9d SHA512 8b5475d81200b724701e3f7312646105295f99d084e324f8990cc494609166d77b834309e19f36452133379682f33174d923d8fbb05f95a75306147c3bac154d
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rospy-1.14.3-r1.ebuild 902 BLAKE2B cc2d72203d6026d6c2fc9694bbbfe92f8af379ec3e0284b67684d30e432757834869710db15e0f546a8c817ccdd6f1cf6e145e68a4a2700ad694c6ca2a6d53bd SHA512 38ecb314607a3db7c111a889f885238a383208f89a8ee952356f44ece4669540f353e81be2d3c45fb3e5aef0c5b3a20c62f9c2db4316e91352caf601560998cb
-EBUILD test_rospy-1.15.4.ebuild 840 BLAKE2B a2b7bd4ee2342d2c780d470d94291bd7557e5ed974d869cffd65c0b06c3bf8be0dbf0621c5866972893c987acaf8e57da71ec05c7a5cc51e8cec9267a82626f6 SHA512 807a14b5886ae3b3e1e1bb230e47db02f9023ccb4c0f47cc4685a39d8e21576dbc1870fa441a33fbf5f84b82aaa4b77833f3eb1c6f488061dad8915d68b6b36c
-EBUILD test_rospy-9999.ebuild 843 BLAKE2B 95bee07029a08cc289842cab2529c1854f1af6ea706853c51725ae88e6e50cad233090f48dfb4c203747a3e4d1fb7849caaf7daa3865730bc6bcb02e295cb77f SHA512 0351a18324e0c5c13cb36af850383a9c904ac8d5bd8f005dfafa6fa1e84a7a9377aaa8fd760036cc7057ee2d4f210f924fed6e65147da9a6c7676f31c75d54a0
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD test_rospy-1.15.8.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
+EBUILD test_rospy-9999.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rospy/files/py3-2.patch b/dev-ros/test_rospy/files/py3-2.patch
deleted file mode 100644
index 18ac23d16866..000000000000
--- a/dev-ros/test_rospy/files/py3-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py   |  6 +--
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- .../test/test_roslogging_user_logger.py       |  8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py   |  2 +-
- tools/rosmsg/src/rosmsg/__init__.py           |  2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py     | 20 ++++----
- .../test_rostopic_command_line_offline.py     | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/test/test_rospy/test/unit/test_genmsg_py.py b/test/test_rospy/test/unit/test_genmsg_py.py
-index 397b35cee..38be1648e 100644
---- a/test/test_rospy/test/unit/test_genmsg_py.py
-+++ b/test/test_rospy/test/unit/test_genmsg_py.py
-@@ -95,8 +95,8 @@ def test_test_rospy_TestFixedArray(self):
-         self.assertEquals([0., 0., 0.], m.f64_3)        
-         self.assertEquals([0], m.i8_1)
-         self.assertEquals([0, 0, 0], m.i8_3)        
--        self.assertEquals(chr(0), m.u8_1)
--        self.assertEquals(chr(0)*3, m.u8_3)        
-+        self.assertEquals(chr(0).encode(), m.u8_1)
-+        self.assertEquals((chr(0)*3).encode(), m.u8_3)
-         self.assertEquals([0], m.i32_1)
-         self.assertEquals([0, 0, 0], m.i32_3)        
-         self.assertEquals([0], m.u32_1)
-@@ -358,7 +358,7 @@ def test_std_msgs_MultiArray(self):
-         # test. the buff was with the uint8[] type consistency
-         buff = StringIO()
-         self.assertEquals(UInt8MultiArray(),UInt8MultiArray())
--        self.assertEquals('',UInt8MultiArray().data)        
-+        self.assertEquals(b'', UInt8MultiArray().data)
-         UInt8MultiArray().serialize(buff)
-         self.assertEquals(UInt8MultiArray(layout=MultiArrayLayout()),UInt8MultiArray())
-         UInt8MultiArray(layout=MultiArrayLayout()).serialize(buff)
diff --git a/dev-ros/test_rospy/files/py3.patch b/dev-ros/test_rospy/files/py3.patch
deleted file mode 100644
index d7ed0f9c9606..000000000000
--- a/dev-ros/test_rospy/files/py3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows  | 2 +-
- test/test_rosmaster/test/nodes/testMaster          | 2 +-
- test/test_rosmaster/test/nodes/testSlave           | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py        | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py             | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py           | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/test/test_rospy/test/unit/test_genmsg_py.py b/test/test_rospy/test/unit/test_genmsg_py.py
-index aebf95b22..397b35cee 100644
---- a/test/test_rospy/test/unit/test_genmsg_py.py
-+++ b/test/test_rospy/test/unit/test_genmsg_py.py
-@@ -44,7 +44,13 @@
- import math
- 
- from roslib.message import SerializationError
--        
-+
-+try:
-+    long
-+except NameError:
-+    long = int
-+
-+
- class TestGenmsgPy(unittest.TestCase):
- 
-     def test_PythonKeyword(self):
diff --git a/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild b/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild
deleted file mode 100644
index 2cf6f2717553..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_USEDEP}]
-		dev-ros/rospy[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
diff --git a/dev-ros/test_rospy/test_rospy-1.15.4.ebuild b/dev-ros/test_rospy/test_rospy-1.15.4.ebuild
deleted file mode 100644
index a60ab86abc52..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_USEDEP}]
-		dev-ros/rospy[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rospy/test_rospy-1.15.8.ebuild b/dev-ros/test_rospy/test_rospy-1.15.8.ebuild
new file mode 100644
index 000000000000..5b429c7f5335
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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
index a87a452ada24..5b429c7f5335 100644
--- a/dev-ros/test_rospy/test_rospy-9999.ebuild
+++ b/dev-ros/test_rospy/test_rospy-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
@@ -9,8 +9,6 @@ ROS_SUBDIR=test/${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit ros-catkin
 
 DESCRIPTION="Unit tests for rospy"
@@ -20,14 +18,16 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
+	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? (
-		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
 		dev-ros/rosbuild
-		dev-ros/rosgraph[${PYTHON_USEDEP}]
-		dev-ros/rospy[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		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
index 6c1171139730..645ac9cfded6 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2877 BLAKE2B af708d68c805323af1e337789798c0318f49e7805cc3b6a52a895edff40fcb71a48c467c2e009c04f19e5ad75231f07e60d94cbfe2baa7a47a5d3d4cd78bd379 SHA512 cd3099ed89f475603151e290dbdddcc170bad5a01002ce51e5a44ceed0ab864480e8daf1eaaf3ab5fbf4fec550f6a0e91ec7dc6400b2fb227abc2bdadc3d64b2
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosservice-1.14.3-r1.ebuild 713 BLAKE2B faacb0d4583af8cde634e608012ed3d1d89a0cd912a54f3c8931a109d3e2ab06965c85c123e7bd92cc83a1a86bc222e5f6648e079dc9e2644ae19268bf96d2b5 SHA512 8604ba792e6a01dc7f085061889d278d48474da3ad21a2580f560ba771dafb3041afd2fe9a797c886bc01af8f04c7f4108f0c8387c25501d5ef3d1667813373a
-EBUILD test_rosservice-1.15.4.ebuild 676 BLAKE2B ecff62b277ac96c0c94754d50a0b1640eebba549a86661f69aebf693ec39d5f66114a7f366ce1adeced5523aa3ffcb7b5d2a4d60fc7e6232f5b8dffa69680e73 SHA512 71453f94f88b1055698f09b4688ad25b5b61246eac009b7a7abed9f13ded12ab158029b16ec76e1900dd2dd8591744db95bdb40d54a20296a01cd04cf0b38f3a
-EBUILD test_rosservice-9999.ebuild 679 BLAKE2B d8c7decce6abc14a7e9c0d9b36a40a001c282333d0e50e8caf7c8598b646adb458bce1aadd01a2a97639dac10d2ec7a232f8145c6fb6a904eb83311bbb47afae SHA512 36c5673453deb431ee1e5816af18510e7bfd9d324089e6bf05af963ef4d769ddc2d8d1d04796f849b75a8d0aeb0dc9663fa9747c07ad20c68934e258e0d273cc
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD test_rosservice-1.15.8.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
+EBUILD test_rosservice-9999.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosservice/files/yaml.patch b/dev-ros/test_rosservice/files/yaml.patch
deleted file mode 100644
index e8d089cbfd09..000000000000
--- a/dev-ros/test_rosservice/files/yaml.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/test/test_rosservice/test/check_rosservice_command_line_online.py b/test/test_rosservice/test/check_rosservice_command_line_online.py
-index dc696adba..c75a52c15 100755
---- a/test/test_rosservice/test/check_rosservice_command_line_online.py
-+++ b/test/test_rosservice/test/check_rosservice_command_line_online.py
-@@ -122,7 +122,7 @@ def test_rosservice(self):
-             output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0]
-             output = output.strip()
-             self.assert_(output, output)
--            val = yaml.load(output)['header']
-+            val = yaml.safe_load(output)['header']
-             self.assertEquals('', val['frame_id'])
-             self.assert_(val['seq'] >= 0)
-             self.assertEquals(0, val['stamp']['secs'])
-@@ -131,7 +131,7 @@ def test_rosservice(self):
-         # test with auto headers
-         for v in ['{header: auto}', '{header: {stamp: now}}']:
-             output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0]
--            val = yaml.load(output.strip())['header']
-+            val = yaml.safe_load(output.strip())['header']
-             self.assertEquals('', val['frame_id'])
-             self.assert_(val['seq'] >= 0)
-             self.assert_(val['stamp']['secs'] >= int(t))
diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild
deleted file mode 100644
index eb480554239e..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_USEDEP}]
-		dev-ros/rospy[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild
deleted file mode 100644
index 507361ef503e..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.15.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=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	test? (
-		dev-ros/test_rosmaster[${PYTHON_USEDEP}]
-		dev-ros/rospy[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild
new file mode 100644
index 000000000000..7f51764ff341
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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
index e11c3e08c1d1..7f51764ff341 100644
--- a/dev-ros/test_rosservice/test_rosservice-9999.ebuild
+++ b/dev-ros/test_rosservice/test_rosservice-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
@@ -9,8 +9,6 @@ ROS_SUBDIR=test/${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit ros-catkin
 
 DESCRIPTION="Unit tests for rospy"
@@ -20,11 +18,12 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	test? (
-		dev-ros/test_rosmaster[${PYTHON_USEDEP}]
-		dev-ros/rospy[${PYTHON_USEDEP}]
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		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
index 350e59889335..22cc37da8a1a 100644
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD test_tf2-0.6.1.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
-EBUILD test_tf2-0.6.2.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
-EBUILD test_tf2-0.6.3.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
-EBUILD test_tf2-0.6.5.ebuild 738 BLAKE2B 437146bf376deae4244d49bebb3335bb9731992e909b7fb6e9228c7f1e3366b5978c8cce5af64f46a25cf904351ac69e97d8e386e7c38522db5fba1503558616 SHA512 59b16e0bb9bc21e0d58e064c16a403f1b94ea5542e08017b76ec5fc219ed482778c640e390e9ebdb094d9f930c1f9ba3e62888480a433d5436b6582a2e8b915e
-EBUILD test_tf2-9999.ebuild 741 BLAKE2B 2913249074a919534e3d42b22cccb6feafae0280339295a6a283cc0992de58225002ac74b26650126f3e203ff74fa8cdacb17b78dbc7bf4ce136d32a414afe43 SHA512 20ba3059bafc461a232c8c94e62e85ca9e38553f9e58a5154e9ce0b7089d5e2a5d1022972289c2de7b4ced6741a95dbff33d076551bd4b0771e60e45f0eebcfd
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD test_tf2-0.7.2.ebuild 782 BLAKE2B e9d033c5ca8dbf23be5b6252da5417d8d5f4055ddb06b0ac5505fc1538d26b0a46ad8180a1aa8df915a224eccde04cd5e153bb78d9817f40e8399645c78e9457 SHA512 6943c5ed0ca706612325ea4d25da2741e3a2d7daee157ad0a8f3d6b6edcd9e336969d979ca03816281ad7dcc342e44ca1e57b75ab3dbf3cdaea23b90a947502c
+EBUILD test_tf2-9999.ebuild 782 BLAKE2B e9d033c5ca8dbf23be5b6252da5417d8d5f4055ddb06b0ac5505fc1538d26b0a46ad8180a1aa8df915a224eccde04cd5e153bb78d9817f40e8399645c78e9457 SHA512 6943c5ed0ca706612325ea4d25da2741e3a2d7daee157ad0a8f3d6b6edcd9e336969d979ca03816281ad7dcc342e44ca1e57b75ab3dbf3cdaea23b90a947502c
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/test_tf2/test_tf2-0.6.1.ebuild b/dev-ros/test_tf2/test_tf2-0.6.1.ebuild
deleted file mode 100644
index 9bfecde03150..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_USEDEP}]
-	dev-ros/tf2_msgs
-	sci-libs/orocos_kdl
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-cpp/gtest"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.6.2.ebuild b/dev-ros/test_tf2/test_tf2-0.6.2.ebuild
deleted file mode 100644
index 9bfecde03150..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_USEDEP}]
-	dev-ros/tf2_msgs
-	sci-libs/orocos_kdl
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-cpp/gtest"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.6.3.ebuild b/dev-ros/test_tf2/test_tf2-0.6.3.ebuild
deleted file mode 100644
index 9bfecde03150..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_USEDEP}]
-	dev-ros/tf2_msgs
-	sci-libs/orocos_kdl
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-cpp/gtest"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.6.5.ebuild b/dev-ros/test_tf2/test_tf2-0.6.5.ebuild
deleted file mode 100644
index 3393b751c864..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.6.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_USEDEP}]
-	dev-ros/tf2_msgs
-	sci-libs/orocos_kdl
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-cpp/gtest"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.7.2.ebuild b/dev-ros/test_tf2/test_tf2-0.7.2.ebuild
new file mode 100644
index 000000000000..24179b340482
--- /dev/null
+++ b/dev-ros/test_tf2/test_tf2-0.7.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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 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_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:=[threads]
+	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
index 4378c07e804e..24179b340482 100644
--- a/dev-ros/test_tf2/test_tf2-9999.ebuild
+++ b/dev-ros/test_tf2/test_tf2-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -18,17 +17,19 @@ RDEPEND=""
 DEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf
 	dev-ros/tf2
 	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_USEDEP}]
+	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
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
 	dev-libs/boost:=[threads]
-	dev-cpp/gtest"
+	dev-cpp/gtest
+"
 
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index b7c6a63fa00b..a8f202cc07b4 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1,5 +1,5 @@
-AUX boost.patch 974 BLAKE2B 77e8a170d7d6dcec9e41e32443abf512d735c0cbb82bc160883e14dad45136818fbe47e34813bf7abe328fca4549c92b5c1041c83a33a5ea63145abb1e8f9431 SHA512 272b7ea812a7a65d415fb8dc845f23cb969391a10e5035b759e48f1fe31466248ffece658f2323a3e3e0ce6b7bfef6ae6e4d0014e8a8a926755e98a9c96783fc
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD tf-1.12.0.ebuild 1041 BLAKE2B bafd8e43f109f7127ce19e48a0d31e44ab91b8027ef02c0c7b86ba0159671ffca727c701e38844e6694c2313de3bd5655a9c94fe9780260507c8c1e35a3643b2 SHA512 8ec179d1f944810777444059a15c395be28c2329c7600d8696f3c99ca56e1d1edf09de48010cab9c05265c346e3dd6afeb95a2f188e6fe1954fee0de3dfa3275
-EBUILD tf-9999.ebuild 1006 BLAKE2B 67006c1c0fc77a0449be9d829464d1efad49aa0e503d96df900e3c288350dd1d140fd2b22bdd76eaa6e3973ef83642251c2ef3218f02492e6d637e903992983e SHA512 980971c39495ef9679810efa1cce7ac029ea92b2fe09031a8dd52d346c37770caf5717641d548b200b42dbce2b4c21dd64d3363794e3fd904c441753fcbd65ac
+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-r1.ebuild 1113 BLAKE2B f03f680d5d9be8be0b24ea486140860d0d5912a1fc81cf79fabb51ede3250ab115e22e38fd4b1f5cbad1b25642926b0bc7926750d4340cf587c0d531684ec9fd SHA512 ee8eb935a5e933686f6bba5ba9004790c7933eb2941159bc1659632ac264ba925fe1bbfb60c370a01b5df92a83ddd82be07fa6da9a3f35ebe98e1a22509acf32
+EBUILD tf-9999.ebuild 1113 BLAKE2B f03f680d5d9be8be0b24ea486140860d0d5912a1fc81cf79fabb51ede3250ab115e22e38fd4b1f5cbad1b25642926b0bc7926750d4340cf587c0d531684ec9fd SHA512 ee8eb935a5e933686f6bba5ba9004790c7933eb2941159bc1659632ac264ba925fe1bbfb60c370a01b5df92a83ddd82be07fa6da9a3f35ebe98e1a22509acf32
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf/files/boost.patch b/dev-ros/tf/files/boost.patch
deleted file mode 100644
index dd926cf05848..000000000000
--- a/dev-ros/tf/files/boost.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2eed72cb7b63fc4ee98af695c625d9a741a09897 Mon Sep 17 00:00:00 2001
-From: Maarten de Vries <maarten@de-vri.es>
-Date: Thu, 17 Jan 2019 21:40:28 +0100
-Subject: [PATCH] Remove `signals` from find_package(Boost COMPONENTS ...)
-
-tf is using signals2, which is not the same library as signals.
-Additionally, signals2 has always been header only, and header only
-libraries must not be listed in find_package.
-
-Boost 1.69 removed the old signals library entirely, so the otherwise
-useless `COMPONENTS signals` actually breaks the build.
----
- tf/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
-index 04dcb4e8..b469f658 100644
---- a/tf/CMakeLists.txt
-+++ b/tf/CMakeLists.txt
-@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
-     std_msgs
-     tf2_ros
- )
--find_package(Boost REQUIRED COMPONENTS thread signals system)
-+find_package(Boost REQUIRED COMPONENTS thread system)
- 
- catkin_python_setup()
- 
diff --git a/dev-ros/tf/files/yaml.patch b/dev-ros/tf/files/yaml.patch
new file mode 100644
index 000000000000..344ef80417ae
--- /dev/null
+++ b/dev-ros/tf/files/yaml.patch
@@ -0,0 +1,13 @@
+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/tf-1.12.0.ebuild b/dev-ros/tf/tf-1.12.0.ebuild
deleted file mode 100644
index 201cf57ee6b6..000000000000
--- a/dev-ros/tf/tf-1.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/angles
-	dev-ros/message_filters
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/tf/tf-1.13.2-r1.ebuild b/dev-ros/tf/tf-1.13.2-r1.ebuild
new file mode 100644
index 000000000000..360303d8a915
--- /dev/null
+++ b/dev-ros/tf/tf-1.13.2-r1.ebuild
@@ -0,0 +1,40 @@
+# 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="Maintains the relationship between frames in a tree structure over time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/angles
+	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}]")
+	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
index 8268c23d3c0d..360303d8a915 100644
--- a/dev-ros/tf/tf-9999.ebuild
+++ b/dev-ros/tf/tf-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/geometry"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in time"
+DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -23,16 +22,19 @@ RDEPEND="
 	dev-ros/rostime
 	dev-ros/roscpp
 	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${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_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(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
index c133031f2197..c8d18ad1d66a 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1,5 +1,4 @@
-AUX boost.patch 958 BLAKE2B 0d75e27281700e0408bbc3132b6fea851e76cfc06b0e9fe7da2911675875e5779cb9aa485539cdfad3e3f812e7711546f0e7c468f964f54a5a0c5ee5c58e5bd5 SHA512 d2f776bfd87fe3b22303b3e7fa5e7a7cf1bc59330ba6d16760172786c3119eb42dde925aa3f7ce04423c1c2cdf6b0fedbe05aeab8d983585e6fd3103996751dc
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2-0.6.5-r1.ebuild 585 BLAKE2B a01271211102fe8762c2c0d222d1e00b3776427cf539965ef113745fd808968763458799130890f87d9fd40f873711070885d1bf76eab1d4a3640dd0244f3001 SHA512 65bf35a70d1a20039f4c8535ca98a54bb85b58e9ff67588921f581634d549460dc1301bf31f34ed8a633f2cd81cb06ff8ac09ecf14a7b7ea7d7af53face432e9
-EBUILD tf2-9999.ebuild 550 BLAKE2B 10c50cfb412755a1c9ca026c2343da67ebdd73a2d9b9eb3697d7d87ca3a167e7f02008cd1f55c6cea8129b162d32c0277ddadfe07dc814a8359e0366f4013121 SHA512 f90dce47cd2d78d2de07c1bfc8da8e17865fe4c3e76313efc8751be397e2892a4df61a10de60eb875309ae9db9c20cd6700a72540cbeb49e303a297d830281b4
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2-0.7.2.ebuild 561 BLAKE2B 959ada1501d564b182a4f437d9f4f760b425761857da4a5e8a84a8aaa9ec1709d6ba5fa6b628a7b8ce8501127034f2e720d98cbd22d004397fcda25c54579902 SHA512 bf6b87155448407748783c0ee9cf5c513899bf23e4b441ec0b9bfb57144e2ebfa5c53254d359e805a2071b7652a05dd623ff541f9bb5fc48a35f125702d4f6a7
+EBUILD tf2-9999.ebuild 561 BLAKE2B 959ada1501d564b182a4f437d9f4f760b425761857da4a5e8a84a8aaa9ec1709d6ba5fa6b628a7b8ce8501127034f2e720d98cbd22d004397fcda25c54579902 SHA512 bf6b87155448407748783c0ee9cf5c513899bf23e4b441ec0b9bfb57144e2ebfa5c53254d359e805a2071b7652a05dd623ff541f9bb5fc48a35f125702d4f6a7
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2/files/boost.patch b/dev-ros/tf2/files/boost.patch
deleted file mode 100644
index 5f87149ee31e..000000000000
--- a/dev-ros/tf2/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 6223549e4d5e1d442a9cfb8e8c7334bcc62c1662
-Author: Maarten de Vries <maarten@de-vri.es>
-Date:   Thu Jan 17 16:00:14 2019 +0100
-
-    Remove `signals` from find_package(Boost COMPONENTS ...).
-    
-    tf2 is using signals2, which is not the same library.
-    Additionally, signals2 has always been header only, and header only
-    libraries must not be listed in find_package.
-    
-    Boost 1.69 removed the old signals library entirely, so the otherwise
-    useless `COMPONENTS signals` actually breaks the build.
-
-diff --git a/tf2/CMakeLists.txt b/tf2/CMakeLists.txt
-index 9ffb17a..7a6da34 100644
---- a/tf2/CMakeLists.txt
-+++ b/tf2/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(tf2)
- 
- find_package(console_bridge REQUIRED)
- find_package(catkin REQUIRED COMPONENTS geometry_msgs rostime tf2_msgs)
--find_package(Boost REQUIRED COMPONENTS signals system thread)
-+find_package(Boost REQUIRED COMPONENTS system thread)
- 
- catkin_package(
-    INCLUDE_DIRS include
diff --git a/dev-ros/tf2/tf2-0.6.5-r1.ebuild b/dev-ros/tf2/tf2-0.6.5-r1.ebuild
deleted file mode 100644
index 826acc9420ad..000000000000
--- a/dev-ros/tf2/tf2-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/console_bridge:=
-	dev-ros/rostime
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/roscpp )
-"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/tf2/tf2-0.7.2.ebuild b/dev-ros/tf2/tf2-0.7.2.ebuild
new file mode 100644
index 000000000000..1e993d3ee72a
--- /dev/null
+++ b/dev-ros/tf2/tf2-0.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge:=
+	dev-ros/rostime
+	dev-libs/boost:=[threads]
+"
+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
index 5c97f8328efe..1e993d3ee72a 100644
--- a/dev-ros/tf2/tf2-9999.ebuild
+++ b/dev-ros/tf2/tf2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,12 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/console_bridge:=
 	dev-ros/rostime
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/roscpp )
+	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
index b25fdf34d11c..a8bced52e7fd 100644
--- a/dev-ros/tf2_bullet/Manifest
+++ b/dev-ros/tf2_bullet/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_bullet-0.6.1.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
-EBUILD tf2_bullet-0.6.2.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
-EBUILD tf2_bullet-0.6.3.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
-EBUILD tf2_bullet-0.6.5.ebuild 400 BLAKE2B 57ddf9be31ec0d99baa695fe01d2b5e3b1cda75ea399929d14cc7108d8bdce5c95eb8bf35151b19fe068a967ef88cea59d25fe82844956e06f83dc8e2839cbb7 SHA512 0dd840841ab016e1dec4314d528d1437c1f64bd08ec17a83ab169689d28871b9f04ff520eb48da00d2874821d86b08cae75bab2ca7e0004e64b0ed9031950286
-EBUILD tf2_bullet-9999.ebuild 403 BLAKE2B 5cd722d732fcbda57a1712a1154c25c7ca071a7f9f98bad333f88ba9bbce875f96c06c6d5174e2da844aefd5592b2010dbbedd501599afd10c8639e4c0726249 SHA512 cb8dc5dde03d9a367af2b78fe5e9a06477703a019b0f3229faac68df0ba1b11313af9d0fce4751202a5302c25373405c616b5a67a0625bb105638f2a038c1a96
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_bullet-0.7.2.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
+EBUILD tf2_bullet-9999.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.1.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.1.ebuild
deleted file mode 100644
index cff2733f7c12..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild
deleted file mode 100644
index cff2733f7c12..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.3.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.3.ebuild
deleted file mode 100644
index cff2733f7c12..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.5.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.5.ebuild
deleted file mode 100644
index 86fbb798b406..000000000000
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 bullet support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-physics/bullet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild
new file mode 100644
index 000000000000..39232f6342a4
--- /dev/null
+++ b/dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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-9999.ebuild b/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
index 0e3481aa549f..39232f6342a4 100644
--- a/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
+++ b/dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
@@ -15,7 +15,12 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	sci-physics/bullet
 "
-DEPEND="${RDEPEND}"
+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
index 57a9695c6e6b..b5acce917c76 100644
--- a/dev-ros/tf2_eigen/Manifest
+++ b/dev-ros/tf2_eigen/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_eigen-0.6.1.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
-EBUILD tf2_eigen-0.6.2.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
-EBUILD tf2_eigen-0.6.3.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
-EBUILD tf2_eigen-0.6.5.ebuild 423 BLAKE2B d48592baeaa164bf98014e191bc5caf43162f28241c787bd532e4dae273b6ce6f50ff84c7e38ea002c34237db8f82c79167256eab52039e6786b212be23a5de6 SHA512 33800d7cef32b4ec75a7e32e1af72acd94a9d1d9e2cbaf6ff79705114860af5f091e365a34b147a10cad4a5ac843948f65042d4cb335a55a34c1b7c11abf0d8f
-EBUILD tf2_eigen-9999.ebuild 426 BLAKE2B ad08ef9dcc12fbc23f846f04e65cd59d2826b99441a05f55ea4cce8c8686956ef3ebd15dfdbd7999de9a89c4c34bdb9476119869dc0213194366735fee2c4828 SHA512 59af992a1e2c160faa74d9f9c7ad06cc95ef4726062726044865da407147e92e0fca5eb32a4b5261d35fbe61288de6d78f1813ebf124a6a2a741cd6219e36774
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_eigen-0.7.2.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
+EBUILD tf2_eigen-9999.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.1.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.1.ebuild
deleted file mode 100644
index b3071940cfb2..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild
deleted file mode 100644
index b3071940cfb2..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.3.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.3.ebuild
deleted file mode 100644
index b3071940cfb2..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.5.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.5.ebuild
deleted file mode 100644
index b5911e90e380..000000000000
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 eigen support"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-ros/tf2
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild
new file mode 100644
index 000000000000..81e3e1a7ddd9
--- /dev/null
+++ b/dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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-9999.ebuild b/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
index ebd5b24c7e79..81e3e1a7ddd9 100644
--- a/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
+++ b/dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,8 +14,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-cpp/eigen:3
 	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 )
 "
-DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_geometry_msgs/Manifest b/dev-ros/tf2_geometry_msgs/Manifest
index 5d7a0a77288a..e963829ac767 100644
--- a/dev-ros/tf2_geometry_msgs/Manifest
+++ b/dev-ros/tf2_geometry_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_geometry_msgs-0.6.3.ebuild 638 BLAKE2B 6ce8934bf2a57cd0723479bdecfede5615e77f6923ebacb7f767b37f6378baae9e039ebb792b0d7adb53c61bbb0bde932860c2d1d2ad42ac5ffb13b55bfc7bcf SHA512 b928127878e9d9447150c66bd796b208a45d7c05d80ec4fd21782ea727c18f9691a936ae1896c4396186cf0dcd4b79312dbe299e2d76c3265501b4648db95d94
-EBUILD tf2_geometry_msgs-0.6.5.ebuild 635 BLAKE2B 11238529a63e1bfbd7045eca08d8ad988ad9ababb6818c52d62e7110838943d2950ee69df73067fcbb938f91d920bdd130fb2ce2b3bd5552dab6dc04093b7b38 SHA512 2466bdd2e31724927e6f4b143457264ab591782a1292c40ff019b1a99c2bdc49159613eb010850ce38424d1393522f2d4d0ec6a0d68d8981998edf6c067b58c3
-EBUILD tf2_geometry_msgs-9999.ebuild 638 BLAKE2B 6ce8934bf2a57cd0723479bdecfede5615e77f6923ebacb7f767b37f6378baae9e039ebb792b0d7adb53c61bbb0bde932860c2d1d2ad42ac5ffb13b55bfc7bcf SHA512 b928127878e9d9447150c66bd796b208a45d7c05d80ec4fd21782ea727c18f9691a936ae1896c4396186cf0dcd4b79312dbe299e2d76c3265501b4648db95d94
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_geometry_msgs-0.7.2.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
+EBUILD tf2_geometry_msgs-9999.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.3.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.3.ebuild
deleted file mode 100644
index 244de1604706..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	sci-libs/orocos_kdl
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.5.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.5.ebuild
deleted file mode 100644
index a15156ecb52e..000000000000
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-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_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	sci-libs/orocos_kdl
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
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
new file mode 100644
index 000000000000..388537a8dcc4
--- /dev/null
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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-9999.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
index 244de1604706..388537a8dcc4 100644
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 
 inherit ros-catkin
@@ -16,11 +15,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	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},${CATKIN_MESSAGES_CXX_USEDEP}]
+	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
+	)
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_kdl/Manifest b/dev-ros/tf2_kdl/Manifest
index 3e96e51085e1..1050d75ac2ad 100644
--- a/dev-ros/tf2_kdl/Manifest
+++ b/dev-ros/tf2_kdl/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_kdl-0.6.1-r1.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
-EBUILD tf2_kdl-0.6.2.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
-EBUILD tf2_kdl-0.6.3.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
-EBUILD tf2_kdl-0.6.5.ebuild 588 BLAKE2B 4b10b7c9328918eacc47fbfbbc0299828c2ad26dd32e93a1799f935d4cdc808e8e74bf7d52d8280e92a151f83a2d908eea7bb471114fa18cc0c40195871f3241 SHA512 4fa0f5d8c3108e4969ddf10c7db4117cc37a76d2f770564bb42e938bae69b5281a297b03ec6540b233f80362183f0cca37ca5470d3e95754bbb087532bd130da
-EBUILD tf2_kdl-9999.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_kdl-0.7.2.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
+EBUILD tf2_kdl-9999.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.1-r1.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.1-r1.ebuild
deleted file mode 100644
index e5c441b6527d..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${PYTHON_USEDEP}]
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild
deleted file mode 100644
index e5c441b6527d..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${PYTHON_USEDEP}]
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.3.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.3.ebuild
deleted file mode 100644
index e5c441b6527d..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${PYTHON_USEDEP}]
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.5.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.5.ebuild
deleted file mode 100644
index 058bb5798fb7..000000000000
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="KDL binding for tf2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${PYTHON_USEDEP}]
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild
new file mode 100644
index 000000000000..91b549006511
--- /dev/null
+++ b/dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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-9999.ebuild b/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
index e5c441b6527d..91b549006511 100644
--- a/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
+++ b/dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,16 +14,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-cpp/eigen:3
 	dev-ros/tf2
 	dev-ros/tf2_ros
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
 	sci-libs/orocos_kdl:=
-	dev-ros/tf2_msgs[${PYTHON_USEDEP}]
-	dev-ros/cmake_modules
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	dev-cpp/eigen:3
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
diff --git a/dev-ros/tf2_msgs/Manifest b/dev-ros/tf2_msgs/Manifest
index 031df58c234e..774a42cd4733 100644
--- a/dev-ros/tf2_msgs/Manifest
+++ b/dev-ros/tf2_msgs/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_msgs-0.6.1.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
-EBUILD tf2_msgs-0.6.2.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
-EBUILD tf2_msgs-0.6.3.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
-EBUILD tf2_msgs-0.6.5.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
-EBUILD tf2_msgs-9999.ebuild 442 BLAKE2B d6a3c2819d577619680bcdc2d3b4518a0c91489b139882e2689885ff40e1c1b7b6639e95b39b357fa5a9539d339bd3b9c8d05ecbff2f2751206028c2903c978c SHA512 ecddeabb736c034df09b0895da2570ba150658c9d010c6cd0198a5808ad5ba80294e4f36593538f1e4976e3a248061efc7047af37b1ad8ad4757aa0b211488a5
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_msgs-0.7.2.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
+EBUILD tf2_msgs-9999.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.6.1.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.1.ebuild
deleted file mode 100644
index 655779b19fe6..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.6.2.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild
deleted file mode 100644
index 655779b19fe6..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.6.3.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.3.ebuild
deleted file mode 100644
index 655779b19fe6..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.6.5.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.5.ebuild
deleted file mode 100644
index 655779b19fe6..000000000000
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-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.2.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild
new file mode 100644
index 000000000000..779b1cb8ae1c
--- /dev/null
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
index 655779b19fe6..779b1cb8ae1c 100644
--- a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
+++ b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/tf2_py/Manifest b/dev-ros/tf2_py/Manifest
index db883faedd43..6bcdd0a02e54 100644
--- a/dev-ros/tf2_py/Manifest
+++ b/dev-ros/tf2_py/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_py-0.6.1.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
-EBUILD tf2_py-0.6.2.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
-EBUILD tf2_py-0.6.3.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
-EBUILD tf2_py-0.6.5.ebuild 411 BLAKE2B 0fec656ef174533924fd84116ff55604ca2645121efb6e9dfe91eb3ad4e86564777b3f83de4f8e9fc7c5bed019067c83d140d982770b81aab9f02170fee14e44 SHA512 2f03c4b60f4942d02bd480e60f44b187f439141507a5da2273d27e52beac6e40e832173630a5d980cc089a792444bf23640de90c31ef2aeafa7fb4b1be8f56d4
-EBUILD tf2_py-9999.ebuild 414 BLAKE2B ddfb7630d561add62cb401b565df834d0d9d824f64dc099aa4963aa92381c332b05f2766b8546d7f649175bcd3ae63ef40e4754b10493055cd722dc7cb97e678 SHA512 3ee385b68f0a48c25e018f179447ea8b8c747c7e6a144280d2ed373f542754325c3ae8de791df6c91cf9e2a1ace19a5a74397fe2fb65d1bb67b3ae00f6c97c5c
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_py-0.7.2.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
+EBUILD tf2_py-9999.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_py/tf2_py-0.6.1.ebuild b/dev-ros/tf2_py/tf2_py-0.6.1.ebuild
deleted file mode 100644
index 97b18592a9a3..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.6.2.ebuild b/dev-ros/tf2_py/tf2_py-0.6.2.ebuild
deleted file mode 100644
index 97b18592a9a3..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.6.3.ebuild b/dev-ros/tf2_py/tf2_py-0.6.3.ebuild
deleted file mode 100644
index 97b18592a9a3..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.6.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.6.5.ebuild b/dev-ros/tf2_py/tf2_py-0.6.5.ebuild
deleted file mode 100644
index 914301bd058c..000000000000
--- a/dev-ros/tf2_py/tf2_py-0.6.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 python bindings"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/tf2_py-0.7.2.ebuild b/dev-ros/tf2_py/tf2_py-0.7.2.ebuild
new file mode 100644
index 000000000000..2bae9efadc93
--- /dev/null
+++ b/dev-ros/tf2_py/tf2_py-0.7.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 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-9999.ebuild b/dev-ros/tf2_py/tf2_py-9999.ebuild
index 8228f47ca0ba..2bae9efadc93 100644
--- a/dev-ros/tf2_py/tf2_py-9999.ebuild
+++ b/dev-ros/tf2_py/tf2_py-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	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
index dfac9a5c4e25..9dcde687b5b1 100644
--- a/dev-ros/tf2_ros/Manifest
+++ b/dev-ros/tf2_ros/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_ros-0.6.1.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
-EBUILD tf2_ros-0.6.2.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
-EBUILD tf2_ros-0.6.3.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
-EBUILD tf2_ros-0.6.5.ebuild 860 BLAKE2B 504c785a1b122cdcfe985ab727c3f4a7c523452cdff5b94cc3d66ff67e0feb64dab06ce8103495518be2d8dd6d041d8419443810b084423a74abfe55c9fef2d8 SHA512 c75d70ac5edde4aadd3405f2cd26a90643a3155c57b958f1686d1f5b2aee5bdbb674b68a526e425e30e7f88129448917f92b590a906ddbdf69020922ac87df04
-EBUILD tf2_ros-9999.ebuild 863 BLAKE2B f456a8e3f159c2271d35970cc06c08880fc45d321b4bd35a1926102d008af02762fc1024ab0aa453150975634ea74d3bca4714ffdf5f09c2663be11ea6b0ddd2 SHA512 900d622cad352217d1a3211ed32a2002db47c032dfa8552a2c524e06de9c31ae8bd59c899285ad4e18ef656bb6afee11c1f583006a5ffa220f1657d3905906a4
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_ros-0.7.2.ebuild 1061 BLAKE2B f09cb8c3989a14b5942222e83b5606a3684361a59a9dd0cc2ec09bfa1f7661f0875540d4d75b8d21b82d8f48fc9e5666884ee1c2c5e78acfbdcdc36a05c88e6a SHA512 4855451f775d3f36140c9053dc54d6f84037aa0fca9ad3cb182db26e249b4d33b42fabc2061ae634f3427b108cc23f2bbbd20aca06b2f0aa309cf5efa8d38b5d
+EBUILD tf2_ros-9999.ebuild 1061 BLAKE2B f09cb8c3989a14b5942222e83b5606a3684361a59a9dd0cc2ec09bfa1f7661f0875540d4d75b8d21b82d8f48fc9e5666884ee1c2c5e78acfbdcdc36a05c88e6a SHA512 4855451f775d3f36140c9053dc54d6f84037aa0fca9ad3cb182db26e249b4d33b42fabc2061ae634f3427b108cc23f2bbbd20aca06b2f0aa309cf5efa8d38b5d
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.1.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.1.ebuild
deleted file mode 100644
index 0e85b91f5107..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild
deleted file mode 100644
index 0e85b91f5107..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.3.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.3.ebuild
deleted file mode 100644
index 0e85b91f5107..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.6.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.5.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.5.ebuild
deleted file mode 100644
index fe678113d01c..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.6.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild b/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild
new file mode 100644
index 000000000000..09a9bc9fc7c8
--- /dev/null
+++ b/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 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="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:=[threads]
+	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
index 00234a1ad22c..09a9bc9fc7c8 100644
--- a/dev-ros/tf2_ros/tf2_ros-9999.ebuild
+++ b/dev-ros/tf2_ros/tf2_ros-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,17 +14,29 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/message_filters
 	dev-ros/roscpp
 	dev-ros/rosgraph
 	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
+	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+	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
index 86918131241e..3f24f4e11b19 100644
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ b/dev-ros/tf2_sensor_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_sensor_msgs-0.6.3.ebuild 669 BLAKE2B dcbbfed6d01622cb9180e5710c873c91b3c89f98b687ef997d6bde5b7a674d5ff28167690e058fb811f4c14abe98f0dae052e333bef7ad512f26da08b060f518 SHA512 5fd908cf73de8cac73082449f277cc8855eef78b3592ffd4f3ac103f2f441a71d4e625239781de015e7318ae44d9b47c4a72d28e2e70e21f18cec3ec17a31382
-EBUILD tf2_sensor_msgs-0.6.5.ebuild 666 BLAKE2B 8342c5fe47e91e18e7c69f7355db1292dcb479562eb02652a65a2a43cdc6eb01cc9cacfea7a74e983c9332ac0c4fe83467722e470579e2c45893951bfb28f9e0 SHA512 b4d0df4072c72bb654bd661aca9d9854e4921ac17eb6c18cba3e52b91597ea94c58e53cad6d7251b4d3924f9958cd82ea850cbc1228363873dd396244fc0ba47
-EBUILD tf2_sensor_msgs-9999.ebuild 669 BLAKE2B 421e0a9477b65e934283192c07b6e8f61fffceb9b563c6fb3da5b4206c1f9c5fbe3d48c277acf604166d014d212b1f3e04c721c692a2723d2112438c1278f325 SHA512 457c001966d6e995f0773f3c6faa15dce13f82f60de4adb4814c1cd624fb60e76cb0cd2c8fbde72dca2ae26fe6250c7c913cd9c26fd2c724df09589929de1db1
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_sensor_msgs-0.7.2.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
+EBUILD tf2_sensor_msgs-9999.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.ebuild
deleted file mode 100644
index b4c841429ce6..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild
deleted file mode 100644
index 48bdaf11cbeb..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	dev-ros/cmake_modules"
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
new file mode 100644
index 000000000000..b6d6fb7ff23f
--- /dev/null
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 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-9999.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
index 9d28f70aecb0..b6d6fb7ff23f 100644
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,25 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	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? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	dev-ros/cmake_modules"
+	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
index 9b084839d3b3..f39fdb234991 100644
--- a/dev-ros/tf2_tools/Manifest
+++ b/dev-ros/tf2_tools/Manifest
@@ -1,10 +1,4 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_tools-0.6.1.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
-EBUILD tf2_tools-0.6.2.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
-EBUILD tf2_tools-0.6.3.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
-EBUILD tf2_tools-0.6.5.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
-EBUILD tf2_tools-9999.ebuild 588 BLAKE2B 5aba4f327df42e6bb555043e15367d575be51997d5d745470eae16a0d834912df48b80f66d5bfebd7dc457c10244c525df92c0f30beb5f3ed08dd5953849542d SHA512 825f55b62e45e765e9f362958f048a78bf874bc9b941fbe40d292619eb4ac13fc6c5bef361a3f4bcd196be173e3ea0f9b4c3d05f7f531246a810f6b8da8337f7
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_tools-0.7.2.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
+EBUILD tf2_tools-9999.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.1.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.1.ebuild
deleted file mode 100644
index 26643ae431b7..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild
deleted file mode 100644
index 26643ae431b7..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.3.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.3.ebuild
deleted file mode 100644
index 26643ae431b7..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.6.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.5.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.5.ebuild
deleted file mode 100644
index 26643ae431b7..000000000000
--- a/dev-ros/tf2_tools/tf2_tools-0.6.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-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_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild b/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild
new file mode 100644
index 000000000000..96f06f51e767
--- /dev/null
+++ b/dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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-9999.ebuild b/dev-ros/tf2_tools/tf2_tools-9999.ebuild
index 26643ae431b7..96f06f51e767 100644
--- a/dev-ros/tf2_tools/tf2_tools-9999.ebuild
+++ b/dev-ros/tf2_tools/tf2_tools-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,10 +15,10 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${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
index 0b1d079c7b70..dbe1228bd967 100644
--- a/dev-ros/tf_conversions/Manifest
+++ b/dev-ros/tf_conversions/Manifest
@@ -1,6 +1,4 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD tf_conversions-1.11.9-r1.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
-EBUILD tf_conversions-1.12.0.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
-EBUILD tf_conversions-9999.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
+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 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild b/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild
deleted file mode 100644
index 9e9aa0f339c9..000000000000
--- a/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/kdl_conversions
-	dev-ros/tf[${PYTHON_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-cpp/eigen:3
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild b/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
deleted file mode 100644
index 9e9aa0f339c9..000000000000
--- a/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/kdl_conversions
-	dev-ros/tf[${PYTHON_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-cpp/eigen:3
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
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
new file mode 100644
index 000000000000..c717bec23799
--- /dev/null
+++ b/dev-ros/tf_conversions/tf_conversions-1.13.2-r1.ebuild
@@ -0,0 +1,33 @@
+# 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
index 9e9aa0f339c9..c717bec23799 100644
--- a/dev-ros/tf_conversions/tf_conversions-9999.ebuild
+++ b/dev-ros/tf_conversions/tf_conversions-9999.ebuild
@@ -1,27 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/geometry"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
+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_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/kdl_conversions
-	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
 	sci-libs/orocos_kdl:=
-	dev-cpp/eigen:3
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	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}
-	test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
+	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
index e70a6702c988..ec67f512df52 100644
--- a/dev-ros/theora_image_transport/Manifest
+++ b/dev-ros/theora_image_transport/Manifest
@@ -1,4 +1,4 @@
-DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD theora_image_transport-1.9.5-r1.ebuild 789 BLAKE2B b282ad8b57e9ed7dded23494a3810fd77a2c90ab710dadfad714d82c2c51d06526429ceb40ab2d521232b6d9599d12a844276be70ddcbe20860db7e43fed23b8 SHA512 13bc08389db9e05dfe415bf3a7e29346ed62cdd19e33cba9041eb2ada68406c243877df12279b487ba65f9f94de9dcb0e4dcc1874313b971f89cb8919c25d0c5
-EBUILD theora_image_transport-9999.ebuild 789 BLAKE2B b282ad8b57e9ed7dded23494a3810fd77a2c90ab710dadfad714d82c2c51d06526429ceb40ab2d521232b6d9599d12a844276be70ddcbe20860db7e43fed23b8 SHA512 13bc08389db9e05dfe415bf3a7e29346ed62cdd19e33cba9041eb2ada68406c243877df12279b487ba65f9f94de9dcb0e4dcc1874313b971f89cb8919c25d0c5
+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 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
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
new file mode 100644
index 000000000000..1b9ba86f85e6
--- /dev/null
+++ b/dev-ros/theora_image_transport/theora_image_transport-1.14.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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-1.9.5-r1.ebuild b/dev-ros/theora_image_transport/theora_image_transport-1.9.5-r1.ebuild
deleted file mode 100644
index a13838696800..000000000000
--- a/dev-ros/theora_image_transport/theora_image_transport-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin to image_transport 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}
-	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
index a13838696800..1b9ba86f85e6 100644
--- a/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild
+++ b/dev-ros/theora_image_transport/theora_image_transport-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Plugin to image_transport for transparently sending an image stream encoded with the Theora codec"
+DESCRIPTION="Plugin for transparently sending an image stream encoded with the Theora codec"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -29,5 +28,6 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig"
diff --git a/dev-ros/timestamp_tools/Manifest b/dev-ros/timestamp_tools/Manifest
index 1fa0090bfbf3..4eee7f619c6a 100644
--- a/dev-ros/timestamp_tools/Manifest
+++ b/dev-ros/timestamp_tools/Manifest
@@ -1,5 +1,6 @@
-AUX tests.patch 652 BLAKE2B 5542e9c18f33575defc466ff28bce65742f09c37d92f1d94ff1143007e45c80bdc9dd453f15d8688bbb0028ead676e619923226cad7342bd70483bd51b4e9e18 SHA512 c2cb51521d82a93857bf67ceb0090e78c1973eaf17a0ed8376b844d1c45b736b9ecab7214636eeeef3af7ff9c2e58030d37dd707a3be0c7af8f81e26dba345f0
+AUX boost.patch 605 BLAKE2B 21419362bbd7c9835722d815b5f02b8292b827d562c9dad3801044080738bd3efa36bf0c74cbb836a633620b4cb0fa1f28c1cb0b5ad6ad38fbe68d31003f23f2 SHA512 c495e773cfecacb275465e05eb08e64ceb0ae8bb023b8bfe7fd6edfd96abc448ef2652774d510618670f49757fa1baab84cfc7a0d3bbb16ea824899e3ca88091
+AUX tests.patch 620 BLAKE2B db7be143209e2b76695d3ecd93e4a524ca692c768f881f7d5f07a6162e3fc428ff053b2342b20663d408343e491985c573d5ed54ef1aa1b9c4941a303b7a5b6b SHA512 c1fa99bd49c370fd38983971268f374f30232691fcd188ec0a2d6d1b8020d619f9e50a88bff3bd36e7463de9a1074f7ad937dc13e54142e091cd80f6c2385b56
 DIST driver_common-1.6.8.tar.gz 15055 BLAKE2B 2d9a4c23d65b8e2f60343f5e3b454e1cc41334d34e0246891b533f216acb743df628d95dd2c0087b06284a85e0ea872baad495a7ed7b59c03e8f8ff32eba4ed8 SHA512 b698143d08785088ac13e62f5b96676bd590a84e4ffb147fa3698be6a8ded510f648d043ecdc1d31ba7b95fb3041d06ee1a39b224c359b8612adebdba259d188
-EBUILD timestamp_tools-1.6.8.ebuild 451 BLAKE2B 3f883ffad47f4d8ac27276c9c7de5d6cc33d5409f6d3dfd16ec10555c11ee9ec9f47fb70ed4b0990642c4deddafe90ebf493ff589f5ff105d6fdec5961387953 SHA512 2ee923cb3696eb675f1949a553e8cff4fb6b49f33907874c682825877380a8773196d3be436df3c3d09a74905cebd6633173e636661e52ad99dcae88d4021348
-EBUILD timestamp_tools-9999.ebuild 451 BLAKE2B 3f883ffad47f4d8ac27276c9c7de5d6cc33d5409f6d3dfd16ec10555c11ee9ec9f47fb70ed4b0990642c4deddafe90ebf493ff589f5ff105d6fdec5961387953 SHA512 2ee923cb3696eb675f1949a553e8cff4fb6b49f33907874c682825877380a8773196d3be436df3c3d09a74905cebd6633173e636661e52ad99dcae88d4021348
+EBUILD timestamp_tools-1.6.8-r1.ebuild 474 BLAKE2B 4ca70244c2671f207c0346d91e9c051d176c24b9a02674e9eaef927a6604d73642e3ec7d5e5355f90675232e17c3615049e48240b55e8ec15226b864bfac9020 SHA512 23ed3e2e57002773470ed7f6b4902ca4a630778dbc8e79ca0f8f5e09f24df6236d1fc5ec2d8ee5c64b9bd734e5ae476e8ab5d040ea8eac9e9ff4ae253f01ee38
+EBUILD timestamp_tools-9999.ebuild 448 BLAKE2B 462b0a391f80dbc0e7c760913667f46d25cc8a13ee2b6ca04d4b018ddfd9a9be336d39256a5a513f62b2ee2d78510cd454421a8f2967ef26d0514a8016848ce0 SHA512 13bf57e52507d7d78fa37a42c5501629f9c857ec08d30c2d4f6601a79343c4a6ac0d6fc7aa1fe22d117c4d1c55f6f5d798e2ba3f836169c856ce5243946c1063
 MISC metadata.xml 339 BLAKE2B 71ed9f79df6d8528f3d967c077f1d01e0290573400356e3749bd24254281651f09507894d2ca4029b8b8a77b51d31d080d9560d9995d3d9fde848f0d71ec083d SHA512 e24ff4ef526475ad5bff434350abb00afccb4c101ab624ee056c1502719d15ec4889eff9170c534af62ba8719bd5fe4f3cf206353244f56e486a29afea53ee7b
diff --git a/dev-ros/timestamp_tools/files/boost.patch b/dev-ros/timestamp_tools/files/boost.patch
new file mode 100644
index 000000000000..de7878ca19b8
--- /dev/null
+++ b/dev-ros/timestamp_tools/files/boost.patch
@@ -0,0 +1,13 @@
+Index: timestamp_tools/include/timestamp_tools/trigger_matcher.h
+===================================================================
+--- timestamp_tools.orig/include/timestamp_tools/trigger_matcher.h
++++ timestamp_tools/include/timestamp_tools/trigger_matcher.h
+@@ -266,7 +266,7 @@ public:
+     if (stamp != RetryLater)
+       return stamp;
+ 
+-    got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(timeout * 1e6));
++    got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(static_cast<int>(timeout * 1e6)));
+     
+     return getTimestampNoblockPrelocked(t);
+   }
diff --git a/dev-ros/timestamp_tools/files/tests.patch b/dev-ros/timestamp_tools/files/tests.patch
index c73d09a1b1ac..d66118537ed3 100644
--- a/dev-ros/timestamp_tools/files/tests.patch
+++ b/dev-ros/timestamp_tools/files/tests.patch
@@ -1,7 +1,7 @@
 Index: driver_common-1.6.8/timestamp_tools/CMakeLists.txt
 ===================================================================
---- driver_common-1.6.8.orig/timestamp_tools/CMakeLists.txt
-+++ driver_common-1.6.8/timestamp_tools/CMakeLists.txt
+--- driver_common-1.6.8.orig/CMakeLists.txt
++++ driver_common-1.6.8/CMakeLists.txt
 @@ -17,5 +17,7 @@ install(DIRECTORY include/${PROJECT_NAME
    DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
    FILES_MATCHING PATTERN "*.h")
diff --git a/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild b/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild
new file mode 100644
index 000000000000..52ab3c68a490
--- /dev/null
+++ b/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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"
+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 )"
+PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild b/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild
deleted file mode 100644
index 1c7b8786e13d..000000000000
--- a/dev-ros/timestamp_tools/timestamp_tools-1.6.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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 )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
index 1c7b8786e13d..86be358b9919 100644
--- a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
+++ b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -19,4 +19,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
+PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 857fbbf35b91..9541d91f7bcc 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2150 BLAKE2B 5620056ff8c1da96f7f5e42bf4fccff73763211051d7c39c35c3dd6181aba3059dcbe9e32b5b6edb6ba4f074601dee7937e6093c321e3b236a7de2bcd7f9252d SHA512 4b9b884c1b29987bff911a945daec6841fb19b5fa34d0b6ffd81c3c338412c3faf5787240c39e7ff5a952841131aeb3f2994161eddc5c3a9b4173c099660e9bd
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD topic_tools-1.14.3-r1.ebuild 729 BLAKE2B ccc071e3a6170f559e3e9dce6886621f4c7c1c72b11ce1f66e83cd04092cd6cc999e7e0526baf9c8a6336c976f27ebcf213d01186aae486cfcdb80a4eeef58dd SHA512 5181892055fbb64cba30d9467d30639c3f23435b805be1c9ea32fd8f19aeafa0a3b152a0106398e69b45134f5f317a3ca2b96f1e2e04e164bee52fa2dc619a40
-EBUILD topic_tools-1.15.4.ebuild 692 BLAKE2B 18d9cb31888309b6e5cbec2c1c30567f0d68bb763081c2a51ae1a3839f768d49e8f7b4de73553d4263ebf44ce4dad81044fc7cc0298f3e18b93eef151037df26 SHA512 3a2c93aa9a49182054372a4115d3cb8f5cfa8b8aed0fb0509b76260492afa218e0c4867d365f04c76a0f1133947f43d7ea75c590c038245d6a6ecd41a29af4fb
-EBUILD topic_tools-9999.ebuild 695 BLAKE2B 63c6c776011923217856c1392fb0d292d0bb44bebd000c7fa6530371a237aefda1a18c07bd78d9352d0f4dc7608a1c9dd335710cc6860485678dd2da4fa621df SHA512 918f548657eeab6f571e371dde921b0cdc374890b3f4a80b9eb51ece52e3404ce750a9447d1139e15a60409054f8f3e6d829f75ad538e6c80ffa8617eaca646a
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD topic_tools-1.15.8.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
+EBUILD topic_tools-9999.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/files/yaml.patch b/dev-ros/topic_tools/files/yaml.patch
deleted file mode 100644
index e783e321b7fb..000000000000
--- a/dev-ros/topic_tools/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/topic_tools/scripts/relay_field b/tools/topic_tools/scripts/relay_field
-index 6630b685d..cc73ac443 100755
---- a/tools/topic_tools/scripts/relay_field
-+++ b/tools/topic_tools/scripts/relay_field
-@@ -98,7 +98,7 @@ class RelayField(object):
-         if self.input_fn is not None:
-             m = self.input_fn(m)
- 
--        msg_generation = yaml.load(self.expression)
-+        msg_generation = yaml.safe_load(self.expression)
-         pub_args = _eval_in_dict_impl(msg_generation, None, {'m': m})
- 
-         now = rospy.get_rostime()
diff --git a/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild
deleted file mode 100644
index ecddea9d6441..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/topic_tools/topic_tools-1.15.4.ebuild b/dev-ros/topic_tools/topic_tools-1.15.4.ebuild
deleted file mode 100644
index 49f8f6d9bbb1..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/topic_tools/topic_tools-1.15.8.ebuild b/dev-ros/topic_tools/topic_tools-1.15.8.ebuild
new file mode 100644
index 000000000000..8c28b2e72861
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.15.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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=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
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+"
+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-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/topic_tools/topic_tools-9999.ebuild b/dev-ros/topic_tools/topic_tools-9999.ebuild
index a14a336c7fdc..8c28b2e72861 100644
--- a/dev-ros/topic_tools/topic_tools-9999.ebuild
+++ b/dev-ros/topic_tools/topic_tools-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
@@ -23,11 +22,14 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rostime
 	dev-ros/xmlrpcpp
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
+		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-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
diff --git a/dev-ros/trajectory_msgs/Manifest b/dev-ros/trajectory_msgs/Manifest
index b979491a8ec9..59d298a0fd0f 100644
--- a/dev-ros/trajectory_msgs/Manifest
+++ b/dev-ros/trajectory_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
-DIST common_msgs-1.12.7.tar.gz 67225 BLAKE2B cfa133dc0354b40f938cfb9331d5838a4fc991cc9c6fdafbffc83f9bc6a4d5ba2218d7d7783a0845c69c8ddff917a4df54661a8e08488e1ae11f5fb41b9bd2a8 SHA512 1c4fd492edc44764f5a47dfd260df4f1be1b8717981f42740b9f795434f50c6b457f6bb3ab70b003991e01ccbc47d54ff06d97e2deaef185625857e5a41b5e65
-EBUILD trajectory_msgs-1.12.5.ebuild 478 BLAKE2B 168d7e900cf043b96c6364078e0c6344b87919b695ec75596bfa17db4383716d208cd38c518d52ef19569b653b053f4d6ab067099e4ff44cb14e2dbbef283437 SHA512 b6f22dbc77e2b27b634b0005633aad10ca8ffb09ad25e20270f5662d5e0aa64169a8d185b26823a69e1a6dad6a7a114893a822b8d99a32744e35c14bd3f438bf
-EBUILD trajectory_msgs-1.12.6.ebuild 478 BLAKE2B 168d7e900cf043b96c6364078e0c6344b87919b695ec75596bfa17db4383716d208cd38c518d52ef19569b653b053f4d6ab067099e4ff44cb14e2dbbef283437 SHA512 b6f22dbc77e2b27b634b0005633aad10ca8ffb09ad25e20270f5662d5e0aa64169a8d185b26823a69e1a6dad6a7a114893a822b8d99a32744e35c14bd3f438bf
-EBUILD trajectory_msgs-1.12.7.ebuild 478 BLAKE2B 168d7e900cf043b96c6364078e0c6344b87919b695ec75596bfa17db4383716d208cd38c518d52ef19569b653b053f4d6ab067099e4ff44cb14e2dbbef283437 SHA512 b6f22dbc77e2b27b634b0005633aad10ca8ffb09ad25e20270f5662d5e0aa64169a8d185b26823a69e1a6dad6a7a114893a822b8d99a32744e35c14bd3f438bf
-EBUILD trajectory_msgs-9999.ebuild 478 BLAKE2B 168d7e900cf043b96c6364078e0c6344b87919b695ec75596bfa17db4383716d208cd38c518d52ef19569b653b053f4d6ab067099e4ff44cb14e2dbbef283437 SHA512 b6f22dbc77e2b27b634b0005633aad10ca8ffb09ad25e20270f5662d5e0aa64169a8d185b26823a69e1a6dad6a7a114893a822b8d99a32744e35c14bd3f438bf
+DIST common_msgs-1.13.0.tar.gz 67838 BLAKE2B 8c324ce792f4e96f655fe9c35310062ba0ec8e23d1206f9b089579238bb6c8afe8db5f5ca9f55ba63cf9508ce6fc1f9534d3150d297462345d7f7be8b36b2eab SHA512 c021614bbf9540d7290d0ad2c5ae12d306ec0b54e0c5c2d6b8a330b9f1ccef7f9d745280985696bd98920ddeac8fe5d475de9ce103803ba19a7bce49e0e1918b
+EBUILD trajectory_msgs-1.13.0.ebuild 438 BLAKE2B 34903f79dec266fa8866558b9b48061b9438cef551dcd8d9509a7e6b1ac5f790d8920df7ff0afe8e10aa81278ce3b112eaede77de8507df046eece1c01ab0cc5 SHA512 77e99f8383ad913ed10dbb42a339828eda78fb433882e816cefabb1b03dc4011e89ff8b8dfa756209e44aa4b0764b6697be9621a7c5951cfed1b33a88c1b7970
+EBUILD trajectory_msgs-9999.ebuild 438 BLAKE2B 34903f79dec266fa8866558b9b48061b9438cef551dcd8d9509a7e6b1ac5f790d8920df7ff0afe8e10aa81278ce3b112eaede77de8507df046eece1c01ab0cc5 SHA512 77e99f8383ad913ed10dbb42a339828eda78fb433882e816cefabb1b03dc4011e89ff8b8dfa756209e44aa4b0764b6697be9621a7c5951cfed1b33a88c1b7970
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.5.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.12.5.ebuild
deleted file mode 100644
index ad5b5c80e84c..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.6.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.12.6.ebuild
deleted file mode 100644
index ad5b5c80e84c..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.12.7.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.12.7.ebuild
deleted file mode 100644
index ad5b5c80e84c..000000000000
--- a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.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=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/common_msgs"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-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.0.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..90cbd29ccbf4
--- /dev/null
+++ b/dev-ros/trajectory_msgs/trajectory_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# 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-9999.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild
index ad5b5c80e84c..90cbd29ccbf4 100644
--- a/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild
+++ b/dev-ros/trajectory_msgs/trajectory_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/common_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/transmission_interface/Manifest b/dev-ros/transmission_interface/Manifest
index 73b571a0e254..3e1e1196b89d 100644
--- a/dev-ros/transmission_interface/Manifest
+++ b/dev-ros/transmission_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD transmission_interface-0.14.2.ebuild 507 BLAKE2B 5739ed7771c8ffddc445db724a19b9551cf81caead58300cc75ec110e1a2726d1767bbb64bcf31c557a271c2088faf9a70f4c03eb24ba0d6f20c93cbd449b535 SHA512 dae1b33c525e80b6a90d35d191d2067a0cb73c3e8e094cca71205aa92f6523c6a379fe932d5f9999d735d9599ff92d63e2975167d26df3cc172adb9d4d044324
-EBUILD transmission_interface-0.15.0.ebuild 507 BLAKE2B 5739ed7771c8ffddc445db724a19b9551cf81caead58300cc75ec110e1a2726d1767bbb64bcf31c557a271c2088faf9a70f4c03eb24ba0d6f20c93cbd449b535 SHA512 dae1b33c525e80b6a90d35d191d2067a0cb73c3e8e094cca71205aa92f6523c6a379fe932d5f9999d735d9599ff92d63e2975167d26df3cc172adb9d4d044324
-EBUILD transmission_interface-0.15.1.ebuild 504 BLAKE2B fad9bc2b9c61f2ef826f82f3729f61c72becb665490d9f16325c30b883d5d9fd19af44c007ee15c9b0aa6c46319702adf8d83fa64f03670d4e64198c2b2bc2fc SHA512 0e7e1262be759212925fc383cd41d228708159b82a39ae09e9e38f25458a6791fbb58f60dc393d5888601f16cb883911e184a3aea1e91b0c3e5864efd22e95ef
-EBUILD transmission_interface-9999.ebuild 507 BLAKE2B 0251e5c8440b426b21f7d8b0a552bb91003f71a9bb265ee98a1c4e2ee77801d7d70626ad19a64502ef0e7a82ef11c4248902283a24fe9f71b372aba9558bf1b3 SHA512 324c2221c0170e4737cb496c661f02ee93002dab969b5b2ede8c637ceb105d5190f1f945273cf1dc84c76f2d1be85294b3d6a05bc4f884b4453b411b8838bd2d
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD transmission_interface-0.19.1.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
+EBUILD transmission_interface-9999.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/transmission_interface/transmission_interface-0.14.2.ebuild b/dev-ros/transmission_interface/transmission_interface-0.14.2.ebuild
deleted file mode 100644
index cbd2d0bc98b5..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.14.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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}"
diff --git a/dev-ros/transmission_interface/transmission_interface-0.15.0.ebuild b/dev-ros/transmission_interface/transmission_interface-0.15.0.ebuild
deleted file mode 100644
index cbd2d0bc98b5..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.15.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-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}"
diff --git a/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild b/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild
deleted file mode 100644
index 5860da756243..000000000000
--- a/dev-ros/transmission_interface/transmission_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/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}"
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild
new file mode 100644
index 000000000000..eeacb3a95b5b
--- /dev/null
+++ b/dev-ros/transmission_interface/transmission_interface-0.19.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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-9999.ebuild b/dev-ros/transmission_interface/transmission_interface-9999.ebuild
index f606c4b418f5..eeacb3a95b5b 100644
--- a/dev-ros/transmission_interface/transmission_interface-9999.ebuild
+++ b/dev-ros/transmission_interface/transmission_interface-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
@@ -23,4 +23,14 @@ RDEPEND="
 	dev-libs/tinyxml
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+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
index 23d37a11fda7..d50096ff4101 100644
--- a/dev-ros/turtle_actionlib/Manifest
+++ b/dev-ros/turtle_actionlib/Manifest
@@ -1,6 +1,6 @@
-DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
-DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
-EBUILD turtle_actionlib-0.1.10.ebuild 634 BLAKE2B 745ef90c77f08d117725b38f0773985a73d598a4a91f5babc665c37d1cf2c60f4322599ce04145bcb1cb8152b42be0c4dcdc42009aa35a7895037b21eab9ab6e SHA512 2a0ef4ee5450238045a2e5b35b65617b34f2e64cb9806ebf9deb875f34f168cea16a71021361a266293710c1621da2f7cf1afeebc111e9460809b63efd2d5324
-EBUILD turtle_actionlib-0.1.11.ebuild 634 BLAKE2B 86fd2f1a690b9eb1dea0cf798c3befb1609b67876e26673cc0f7cfa8415dc4c52a4d781a6879c0092b53c1f67d22b2abc79f82040cbd3756f3a9a3709efc98d0 SHA512 9415ee6698ea4f3b7d5c78f6fd606f1d1d22ce9ffa2df0d13bf015a7092847e91dbfe018c2aebcf7cc09f8c1d308b45278945ebc753f2d155aaa629fe6031de9
-EBUILD turtle_actionlib-9999.ebuild 634 BLAKE2B 745ef90c77f08d117725b38f0773985a73d598a4a91f5babc665c37d1cf2c60f4322599ce04145bcb1cb8152b42be0c4dcdc42009aa35a7895037b21eab9ab6e SHA512 2a0ef4ee5450238045a2e5b35b65617b34f2e64cb9806ebf9deb875f34f168cea16a71021361a266293710c1621da2f7cf1afeebc111e9460809b63efd2d5324
+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 turtle_actionlib-0.1.12.ebuild 603 BLAKE2B 85f56b03bd78810c8a6b0e40144fc82b0a8b0d16f0b5e053e038d000c4d06b3af52349b5ba6bb9c08859607dabe8de9c0dca3a039843929b5334f50650f8364d SHA512 bf64136a8d14ce1477cd69775c3e223dff0d97d49cd50772f00b9aeebfa09574cd428de78244bbeda6b8f861a02a5188baa2563bb9a90722fea3a5e7f9fdbab2
+EBUILD turtle_actionlib-0.2.0.ebuild 603 BLAKE2B 85f56b03bd78810c8a6b0e40144fc82b0a8b0d16f0b5e053e038d000c4d06b3af52349b5ba6bb9c08859607dabe8de9c0dca3a039843929b5334f50650f8364d SHA512 bf64136a8d14ce1477cd69775c3e223dff0d97d49cd50772f00b9aeebfa09574cd428de78244bbeda6b8f861a02a5188baa2563bb9a90722fea3a5e7f9fdbab2
+EBUILD turtle_actionlib-9999.ebuild 603 BLAKE2B 85f56b03bd78810c8a6b0e40144fc82b0a8b0d16f0b5e053e038d000c4d06b3af52349b5ba6bb9c08859607dabe8de9c0dca3a039843929b5334f50650f8364d SHA512 bf64136a8d14ce1477cd69775c3e223dff0d97d49cd50772f00b9aeebfa09574cd428de78244bbeda6b8f861a02a5188baa2563bb9a90722fea3a5e7f9fdbab2
 MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.10.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.10.ebuild
deleted file mode 100644
index 14da5732c951..000000000000
--- a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-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
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/turtlesim
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild
deleted file mode 100644
index 24600b2d603f..000000000000
--- a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/common_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-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
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/turtlesim
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.12.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.12.ebuild
new file mode 100644
index 000000000000..f546db76e3fd
--- /dev/null
+++ b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.12.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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}
+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
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/turtlesim
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.2.0.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.2.0.ebuild
new file mode 100644
index 000000000000..f546db76e3fd
--- /dev/null
+++ b/dev-ros/turtle_actionlib/turtle_actionlib-0.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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}
+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
+	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
index 14da5732c951..f546db76e3fd 100644
--- a/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild
+++ b/dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/common_tutorials"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/turtle_tf/Manifest b/dev-ros/turtle_tf/Manifest
index 5efb6001ec96..625dc0f2d0f7 100644
--- a/dev-ros/turtle_tf/Manifest
+++ b/dev-ros/turtle_tf/Manifest
@@ -1,4 +1,4 @@
 DIST geometry_tutorials-0.2.3.tar.gz 16105 BLAKE2B 331e9d3f156610ef62242d4ade54c5b5e7b688ca6299e0b3d1bc8f9ceaed66e97df609e595d8c8d83b0a281e403f5f20434e990553f1391d39d85348df397fa8 SHA512 3dbc22f50abf790340711cd7f297c2fb9561bb0f1037cf8988b8304f3f862eb66cb07604b571cb7d2acaba04aba567b903a578998a5ff18673c125b337c9d635
-EBUILD turtle_tf-0.2.3.ebuild 626 BLAKE2B b47ed9d9af85f28677b781ef793a5e70c7519496d63ac575788c42b96b44316c65f2c627ee01504a27320460417eb230d110a2ff9e913ecd7b3ea315576eb46c SHA512 1e801e0e0fcfe70dc33feecec568b75e22ffdf1418381b59a16aeb1cb8d5c6bb6fd6c9a5624e01dd3ed868b3265568d7a31cba08f69fbee9191324f442cf77eb
-EBUILD turtle_tf-9999.ebuild 626 BLAKE2B b47ed9d9af85f28677b781ef793a5e70c7519496d63ac575788c42b96b44316c65f2c627ee01504a27320460417eb230d110a2ff9e913ecd7b3ea315576eb46c SHA512 1e801e0e0fcfe70dc33feecec568b75e22ffdf1418381b59a16aeb1cb8d5c6bb6fd6c9a5624e01dd3ed868b3265568d7a31cba08f69fbee9191324f442cf77eb
+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 336 BLAKE2B d96d84717f479ca09194af211cae6924a342d43f2007badbe36f8986ce87000b5ee576a796dccbe741707dbeec730100c3a6f0a217bbceaae13b8397627ddf57 SHA512 79de9c6a61f56c0a03ff7eb31ba09215ff77e79a35980d3a63cbfd38cd4d5f84b0a8d6074aeb0d281884bcba981aa8467695a9249fdd644579eabc8bfe787da0
diff --git a/dev-ros/turtle_tf/turtle_tf-0.2.3.ebuild b/dev-ros/turtle_tf/turtle_tf-0.2.3.ebuild
index 4e8d1ce0b0b2..3435ed62c77e 100644
--- a/dev-ros/turtle_tf/turtle_tf-0.2.3.ebuild
+++ b/dev-ros/turtle_tf/turtle_tf-0.2.3.ebuild
@@ -15,9 +15,9 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_USEDEP}]
+	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:=
diff --git a/dev-ros/turtle_tf/turtle_tf-9999.ebuild b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
index 4e8d1ce0b0b2..3435ed62c77e 100644
--- a/dev-ros/turtle_tf/turtle_tf-9999.ebuild
+++ b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
@@ -15,9 +15,9 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_USEDEP}]
+	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:=
diff --git a/dev-ros/turtle_tf2/Manifest b/dev-ros/turtle_tf2/Manifest
index 95d16457630b..8ae987356112 100644
--- a/dev-ros/turtle_tf2/Manifest
+++ b/dev-ros/turtle_tf2/Manifest
@@ -1,4 +1,4 @@
 DIST geometry_tutorials-0.2.3.tar.gz 16105 BLAKE2B 331e9d3f156610ef62242d4ade54c5b5e7b688ca6299e0b3d1bc8f9ceaed66e97df609e595d8c8d83b0a281e403f5f20434e990553f1391d39d85348df397fa8 SHA512 3dbc22f50abf790340711cd7f297c2fb9561bb0f1037cf8988b8304f3f862eb66cb07604b571cb7d2acaba04aba567b903a578998a5ff18673c125b337c9d635
-EBUILD turtle_tf2-0.2.3.ebuild 645 BLAKE2B 6b91f6f7401786bb7b9348064b56a0702afe632030a2e34e20dc0220c3b76d87e3e6b09cb0169e46952c414605c1bd257b3861fc5c5f95069296aa5777f81373 SHA512 db58d6fed8a37ece4d796e5914b6bf48b87ccee9f8d1f97caead33b49c93cb19eed3fd85b5c664d388b5357d3a7bfe74fc70555b4e0b5435c56f6bb668619cd8
-EBUILD turtle_tf2-9999.ebuild 645 BLAKE2B 6b91f6f7401786bb7b9348064b56a0702afe632030a2e34e20dc0220c3b76d87e3e6b09cb0169e46952c414605c1bd257b3861fc5c5f95069296aa5777f81373 SHA512 db58d6fed8a37ece4d796e5914b6bf48b87ccee9f8d1f97caead33b49c93cb19eed3fd85b5c664d388b5357d3a7bfe74fc70555b4e0b5435c56f6bb668619cd8
+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 336 BLAKE2B d96d84717f479ca09194af211cae6924a342d43f2007badbe36f8986ce87000b5ee576a796dccbe741707dbeec730100c3a6f0a217bbceaae13b8397627ddf57 SHA512 79de9c6a61f56c0a03ff7eb31ba09215ff77e79a35980d3a63cbfd38cd4d5f84b0a8d6074aeb0d281884bcba981aa8467695a9249fdd644579eabc8bfe787da0
diff --git a/dev-ros/turtle_tf2/turtle_tf2-0.2.3.ebuild b/dev-ros/turtle_tf2/turtle_tf2-0.2.3.ebuild
index f971ef911f09..2726f4e96371 100644
--- a/dev-ros/turtle_tf2/turtle_tf2-0.2.3.ebuild
+++ b/dev-ros/turtle_tf2/turtle_tf2-0.2.3.ebuild
@@ -14,13 +14,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_USEDEP}]
 	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
index f971ef911f09..2726f4e96371 100644
--- a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
+++ b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
@@ -14,13 +14,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_USEDEP}]
 	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
index 29208a05f8ce..e9c8dadb8662 100644
--- a/dev-ros/turtlesim/Manifest
+++ b/dev-ros/turtlesim/Manifest
@@ -1,4 +1,6 @@
-DIST ros_tutorials-0.10.0.tar.gz 159486 BLAKE2B 71b6fabb1a85ac9740dfba9f40be318e211d519189f8be05e58bf146b5d22566ea6ddcdca6331366c05e95c314b656c4f5688c4da3d20b1cdce78639a76e14c5 SHA512 dba529965bad64957721c71f1c7b2b60ece085ed0186a107fbec03c231940b19004b3bf9dce5c1ac3dcfe1c339d49a2214811d5227f453b1c3f541076a653048
-EBUILD turtlesim-0.10.0.ebuild 744 BLAKE2B 1a6226dea325415ce67d6327e7c7acb49631c481e2ea58040b424cb067dd1324d9b234bc7c0966e4706196b134ab718d22ea48c75349fd4d7ff44cc25f60e875 SHA512 328816ae5026200066a307eab6f4be817f4d7f239d154a46cffb431a05b5389f0950e450cf591ddc0d4344bcb6b90f95c7c81f614b9e454863b5f7c321e38efa
+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.ebuild 744 BLAKE2B 1a6226dea325415ce67d6327e7c7acb49631c481e2ea58040b424cb067dd1324d9b234bc7c0966e4706196b134ab718d22ea48c75349fd4d7ff44cc25f60e875 SHA512 328816ae5026200066a307eab6f4be817f4d7f239d154a46cffb431a05b5389f0950e450cf591ddc0d4344bcb6b90f95c7c81f614b9e454863b5f7c321e38efa
+EBUILD turtlesim-0.10.2.ebuild 744 BLAKE2B 1a6226dea325415ce67d6327e7c7acb49631c481e2ea58040b424cb067dd1324d9b234bc7c0966e4706196b134ab718d22ea48c75349fd4d7ff44cc25f60e875 SHA512 328816ae5026200066a307eab6f4be817f4d7f239d154a46cffb431a05b5389f0950e450cf591ddc0d4344bcb6b90f95c7c81f614b9e454863b5f7c321e38efa
 EBUILD turtlesim-9999.ebuild 744 BLAKE2B 1a6226dea325415ce67d6327e7c7acb49631c481e2ea58040b424cb067dd1324d9b234bc7c0966e4706196b134ab718d22ea48c75349fd4d7ff44cc25f60e875 SHA512 328816ae5026200066a307eab6f4be817f4d7f239d154a46cffb431a05b5389f0950e450cf591ddc0d4344bcb6b90f95c7c81f614b9e454863b5f7c321e38efa
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/turtlesim/turtlesim-0.10.0.ebuild b/dev-ros/turtlesim/turtlesim-0.10.1.ebuild
index 1f53e6c46ac3..1f53e6c46ac3 100644
--- a/dev-ros/turtlesim/turtlesim-0.10.0.ebuild
+++ b/dev-ros/turtlesim/turtlesim-0.10.1.ebuild
diff --git a/dev-ros/turtlesim/turtlesim-0.10.2.ebuild b/dev-ros/turtlesim/turtlesim-0.10.2.ebuild
new file mode 100644
index 000000000000..1f53e6c46ac3
--- /dev/null
+++ b/dev-ros/turtlesim/turtlesim-0.10.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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 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:=[threads]
+	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
index 3db24bef13fe..6c4d11eb682f 100644
--- a/dev-ros/unique_id/Manifest
+++ b/dev-ros/unique_id/Manifest
@@ -1,4 +1,5 @@
+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 629 BLAKE2B d4e7c7b69db49694e441e0a1ec99c88a2afaa3250606bfa5925e9aea88db5ce106fa1d5e24741dc11f88481adc333e7cb018eb0706f51ad36fc0596a6dada8f9 SHA512 4552ecd62998f8cd074c0c91326d26112cb8a469d3a4f042586c807e0904055aa18b615bbf5f5936056ec8e7f7874ab8b01dba3dafae0a139ff125148146c2c7
-EBUILD unique_id-9999.ebuild 629 BLAKE2B d4e7c7b69db49694e441e0a1ec99c88a2afaa3250606bfa5925e9aea88db5ce106fa1d5e24741dc11f88481adc333e7cb018eb0706f51ad36fc0596a6dada8f9 SHA512 4552ecd62998f8cd074c0c91326d26112cb8a469d3a4f042586c807e0904055aa18b615bbf5f5936056ec8e7f7874ab8b01dba3dafae0a139ff125148146c2c7
+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 351 BLAKE2B 263bd97d8a235f46caee579594b8c44e0f638ba246459a9b7090da4fafdbafcc26a8fca2716c005a2cfb4dac98def55e691744d7ce869528032652b2f7fda96e SHA512 8636c13070578878bd780ee448a76c3a5040758e23f5c1e990bd433fdf91a3645294210d172917317715f806d87dac379a023979a555c68270e0c79319c4b659
diff --git a/dev-ros/unique_id/files/tests.patch b/dev-ros/unique_id/files/tests.patch
new file mode 100644
index 000000000000..b64a1be5e38b
--- /dev/null
+++ b/dev-ros/unique_id/files/tests.patch
@@ -0,0 +1,17 @@
+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/unique_id-1.0.6.ebuild b/dev-ros/unique_id/unique_id-1.0.6.ebuild
index 7ff69d0fac63..32432dfa5632 100644
--- a/dev-ros/unique_id/unique_id-1.0.6.ebuild
+++ b/dev-ros/unique_id/unique_id-1.0.6.ebuild
@@ -16,9 +16,19 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${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 dev-python/nose[${PYTHON_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
index 7ff69d0fac63..32432dfa5632 100644
--- a/dev-ros/unique_id/unique_id-9999.ebuild
+++ b/dev-ros/unique_id/unique_id-9999.ebuild
@@ -16,9 +16,19 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${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 dev-python/nose[${PYTHON_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
index cddb25aa08ab..064fc2d53faf 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1,4 +1,4 @@
-DIST urdf-1.13.1.tar.gz 43326 BLAKE2B dce42216cc21595b91964b970d45bbc79d8c144ee331f72e9c3d31f024f3c0f18e59563055df7c4e4337f5bf1361a838a07c80dabb100b7522999a0949384639 SHA512 8a27b0bff40cb42d5eeb62422c371a48c25e3f4513711b86752192b618ceec308bcebb1d52aa3d058448d30c6724cc2cc337f815b9043874793e82e6404d6648
-EBUILD urdf-1.13.1-r1.ebuild 695 BLAKE2B 9c98f0ce66f033828b0be3732e71d0cec2abf7cad91e21e936d845ff7d08e29da23b07c68b7c9e490a64feebcf67063ef4f043be61e8aff955685e659bac8564 SHA512 452eed5adccde1a48710ecebf859925eb3a65cebd7f21534f4f7c2c150997c617a9833964f91c275831704a428f5fcae9f8916c2cb0c294e75f3576ba915fc4a
-EBUILD urdf-9999.ebuild 695 BLAKE2B 9c98f0ce66f033828b0be3732e71d0cec2abf7cad91e21e936d845ff7d08e29da23b07c68b7c9e490a64feebcf67063ef4f043be61e8aff955685e659bac8564 SHA512 452eed5adccde1a48710ecebf859925eb3a65cebd7f21534f4f7c2c150997c617a9833964f91c275831704a428f5fcae9f8916c2cb0c294e75f3576ba915fc4a
+DIST urdf-1.13.2.tar.gz 43588 BLAKE2B f3e97170e1930361803be2c86322ab95b62bca519127bdc3ad73065d764eaca87c2790fc1d4823e53167c853c164fc1020e1f208b6e5af025b1bb96cc0420dc2 SHA512 d22e8a647a701ff18a446d9d92511a01266b8a34c11f9f238bbc79373fa3849ebc3a11a56fea7beb4a41f893ffa30ddd5e3a6361751a6d720de6be6c6184fe41
+EBUILD urdf-1.13.2.ebuild 760 BLAKE2B 63b39dea8acd6e92701c27e0fa078a769ea761bf3cb4a9bd5bdbd56cbe849e8513eff7fe17dc12569dc4750b262e1f9fa5cc4750b0f1ae6f3e83598a9ee937a0 SHA512 3dae201ee373c31275d2e7c0884c187ec85e5546c6aed250feff845ac818636b4d283702ab0f2d8bc855745575fe79bc858190ba0f4ac47f762cffc5fbb7fb2a
+EBUILD urdf-9999.ebuild 760 BLAKE2B 63b39dea8acd6e92701c27e0fa078a769ea761bf3cb4a9bd5bdbd56cbe849e8513eff7fe17dc12569dc4750b262e1f9fa5cc4750b0f1ae6f3e83598a9ee937a0 SHA512 3dae201ee373c31275d2e7c0884c187ec85e5546c6aed250feff845ac818636b4d283702ab0f2d8bc855745575fe79bc858190ba0f4ac47f762cffc5fbb7fb2a
 MISC metadata.xml 322 BLAKE2B 113835aed7f5cb356ac6ebb2348a2215f2f253e7e0e5209cae6f9712d198486c8105073ada1cf53bc3ee2ce2631dc610d40a610e25da4796b9a1cfda3ec31b82 SHA512 fce96c81cd93f93d445aac4a6a7b376059f69cde1abd44d3fbc3e46ed3b3a9b68ab6db51b08aad817fe28201d1c2b7a1f1c07455caae903f948ac23950b9c221
diff --git a/dev-ros/urdf/urdf-1.13.1-r1.ebuild b/dev-ros/urdf/urdf-1.13.1-r1.ebuild
deleted file mode 100644
index e6840f8e198c..000000000000
--- a/dev-ros/urdf/urdf-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-libs/urdfdom
-	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_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-1.13.2.ebuild b/dev-ros/urdf/urdf-1.13.2.ebuild
new file mode 100644
index 000000000000..085590834b3b
--- /dev/null
+++ b/dev-ros/urdf/urdf-1.13.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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++ parser for the Unified Robot Description Format (URDF)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-libs/urdfdom
+	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
index e6840f8e198c..085590834b3b 100644
--- a/dev-ros/urdf/urdf-9999.ebuild
+++ b/dev-ros/urdf/urdf-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/urdf"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -28,4 +27,9 @@ RDEPEND="
 	dev-ros/class_loader:=
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
+	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
index bb15232a5aa1..b74b1a4c79f1 100644
--- a/dev-ros/urdf_parser_plugin/Manifest
+++ b/dev-ros/urdf_parser_plugin/Manifest
@@ -1,6 +1,4 @@
-DIST robot_model-1.12.11.tar.gz 277822 BLAKE2B 3bdd2b931ddfd062594ccb2be4ce6d4863a5fa66f538c3ee48c3600b3be249d267f9d03aa9a701bc6ab22c4297d659a24da668fedcd25c75fe128c43cc781be0 SHA512 8dea6fc72e9beaddbf9a82cb177561cb89c69ef8f58f0c4882598f6cc33a0e10564d9696f07b6f4e3e3404d3f1f5236e54eea4b8d249be0a216cd3ce12a03cde
-DIST urdf-1.13.1.tar.gz 43326 BLAKE2B dce42216cc21595b91964b970d45bbc79d8c144ee331f72e9c3d31f024f3c0f18e59563055df7c4e4337f5bf1361a838a07c80dabb100b7522999a0949384639 SHA512 8a27b0bff40cb42d5eeb62422c371a48c25e3f4513711b86752192b618ceec308bcebb1d52aa3d058448d30c6724cc2cc337f815b9043874793e82e6404d6648
-EBUILD urdf_parser_plugin-1.12.11.ebuild 359 BLAKE2B 7175e7cf30ba62e2a23e951b50234ed6786db1b4029b3fa6e5b3ffd402e27af6b9a061b1a02bd48e53600d4325b5f8126063b1d8ed1c51e238aa0c0e581a8771 SHA512 ee48574e3acef6f5b669d2895715e8a3b4fc831ef3419409f1a4cc68c04c1ce085fd108885522aed62bcb256ddeb2e62c4ce8c5d0ec68393245debfc96e555aa
-EBUILD urdf_parser_plugin-1.13.1.ebuild 352 BLAKE2B 35f46ddfd12bc489388092bc2a98582e9b5ec995dd8b499e78d13e7745492cc9569a8615552a3f710faeb63f289534ea80eca4464dd6df570c52dcca40224d34 SHA512 2145b589f3cc792b7d2dacc155c5143ef993b36d69cfb58f4ebb2cb7b9bb5a6d5a39311fc768925fea010b50c6aff94ae7031877ed350f75e6eb59c74a5ac6a6
-EBUILD urdf_parser_plugin-9999.ebuild 352 BLAKE2B 35f46ddfd12bc489388092bc2a98582e9b5ec995dd8b499e78d13e7745492cc9569a8615552a3f710faeb63f289534ea80eca4464dd6df570c52dcca40224d34 SHA512 2145b589f3cc792b7d2dacc155c5143ef993b36d69cfb58f4ebb2cb7b9bb5a6d5a39311fc768925fea010b50c6aff94ae7031877ed350f75e6eb59c74a5ac6a6
+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 322 BLAKE2B 113835aed7f5cb356ac6ebb2348a2215f2f253e7e0e5209cae6f9712d198486c8105073ada1cf53bc3ee2ce2631dc610d40a610e25da4796b9a1cfda3ec31b82 SHA512 fce96c81cd93f93d445aac4a6a7b376059f69cde1abd44d3fbc3e46ed3b3a9b68ab6db51b08aad817fe28201d1c2b7a1f1c07455caae903f948ac23950b9c221
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.11.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.11.ebuild
deleted file mode 100644
index b711fa9ab4bc..000000000000
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.11.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-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-1.13.1.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.1.ebuild
deleted file mode 100644
index 4e2a5c3c7563..000000000000
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/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-1.13.2.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.2.ebuild
new file mode 100644
index 000000000000..ef001155f19c
--- /dev/null
+++ b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.13.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 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
index 4e2a5c3c7563..ef001155f19c 100644
--- a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild
+++ b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/urdf"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/urdf_tutorial/Manifest b/dev-ros/urdf_tutorial/Manifest
index 599326830b3f..f533ffa64b1e 100644
--- a/dev-ros/urdf_tutorial/Manifest
+++ b/dev-ros/urdf_tutorial/Manifest
@@ -1,7 +1,4 @@
-AUX tests.patch 593 BLAKE2B c7597300a131235a1f60407d2123cdcdebb4e95328ba413b7243934a4401e084b814682c23ec58950db24f738b2a8e7064f62ab5784764461288de7b352cdcb3 SHA512 0ef25218dad5f9f4798557131cd10043b5ac3314723b2f6d2d2a5de961153748c8df955e14359338c289e1b3f20301beef173f5aa5d98524a612d9977d621406
-DIST urdf_tutorial-0.3.0.tar.gz 871048 BLAKE2B 2bca4409696011c75e7b6c1ae811fe4caec3fe34b28ea80c9774b6068c64509a97452173c1e43ba92f77081419b58bf5f6987e1e9941eca8ce077c534636bad9 SHA512 1518cd2aa783e92dd7a996b9cff9df37f21f7585d59b6001bd9a42782b2a5d81e96e8d2502955283f29390c7fc4944250ff1d954ab6e511e0886f243c4aabbde
-DIST urdf_tutorial-0.4.0.tar.gz 865626 BLAKE2B 42a8c3274e00393f846d4e2e9641740dad214bbcdc4f65095f96f2faac1f3709170d5719085d5927ca0c322f9b8cc57b2f8494353bec629978874870a8d37206 SHA512 256859d83fb5860df27cf8922043fb61158134c1ea06f3943fed3b8183c7384819a761d83bcb03a924a813185be07e89ca510076bfa1dfe4c2e52f561503fa88
-EBUILD urdf_tutorial-0.3.0.ebuild 538 BLAKE2B bb697e25127e767527bfec3300afa588fd4b0dff34a2a9e5145723e96465922f790d02a571dc302094f85dd9e43a84aa41b81636aeab91d0519d49ede897fe09 SHA512 214b1c36eb845b4a8606753163fb781cc3a0a0f2d4283d34c0f5499e6b478a8255d338a4c7b754c73a1a813a28168ca857ed7d22295745996b45a33e7fabd1e9
-EBUILD urdf_tutorial-0.4.0.ebuild 480 BLAKE2B 6a0825689ee5abba1ca565a4bac64b2671a991fedded31709728aff30a362b9588e74f39bec47001e739052ee7ace8cf89cb0c1df38e36988a5e13703c841db1 SHA512 5a01272a6a13efd6f309c3010b66d1f5cc70b8156d63a03c98dfaf22c1c3a6612ff0c65f47c4189717bf69cadbf00d86f4649fb23cfdaa49b19c9c15857efde7
-EBUILD urdf_tutorial-9999.ebuild 480 BLAKE2B 6a0825689ee5abba1ca565a4bac64b2671a991fedded31709728aff30a362b9588e74f39bec47001e739052ee7ace8cf89cb0c1df38e36988a5e13703c841db1 SHA512 5a01272a6a13efd6f309c3010b66d1f5cc70b8156d63a03c98dfaf22c1c3a6612ff0c65f47c4189717bf69cadbf00d86f4649fb23cfdaa49b19c9c15857efde7
+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 331 BLAKE2B ef4364f8ec21105621d1d902a42bcd3c84797d9d72781e5fc1d5f80fc81cf5920aef1b68edd558a84510a3bfd8b1266f826c64d2e842c42b7006f980de8f1626 SHA512 b1e2cc797f0ddcd22bbc3c0c36c2339a95e66b05c1ac2042e7261fce8c9b55586aae1ee0633b98ead7eff51788f3debb5568c06567746af116665375f32b918f
diff --git a/dev-ros/urdf_tutorial/files/tests.patch b/dev-ros/urdf_tutorial/files/tests.patch
deleted file mode 100644
index b34f76bc4b8a..000000000000
--- a/dev-ros/urdf_tutorial/files/tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 3c068fc166d662d1459610a56dc955f3bf22f7fe
-Author: David V. Lu <davidvlu@gmail.com>
-Date:   Sun Jul 2 16:07:37 2017 -0400
-
-    Fix launch test
-
-diff --git a/urdf_tutorial/launch/display.launch b/urdf_tutorial/launch/display.launch
-index 959946a..66a429a 100644
---- a/urdf_tutorial/launch/display.launch
-+++ b/urdf_tutorial/launch/display.launch
-@@ -1,6 +1,6 @@
- <launch>
- 
--  <arg name="model" />
-+  <arg name="model" default="$(find urdf_tutorial)/urdf/01-myfirst.urdf"/>
-   <arg name="gui" default="true" />
-   <arg name="rvizconfig" default="$(find urdf_tutorial)/rviz/urdf.rviz" />
- 
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.3.0.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.3.0.ebuild
deleted file mode 100644
index 1c6352b18714..000000000000
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
-KEYWORDS="~amd64"
-ROS_SUBDIR="${PN}"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="URDF tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/urdf
-	dev-ros/joint_state_publisher
-	dev-ros/robot_state_publisher
-	dev-ros/rviz
-	dev-ros/xacro
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/roslaunch[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild
deleted file mode 100644
index 305da65fc713..000000000000
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="URDF tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/urdf
-	dev-ros/joint_state_publisher
-	dev-ros/robot_state_publisher
-	dev-ros/rviz
-	dev-ros/xacro
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/roslaunch[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild
new file mode 100644
index 000000000000..eb0fb1a2bf27
--- /dev/null
+++ b/dev-ros/urdf_tutorial/urdf_tutorial-0.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 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
index 305da65fc713..eb0fb1a2bf27 100644
--- a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
+++ b/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,10 +15,11 @@ 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_USEDEP}] )
+	test? ( dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}] )
 "
diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest
index 5bd6e3b64479..80e6f612cfa1 100644
--- a/dev-ros/urg_node/Manifest
+++ b/dev-ros/urg_node/Manifest
@@ -1,4 +1,4 @@
 DIST urg_node-0.1.13.tar.gz 20949 BLAKE2B e85653ec46dd85aa62e4e5f06c4d4c775a2d616f0b4daa80584bf81010ad06acbec7f73e0b4a238618c36ec83d07e4dd513fafa9b29e197ad21b56ec02fe4452 SHA512 be503538a293fa0cdf6e7902c0faa5c866a2298193f4ad6cce705dab90220955d4cb21087d84d10ff7d2daf29f362391f17a038496f3036934c57e12f3270a30
-EBUILD urg_node-0.1.13.ebuild 649 BLAKE2B 435828a77b61ffef8e6d447063dbd688dea55d56d88985690d2cc7b0812c5dde4ad623db4d0bfb83f810cae2d463739c41fae9f7f547e7b4e8658d3ffa1a4798 SHA512 3d1194e35fa42887ac01cd0c37893b3a7ab1652a0d540a148976a02a2948a9f29f862d7c836f354a5e3cb735cfa0be23adff3248a08bac33ebf91a2491010048
-EBUILD urg_node-9999.ebuild 649 BLAKE2B 435828a77b61ffef8e6d447063dbd688dea55d56d88985690d2cc7b0812c5dde4ad623db4d0bfb83f810cae2d463739c41fae9f7f547e7b4e8658d3ffa1a4798 SHA512 3d1194e35fa42887ac01cd0c37893b3a7ab1652a0d540a148976a02a2948a9f29f862d7c836f354a5e3cb735cfa0be23adff3248a08bac33ebf91a2491010048
+EBUILD urg_node-0.1.13.ebuild 706 BLAKE2B dc532968dee8bd4acc630d770b436e2c2a82b7fa234d544114716e86a21004c0331293c0642ef8e22522d3ad20d4d68dc07c18af7c06b3051aba69c92e87eb81 SHA512 da8add88676236f91b1c6ed0f625e38e10f79922cdc0255b6bf199669b46527eec3147a7e0e5af6ca8ec3a1e8c301a8eaa11c34b7e33804f6b9d6199300f53ed
+EBUILD urg_node-9999.ebuild 706 BLAKE2B dc532968dee8bd4acc630d770b436e2c2a82b7fa234d544114716e86a21004c0331293c0642ef8e22522d3ad20d4d68dc07c18af7c06b3051aba69c92e87eb81 SHA512 da8add88676236f91b1c6ed0f625e38e10f79922cdc0255b6bf199669b46527eec3147a7e0e5af6ca8ec3a1e8c301a8eaa11c34b7e33804f6b9d6199300f53ed
 MISC metadata.xml 334 BLAKE2B 11f0825fc04fb1be3a7d357977ce3abc4c5d34e8e9924512a2a47cdc00be4153912e5e60f7d3b24e58a1e3942554bf4c2ce015818b32de50d0b25bb3e6db0dbf SHA512 eb832353afafdd96bb0d620bb87a19720451fdffa2150cbf0bf547c6f782c62f395d00e2f675d9da0345a377fd4f22d8e951bb9da7ade108f4e0a51b5af235b5
diff --git a/dev-ros/urg_node/urg_node-0.1.13.ebuild b/dev-ros/urg_node/urg_node-0.1.13.ebuild
index b1e6973afc9f..3cfaf52c5d20 100644
--- a/dev-ros/urg_node/urg_node-0.1.13.ebuild
+++ b/dev-ros/urg_node/urg_node-0.1.13.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/urg_c
 	dev-ros/tf
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/nodelet
 	dev-ros/rosconsole
 	dev-ros/roscpp
@@ -27,4 +27,8 @@ RDEPEND="
 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
index b1e6973afc9f..3cfaf52c5d20 100644
--- a/dev-ros/urg_node/urg_node-9999.ebuild
+++ b/dev-ros/urg_node/urg_node-9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/urg_c
 	dev-ros/tf
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/nodelet
 	dev-ros/rosconsole
 	dev-ros/roscpp
@@ -27,4 +27,8 @@ RDEPEND="
 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/visp_camera_calibration/Manifest b/dev-ros/visp_camera_calibration/Manifest
index 34d719008b00..922c29dd1d2c 100644
--- a/dev-ros/visp_camera_calibration/Manifest
+++ b/dev-ros/visp_camera_calibration/Manifest
@@ -1,5 +1,5 @@
 AUX gcc6.patch 421 BLAKE2B cf5b648dbd6d5121db22cee0aaddd9a359a87e9305e3887b4ec15b148e2921baf2562c9c377abb6c848088ce9592952bf537469fbe68cc025ad6e32db8817c61 SHA512 a4ed8165e1a8099d79bfe48563558bbb6de20b90dcc7def4b9dbb46a6c1115cbacfe09ed0c3ddb2b654914fe3b49554f11453fc3d2c87c8841b6755a24f08c4e
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
-EBUILD visp_camera_calibration-0.11.1.ebuild 789 BLAKE2B d62ab0001dedfa3710621da3795f2534f6d13666df4018b4b6d67601ae2e8bff8fcc8dc07d90466a74534988c8b088ccbef43af18a087e3b5db5ca98f4691480 SHA512 e71431f8a0dafb2d0f70063d7a24298024a0fa4357e85b18109e1e0fd74b06c06269a4ff0b5b84b377aa9ba1437efd401a5aaf382464dde3573d0bed7a1c4086
-EBUILD visp_camera_calibration-9999.ebuild 789 BLAKE2B d62ab0001dedfa3710621da3795f2534f6d13666df4018b4b6d67601ae2e8bff8fcc8dc07d90466a74534988c8b088ccbef43af18a087e3b5db5ca98f4691480 SHA512 e71431f8a0dafb2d0f70063d7a24298024a0fa4357e85b18109e1e0fd74b06c06269a4ff0b5b84b377aa9ba1437efd401a5aaf382464dde3573d0bed7a1c4086
+EBUILD visp_camera_calibration-0.11.1.ebuild 792 BLAKE2B db393f726d448787244777fe03c8f5d1c0f3d7bbae3167b4c8be442a36c7c18967f9db73d1397da68ae5114f191aec69279ec35819b92936cd2456a5af50fa9b SHA512 1c5d49edccab9e4831dc742661e9060835d4af2e57ecb75abff215068f29aa136dc0be33f4770a159bb5f1ebee77aa738cf4aa9f9e32aab86ad5581d7dd54f98
+EBUILD visp_camera_calibration-9999.ebuild 792 BLAKE2B db393f726d448787244777fe03c8f5d1c0f3d7bbae3167b4c8be442a36c7c18967f9db73d1397da68ae5114f191aec69279ec35819b92936cd2456a5af50fa9b SHA512 1c5d49edccab9e4831dc742661e9060835d4af2e57ecb75abff215068f29aa136dc0be33f4770a159bb5f1ebee77aa738cf4aa9f9e32aab86ad5581d7dd54f98
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
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
index 9ca3a9dedfc1..c68c3131f198 100644
--- 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
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-ros/camera_calibration_parsers
 	dev-ros/roscpp
 	dev-ros/visp_bridge
-	sci-libs/ViSP:=
+	sci-libs/ViSP:=[X]
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
index 9ca3a9dedfc1..c68c3131f198 100644
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-ros/camera_calibration_parsers
 	dev-ros/roscpp
 	dev-ros/visp_bridge
-	sci-libs/ViSP:=
+	sci-libs/ViSP:=[X]
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-ros/visp_tracker/Manifest b/dev-ros/visp_tracker/Manifest
index e38d242ebd48..6efd18890855 100644
--- a/dev-ros/visp_tracker/Manifest
+++ b/dev-ros/visp_tracker/Manifest
@@ -1,5 +1,5 @@
 AUX gcc6.patch 350 BLAKE2B 5e0f54319cc37bf0a4cf46e3b96f37bdb059af0f0e4a2b7219363504c96a2ed43121f4028c4d264959f1cf78e10d329ac67ee85d6a2868212b0cbcf924e2f93d SHA512 b1647cca84792212a1fe20685e83ee28fc225fb7272ed892fdbc4faae809059ce955cf5df1d8b3543c1248a741ad9a0bcb263a547aa21be2cebd8608dfba457e
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
-EBUILD visp_tracker-0.11.1.ebuild 1016 BLAKE2B 90adc1c09965a1008512b33a15f5bc60776f8a4cec692dea4a78b41537ddd2a1db91c4ace1ce93ea5b33508ffd41e05948fb67ca6da2c10975f9e565fe3071a2 SHA512 f959c7ce62a96ab58efe8b460b883973e3e9e4a7f26facafbd4d9f6d7557db23a33fe4252f7108929d1953f5b12d6773ffcc5c2d76f021374c400f063aaa932e
-EBUILD visp_tracker-9999.ebuild 1016 BLAKE2B 90adc1c09965a1008512b33a15f5bc60776f8a4cec692dea4a78b41537ddd2a1db91c4ace1ce93ea5b33508ffd41e05948fb67ca6da2c10975f9e565fe3071a2 SHA512 f959c7ce62a96ab58efe8b460b883973e3e9e4a7f26facafbd4d9f6d7557db23a33fe4252f7108929d1953f5b12d6773ffcc5c2d76f021374c400f063aaa932e
+EBUILD visp_tracker-0.11.1.ebuild 1056 BLAKE2B 9bb131b475941f0fe32df84c443fe9a588641cf050e1e17069805b453712248125466a01813d3b8f32642717bc941bd7df66b0a756aaa827acd551657076fe07 SHA512 f257de30756386dad8bf70e9e87b19cf25ef6f4797a5ac5236d984063a3574cc09c8629ba1743faca0db4015181fa81f834db702cce45d5ed3c58a0c97c870e6
+EBUILD visp_tracker-9999.ebuild 1056 BLAKE2B 9bb131b475941f0fe32df84c443fe9a588641cf050e1e17069805b453712248125466a01813d3b8f32642717bc941bd7df66b0a756aaa827acd551657076fe07 SHA512 f257de30756386dad8bf70e9e87b19cf25ef6f4797a5ac5236d984063a3574cc09c8629ba1743faca0db4015181fa81f834db702cce45d5ed3c58a0c97c870e6
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild
index 48465b50bcff..9c960de1da8a 100644
--- a/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild
+++ b/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild
@@ -26,9 +26,9 @@ RDEPEND="
 	dev-ros/resource_retriever
 	dev-ros/roscpp
 	dev-ros/sensor_msgs
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	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:=
 "
diff --git a/dev-ros/visp_tracker/visp_tracker-9999.ebuild b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
index 48465b50bcff..9c960de1da8a 100644
--- a/dev-ros/visp_tracker/visp_tracker-9999.ebuild
+++ b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
@@ -26,9 +26,9 @@ RDEPEND="
 	dev-ros/resource_retriever
 	dev-ros/roscpp
 	dev-ros/sensor_msgs
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	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:=
 "
diff --git a/dev-ros/visualization_msgs/Manifest b/dev-ros/visualization_msgs/Manifest
index 9acab15ae2de..72f844101caf 100644
--- a/dev-ros/visualization_msgs/Manifest
+++ b/dev-ros/visualization_msgs/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD visualization_msgs-1.12.7.ebuild 478 BLAKE2B 881bdd7cae315245dcff079e5b3fa50c27326904b96a4e8c67b3033340140df856dca8dbf70448ca0d386efd14f2226e4b10730234e7746250e783f71db785fd SHA512 0abdc457cfeafee77723962c922a047c3279a311ce11548c2c6097ca842bdce45787d7c03a8dfdfde95b119cad31917a6c549c2b6370c10100657a7dd92a83e6
+EBUILD visualization_msgs-1.13.0.ebuild 478 BLAKE2B 881bdd7cae315245dcff079e5b3fa50c27326904b96a4e8c67b3033340140df856dca8dbf70448ca0d386efd14f2226e4b10730234e7746250e783f71db785fd SHA512 0abdc457cfeafee77723962c922a047c3279a311ce11548c2c6097ca842bdce45787d7c03a8dfdfde95b119cad31917a6c549c2b6370c10100657a7dd92a83e6
 EBUILD visualization_msgs-9999.ebuild 478 BLAKE2B 881bdd7cae315245dcff079e5b3fa50c27326904b96a4e8c67b3033340140df856dca8dbf70448ca0d386efd14f2226e4b10730234e7746250e783f71db785fd SHA512 0abdc457cfeafee77723962c922a047c3279a311ce11548c2c6097ca842bdce45787d7c03a8dfdfde95b119cad31917a6c549c2b6370c10100657a7dd92a83e6
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild b/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..2532363c374c
--- /dev/null
+++ b/dev-ros/visualization_msgs/visualization_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# 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 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
index 9d484c942a58..c3524ac57c19 100644
--- a/dev-ros/voxel_grid/Manifest
+++ b/dev-ros/voxel_grid/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
+DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
 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-9999.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/voxel_grid/voxel_grid-1.17.0.ebuild b/dev-ros/voxel_grid/voxel_grid-1.17.0.ebuild
new file mode 100644
index 000000000000..2a7672352f28
--- /dev/null
+++ b/dev-ros/voxel_grid/voxel_grid-1.17.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 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
index 1d4d06a7d1d2..587006448cd3 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,4 +1,5 @@
+AUX tests.patch 625 BLAKE2B 5ec4d6bca2278f40a4886371abd75beb0ff933d3b7e6e9e4554e7f9d63b521d2ff9d2c91c530177c818de2006bbc7db77e86ce3f4323017f870cb6b2a186ba9c SHA512 10da25011dc5c63d282d45862c35d9f900a90bc61059d6e703e50e2a94bdd4ca9c0f20d3fe6e5b03b3f98059e1bcb74272adcbb7f72d5e5f1d3ad4ce5a5f6bca
 DIST xacro-1.14.1.tar.gz 80879 BLAKE2B 6ce62c42e194d41bc2c0af322497f2ade2d4ac9e788cd15f3b7b6c976abae575b3bbb1224085d4e2d68cd10d3fbb665b9b333f91a38bdefe4a22f71d9270f005 SHA512 fb2272a4c4da47dcee26860ec94a5b4921401c6a4f0544181c7a9ae188c0cf6bb8ee2c0c0eb6e7fabd3f323c10d391dbafcc2b118384a32ecd18da6c8075ae10
-EBUILD xacro-1.14.1.ebuild 463 BLAKE2B b2a331233b1ad1ee58057838114e1285a5c7593e89b9646d91346132f6b9f3b3730518fe3fbd20dd45f767332fbca4acac2038d8a6672530a552f945959ec8ae SHA512 57e581c8615ad3f8e1cf90b1ecda1cdffb729ea228440338128bcce2aa827f77cdf9032e2842e01b11a2a8dfffa7fc585edae30c2452d6151f6e2a7b57ab4573
-EBUILD xacro-9999.ebuild 463 BLAKE2B b2a331233b1ad1ee58057838114e1285a5c7593e89b9646d91346132f6b9f3b3730518fe3fbd20dd45f767332fbca4acac2038d8a6672530a552f945959ec8ae SHA512 57e581c8615ad3f8e1cf90b1ecda1cdffb729ea228440338128bcce2aa827f77cdf9032e2842e01b11a2a8dfffa7fc585edae30c2452d6151f6e2a7b57ab4573
+EBUILD xacro-1.14.1.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
+EBUILD xacro-9999.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
 MISC metadata.xml 323 BLAKE2B d43754a1147a95e3536569c858b3dafecbc9dd4ec06ef00d23d7948de3aaf40d15aabf502f6c1b5579c03139c06579517c86fddc6eaa61f970baf101d9fef68e SHA512 9c6fccac3f7ab699969eb90199aa9690d064f1d66cc003c157bf85bc3147ae42f1433ac1589f57ce5b05ebd78a44c7f1a92f99e3af29bdee58727c1a676afd37
diff --git a/dev-ros/xacro/files/tests.patch b/dev-ros/xacro/files/tests.patch
new file mode 100644
index 000000000000..28d4b5768c35
--- /dev/null
+++ b/dev-ros/xacro/files/tests.patch
@@ -0,0 +1,21 @@
+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/xacro-1.14.1.ebuild b/dev-ros/xacro/xacro-1.14.1.ebuild
index e29730c0f573..8383de0334c5 100644
--- a/dev-ros/xacro/xacro-1.14.1.ebuild
+++ b/dev-ros/xacro/xacro-1.14.1.ebuild
@@ -13,9 +13,20 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
 "
 RDEPEND="${RDEPEND}
-	dev-ros/roslaunch[${PYTHON_USEDEP}]"
+	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
index e29730c0f573..8383de0334c5 100644
--- a/dev-ros/xacro/xacro-9999.ebuild
+++ b/dev-ros/xacro/xacro-9999.ebuild
@@ -13,9 +13,20 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
 "
 RDEPEND="${RDEPEND}
-	dev-ros/roslaunch[${PYTHON_USEDEP}]"
+	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
index 5363a3a1037a..535545b0bdab 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,4 +1,4 @@
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD xmlrpcpp-1.15.4.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
-EBUILD xmlrpcpp-9999.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD xmlrpcpp-1.15.8.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
+EBUILD xmlrpcpp-9999.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild
deleted file mode 100644
index 605e02ba7813..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.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_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"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild
new file mode 100644
index 000000000000..2987c4392d5e
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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="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[threads]
+	)
+"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
index 605e02ba7813..2987c4392d5e 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
@@ -14,5 +14,13 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost[threads]
+	)
+"