gentoo resync : 06.08.2019

5 files changed, 21 insertions, 39 deletions

diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index 50378f002836..138608fafb2d 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,6 +1,5 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+AUX boost170.patch 513 BLAKE2B c78a511ebf9ec506d75ba5ad639932321ff5542d5812db3e7b448765aff92c9b3e75f299c0ef15626cd5bbd6a34acee9efe202dc2f38dc20478b3f8e2f6b2577 SHA512 15c4024d4de848e06b47d845dd33758cac44c1e2c07982749a523a7d8d852921fff1306aa105f65df6d5152a09e974a0cfb8c1f70859cc415f51b1e1ec9e2b79
 DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-EBUILD image_view-1.12.22-r1.ebuild 794 BLAKE2B 90e70f23cb4ad8c7430293bb2499acdcc35a64f5a9b605e1d96cd4e754a3d16741a190a7b1c989d8e1fc8d12507308227887eacb5e0e9663ad3e58c82ec8bfe4 SHA512 bdd6d9362267653cbd80ea6c8dd6a98b8c7eeb3b4908e270af5109d7c36ffb8a6eed7012314f52b05cafbc0c1fcb27d4f9ff3a3742faf7d408f0ce3a6c04b19f
-EBUILD image_view-1.12.23.ebuild 794 BLAKE2B b110f344132d47cdf515fadfdabb4d194c621ebe5b5aa6af9bd618e77a5b8ed57e9d3c616d4379c62a6bd21300b241e9305ba3b8e67ce20b2b2c22d5a52f7643 SHA512 9c8802246ef3e980f7111f16214ef251e62fc2b093c4e2ca8397c3fbb23ed360ff8b463fbf19947c445e0b039e2e3f91ae5c8350aa9fd0e2e190b568e5e3b7ea
-EBUILD image_view-9999.ebuild 794 BLAKE2B 90e70f23cb4ad8c7430293bb2499acdcc35a64f5a9b605e1d96cd4e754a3d16741a190a7b1c989d8e1fc8d12507308227887eacb5e0e9663ad3e58c82ec8bfe4 SHA512 bdd6d9362267653cbd80ea6c8dd6a98b8c7eeb3b4908e270af5109d7c36ffb8a6eed7012314f52b05cafbc0c1fcb27d4f9ff3a3742faf7d408f0ce3a6c04b19f
+EBUILD image_view-1.12.23.ebuild 879 BLAKE2B fa54faf98131e0639ebfb8b375c3e6d09b7765ec108cdba4a91adfbc20a74a6dc9053d4b09f306329d0f97a675c347ef2363480508bee8e84869221b3c60d002 SHA512 f5ae3c9cdd3297cdea49c0a9ad6083e547bfc4327360e362001a044e26b9fed332465ececc8a3f2ff6c1b63092a65b17b6267274db7c55cbdc10bd5ec182754e
+EBUILD image_view-9999.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_view/files/boost170.patch b/dev-ros/image_view/files/boost170.patch
new file mode 100644
index 000000000000..ab52d89c5fad
--- /dev/null
+++ b/dev-ros/image_view/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: image_view/CMakeLists.txt
+===================================================================
+--- image_view.orig/CMakeLists.txt
++++ image_view/CMakeLists.txt
+@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+ generate_dynamic_reconfigure_options(cfg/ImageView.cfg)
+ 
+ catkin_package(CATKIN_DEPENDS dynamic_reconfigure)
+-find_package(Boost REQUIRED COMPONENTS signals thread)
++find_package(Boost REQUIRED COMPONENTS thread)
+ find_package(OpenCV REQUIRED)
+ 
+ include_directories(${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/image_view/image_view-1.12.22-r1.ebuild b/dev-ros/image_view/image_view-1.12.22-r1.ebuild
deleted file mode 100644
index 9b9820cf2699..000000000000
--- a/dev-ros/image_view/image_view-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 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="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv:=
-	x11-libs/gtk+:2
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/image_view-1.12.23.ebuild b/dev-ros/image_view/image_view-1.12.23.ebuild
index 6835689f080e..b7c4e715c9e9 100644
--- a/dev-ros/image_view/image_view-1.12.23.ebuild
+++ b/dev-ros/image_view/image_view-1.12.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,5 +29,7 @@ RDEPEND="
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild
index 9b9820cf2699..b9c0dff05bac 100644
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ b/dev-ros/image_view/image_view-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,5 +29,6 @@ RDEPEND="
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"