gentoo resync : 25.08.2020

5 files changed, 17 insertions, 61 deletions

diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
index bac26d96391e..f2a290922baf 100644
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
-DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD joint_limits_interface-0.14.2.ebuild 490 BLAKE2B 28b4f9b3a31ad18ce69dd4a22115725cda506148bf8e5095ccc3e9bb81a070742245fef113669e98a4b227c14b35ea8e63c94d7f1c303f50518065f9e67ec9aa SHA512 e578f1fc6e23f69746cd3df192d2b28d5e96024fbef7fa9ffd3aaf538516e5ce62c22e0f7bc84473e3daf4f8aaa0d0e65a940994236e4b6bcb726786367ee114
-EBUILD joint_limits_interface-0.15.0.ebuild 490 BLAKE2B 28b4f9b3a31ad18ce69dd4a22115725cda506148bf8e5095ccc3e9bb81a070742245fef113669e98a4b227c14b35ea8e63c94d7f1c303f50518065f9e67ec9aa SHA512 e578f1fc6e23f69746cd3df192d2b28d5e96024fbef7fa9ffd3aaf538516e5ce62c22e0f7bc84473e3daf4f8aaa0d0e65a940994236e4b6bcb726786367ee114
-EBUILD joint_limits_interface-0.15.1.ebuild 487 BLAKE2B f2b06422bdab4950e663c26b8af1c4d28f1d4f61923a36184ce4741389a2e19c6fac576f04b60e17e1dbf4fc90c0b249157f36b32951dc54b94f7e6415610d1f SHA512 56670bed7d830973ad3c565040bc7743800980d78937137df1ccbe0a44a449fa24fca73130dd9965460895341f8b79a2126605e44eaa744ae6bf8e08f2afcd2c
-EBUILD joint_limits_interface-9999.ebuild 490 BLAKE2B a26744ba31855f5d0cd31e84491a137532818a465b22d9df958d0ad94f97a43b11f8a3046ca124f8a4b93a1dc48aabbdd3428cf1c0c50d9fd59ca9b2a4ff9a03 SHA512 41ca8984579c77512c5aa03228b1326482ae9a2a68c64feec168f9bb06e884e802d49c50073777571f955ec19941de6b60129e96f6ebbade73da03d48936518c
+DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
+EBUILD joint_limits_interface-0.19.1.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
+EBUILD joint_limits_interface-9999.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild
deleted file mode 100644
index 9f9f5afce787..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.0.ebuild
+++ /dev/null
@@ -1,24 +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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-libs/urdfdom
-	dev-ros/urdf
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild
deleted file mode 100644
index af15ec2bb5cc..000000000000
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.15.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interface for enforcing joint limits"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hardware_interface
-	dev-libs/urdfdom
-	dev-ros/urdf
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.14.2.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild
index 9f9f5afce787..86815d181892 100644
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.14.2.ebuild
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild
@@ -1,11 +1,10 @@
-# 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-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -22,3 +21,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
index c8529d171588..86815d181892 100644
--- a/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2016 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-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -22,3 +21,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}