gentoo resync : 15.12.2019

7 files changed, 20 insertions, 230 deletions

diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 5acbf46e7172..c5e48222ae71 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,13 +1,5 @@
-DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+AUX ocv4.patch 557 BLAKE2B 65adfeae5045dc21b29193a7bcbbf22cb4649425d551b8710bc557cbcf13f04f00fb319a2ea8962cd4cd4dd08976ad0257897f37a746410c59af12cd2cd4857d SHA512 335f85ee02cc1b54504d33fb8c06b49fb80f1d1e7bbb427870718a0adc92227bff9ba4ecfc7e6e7dc8f4bf95a404ef2d7894305504b4fe9f97ceeda84f4f2a5d
 DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-EBUILD gazebo_plugins-2.6.2.ebuild 1425 BLAKE2B 7346eacd043a18ec5f1394c05772a0a662f6461698c35955b8c0bee18bcba98ba213c1633e7c5647c6788df132c02b45bf1017d18a8b8211ffbbf036aa94ee8e SHA512 17b7572dd9e6e26f0eeffee09d301f6c25dfb9a40334f02047d2fabf3f2b6196a5a3e2e8ffdd6753c0f9d908ec9e4bc0a16455bae22de5f46aa335d15be41fd1
-EBUILD gazebo_plugins-2.7.3.ebuild 1698 BLAKE2B 97e8bb62518f3d7fca4e315971a4ebd4a44492ad7a951dc992e3a7b88227a6cecc7293db2fd760911bcd9388dd1644c5f155a5fda1a4d38626e1cf39d2115810 SHA512 e6b11eb60341523338b6c5ec182cd759f9b270c49ced0cb3c3693d254058a42462a5fb94a7eade95e2d920a2a66896921bf5ce6e040f4e3640274843e8e368a8
-EBUILD gazebo_plugins-2.7.4.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
-EBUILD gazebo_plugins-2.8.4.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
-EBUILD gazebo_plugins-2.8.5.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
+EBUILD gazebo_plugins-2.8.5.ebuild 1482 BLAKE2B b86e75c0c0a5b07178e982111bcfb9e6dc4b463ca14287385f391bbc9e52a96b5b4dc1714a8f84676cf5324ded180f16c43eef4fd186aa753dbda7ce0d0d1f06 SHA512 9e5158a1db27535d58bd06aa5398de274e34ad011b5a62aa659a4a57a8622bf0f6bcbed79d4594f21210d9d1b4803a89038fd2d8748a1c5b32a5f6227384d34c
 EBUILD gazebo_plugins-9999.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/files/ocv4.patch b/dev-ros/gazebo_plugins/files/ocv4.patch
new file mode 100644
index 000000000000..6d93feac4be9
--- /dev/null
+++ b/dev-ros/gazebo_plugins/files/ocv4.patch
@@ -0,0 +1,17 @@
+Index: gazebo_plugins/src/gazebo_ros_prosilica.cpp
+===================================================================
+--- gazebo_plugins.orig/src/gazebo_ros_prosilica.cpp
++++ gazebo_plugins/src/gazebo_ros_prosilica.cpp
+@@ -44,10 +44,8 @@
+ #include <diagnostic_updater/diagnostic_updater.h>
+ #include <sensor_msgs/RegionOfInterest.h>
+ 
+-#include <opencv/cv.h>
+-#include <opencv/highgui.h>
+-
+-#include <opencv/cvwimage.h>
++#include <opencv2/core/core_c.h>
++#include <opencv2/highgui/highgui_c.h>
+ 
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/bind.hpp>
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild
deleted file mode 100644
index da59ee7200ec..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild
+++ /dev/null
@@ -1,52 +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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_5} )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/nodelet
-	dev-ros/angles
-	dev-ros/std_srvs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-ros/tf
-	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/driver_base[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pcl_conversions
-	dev-ros/image_transport
-	dev-ros/rosconsole
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/polled_camera
-	dev-ros/diagnostic_updater
-	dev-ros/camera_info_manager
-	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/libxml2
-	>=sci-electronics/gazebo-7:=
-	dev-libs/protobuf:=
-	dev-games/ogre
-	sci-libs/pcl
-	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild
deleted file mode 100644
index 848d517f6367..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild
+++ /dev/null
@@ -1,62 +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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_5} )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin eutils
-
-DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/nodelet
-	dev-ros/angles
-	dev-ros/std_srvs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-ros/tf
-	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/driver_base[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pcl_conversions
-	dev-ros/image_transport
-	dev-ros/rosconsole
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/polled_camera
-	dev-ros/diagnostic_updater
-	dev-ros/camera_info_manager
-	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/libxml2
-	>=sci-electronics/gazebo-7:=
-	dev-libs/protobuf:=
-	dev-games/ogre
-	sci-libs/pcl
-	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2"
-
-src_prepare() {
-	pushd "${WORKDIR}/gazebo_ros_pkgs-${PV}" || die
-	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	popd || die
-	ros-catkin_src_prepare
-}
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild
deleted file mode 100644
index af125170e28e..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild
+++ /dev/null
@@ -1,53 +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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_5} )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/nodelet
-	dev-ros/angles
-	dev-ros/std_srvs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-ros/tf
-	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/driver_base[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pcl_conversions
-	dev-ros/image_transport
-	dev-ros/rosconsole
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/polled_camera
-	dev-ros/diagnostic_updater
-	dev-ros/camera_info_manager
-	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/libxml2
-	>=sci-electronics/gazebo-7:=
-	dev-libs/protobuf:=
-	dev-games/ogre
-	sci-libs/pcl
-	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.4.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.4.ebuild
deleted file mode 100644
index af125170e28e..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.4.ebuild
+++ /dev/null
@@ -1,53 +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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_5} )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/nodelet
-	dev-ros/angles
-	dev-ros/std_srvs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-ros/tf
-	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/driver_base[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pcl_conversions
-	dev-ros/image_transport
-	dev-ros/rosconsole
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/polled_camera
-	dev-ros/diagnostic_updater
-	dev-ros/camera_info_manager
-	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/libxml2
-	>=sci-electronics/gazebo-7:=
-	dev-libs/protobuf:=
-	dev-games/ogre
-	sci-libs/pcl
-	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
index af125170e28e..d2a12c5f8749 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
@@ -51,3 +51,4 @@ RDEPEND="
 	dev-ros/roslib[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv4.patch" )