gentoo resync : 28.04.2021

5 files changed, 5 insertions, 36 deletions

diff --git a/dev-ros/timestamp_tools/Manifest b/dev-ros/timestamp_tools/Manifest
index 4eee7f619c6a..20372be0f441 100644
--- a/dev-ros/timestamp_tools/Manifest
+++ b/dev-ros/timestamp_tools/Manifest
@@ -1,6 +1,4 @@
-AUX boost.patch 605 BLAKE2B 21419362bbd7c9835722d815b5f02b8292b827d562c9dad3801044080738bd3efa36bf0c74cbb836a633620b4cb0fa1f28c1cb0b5ad6ad38fbe68d31003f23f2 SHA512 c495e773cfecacb275465e05eb08e64ceb0ae8bb023b8bfe7fd6edfd96abc448ef2652774d510618670f49757fa1baab84cfc7a0d3bbb16ea824899e3ca88091
-AUX tests.patch 620 BLAKE2B db7be143209e2b76695d3ecd93e4a524ca692c768f881f7d5f07a6162e3fc428ff053b2342b20663d408343e491985c573d5ed54ef1aa1b9c4941a303b7a5b6b SHA512 c1fa99bd49c370fd38983971268f374f30232691fcd188ec0a2d6d1b8020d619f9e50a88bff3bd36e7463de9a1074f7ad937dc13e54142e091cd80f6c2385b56
-DIST driver_common-1.6.8.tar.gz 15055 BLAKE2B 2d9a4c23d65b8e2f60343f5e3b454e1cc41334d34e0246891b533f216acb743df628d95dd2c0087b06284a85e0ea872baad495a7ed7b59c03e8f8ff32eba4ed8 SHA512 b698143d08785088ac13e62f5b96676bd590a84e4ffb147fa3698be6a8ded510f648d043ecdc1d31ba7b95fb3041d06ee1a39b224c359b8612adebdba259d188
-EBUILD timestamp_tools-1.6.8-r1.ebuild 474 BLAKE2B 4ca70244c2671f207c0346d91e9c051d176c24b9a02674e9eaef927a6604d73642e3ec7d5e5355f90675232e17c3615049e48240b55e8ec15226b864bfac9020 SHA512 23ed3e2e57002773470ed7f6b4902ca4a630778dbc8e79ca0f8f5e09f24df6236d1fc5ec2d8ee5c64b9bd734e5ae476e8ab5d040ea8eac9e9ff4ae253f01ee38
-EBUILD timestamp_tools-9999.ebuild 448 BLAKE2B 462b0a391f80dbc0e7c760913667f46d25cc8a13ee2b6ca04d4b018ddfd9a9be336d39256a5a513f62b2ee2d78510cd454421a8f2967ef26d0514a8016848ce0 SHA512 13bf57e52507d7d78fa37a42c5501629f9c857ec08d30c2d4f6601a79343c4a6ac0d6fc7aa1fe22d117c4d1c55f6f5d798e2ba3f836169c856ce5243946c1063
+DIST driver_common-1.6.9.tar.gz 15374 BLAKE2B 88bcba03596d9a641091d37db8329807cfa0d4dd766298a25f8e41b6da567eb246fdd8c4c8a39698b60a47a118b81b15c3ac93154490a1258d93d3e2fbd5c049 SHA512 1a5f7d261a3e754b380824256d35432cee521b7d255a7f152b6a69d5181ea45a2bbca7a7c6d4e0bea753c8f3c59018a63357c87d2535a9cb55ba311f11e5d749
+EBUILD timestamp_tools-1.6.9.ebuild 410 BLAKE2B 043eabedd01847e1e1dfa2da8e2538337679e5cb6e09b1898209c34c68c1532933ad87f3320d6b9fc36999b30aec033f956944df9fc6da61e03d35d7323349e9 SHA512 f46612714bc069857e1d1d6dac23b467d7019f6834282b5656ae86a3a7fd2eba35305dda41addc553d9af3f84e644bee35e79108c26ad148eb77657a23debec7
+EBUILD timestamp_tools-9999.ebuild 410 BLAKE2B 043eabedd01847e1e1dfa2da8e2538337679e5cb6e09b1898209c34c68c1532933ad87f3320d6b9fc36999b30aec033f956944df9fc6da61e03d35d7323349e9 SHA512 f46612714bc069857e1d1d6dac23b467d7019f6834282b5656ae86a3a7fd2eba35305dda41addc553d9af3f84e644bee35e79108c26ad148eb77657a23debec7
 MISC metadata.xml 339 BLAKE2B 71ed9f79df6d8528f3d967c077f1d01e0290573400356e3749bd24254281651f09507894d2ca4029b8b8a77b51d31d080d9560d9995d3d9fde848f0d71ec083d SHA512 e24ff4ef526475ad5bff434350abb00afccb4c101ab624ee056c1502719d15ec4889eff9170c534af62ba8719bd5fe4f3cf206353244f56e486a29afea53ee7b
diff --git a/dev-ros/timestamp_tools/files/boost.patch b/dev-ros/timestamp_tools/files/boost.patch
deleted file mode 100644
index de7878ca19b8..000000000000
--- a/dev-ros/timestamp_tools/files/boost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: timestamp_tools/include/timestamp_tools/trigger_matcher.h
-===================================================================
---- timestamp_tools.orig/include/timestamp_tools/trigger_matcher.h
-+++ timestamp_tools/include/timestamp_tools/trigger_matcher.h
-@@ -266,7 +266,7 @@ public:
-     if (stamp != RetryLater)
-       return stamp;
- 
--    got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(timeout * 1e6));
-+    got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(static_cast<int>(timeout * 1e6)));
-     
-     return getTimestampNoblockPrelocked(t);
-   }
diff --git a/dev-ros/timestamp_tools/files/tests.patch b/dev-ros/timestamp_tools/files/tests.patch
deleted file mode 100644
index d66118537ed3..000000000000
--- a/dev-ros/timestamp_tools/files/tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: driver_common-1.6.8/timestamp_tools/CMakeLists.txt
-===================================================================
---- driver_common-1.6.8.orig/CMakeLists.txt
-+++ driver_common-1.6.8/CMakeLists.txt
-@@ -17,5 +17,7 @@ install(DIRECTORY include/${PROJECT_NAME
-   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-   FILES_MATCHING PATTERN "*.h")
- 
-+if(CATKIN_ENABLE_TESTING)
- catkin_add_gtest(test_trigger_matcher test/test_trigger_matcher.cpp)
--target_link_libraries(test_trigger_matcher ${catkin_LIBRARIES})
-\ No newline at end of file
-+target_link_libraries(test_trigger_matcher ${catkin_LIBRARIES})
-+endif()
diff --git a/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild b/dev-ros/timestamp_tools/timestamp_tools-1.6.9.ebuild
index 52ab3c68a490..efb32587375a 100644
--- a/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild
+++ b/dev-ros/timestamp_tools/timestamp_tools-1.6.9.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
@@ -19,4 +19,3 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
index 86be358b9919..efb32587375a 100644
--- a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
+++ b/dev-ros/timestamp_tools/timestamp_tools-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
@@ -19,4 +19,3 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/boost.patch" )