gentoo resync : 25.08.2020

6 files changed, 13 insertions, 121 deletions

diff --git a/dev-ros/image_publisher/Manifest b/dev-ros/image_publisher/Manifest
index fe1e2186c5bf..865a8f946b8e 100644
--- a/dev-ros/image_publisher/Manifest
+++ b/dev-ros/image_publisher/Manifest
@@ -1,9 +1,4 @@
-AUX ocv4.patch 1826 BLAKE2B 647de2fc507e52734fb9e4c4c13043fd1424c2ab78ddbf2edb876660b5344877b8389ffc1194b20391249fad699c6e50305421f2ce8d58f880953e155de53120 SHA512 ef84c6d0ca37718b025dd570df596f8cd83bf8d5ca6e1bce5ad0725fdf852c55dbae876bea15f3e9534177b13538bfcaef7d6cf693c29e6ca4e99b3276acc7eb
-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_publisher-1.12.22-r1.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
-EBUILD image_publisher-1.12.23.ebuild 659 BLAKE2B e0fefc67d3680c3bd1e2cf54d32eedd4d1e997de6707f4b77604d776a5b63ef67a423ed0618b3566f2272f94a2500507c5ad0de1d44858de9d0a81fec9f96e1b SHA512 ffd763e3b47a77022e3ee17b180e629e3297fce8f85d34e40997019e3ee4f0a0cb01fe898b1a16b665d91c3d1a60c9312d97cbe6fdb1391796c4e087726f2155
-EBUILD image_publisher-1.13.0.ebuild 697 BLAKE2B 9c613067b2e7b88e45ad4dbe0df663ea785b1ebffb76d3bf146afab6295cb46ca51e5f2c560b66e0222b2cae572b4dfcf643066f4b49fb96a5dd1346508fbdfc SHA512 5e265bdbed1d7a3b89f4d4c1ebdb967ef7052ef7930dc41c7466d3ce002a6beb23aa6b9d201759deb1421c79194278f9894ec8dec623b823d834eb79f0a51368
-EBUILD image_publisher-9999.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
+DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
+EBUILD image_publisher-1.15.2.ebuild 629 BLAKE2B 9f1a0ad822d5f699a9464052a91d7121584d61c85d971c2e5dd85b642fd04809b8e3cb7a4c26ae36a3441495554347cc5de49229d749bd43f83a01a770c9617f SHA512 48ab3110a492d8bcbbc678bd20425927e43d84d8a722771b7c1c4385a7b6a06b7fb9e9091d02163962f628ec6eea507aeee8d265d235d72f446325333c9a2739
+EBUILD image_publisher-9999.ebuild 629 BLAKE2B 9f1a0ad822d5f699a9464052a91d7121584d61c85d971c2e5dd85b642fd04809b8e3cb7a4c26ae36a3441495554347cc5de49229d749bd43f83a01a770c9617f SHA512 48ab3110a492d8bcbbc678bd20425927e43d84d8a722771b7c1c4385a7b6a06b7fb9e9091d02163962f628ec6eea507aeee8d265d235d72f446325333c9a2739
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_publisher/files/ocv4.patch b/dev-ros/image_publisher/files/ocv4.patch
deleted file mode 100644
index 12baac2d8473..000000000000
--- a/dev-ros/image_publisher/files/ocv4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: image_publisher/CMakeLists.txt
-===================================================================
---- image_publisher.orig/CMakeLists.txt
-+++ image_publisher/CMakeLists.txt
-@@ -10,7 +10,7 @@ message(STATUS "opencv version ${OpenCV_
- if(OpenCV_VERSION VERSION_LESS "3.0.0")
-   find_package(OpenCV 2 REQUIRED COMPONENTS ${opencv_2_components})  
- else()
--  find_package(OpenCV 3 REQUIRED COMPONENTS ${opencv_3_components})  
-+  find_package(OpenCV REQUIRED COMPONENTS ${opencv_3_components})  
- endif()
- 
- # generate the dynamic_reconfigure config file
-Index: image_publisher/src/nodelet/image_publisher_nodelet.cpp
-===================================================================
---- image_publisher.orig/src/nodelet/image_publisher_nodelet.cpp
-+++ image_publisher/src/nodelet/image_publisher_nodelet.cpp
-@@ -95,7 +95,7 @@ class ImagePublisherNodelet : public nod
-     {
-       if ( cap_.isOpened() ) {
-         if ( ! cap_.read(image_) ) {
--          cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
-+          cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
-         }
-       }
-       if (flip_image_)
-@@ -136,7 +136,7 @@ public:
-     nh_.param("filename", filename_, std::string(""));
-     NODELET_INFO("File name for publishing image is : %s", filename_.c_str());
-     try {
--      image_ = cv::imread(filename_, CV_LOAD_IMAGE_COLOR);
-+      image_ = cv::imread(filename_, cv::IMREAD_COLOR);
-       if ( image_.empty() ) { // if filename is motion file or device file
-         try {  // if filename is number
-           int num = boost::lexical_cast<int>(filename_);//num is 1234798797
-@@ -146,7 +146,7 @@ public:
-         }
-         CV_Assert(cap_.isOpened());
-         cap_.read(image_);
--        cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
-+        cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
-       }
-       CV_Assert(!image_.empty());
-     }
diff --git a/dev-ros/image_publisher/image_publisher-1.12.23.ebuild b/dev-ros/image_publisher/image_publisher-1.12.23.ebuild
deleted file mode 100644
index 44b01c18391f..000000000000
--- a/dev-ros/image_publisher/image_publisher-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="Publish an image stream from single image file or avi file."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_publisher/image_publisher-1.13.0.ebuild b/dev-ros/image_publisher/image_publisher-1.13.0.ebuild
deleted file mode 100644
index dd6ff1f0df2e..000000000000
--- a/dev-ros/image_publisher/image_publisher-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +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="Publish an image stream from single image file or avi file."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	>=media-libs/opencv-4:=
-	dev-ros/dynamic_reconfigure
-	dev-ros/camera_info_manager
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/image_publisher/image_publisher-1.12.22-r1.ebuild b/dev-ros/image_publisher/image_publisher-1.15.2.ebuild
index 7a3fea27064f..34d0c0948d93 100644
--- a/dev-ros/image_publisher/image_publisher-1.12.22-r1.ebuild
+++ b/dev-ros/image_publisher/image_publisher-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
@@ -23,7 +22,8 @@ RDEPEND="
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_publisher/image_publisher-9999.ebuild b/dev-ros/image_publisher/image_publisher-9999.ebuild
index 7a3fea27064f..34d0c0948d93 100644
--- a/dev-ros/image_publisher/image_publisher-9999.ebuild
+++ b/dev-ros/image_publisher/image_publisher-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
@@ -23,7 +22,8 @@ RDEPEND="
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"