gentoo auto-resync : 15:01:2024 - 13:18:00

3 files changed, 73 insertions, 7 deletions

diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 524c95684aab..a2886e498d4e 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,6 +1,8 @@
 AUX vtk.patch 507 BLAKE2B c6de651fa6bf13fb650f40232d27057f1bea78e2f3b45b2a6576d25bbde33bd3fea0b518f3317aa58238452e338f92d1f35f584017fb6a805cbb33230605a8a6 SHA512 c9fcb0352dd81c4440da0a8e4664497aebffa6c81e295cc304a43fa43b984b97d23d5dedd84b4d16dd979d509c7882c35aebecdb191b6c33c32b9183c053ad6b
 AUX yamlcpp.patch 675 BLAKE2B 269eb1d6f0e276cc6863d4ae8e8a3c73c6264b681a76f9bc32db185ed0c7b3a115b0fd1871569ff0ddb34dfd10c5aaafe658a620f70e4964bf196fd6ad57780c SHA512 fa8aabe06b75c2fdd3be222c4c51de6c5bc9ca9f2444c4e97cb63c910bf572f616cf0ac6381d4bf0a5f5fe07cb520eb6f748a4fcd19cf7cdd89f76a52da6a5bc
 DIST rtabmap-0.20.23.tar.gz 21922099 BLAKE2B ed254beea19b635ffad6e09edd8ea8370eda633dacd3dfcc273b6b750685ac4dac8b57ee91d273eef21c23f4b057cc401354a8a18d2e93ec2f6564bb84c59c0f SHA512 bef7140d569cdb3a86d329b79d410feeb5fe3291263e3be68a62270f807c102b5911946d50fb2f084b8a76eaa7e486c5819dc29ef1c71ef80ac3d5ee41910942
+DIST rtabmap-0.21.3.tar.gz 21956462 BLAKE2B 41c3c95715bc165d339a4a63747e40db4357ffd1b5151630689008a6856c4721805ec8def9b47ea487ca428641b5d253dfa5b62b1bbb14027168bbc0e4c350d3 SHA512 0b9b2d2fdcfdef0324fcde54a74ecec75786372f2df0bd8d9383ae71c500098bff016465a68ce2a9328d0a2beee4bf9b0af6b21435589ce1e91503fe2aca5d01
 EBUILD rtabmap-0.20.23.ebuild 1541 BLAKE2B 251451eb169e84f70109f7f43220e24187bd13089858e2de4005223ac6811a80f31b945512dcf4f68cf469b51878416b9323ee267aa0a7830b249d4eef3fcf15 SHA512 e84a9ab2203e9a45455da222a9d91fd48846c58a994425c32c7467e65ca0e260b4d11fa46306f47fee8d5701d4efd3de52236ab62f42c971d84a2b1aa18a7890
-EBUILD rtabmap-9999.ebuild 1517 BLAKE2B f6f415f78c97b509432c136a7f94880d66225fa046efc34461fa5041ccdcf2c69ca681498b7cf4465b3df525af9fd6076d1f8b09ab1425bcd63f85584aad28e5 SHA512 47a8781ad4605bed3ef323d870287ac654d393794e261e6e4a5e40f382bb4b7fd7678824a1dd5a4b17943f746c55b15c1959f3d822a15936d002c6e10f21ea99
+EBUILD rtabmap-0.21.3.ebuild 1485 BLAKE2B ba7da3b2d4ca1b7c150e6705746c453f26168fa0e4afedcb07b30d34e7d068c351e36818a609ce49e5a12612e6d2c34c29e512ba5b635c769d2d089e1a21e2bf SHA512 ff8420c2730254f31ae40d35bd1e2e1221e82b4e392d0112b4f26a47d080c54db1ce8b0eca1bb047091779ae40a8c3ad3bfdfc881900413b8ff2ad6afe84890b
+EBUILD rtabmap-9999.ebuild 1485 BLAKE2B ba7da3b2d4ca1b7c150e6705746c453f26168fa0e4afedcb07b30d34e7d068c351e36818a609ce49e5a12612e6d2c34c29e512ba5b635c769d2d089e1a21e2bf SHA512 ff8420c2730254f31ae40d35bd1e2e1221e82b4e392d0112b4f26a47d080c54db1ce8b0eca1bb047091779ae40a8c3ad3bfdfc881900413b8ff2ad6afe84890b
 MISC metadata.xml 472 BLAKE2B 141f2e2a39f7e3e8543c255995ecc14ee3168985e47a4c0882d32fdd884a81ca0aeade5a41092ce5525a54a0ac2802714e2c6031c09af9671682231378918c64 SHA512 a472fd8de805c23ebf8de91fdecab35cb5af78bb971ad10f8e4b23ab97efaffc3f7fa3ffbec457ab120d3fe75f4d021079a67d426f0df022be389f00bc311651
diff --git a/sci-libs/rtabmap/rtabmap-0.21.3.ebuild b/sci-libs/rtabmap/rtabmap-0.21.3.ebuild
new file mode 100644
index 000000000000..88c172c29ffb
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.21.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake multilib
+
+VER_SUFFIX=noetic
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}-${VER_SUFFIX}"
+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:=
+	dev-cpp/yaml-cpp:=
+	ieee1394? ( media-libs/libdc1394:2= )
+	openni2? ( dev-libs/OpenNI2 )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="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_src_configure
+}
+
+src_install() {
+	cmake_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-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 86bb221427fb..88c172c29ffb 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -11,13 +11,13 @@ fi
 
 inherit ${SCM} cmake multilib
 
-VER_SUFFIX=rolling
+VER_SUFFIX=noetic
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P}-${VER_SUFFIX}"
 fi
 
@@ -47,8 +47,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		"-DWITH_QT=$(usex qt5 ON OFF)"