gentoo resync : 25.08.2020

11 files changed, 60 insertions, 189 deletions

diff --git a/dev-ros/rospy_tutorials/Manifest b/dev-ros/rospy_tutorials/Manifest
index 9764a026dc96..7b4d84a264f0 100644
--- a/dev-ros/rospy_tutorials/Manifest
+++ b/dev-ros/rospy_tutorials/Manifest
@@ -1,18 +1,6 @@
-DIST ros_tutorials-0.10.0.tar.gz 159486 BLAKE2B 71b6fabb1a85ac9740dfba9f40be318e211d519189f8be05e58bf146b5d22566ea6ddcdca6331366c05e95c314b656c4f5688c4da3d20b1cdce78639a76e14c5 SHA512 dba529965bad64957721c71f1c7b2b60ece085ed0186a107fbec03c231940b19004b3bf9dce5c1ac3dcfe1c339d49a2214811d5227f453b1c3f541076a653048
-DIST ros_tutorials-0.6.1.tar.gz 126792 BLAKE2B 5964c8fe5ddc736e9933b89f9c66eae436805ec5c564a2144c1e338537da18b2064e9aba209f25a82b7d88e5b2bd2e1401dbe931614f65544ae2f5170270ff1f SHA512 f09e5451030c0a76a9473020535e79ac06e748f4208109cf83e61526d13472c3390402814a3d145cb793c5418af703cd9959ca57143798d1706185c13d3418c5
-DIST ros_tutorials-0.7.0.tar.gz 140125 BLAKE2B 9f1006c933b4cb642f77c8e68ddda92213b9cfd132131b2768c4fe17ef6b1b8bf8da89da3fea2a0692d340d9f0b1e953fb150e2dae9e18de86b59fe50b72cb74 SHA512 b7c51bc007c0bddfb38361750a0225606d9e85a3404d6b21f3a32c8ccb1786844f225a49ad8f525c684c838eff9ec9f7e7c39a15adf5ea5dd187a59c90144711
-DIST ros_tutorials-0.7.1.tar.gz 140483 BLAKE2B 8f2d4aee6494476bf7efb2ea35962ea6154485143f108b8e7603a9a1e67cb76f6c87e7b2612cd07ba19c50b44cd7fbbcd89f13f902eafd17c2a0eb8738357050 SHA512 0970e6428af992addfa1af327b2e0a3f85a926c90cfceba89d415acc5404a364164e0dd497c9296f03ac06c575380ad21e83b0cdbf6709c49dc650087145ddaa
-DIST ros_tutorials-0.8.0.tar.gz 153739 BLAKE2B 0dc7918a2b95a26518d07d753040e381b26c357eb3995a22a429d58c244751d7c58c8736efbab23a6a5ca6903f08e43acf9519f2a534b22fe89ea853b2e3fbff SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795
-DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
-DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
-DIST ros_tutorials-0.9.1.tar.gz 155151 BLAKE2B 7371063ef77981892fee54b6b3d29907421f29deece22c6d53ace576717357a9700a2e14a03bd9f24c2285a16b55f5c9665a0da5081ae1599da8df5ec68ba425 SHA512 62a980e9515515496de39aa360df030f0dd8678bbf132d90386775c34e3b54f33a477aaefb65db803dcd704b8fbc61d445617399ac38cc2fa3f3363a6052682f
-EBUILD rospy_tutorials-0.10.0.ebuild 581 BLAKE2B 24b34242778a10db129f8ab7e0febe8bb70187f3101bc3a360923f291aca86cc6414b438eb9def85c3c3dea7009a446ba9d2a8cfcd85a68a9771ee883a53adcb SHA512 801bccc7493e6a688392c5346faefb52dcc1077238ec6b5cfab6520923e749eb2f9cb0f7c83266849fb2692a5c7cf858d3a015d02f15e744e1645e087317adec
-EBUILD rospy_tutorials-0.6.1.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
-EBUILD rospy_tutorials-0.7.0.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
-EBUILD rospy_tutorials-0.7.1.ebuild 584 BLAKE2B ed4d39bd594234392e65e19dcaa019c7620196cc3807203984c77e779c9ad1b28f5940882bf2e131a21bce294c222a2c2131660c7a7bbf87a2ad0c8cdc990240 SHA512 3ac348fb1a4436859b9f74e9fe78db3d239f78fd12757f2d5481c5b2562c56fb36aeae28e23419cd278e7d34f7ff8404af81dce5e0322f9131ed69ac2d71f748
-EBUILD rospy_tutorials-0.8.0.ebuild 584 BLAKE2B 40388c2c6d10ade2e2b313523f6d21d5fadc0c6d9c71769245833e5e5b56a3b16ab8d97c72bf4c4672e0431c33ad3092e675e04d5070bdf26f1df8ad3c63aa61 SHA512 01fb16bb755f6f9f9afa5045fd4b76b370800b3e59dce440317a4c5b26cfeb6e2d1d66195fee0374185cd08e91dd25bcba9cb5130581727293de7e1eb27a5712
-EBUILD rospy_tutorials-0.8.1.ebuild 584 BLAKE2B 40388c2c6d10ade2e2b313523f6d21d5fadc0c6d9c71769245833e5e5b56a3b16ab8d97c72bf4c4672e0431c33ad3092e675e04d5070bdf26f1df8ad3c63aa61 SHA512 01fb16bb755f6f9f9afa5045fd4b76b370800b3e59dce440317a4c5b26cfeb6e2d1d66195fee0374185cd08e91dd25bcba9cb5130581727293de7e1eb27a5712
-EBUILD rospy_tutorials-0.9.0.ebuild 584 BLAKE2B efcf40c9f6d8e01f5195c13812c8155ad424281f6320d3cdf3aa1848f009db86b8d04b6ea0c120dffc3135f1d218807e260fd4711955aace0dda5880f5af7866 SHA512 91fdde82439c6052e3beaa60c3fcf05584db3b37b15feab37f84ec9c5eb3c8c74a36b630232756bd5c71d31d8ee328f811c0e7742899eae1c765b930e839f0ac
-EBUILD rospy_tutorials-0.9.1.ebuild 581 BLAKE2B 2a1246c99e200e97be41048d1706d59efc4401746b49776def06cd7a190b588af3b561aa891abade9c177028ba48ec12ed76f0b492ebe21769f7a1dc95fb1ba9 SHA512 445d3b6cfc8ac0a9705cfa0c22b219c2c97f9ec6955736ddac89adb655b5f31bb79fd9c774b2eb06f7820e7c1ce328ce1dcfa8051005865490806e9290ebe018
-EBUILD rospy_tutorials-9999.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
+DIST ros_tutorials-0.10.1.tar.gz 159522 BLAKE2B b0e045c6ee62cb68dfa977d17125af23d8ef80a619e822d245531a6cb3520a4d53120769e74ae2ba9af2813ce968e0c4fb22b7655eadd13b1a720705a9f75374 SHA512 592edb84f2e0ea80b2757ae890f495e8cb93d867b1bc6d64e6446f28fcffbd48c05703ac30ac29fd184a689f465728a5958d8c747587c756b53341c1d0740684
+DIST ros_tutorials-0.10.2.tar.gz 159630 BLAKE2B 6b7ea4c0aba110b746052a42150dd4e9faedbb1e4ab5a44bbef7c1079192238ac22bb18fc9968ea9e4450dde47bf1f5b7dabc0788aa8c232dfef3d1039a63f2e SHA512 73b420acf20a468f51db891fe0b0b33c3c838ea6fab4c03faab9a7abedc3ee68ec27ef0e70869143d0a22941eb77bac1fc80542cc0c14988ff75cb9685c174c5
+EBUILD rospy_tutorials-0.10.1.ebuild 639 BLAKE2B 3b602a52e1c9f45918a4212621203b5a611545ae9ad60826694b52131442c1da2fe4870adec2dc1ff19caa1b42a039b2e241904abfb9d2f0804130f2420b28af SHA512 d6a94c2ed8f1d2d6946d199a15e57bb4d33fb8d13cbc8f748248750240f6b8c71d66ecd4df7f4b4f379c2a70119009f56a4d3da8bd101c54384d9c52a54cfbd5
+EBUILD rospy_tutorials-0.10.2.ebuild 639 BLAKE2B 3b602a52e1c9f45918a4212621203b5a611545ae9ad60826694b52131442c1da2fe4870adec2dc1ff19caa1b42a039b2e241904abfb9d2f0804130f2420b28af SHA512 d6a94c2ed8f1d2d6946d199a15e57bb4d33fb8d13cbc8f748248750240f6b8c71d66ecd4df7f4b4f379c2a70119009f56a4d3da8bd101c54384d9c52a54cfbd5
+EBUILD rospy_tutorials-9999.ebuild 639 BLAKE2B 3b602a52e1c9f45918a4212621203b5a611545ae9ad60826694b52131442c1da2fe4870adec2dc1ff19caa1b42a039b2e241904abfb9d2f0804130f2420b28af SHA512 d6a94c2ed8f1d2d6946d199a15e57bb4d33fb8d13cbc8f748248750240f6b8c71d66ecd4df7f4b4f379c2a70119009f56a4d3da8bd101c54384d9c52a54cfbd5
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
index 31948ff70209..ecde7b0dc1db 100644
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.0.ebuild
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
@@ -1,23 +1,30 @@
 # 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/ros_tutorials"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
