summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2020-05-18 17:13:39 +0200
committerAlexis Ballier <aballier@gentoo.org>2020-05-18 17:18:25 +0200
commit8ce1ea854d1e5d9ee07b7b7cbc419942eff3e8ab (patch)
treec631d210abfca9b182d9054ea3ef2a52fb38bd11
parentdev-ros/gazebo_plugins: Remove old (diff)
downloadgentoo-8ce1ea854d1e5d9ee07b7b7cbc419942eff3e8ab.tar.gz
gentoo-8ce1ea854d1e5d9ee07b7b7cbc419942eff3e8ab.tar.bz2
gentoo-8ce1ea854d1e5d9ee07b7b7cbc419942eff3e8ab.zip
dev-ros/gazebo_plugins: eapi7
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
-rw-r--r--dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild20
-rw-r--r--dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild20
2 files changed, 22 insertions, 18 deletions
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild
index 4d6a5baf32c3..f7bd8731a74f 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.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-simulation/gazebo_ros_pkgs"
KEYWORDS="~amd64"
PYTHON_COMPAT=( python2_7 )
@@ -17,22 +17,17 @@ IUSE=""
RDEPEND="
dev-ros/gazebo_dev
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/roscpp
dev-ros/rospy
dev-ros/nodelet
dev-ros/angles
dev-ros/std_srvs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ 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/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/pcl_conversions
dev-ros/image_transport
dev-ros/rosconsole
@@ -41,7 +36,6 @@ RDEPEND="
dev-ros/polled_camera
dev-ros/diagnostic_updater
dev-ros/camera_info_manager
- dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-libs/libxml2
>=sci-electronics/gazebo-7:=
dev-libs/protobuf:=
@@ -50,5 +44,13 @@ RDEPEND="
dev-libs/boost:=
dev-ros/roslib[${PYTHON_USEDEP}]
"
-DEPEND="${RDEPEND}"
+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-9999.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
index 4d6a5baf32c3..f7bd8731a74f 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-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-simulation/gazebo_ros_pkgs"
KEYWORDS="~amd64"
PYTHON_COMPAT=( python2_7 )
@@ -17,22 +17,17 @@ IUSE=""
RDEPEND="
dev-ros/gazebo_dev
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/roscpp
dev-ros/rospy
dev-ros/nodelet
dev-ros/angles
dev-ros/std_srvs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ 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/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/pcl_conversions
dev-ros/image_transport
dev-ros/rosconsole
@@ -41,7 +36,6 @@ RDEPEND="
dev-ros/polled_camera
dev-ros/diagnostic_updater
dev-ros/camera_info_manager
- dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-libs/libxml2
>=sci-electronics/gazebo-7:=
dev-libs/protobuf:=
@@ -50,5 +44,13 @@ RDEPEND="
dev-libs/boost:=
dev-ros/roslib[${PYTHON_USEDEP}]
"
-DEPEND="${RDEPEND}"
+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" )