gentoo resync : 25.08.2020

5 files changed, 13 insertions, 67 deletions

diff --git a/dev-ros/control_toolbox/Manifest b/dev-ros/control_toolbox/Manifest
index 3da58c511243..f58390e82c9c 100644
--- a/dev-ros/control_toolbox/Manifest
+++ b/dev-ros/control_toolbox/Manifest
@@ -1,8 +1,4 @@
-DIST control_toolbox-1.14.0.tar.gz 24084 BLAKE2B c4ffd003060e57a6f08b2f064ada0c237eaea782aa719819fcd437868a440e68b278871cd82f6cfb7f877ca7b7f6da6aa17509198a550eb20c53bfbe095da75e SHA512 205d1e8421f3727532d14746f1898536a6bb6144071e8f5c8f5be17242462ed18512d7ede61ef686db46d6beea4b655c1ad22dec1e5940c99e2d52e0a88c1769
-DIST control_toolbox-1.15.0.tar.gz 24096 BLAKE2B fc2288f9b6493b4d3de9eabfa43313602702fcf66bf2cae5091866e9f4989126cfebe4efb73a12bbd67fee4dfb16de4847984f7da3636dd402b47658876686a2 SHA512 e2f1bae35d3c70fb15eff30fb7a3d380cd5857ffebb28cac2d48de7e0f12191a0c3a57ccc80978155f42e6ffc59af14c372ddec0532ecb2a7c2db720737c1a16
-DIST control_toolbox-1.16.0.tar.gz 23723 BLAKE2B 00de0c11804ce31d07877f480d62b7bfecae86ab8ce1a63107948f02449a05a355b75e4fc0f22dc95be5b9000adc133b2e731029d6143d2af8b425387806173d SHA512 942f63b95f4540dd634daf090389b4f839b59a73d85ad8d1636b7180e2cb3c66d75cf131216d53709bafec54543dab2034e6e88d38ab1045711eda095ea77dd7
-EBUILD control_toolbox-1.14.0.ebuild 612 BLAKE2B f0ae704eccaee7d7a5f52ec6013ec7719a846cf1657c51dade13fa5e9916469350502cf7ab0cce0ece8081fe755496bbf733cc93e998550902b6ffbb2a3b5cca SHA512 9073442c13842494217909825a4c914d6a0dc30a69b6ab624b1995b979e81855b6c9ff5cd84a6a72a7cd05a0833cb6ee68043d52824db97a31b5462bb734f41b
-EBUILD control_toolbox-1.15.0.ebuild 612 BLAKE2B 651a30f85c57dcad1307caf7718826bf94005b32a96e036ab3dc9d906ccd0d38d95314d09019a0d058faacc2fafbfc2e54afe065742018fd89faa6982d9cb8f6 SHA512 3a0728bfaaab6258ccbd20a97fad87f5c54ea12a6b2e5b35b7cb9dace982a4c23bf66f0e1b2d4c8a027506e322538c0b39e3dfb18bd860a87a1f7b4ae05d9367
-EBUILD control_toolbox-1.16.0.ebuild 612 BLAKE2B b9c7d3d7d55331055b1314d1d580dbe0d4049cc1a8d76be201d06580588f90f6cca1188a54edfba414d689f4ff30c56cbc5579679d55ffd54c977d9c319b6828 SHA512 8a7f46358516f2198f38512d688c3d8bab1ad25a43d33cff150a2d8d6b7c941d89d9402ceb3a93816fc32fc2b812fd560e0278cbc979598c6fe528b89a3f0dc0
-EBUILD control_toolbox-9999.ebuild 612 BLAKE2B f0ae704eccaee7d7a5f52ec6013ec7719a846cf1657c51dade13fa5e9916469350502cf7ab0cce0ece8081fe755496bbf733cc93e998550902b6ffbb2a3b5cca SHA512 9073442c13842494217909825a4c914d6a0dc30a69b6ab624b1995b979e81855b6c9ff5cd84a6a72a7cd05a0833cb6ee68043d52824db97a31b5462bb734f41b
+DIST control_toolbox-1.18.2.tar.gz 24244 BLAKE2B 13c4d4d6991db496ea6223c6cc33c9b0b7fa7b3e18c13cc330cf032ac67b185a596ca2eb118678faf6f0a3106458e3ce20635dfd99fbc1acf176ee2844e6ec99 SHA512 0b8bbd0fec88b1679260d9b5d5c5762f52fd14f4156be45ea07a410a7967571136a65115f530ae4f7a84e456e56c363616e23d0b54d8c092a38a80fad691c705
+EBUILD control_toolbox-1.18.2.ebuild 607 BLAKE2B c5b007986f5d9d52d2f2602b6e72269cbd828f3cbdd5b5b736b52d71401e34dee5ce9b5ffbe4f9f9227d8b79c105f3a1f8ae75c6e171d762e41dbcea155a3050 SHA512 df8cf33df250b0e291f7d95bb8c9d8dc4d28b76bb81c6f348a7350a50d0ce8ffd126def6cfd754da02928624e1d8356bef9bbd5446d42dd69f9d14ee1dd1e234
+EBUILD control_toolbox-9999.ebuild 607 BLAKE2B c5b007986f5d9d52d2f2602b6e72269cbd828f3cbdd5b5b736b52d71401e34dee5ce9b5ffbe4f9f9227d8b79c105f3a1f8ae75c6e171d762e41dbcea155a3050 SHA512 df8cf33df250b0e291f7d95bb8c9d8dc4d28b76bb81c6f348a7350a50d0ce8ffd126def6cfd754da02928624e1d8356bef9bbd5446d42dd69f9d14ee1dd1e234
 MISC metadata.xml 342 BLAKE2B fb0771fe1ae1d9988202a13aa319eca68cde1c129b68b74405ba854416522c81917bd7ecc26dd6ff0d9c32a02c5b089dbbaa4b13eb6ee3e65c050a09ec6731e8 SHA512 81835aefd67c55665a6f7d2a2cdbced84032d83ca35d6924410a62c00021cf7eb0e11e1094e0bb70becb635b480c8e527c7e9bdfaaa17149918552d440539e0c
diff --git a/dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild
deleted file mode 100644
index 2c6a1e83f76d..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild
+++ /dev/null
@@ -1,26 +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-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
-	dev-ros/realtime_tools
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild
deleted file mode 100644
index 91cec2668963..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild
+++ /dev/null
@@ -1,26 +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-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
-	dev-ros/realtime_tools
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.18.2.ebuild
index ac4eb7122b93..46a22e5b1b70 100644
--- a/dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-1.18.2.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-controls/control_toolbox"
 KEYWORDS="~amd64"
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -21,6 +20,8 @@ RDEPEND="
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads]
 	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
 	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-9999.ebuild b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
index ac4eb7122b93..46a22e5b1b70 100644
--- a/dev-ros/control_toolbox/control_toolbox-9999.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-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-controls/control_toolbox"
 KEYWORDS="~amd64"
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -21,6 +20,8 @@ RDEPEND="
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads]
 	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
 	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )
 "
-DEPEND="${RDEPEND}"