gentoo resync : 25.08.2020

6 files changed, 54 insertions, 105 deletions

diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 91ac651af1dd..e5c9a82f15c7 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,8 +1,5 @@
-AUX boost.patch 1066 BLAKE2B 955d62df23d3165df5cf2645967755bf8dbd993779ddba0c6db4cbd77c6456d536421d428475ef521f3b961e4e9dd9f93a78066f10ed961fddb6a8528ea29648 SHA512 a78c61c54c7389647fa7001ce0d453b0d2b74324877da1275edc487c18cd6208a640678575887f84bcab0a742618efe69bd209855a4f57f58ede98f0a3cd7600
 AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD message_filters-1.14.3-r1.ebuild 795 BLAKE2B 294a8f9f9f3d3b47a8a692c86b88badd8370ef38f680e6fb2ed1fbfb027ffe8e20cfdfea63564478488e2b583d5588478330535c458ce7b45383d2e979e3d5cf SHA512 e159086871167df2de97ad0912162f4ac2c94a4e43796d41f8b4a338d1cc8783a094de87497c719d9608d62a2cfa1f31f17fa946a96cb1b01203a8ed47039055
-EBUILD message_filters-1.15.4.ebuild 769 BLAKE2B 1d022886a2dc5110f40e8eec6458687855690d2c5f073a96e936c16172bd20c656d127bf2a76d636dffda664a4431ac943dc4f97a52b9aed0544ff267a721bc5 SHA512 9d9f9dfcc87fa07dd7473710a059d88267ebf55ba84b00d709b0aec7959049a3f0de7cf490fa46d19c330403a168e1114cd99e2a2425bea406228878d1d41cf0
-EBUILD message_filters-9999.ebuild 769 BLAKE2B 1d022886a2dc5110f40e8eec6458687855690d2c5f073a96e936c16172bd20c656d127bf2a76d636dffda664a4431ac943dc4f97a52b9aed0544ff267a721bc5 SHA512 9d9f9dfcc87fa07dd7473710a059d88267ebf55ba84b00d709b0aec7959049a3f0de7cf490fa46d19c330403a168e1114cd99e2a2425bea406228878d1d41cf0
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD message_filters-1.15.8.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
+EBUILD message_filters-9999.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/files/boost.patch b/dev-ros/message_filters/files/boost.patch
deleted file mode 100644
index 1acc778756a8..000000000000
--- a/dev-ros/message_filters/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
-Author: Maarten de Vries <maarten@de-vri.es>
-Date:   Thu Jan 31 00:58:29 2019 +0100
-
-    Remove signals from find_package(Boost COMPONENTS ...) (#1580)
-    
-    The packages use signals2, not signals. Only boost libraries with
-    compiled code should be passed to find_package(Boost COMPONENTS ...),
-    and the signals2 library has always been header only.
-    
-    Boost 1.69 has removed the deprecated signals library, so the otherwise
-    useless but harmless `signals` component now breaks the build.
-
-diff --git a/utilities/message_filters/CMakeLists.txt b/utilities/message_filters/CMakeLists.txt
-index 5694ac57e..d2b1477ad 100644
---- a/utilities/message_filters/CMakeLists.txt
-+++ b/utilities/message_filters/CMakeLists.txt
-@@ -13,7 +13,7 @@ catkin_package(
- )
- catkin_python_setup()
- 
--find_package(Boost REQUIRED COMPONENTS signals thread)
-+find_package(Boost REQUIRED COMPONENTS thread)
- 
- include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
- link_directories(${catkin_LIBRARY_DIRS})
diff --git a/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild b/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild
deleted file mode 100644
index c2ab8b9cdbe7..000000000000
--- a/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.15.4.ebuild b/dev-ros/message_filters/message_filters-1.15.4.ebuild
deleted file mode 100644
index ec6cbf8434ad..000000000000
--- a/dev-ros/message_filters/message_filters-1.15.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.15.8.ebuild b/dev-ros/message_filters/message_filters-1.15.8.ebuild
new file mode 100644
index 000000000000..2bbb5486cfc4
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.8.ebuild
@@ -0,0 +1,37 @@
+# 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/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/message_filters/message_filters-9999.ebuild b/dev-ros/message_filters/message_filters-9999.ebuild
index ec6cbf8434ad..2bbb5486cfc4 100644
--- a/dev-ros/message_filters/message_filters-9999.ebuild
+++ b/dev-ros/message_filters/message_filters-9999.ebuild
@@ -1,16 +1,15 @@
 # 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/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -19,14 +18,20 @@ RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
 	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
 DEPEND="${RDEPEND}
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
 PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}