gentoo resync : 25.08.2020

11 files changed, 26 insertions, 180 deletions

diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index 9e448054f960..a2b1a935487a 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,20 +1,6 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD test_rosgraph-1.13.0.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.1.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.2.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.4.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.5.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
-EBUILD test_rosgraph-1.13.6.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.14.2.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.14.3.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
-EBUILD test_rosgraph-1.15.4.ebuild 435 BLAKE2B a4e168d4de8994d37ce04b1835d22097a9d734aaff1ca12f9763eb62fe337ecf676b350ea5ccc4a388bcb59c40b04be37758cf7407648549887d0a79d708a48a SHA512 4a8b4124d0bf813e4ff89083806efab24654bee7a69ce7cbac71eba94ac2c1b07dbfb6f48a4526d8b665f8d7af660cb43d7c230e9ea353d1c974e911b8158806
-EBUILD test_rosgraph-9999.ebuild 438 BLAKE2B 7f9b25d24b5cab1d71ca26dc80adc38743677d4794e97dc06d8f9c8f40e0cbe42824928f279078bd7c8ea0fac89d17a331f22ced085397a58232be41de424422 SHA512 6a7779f57141d8c72a97e36d73411f5241b3839ff8d1a3d102314fee9192ff6ff637ae86918723a4fa1b8e5dc2523c6a8907ec655f3ec6f5e3abb25533f3a780
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD test_rosgraph-1.15.7.ebuild 421 BLAKE2B 511420303458e310ce9aa7247d12fec089f2caf0e73abea4145c7a530c819fe62042cbaf8bcc2f2c13d51fd8b7099234e725e79efd630db2adc01675ac636951 SHA512 b43c9865b12656ec3dbcbc14b29cf258fa7f4093c8a528f6dc68ddbbeeb8fc72579f9d37ef3703e24d27c51dff6a5dde1855837eac1173734ca2cc457b2c1b08
+EBUILD test_rosgraph-1.15.8.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
+EBUILD test_rosgraph-9999.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.0.ebuild
+++ /dev/null
@@ -1,21 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.2.ebuild
+++ /dev/null
@@ -1,21 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.4.ebuild
+++ /dev/null
@@ -1,21 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild
deleted file mode 100644
index a74f6b7bd3cb..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.5.ebuild
+++ /dev/null
@@ -1,21 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild
+++ /dev/null
@@ -1,21 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.14.2.ebuild
+++ /dev/null
@@ -1,21 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild
deleted file mode 100644
index e901f1348a64..000000000000
--- a/dev-ros/test_rosgraph/test_rosgraph-1.14.3.ebuild
+++ /dev/null
@@ -1,21 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosgraph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild
index 065166144a2e..17776e85e11b 100644
--- a/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.7.ebuild
@@ -1,12 +1,11 @@
 # 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_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
 "
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.1.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.8.ebuild
index a74f6b7bd3cb..71104c076e50 100644
--- a/dev-ros/test_rosgraph/test_rosgraph-1.13.1.ebuild
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.8.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 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_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,12 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild b/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
index 03ab95277675..71104c076e50 100644
--- a/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
+++ b/dev-ros/test_rosgraph/test_rosgraph-9999.ebuild
@@ -1,12 +1,11 @@
-# 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_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,7 +14,12 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}