gentoo resync : 25.08.2020

4 files changed, 12 insertions, 38 deletions

diff --git a/dev-ros/compressed_image_transport/Manifest b/dev-ros/compressed_image_transport/Manifest
index c31e789ccc48..5423f8cc5c3e 100644
--- a/dev-ros/compressed_image_transport/Manifest
+++ b/dev-ros/compressed_image_transport/Manifest
@@ -1,5 +1,4 @@
-AUX ocv4.patch 823 BLAKE2B e435db081e4fb82fb3ab6a0aa46dc157c06c5d4e89b8f93bca737300b4a34c63a77101907e0ccd4d11764a5aeba084cbba98fa25cd5eb0923217cb6961b207da SHA512 0372e0c4401424dccd6e5e20d9d9eae37a7d38801a2d73a93631545d347569a685d9540a9e73b65db83e8cb6499874e0675b1eed25d0b0a8c9ca5c6557609ccb
-DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD compressed_image_transport-1.9.5-r1.ebuild 632 BLAKE2B 5431debfeda9cf204fa8e3213d7524de051885ee2db0e2b5b96e11f1f34ea2a7cfb0b3c6e2d353b07b1539f43448df400374ecb5bf7ba6dbd112cd0b5fd9cc6f SHA512 33dc22784dcc6ab9fd4ce13c17e9cf42342cd2f60f2494b7c0ab1816495a615ada381ae94e12d4c12f05ebc60318ae00a30132693cf9a169d0ff14d18342612c
-EBUILD compressed_image_transport-9999.ebuild 594 BLAKE2B 0371f8f25fc02e5ce6dc843a2642c0bf9138f1696ec940bff8508a79bc66ccc193f317610a8587720f6c6daf0db53feec6b82bcd8d8d63815dd0b481fc8f82f1 SHA512 f5711ff9ac19b3f2d38627aee4c2e7ea88202d892eff1cd38ef6e256173a81e4e4245034f01cd0c80b4feb01e2a44ea3e8e1b97dfef18882465813ab529c2fc5
+DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
+EBUILD compressed_image_transport-1.14.0.ebuild 551 BLAKE2B 90730fdbf3d9d330a708ce8e5ec45a07bb34dbf698199b092707ac6d8d1868d3def90eba2b415280e730665dbbb0af1a860c1c93ab2cc4ce6b252fed5a29da87 SHA512 2e36d72c20c4f6edc0938ef8523dbb85875cb787440cba474872e5e9bde81c155bcdcb09c66ce739c6da29a2f284505da47ed8d52a0e38eb5010e54e5d585bec
+EBUILD compressed_image_transport-9999.ebuild 551 BLAKE2B 90730fdbf3d9d330a708ce8e5ec45a07bb34dbf698199b092707ac6d8d1868d3def90eba2b415280e730665dbbb0af1a860c1c93ab2cc4ce6b252fed5a29da87 SHA512 2e36d72c20c4f6edc0938ef8523dbb85875cb787440cba474872e5e9bde81c155bcdcb09c66ce739c6da29a2f284505da47ed8d52a0e38eb5010e54e5d585bec
 MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
index 044d1c361210..f2997bda2e2c 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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_transport_plugins"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Plugin to image_transport for transparently sending images encoded as JPEG or PNG"
+DESCRIPTION="Plugin for transparently sending images encoded as JPEG or PNG"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_transport
-	>=media-libs/opencv-4:=
+	media-libs/opencv:=
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
index 46fc32014194..f2997bda2e2c 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
@@ -1,22 +1,21 @@
-# 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_transport_plugins"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Plugin to image_transport for transparently sending images encoded as JPEG or PNG"
+DESCRIPTION="Plugin for transparently sending images encoded as JPEG or PNG"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_transport
 	media-libs/opencv:=
 	dev-libs/boost:=
diff --git a/dev-ros/compressed_image_transport/files/ocv4.patch b/dev-ros/compressed_image_transport/files/ocv4.patch
deleted file mode 100644
index 6b3406b5c006..000000000000
--- a/dev-ros/compressed_image_transport/files/ocv4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: compressed_image_transport/src/compressed_publisher.cpp
-===================================================================
---- compressed_image_transport.orig/src/compressed_publisher.cpp
-+++ compressed_image_transport/src/compressed_publisher.cpp
-@@ -97,7 +97,7 @@ void CompressedPublisher::publish(const
-     // JPEG Compression
-     case JPEG:
-     {
--      params[0] = CV_IMWRITE_JPEG_QUALITY;
-+      params[0] = cv::IMWRITE_JPEG_QUALITY;
-       params[1] = config_.jpeg_quality;
- 
-       // Update ros message format header
-@@ -154,7 +154,7 @@ void CompressedPublisher::publish(const
-       // PNG Compression
-     case PNG:
-     {
--      params[0] = CV_IMWRITE_PNG_COMPRESSION;
-+      params[0] = cv::IMWRITE_PNG_COMPRESSION;
-       params[1] = config_.png_level;
- 
-       // Update ros message format header