gentoo resync : 15.12.2019

5 files changed, 34 insertions, 75 deletions

diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 65ea71b8399a..76eff00071ec 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,6 +1,5 @@
-DIST rtabmap-0.18.1.tar.gz 19725948 BLAKE2B c43cf9c696a151b9f9117d13438122bf47fc66914249377b7c9519a2838c8512147d68f999744c1f1c5a298e1b7adb7b77db8df1c6100d1d9a7a0acbf8b24967 SHA512 37fc2e6445531875cb9b27684cd5ff7a651ca2a8a3c653a52813352579bd2f4a4ee4be7c690cf0b29ae7907d26fd8a1f4e9188071409611b845333e734714aca
+AUX ocv4.patch 698 BLAKE2B 4ec82ff9d08b3051181cd44b157b9097783e4128e5bb09debbd844ec574455c5f9a5e153d643f209f96bf0f2a92474d189d5b8449a17fbe171dc5cee395748b3 SHA512 83814e1fa862c1eb8f23d0865a4f36d2067512af57a12c3569697b12559d27027915b888d9c1cb845d08bd82bdabffd3a06594234b23a68f04a6c723d00265b4
 DIST rtabmap-0.19.3.tar.gz 19818629 BLAKE2B f732a02db6ef8434b1457234211a128e3050236590e0f6a1e08e36bbb5899b9d3de9409d7d7329f346d29874d440bd86835c1501fb638e3802e2663907e7b04d SHA512 bda72596911b1c35d757322c7e5acd7e43ec1f4e984bfb0599cfb39597bee79e470d1bc11b492f244f39c35812ae570d023848cdcbd011eeb78e347727045509
-EBUILD rtabmap-0.18.1.ebuild 1427 BLAKE2B 8cd9e1dcbe91cd609815f9dadd9c252ef9145f2fa2a79e4f0fa627d276310d648cc53d81a4dce4e1b47fab5af19243f50643e2209e50920b2b373c83d1de7d0b SHA512 f380f1de720a19f8bcd5a4aec152b4776771c41794595151890fb47c63ef512a24cc3922d5e7b3ac5eb9671274fb1d26867dcb677eb1e5ee61a4e84461341afb
-EBUILD rtabmap-0.19.3.ebuild 1427 BLAKE2B 8df77b7a3a13eaceb32b14acf719d0ed5310a47861d8ea1fc0b198d52fd8a41d0a898269d8efb03581a8f8c402834a351483928ccb3c215227a3e6cab0863cd2 SHA512 91f0b78b6bfa53210aed90c326ed5151e2712edef451953416e3e81ac5842a8f0e3349ea6ce0eb2b3097012014b908af915525e65e1a074bedd86f3a82594290
-EBUILD rtabmap-9999.ebuild 1427 BLAKE2B 8cd9e1dcbe91cd609815f9dadd9c252ef9145f2fa2a79e4f0fa627d276310d648cc53d81a4dce4e1b47fab5af19243f50643e2209e50920b2b373c83d1de7d0b SHA512 f380f1de720a19f8bcd5a4aec152b4776771c41794595151890fb47c63ef512a24cc3922d5e7b3ac5eb9671274fb1d26867dcb677eb1e5ee61a4e84461341afb
+EBUILD rtabmap-0.19.3-r1.ebuild 1473 BLAKE2B 2a8c64e81f3077cc3440294ccd1fe605a4dd4211b50639414913fb34671486b6cca15ad1483a9b3a63852295c06e108b9fe74358505c5a0e262844df15392fe4 SHA512 1d1c479c484c811b44e8f088add28daa00e7154c2e6db25960e263f2eede05b9e939dc2190d8d9cb337f3fddd82c35a471df17bb0f3a54bd1bebe963aa03b3ac
+EBUILD rtabmap-9999.ebuild 1436 BLAKE2B 058a4f207d6ff2c0f2b05a4126dbf7ebae67de82bdf956b0abdd5ba6f8285b3cd61f60ae086ca2036f9523f62b90ad61c462f98a983e05b7207643ba16f80a1e SHA512 139f504b42598b3c0c9894a87f32f7980873122a2959e3ca1b1764a77e7e0c3bc7c7af360494422b629ee01c0ee711b974312388d412007b47ed545b8e8928ed
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/files/ocv4.patch b/sci-libs/rtabmap/files/ocv4.patch
new file mode 100644
index 000000000000..465b364ef013
--- /dev/null
+++ b/sci-libs/rtabmap/files/ocv4.patch
@@ -0,0 +1,23 @@
+From d5b4b252870e4225ed00bd544a102015e5172c85 Mon Sep 17 00:00:00 2001
+From: matlabbe <matlabbe@gmail.com>
+Date: Fri, 9 Aug 2019 15:31:47 -0400
+Subject: [PATCH] updated ORBExtractor opencv include (compatibility issue
+ https://github.com/introlab/rtabmap_ros/issues/333)
+
+---
+ corelib/src/opencv/ORBextractor.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/corelib/src/opencv/ORBextractor.h b/corelib/src/opencv/ORBextractor.h
+index 0f06c395..58619a15 100644
+--- a/corelib/src/opencv/ORBextractor.h
++++ b/corelib/src/opencv/ORBextractor.h
+@@ -31,7 +31,7 @@
+ 
+ #include <vector>
+ #include <list>
+-#include <opencv/cv.h>
++#include <opencv2/core/core_c.h>
+ 
+ 
+ namespace rtabmap
diff --git a/sci-libs/rtabmap/rtabmap-0.18.1.ebuild b/sci-libs/rtabmap/rtabmap-0.18.1.ebuild
deleted file mode 100644
index 0a88ca05e482..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.18.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk,qt5(-)?]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
-	ieee1394? ( media-libs/libdc1394 )
-	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# Needed since we force ros crawling to be done only in
-	# /usr/share/ros_packages/
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild b/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild
index da61f393cbde..df3b781baf72 100644
--- a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -42,8 +42,9 @@ RDEPEND="
 		dev-qt/qtsvg:5
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 0a88ca05e482..24cbe5a01b96 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -42,8 +42,8 @@ RDEPEND="
 		dev-qt/qtsvg:5
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(