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 f0900cf7e7c1b..e7359f7341dc5 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 f0900cf7e7c1b..e7359f7341dc5 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" )