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 37c1c17be5dd6..c3d3ee32e16bb 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 db5d715833753..c3d3ee32e16bb 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" )