gentoo resync : 25.08.2020

5 files changed, 85 insertions, 7 deletions

diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
index 65c34990c7c5..584dd91e583a 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -1,5 +1,9 @@
 AUX gcc6.patch 487 BLAKE2B 9301c9e8e22bb780ea2d91a0055fc0f2f03af1ce3fefeb3bf8c5d53d544f1b73b5420a3cf510c6adc71a615ddfea2894c9ff1fbc4655a403b5b599753a25727e SHA512 20b0cf8ed7774493fa0626fd89932368d6bcbb50e4719cbd29c58012d5bd60357392984959452f8ba12266c54cbd8d825d972de2a3f46f067bda164868d32f86
-DIST diagnostics-1.9.3.tar.gz 531618 BLAKE2B 10bbf697477d58cfe405e6634259af4125792be873bc38aa899d09089c4162a2107d5910bcba670edb5df77d5692b9c57070a4eca911c648c7a4a25d2ffa9f07 SHA512 56e97ea5751c82acc18e7098d0449c7be271c91a191d363671ff118bedb9797d0b5568394c929d534d73560ff9048915d0693aa0b66942761fb12ed255f6f1b7
-EBUILD test_diagnostic_aggregator-1.9.3.ebuild 492 BLAKE2B e8945f4e168fe32a7410c274dd196039445a8d8755bb6f1199371f011ce89e251eec7e6270767e5b083ea1271127a907620a3fd5b035cc60029f299b2136f291 SHA512 f93e6e1110111f3c3b1dfcc322bb0ed1c895dec96fb837075be6b09a1b4220d7de411c00a284293c45cc8e57d335239db0e9d54cb2e26b17a808190aa09c3b63
-EBUILD test_diagnostic_aggregator-9999.ebuild 492 BLAKE2B e8945f4e168fe32a7410c274dd196039445a8d8755bb6f1199371f011ce89e251eec7e6270767e5b083ea1271127a907620a3fd5b035cc60029f299b2136f291 SHA512 f93e6e1110111f3c3b1dfcc322bb0ed1c895dec96fb837075be6b09a1b4220d7de411c00a284293c45cc8e57d335239db0e9d54cb2e26b17a808190aa09c3b63
+DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
+DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
+EBUILD test_diagnostic_aggregator-1.10.1.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
+EBUILD test_diagnostic_aggregator-1.9.4.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
+EBUILD test_diagnostic_aggregator-1.9.6.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
+EBUILD test_diagnostic_aggregator-9999.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.1.ebuild
index cabd94dbe35a..fcaf935a3f4e 100644
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.1.ebuild
@@ -1,7 +1,7 @@
-# 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/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -23,3 +23,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+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/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild
new file mode 100644
index 000000000000..fcaf935a3f4e
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.4.ebuild
@@ -0,0 +1,31 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="diagnostic_aggregator tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_aggregator
+	dev-ros/diagnostic_msgs
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+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/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.6.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.6.ebuild
new file mode 100644
index 000000000000..fcaf935a3f4e
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.6.ebuild
@@ -0,0 +1,31 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="diagnostic_aggregator tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_aggregator
+	dev-ros/diagnostic_msgs
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+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/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
index cabd94dbe35a..fcaf935a3f4e 100644
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
@@ -1,7 +1,7 @@
-# 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/diagnostics"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -23,3 +23,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}