gentoo resync : 25.08.2020

5 files changed, 29 insertions, 79 deletions

diff --git a/dev-ros/image_proc/Manifest b/dev-ros/image_proc/Manifest
index 5480a59ea12e..b4900cfd16c7 100644
--- a/dev-ros/image_proc/Manifest
+++ b/dev-ros/image_proc/Manifest
@@ -1,8 +1,4 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
-DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
-EBUILD image_proc-1.12.22-r1.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
-EBUILD image_proc-1.12.23.ebuild 651 BLAKE2B d01b42e8fb22054539ad4eb4f55993ddf8887fe1c950eaa8ef6b9264348d73d82d32904984fe65500c2af4c0342e3f70023b8808d8d5a9a09dbafdd11963ffb4 SHA512 4db3b8b9a3ac3dc3e98c9896dceaa8652868bc8818072cb5144749491344dfb8662beb275c4462b5890400217b63c156ebdba9960cbdac0e18000a2a565497bc
-EBUILD image_proc-1.13.0.ebuild 648 BLAKE2B cbb98c94317f93e8b7344a988948d2b8d0eed6e663f9fe97309436f7564d787eecc612ddaae6f7799c028901aa5f44418aef0193cc7a8f6aa14bbc86a4a69e3e SHA512 e5de63d615616bd3ed32106d2118525de6838ac63e30f24cfe66e0b34d98ebbfae5a7c4a1e57b98be24b19665ceae64aa1713b34eac5a4c237e0b4dfe51ed1ac
-EBUILD image_proc-9999.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_proc-1.15.2.ebuild 758 BLAKE2B a543f793a421450b7cd7012091011484195b9ac822c56344643e8866de9cccdd045904a87ead629c0d247b81dccbb1a06c961113f7067c7a4ed503490a471144 SHA512 1a77611d5d36d095927094a6fb97c7663ec0cbf1fca551f60e0df2a434d15afb3b0ddea95ff10d3c71cc41af6aab22d12616011cf6f394d2ca63511744cbaf04
+EBUILD image_proc-9999.ebuild 758 BLAKE2B a543f793a421450b7cd7012091011484195b9ac822c56344643e8866de9cccdd045904a87ead629c0d247b81dccbb1a06c961113f7067c7a4ed503490a471144 SHA512 1a77611d5d36d095927094a6fb97c7663ec0cbf1fca551f60e0df2a434d15afb3b0ddea95ff10d3c71cc41af6aab22d12616011cf6f394d2ca63511744cbaf04
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_proc/image_proc-1.12.23.ebuild b/dev-ros/image_proc/image_proc-1.12.23.ebuild
deleted file mode 100644
index 5f6d762c33e0..000000000000
--- a/dev-ros/image_proc/image_proc-1.12.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/image_proc-1.13.0.ebuild b/dev-ros/image_proc/image_proc-1.13.0.ebuild
deleted file mode 100644
index 9a57f7096740..000000000000
--- a/dev-ros/image_proc/image_proc-1.13.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/image_proc-1.12.22-r1.ebuild b/dev-ros/image_proc/image_proc-1.15.2.ebuild
index bd66af15e302..e38214ace5bb 100644
--- a/dev-ros/image_proc/image_proc-1.12.22-r1.ebuild
+++ b/dev-ros/image_proc/image_proc-1.15.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 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-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,14 +15,21 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
-	dev-libs/console_bridge:=
+	dev-ros/nodelet_topic_tools
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
 	media-libs/opencv:=
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+		dev-ros/camera_calibration_parsers
+	)
+"
diff --git a/dev-ros/image_proc/image_proc-9999.ebuild b/dev-ros/image_proc/image_proc-9999.ebuild
index bd66af15e302..e38214ace5bb 100644
--- a/dev-ros/image_proc/image_proc-9999.ebuild
+++ b/dev-ros/image_proc/image_proc-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 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-perception/image_pipeline"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,14 +15,21 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
-	dev-libs/console_bridge:=
+	dev-ros/nodelet_topic_tools
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
 	media-libs/opencv:=
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+		dev-ros/camera_calibration_parsers
+	)
+"