gentoo resync : 11.05.2018

5 files changed, 6 insertions, 59 deletions

diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
index 9efde9957ef7..65c34990c7c5 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -1,9 +1,5 @@
 AUX gcc6.patch 487 BLAKE2B 9301c9e8e22bb780ea2d91a0055fc0f2f03af1ce3fefeb3bf8c5d53d544f1b73b5420a3cf510c6adc71a615ddfea2894c9ff1fbc4655a403b5b599753a25727e SHA512 20b0cf8ed7774493fa0626fd89932368d6bcbb50e4719cbd29c58012d5bd60357392984959452f8ba12266c54cbd8d825d972de2a3f46f067bda164868d32f86
-DIST diagnostics-1.8.10.tar.gz 525999 BLAKE2B 97d28f89c01fb8ee17fda9b0207f68848c57af754980562dce05d9eb76b1505f316ef64fe06a8a76db807d0b6d39657924e0f5c9dd8372a1df2fbefd51cacd8c SHA512 a3719b1cb745e376bbff55c483c92916588b4548c0c7b57cad299d3b748ca278a2d6b1a874168dd489b60a6dbc2250b40db1c55b54a4043de1b5c3ce3c8a5513
-DIST diagnostics-1.9.0.tar.gz 528593 BLAKE2B 12ecbbf0b0d091d5325c30de5ff836d245294beac7cc23976e403eee4ab6b71afd0972dded5276e96387fbc4bd2c1e57c17efff9e4c606cf18b6095f95099ba0 SHA512 98086feb84939108a959b36a3f59a7c52b4413ceb57d5c3c393db98dfad4c5f1572f584248293502a27619db706a585ebe0cb98c4af0b8681d6d78be0e1c022c
-DIST diagnostics-1.9.2.tar.gz 530844 BLAKE2B 9b67f24df11ec5a716bd80ae7eb0f80f777c3014c4c0ed115e15f67649245bb685c13502a8e7889fe02bdcce43d465c11c0b2d448b698716aebed25c23512883 SHA512 6074b7fb6366bc40252af6317b27f509ee969f30c532fae47bba506f4851656d8bef041bea6256046325316807ba4d9e570f695d517b562970ecaf72d2def759
-EBUILD test_diagnostic_aggregator-1.8.10.ebuild 492 BLAKE2B cde5d5392fc76ab0cc24930e8dfdaf4db933f62cf967ed5eca3e10ad8896bd98bd72997b16a599ee45ad4d6389cd8cc7058da06c06868e716092685f9a4d4624 SHA512 a2abb07dd5a7c00a5953fda4dde21ba895d5660c2beaba8534af1da674b723ae88f9ddf9989ad2f62d1f865d8f8e4542b07730067a8c60fca54aa27ea6b7b015
-EBUILD test_diagnostic_aggregator-1.9.0.ebuild 492 BLAKE2B cd2356a248cf15596fa624f5a5f624d317e013c45e33c108ea843406fbbac89f8bb9162c4facdae73ebcc729635aeb5627dff5c872f00b9f548e25e9d53f9dca SHA512 6c60a94ee6d0c02e3dc89b27cf29ccd24dd6bd66e6a7732feec766be6c989c23e520dad70fa31d2fcfac3cfe0aebadac85964be8cda56b931d89557df9f96382
-EBUILD test_diagnostic_aggregator-1.9.2.ebuild 492 BLAKE2B cd2356a248cf15596fa624f5a5f624d317e013c45e33c108ea843406fbbac89f8bb9162c4facdae73ebcc729635aeb5627dff5c872f00b9f548e25e9d53f9dca SHA512 6c60a94ee6d0c02e3dc89b27cf29ccd24dd6bd66e6a7732feec766be6c989c23e520dad70fa31d2fcfac3cfe0aebadac85964be8cda56b931d89557df9f96382
-EBUILD test_diagnostic_aggregator-9999.ebuild 455 BLAKE2B d5de75bbe893213ab13ec5d427955f4b00fed1f70b125c70a0e112845fb611fd35d5b270962b65676bd628cb77d3eb9d513edaf6ad41bee1b6ba3744e8611d2e SHA512 35da5236b9b09505bf97bcae256d16a7700a7170020e82577a53d260b3e3dd751e79b14e71169e61ce3d9b0ebcfb1cb0b1bdf21f92438360633ea0cad37d8eda
+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
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.0.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.0.ebuild
deleted file mode 100644
index e91f3025a206..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.0.ebuild
+++ /dev/null
@@ -1,25 +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/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" )
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.2.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.2.ebuild
deleted file mode 100644
index e91f3025a206..000000000000
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.2.ebuild
+++ /dev/null
@@ -1,25 +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/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" )
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
index 26eb4591a5b0..cabd94dbe35a 100644
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
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 b2364a6257b7..cabd94dbe35a 100644
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-ros/rostest
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )