diff --git a/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild b/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
index 1113971a55b2b..11457f2e0fb45 100644
--- a/dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
+++ b/dev-ros/nav_msgs/nav_msgs-1.13.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
 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/nav_msgs/nav_msgs-9999.ebuild b/dev-ros/nav_msgs/nav_msgs-9999.ebuild
index 1113971a55b2b..11457f2e0fb45 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"