summaryrefslogtreecommitdiff
path: root/dev-ros/gazebo_ros
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/gazebo_ros
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/gazebo_ros')
-rw-r--r--dev-ros/gazebo_ros/Manifest17
-rw-r--r--dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild35
-rw-r--r--dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild45
-rw-r--r--dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild36
-rw-r--r--dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild36
-rw-r--r--dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild36
-rw-r--r--dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild (renamed from dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild)22
-rw-r--r--dev-ros/gazebo_ros/gazebo_ros-9999.ebuild24
8 files changed, 28 insertions, 223 deletions
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
index c9e87f7065cd..2f3830cf9d48 100644
--- a/dev-ros/gazebo_ros/Manifest
+++ b/dev-ros/gazebo_ros/Manifest
@@ -1,15 +1,4 @@
-DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_ros-2.6.2.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
-EBUILD gazebo_ros-2.7.3.ebuild 1282 BLAKE2B 2ad6a1a6e9a192a34ac8140b20ebc4787a31971d176e4ddd7f929746b1d694955e50b166f732908906ee1b5385dd51cbca746ee1ff4727e48948fca8c3ce0f37 SHA512 5d25298b56befcd572bd1939b075ed34a772410e10ebe73975a6e1f756e10bd090a2cd4776fa4bda21bd994ed1cce20155a1dae02bf8918e46259228ec3c43f8
-EBUILD gazebo_ros-2.7.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
-EBUILD gazebo_ros-2.8.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
-EBUILD gazebo_ros-2.8.5.ebuild 1026 BLAKE2B befc99333d36e2366eb794f9d2a820a310759ec9aa3e573d382f7fa7aac1e1499d8c1d7844e9343843ef66012a38e9a22781471e8c496758dce10360144f5961 SHA512 373e347c174d56497d381d3e0c6a76795caaeea32c083e878fd245b012b661c9385da8f51e19282f06ff7595fddf40ac0f573c491cc21ee1abf0611dfe1da35b
-EBUILD gazebo_ros-2.8.7.ebuild 1026 BLAKE2B df4eeb0fce0223ce1fcc82edd1f86803dc8976ee18817aba06785284df4de4fa058fa8006d83d6150b5148c149bdda6d2c5d161d55879f0363e1a082b287aceb SHA512 92d9f63c5fe95142d6dbc89c83392f93ead16c9f0895cfae48c34c6b892e573f8e118ef7426f5c12d9f0122c577ca2c5f73877feed58272bb6a8fd4e795d73e2
-EBUILD gazebo_ros-9999.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_ros-2.9.1.ebuild 1085 BLAKE2B df33199d29c4f98b0bdcac64b8758ef8a70871560999833501f27802faa715e603a981c69c1366c34e3f8816ac4596a6b72c0f169c842fd7cd7887863d4e5333 SHA512 f1de76be96789c41356aaaea2d9d08885d2dc8bd001bf0f0dbffa9ab6243a7bec352609acafeb79e9c28536bf3d6adb9c1958c37e3eaf05713d3912c89d04b81
+EBUILD gazebo_ros-9999.ebuild 1085 BLAKE2B df33199d29c4f98b0bdcac64b8758ef8a70871560999833501f27802faa715e603a981c69c1366c34e3f8816ac4596a6b72c0f169c842fd7cd7887863d4e5333 SHA512 f1de76be96789c41356aaaea2d9d08885d2dc8bd001bf0f0dbffa9ab6243a7bec352609acafeb79e9c28536bf3d6adb9c1958c37e3eaf05713d3912c89d04b81
MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild
deleted file mode 100644
index 168e26eb91b1..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/tinyxml
- sci-electronics/gazebo:=
- dev-libs/protobuf:=
- dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/tf[${PYTHON_USEDEP}]
- dev-ros/dynamic_reconfigure
- dev-libs/libxml2
- dev-libs/boost:=[threads]
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
deleted file mode 100644
index 191679505052..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin eutils
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/gazebo_dev
- dev-libs/tinyxml
- sci-electronics/gazebo:=
- dev-libs/protobuf:=
- dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/tf[${PYTHON_USEDEP}]
- dev-ros/dynamic_reconfigure
- dev-libs/libxml2
- dev-libs/boost:=[threads]
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-SRC_URI="${SRC_URI}
- mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2"
-
-src_prepare() {
- pushd "${WORKDIR}/gazebo_ros_pkgs-${PV}" || die
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- popd || die
- ros-catkin_src_prepare
-}
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
deleted file mode 100644
index ca217b085352..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/gazebo_dev
- dev-libs/tinyxml
- sci-electronics/gazebo:=
- dev-libs/protobuf:=
- dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/tf[${PYTHON_USEDEP}]
- dev-ros/dynamic_reconfigure
- dev-libs/libxml2
- dev-libs/boost:=[threads]
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild
deleted file mode 100644
index ca217b085352..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/gazebo_dev
- dev-libs/tinyxml
- sci-electronics/gazebo:=
- dev-libs/protobuf:=
- dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/tf[${PYTHON_USEDEP}]
- dev-ros/dynamic_reconfigure
- dev-libs/libxml2
- dev-libs/boost:=[threads]
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
deleted file mode 100644
index 107dee905b18..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/gazebo_dev
- dev-libs/tinyxml
- sci-electronics/gazebo:=
- dev-libs/protobuf:=
- dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/roscpp
- dev-ros/tf[${PYTHON_USEDEP}]
- dev-ros/dynamic_reconfigure
- dev-libs/libxml2
- dev-libs/boost:=[threads]
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild
index 254d5552bb46..40f612568195 100644
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild
+++ b/dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild
@@ -1,16 +1,15 @@
# 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 )
CATKIN_HAS_MESSAGES=yes
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+DESCRIPTION="ROS plugins that offer messages and services for interfacing with gazebo"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
@@ -20,17 +19,20 @@ RDEPEND="
dev-libs/tinyxml
sci-electronics/gazebo:=
dev-libs/protobuf:=
- dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/gazebo_plugins[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
dev-ros/roscpp
- dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
dev-ros/dynamic_reconfigure
dev-libs/libxml2
dev-libs/boost:=[threads]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild b/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
index ca217b085352..40f612568195 100644
--- a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
+++ b/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2018 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-simulation/gazebo_ros_pkgs"
KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
CATKIN_HAS_MESSAGES=yes
ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+DESCRIPTION="ROS plugins that offer messages and services for interfacing with gazebo"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
@@ -20,17 +19,20 @@ RDEPEND="
dev-libs/tinyxml
sci-electronics/gazebo:=
dev-libs/protobuf:=
- dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/gazebo_plugins[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
dev-ros/roscpp
- dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
dev-ros/dynamic_reconfigure
dev-libs/libxml2
dev-libs/boost:=[threads]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_msgs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
-DEPEND="${RDEPEND}"