+DESCRIPTION="Attempts to show the features of ROS step-by-step"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/roscpp_tutorials
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.2.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.2.ebuild
new file mode 100644
index 000000000000..ecde7b0dc1db
--- /dev/null
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/ros_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to show the features of ROS step-by-step"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/roscpp_tutorials
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.6.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.6.1.ebuild
deleted file mode 100644
index 57da80ce742c..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild
deleted file mode 100644
index 57da80ce742c..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.7.1.ebuild
deleted file mode 100644
index 490201e139c2..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.8.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.8.0.ebuild
deleted file mode 100644
index fb8c51aee23a..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.8.0.ebuild
+++ /dev/null
@@ -1,23 +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/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.8.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.8.1.ebuild
deleted file mode 100644
index fb8c51aee23a..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.8.1.ebuild
+++ /dev/null
@@ -1,23 +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/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.ebuild
deleted file mode 100644
index 4ad7609bac39..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.ebuild
+++ /dev/null
@@ -1,23 +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/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild
deleted file mode 100644
index 0884ee095a59..000000000000
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.1.ebuild
+++ /dev/null
@@ -1,23 +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/ros_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
index 57da80ce742c..ecde7b0dc1db 100644
--- a/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
@@ -1,23 +1,30 @@
-# 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/ros_tutorials"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
+DESCRIPTION="Attempts to show the features of ROS step-by-step"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/roscpp_tutorials
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}