6 files changed, 10 insertions, 119 deletions
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
index faea41e74ebd..2ceb027a130a 100644
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/Manifest
@@ -1,10 +1,4 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-EBUILD controller_manager_tests-0.19.1.ebuild 916 BLAKE2B 2863c87ca0bc54a305777f574d127c53b61580761dabbb5a7b694ec87c2558dedfe38ca4ade4600684991c330a0d38fcb7d35ebc6afc54d06fb9d2f49e953915 SHA512 13364da33088948d81937f9c613920b651f1f19fda2cf256a6ed22a4cce95bc7c40ffc0447936e93e7604064a8be75b58efced3ec6aae50e9f9a77ec7b09183c
-EBUILD controller_manager_tests-0.19.2.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
-EBUILD controller_manager_tests-0.19.3.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
-EBUILD controller_manager_tests-0.19.4.ebuild 902 BLAKE2B 7b06e897aa15f6c287898a4f0d410ce1f3ad9fb8669a091a4e05cb6964a5fb2afb3ae11d46aa02436d3f62672a94ce7ee19f508bdecb8c8cfe64a879ac9b3a7d SHA512 7c7e4aa58b76b12b9e283bb4a03ba3f550e39bca0b0485a1f6bb895ebf2211ab849af5e2e5ec678b0cd98fce829e4e43b266722eae5372b5b2ff9011d6e225f0
-EBUILD controller_manager_tests-9999.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
+EBUILD controller_manager_tests-0.19.5.ebuild 932 BLAKE2B 3688839251bbcdcab09703ba8bd395137b84995f397a3f2b0204d3e3c0ead08579bc4c2f48be2b68a5cf5897f57e68a33a408f45da8332c471d924f096c7faf7 SHA512 db2936ee1c76c759a31eca899f1c2d129fce2044335321a00dd80bf7f00d54117d4d15a7a607d7d8874fe0797a55c5df6f1cf976783a3ca87a0c3232b0dea47e
+EBUILD controller_manager_tests-9999.ebuild 932 BLAKE2B 3688839251bbcdcab09703ba8bd395137b84995f397a3f2b0204d3e3c0ead08579bc4c2f48be2b68a5cf5897f57e68a33a408f45da8332c471d924f096c7faf7 SHA512 db2936ee1c76c759a31eca899f1c2d129fce2044335321a00dd80bf7f00d54117d4d15a7a607d7d8874fe0797a55c5df6f1cf976783a3ca87a0c3232b0dea47e
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
deleted file mode 100644
index 44483c86ebe3..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	)"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild
deleted file mode 100644
index 3c574d1b681b..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild
deleted file mode 100644
index 3c574d1b681b..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.4.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild
index 976ea1f42e0f..c28c2b9f697c 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.4.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rosbash
+	)
 "
 # needed by combined_robot_hw_tests
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
index 3c574d1b681b..c28c2b9f697c 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rosbash
+	)
 "
 # needed by combined_robot_hw_tests
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )