diff --git a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild
index be5d89f8bd967..073087b63bf63 100644
--- a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild
+++ b/dev-ros/shape_tools/shape_tools-0.2.1.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-planning/shape_tools"
 KEYWORDS="~amd64 ~arm"
@@ -14,11 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+"
+DEPEND="${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
diff --git a/dev-ros/shape_tools/shape_tools-9999.ebuild b/dev-ros/shape_tools/shape_tools-9999.ebuild
index be5d89f8bd967..073087b63bf63 100644
--- a/dev-ros/shape_tools/shape_tools-9999.ebuild
+++ b/dev-ros/shape_tools/shape_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/ros-planning/shape_tools"
 KEYWORDS="~amd64 ~arm"
@@ -14,11 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+"
+DEPEND="${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