gentoo resync : 06.08.2019

3 files changed, 5 insertions, 70 deletions

diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 08bf1dbcb961..65ea71b8399a 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,8 +1,6 @@
-DIST rtabmap-0.14.0.tar.gz 19515196 BLAKE2B 851017bd3114c4dfaf323ef7ba6c3e970480de4c227b06d625cec0363a144a220be587934b0d457eca587d39c0c0b609acebd71ce7a98f1193ab5723f6a47f9a SHA512 00e2996b11aef8e0f61dc59ac59626b5b695ac3b5281d7776d73b54edbd90473bfffa1daae148e090b601a4d56d7feff2190f362ea188640b93db06e3760042f
-DIST rtabmap-0.17.1.tar.gz 19632117 BLAKE2B 6e2bd929da4148856317f0b03197e541223d59810397fc5d282b04ace5af796028cd8cde850d89fb2f3f289ed11d155a5163132edd7e65e2bc8a1bad1d09c54a SHA512 6714d245b87012cb0432b677c87b17e3bc182df2025203f0bd63b1f4ab06d03d795de4792d3cc4fe6d1ca4db40852c15350fed3c3a6e27176ea5e764a9816cd2
 DIST rtabmap-0.18.1.tar.gz 19725948 BLAKE2B c43cf9c696a151b9f9117d13438122bf47fc66914249377b7c9519a2838c8512147d68f999744c1f1c5a298e1b7adb7b77db8df1c6100d1d9a7a0acbf8b24967 SHA512 37fc2e6445531875cb9b27684cd5ff7a651ca2a8a3c653a52813352579bd2f4a4ee4be7c690cf0b29ae7907d26fd8a1f4e9188071409611b845333e734714aca
-EBUILD rtabmap-0.14.0.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6
-EBUILD rtabmap-0.17.1.ebuild 1446 BLAKE2B 7f638d8f3b7e756a39122ec993b0471bbf1e72d8fa986679f796c9e5e415fabba12721e7139bc70cb881082f2c2927066f6de814fed35105b85f47f61d196094 SHA512 27178728cadf42f1e8cc9e47e52ef69d3ef9ee6bb1c71223ed80edfa9fe451a6020ddbc08f5f960c2dcb6df77535d0f72458c465213886788048b2b6493fba30
+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
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/rtabmap-0.17.1.ebuild b/sci-libs/rtabmap/rtabmap-0.17.1.ebuild
deleted file mode 100644
index 9bbe6d06b163..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.17.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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}-melodic.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}-melodic"
-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.14.0.ebuild b/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
index ec181ba72d33..da61f393cbde 100644
--- a/sci-libs/rtabmap/rtabmap-0.14.0.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.19.3.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
@@ -17,6 +17,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 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)"
@@ -27,7 +28,7 @@ IUSE="examples ieee1394 openni2 qt5"
 
 RDEPEND="
 	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk]
+	sci-libs/pcl:=[openni,vtk,qt5(-)?]
 	sci-libs/vtk:=[qt5(-)?]
 	sys-libs/zlib
 	sci-libs/octomap:=