gentoo resync : 28.04.2021

4 files changed, 90 insertions, 36 deletions

diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index 5a93b29e55cb..cf4de21650df 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,6 +1,16 @@
-DIST slam_gmapping-1.4.1.tar.gz 21258 BLAKE2B 61b6ee8064be43a3f6e1cafba4efb24b9cf9faa471f749539dcf5aaba9a027885f32549f9df465b88cf02a38f7ebca8fdea469880512298ab0ebf221a3e18bfb SHA512 adc458a033ed0c573a1099ff8c8164d5157b5fd94efafa92fc3a45bcde86a0754f582e87743289637c2f6f7632557ac924ed2cf62d89b15f1a47b822773dbdba
+DIST gmapping-1.4.2-basic_localization_stage_groundtruth.pgm 16000058 BLAKE2B 4bf5494b34be09f4dcf63c26c8bcfd29b63e96a11d667dd8083dee6a2f8352b67c84ffa5603ec262a5af3e7fcbb7ca71ca77563df92f8cf72d3e4cdb2f817226 SHA512 32be0d40c84b2a5320215efee317d97e25131aa4ce2f39e6dbdb4481b4782ba8d437dd8d086a60728ee215d6243ea9ff0693c6bffd2cae542977d5bd55c91fad
+DIST gmapping-1.4.2-basic_localization_stage_indexed.bag 8554014 BLAKE2B 56605fc2642ee7dfe93379c620e8888da56260e23155dc68b3026c59d219cbd287ea04e9387bf3105a1089f8d930976d2a9875775d63646def090f2fdfa3f9e5 SHA512 2060ad1f65150043b254f820357eafe179483e3fd12bd0d85721841bfc9a15bf702dfbb34f99cb9b1566bafe64b79b8777d6e7c2ee77bc33ca7e87eb4b6fb240
+DIST gmapping-1.4.2-hallway_slow_2011-03-04-21-41-33.bag 43648223 BLAKE2B 93d733a8ed4e959c0a786369ce95c51698849591de200b99da01cd4a3acd22dd2faeb0e532c0a29add1b04f0de88384df171bcc404cefb772a19171949d71a77 SHA512 dd97fa6a0c22a2802473d343ad9f9b26ba8ebd119c8baa6ae3bcf19e913742a1456aa2879aef64c1bd6aab987d5b164f6cb4c251a3fd0736a290465b7f0f92bc
+DIST gmapping-1.4.2-test_replay_crash.bag 191247 BLAKE2B 348b6b1766cc2e2909106a544936538ced8a7d33536f5a964de03155df531ca57733386834804f81071b40a09c188e32ee23ef6d14f8436849e0d20a84bd7297 SHA512 e94b351d2a3406ee01c14b09237e9108812a0e65f3cbfceeb4b7def514f61ca934545764962b36804e28fc9cac8ce17f3f6d18a7cb7574dcb0a2f169cd7a1014
+DIST gmapping-1.4.2-test_turtlebot.bag 3003517 BLAKE2B d5d9f468aa5ac700bc3a3f819fe3ab1bd2ea7a28fb468dac9ac82c0bbbc1d59146bce132482baf81cfd763c25e82f9fa5cfbac28c6cc2fea6e114063b0daaf17 SHA512 8a9d9a0d63da607a2fc220e15e37ea339a254433dcb9b91e3b3041f032924177078ddeaef50df00e2ca0e5a9bd80ec17eadd8bfb4f0f879faab62de54a0555a4
+DIST gmapping-1.4.2-test_upside_down.bag 9353464 BLAKE2B e4835be6d70595e67c25eac28803857c6d14375b63e5c11991d50b7e47614e093728a628281241cfd5678e4ed84a776890ab68ccf129ddcdcb2b4c693afa4c5c SHA512 c8e193fd65c049b436c24677ba26e1e2e29f5ea744ea4e50f311224c4dbca685ba7da1804bcf3a41cea41ae79a1848158c8fdb0c4954cfa4ec4130089adfc7b4
+DIST gmapping-9999-basic_localization_stage_groundtruth.pgm 16000058 BLAKE2B 4bf5494b34be09f4dcf63c26c8bcfd29b63e96a11d667dd8083dee6a2f8352b67c84ffa5603ec262a5af3e7fcbb7ca71ca77563df92f8cf72d3e4cdb2f817226 SHA512 32be0d40c84b2a5320215efee317d97e25131aa4ce2f39e6dbdb4481b4782ba8d437dd8d086a60728ee215d6243ea9ff0693c6bffd2cae542977d5bd55c91fad
+DIST gmapping-9999-basic_localization_stage_indexed.bag 8554014 BLAKE2B 56605fc2642ee7dfe93379c620e8888da56260e23155dc68b3026c59d219cbd287ea04e9387bf3105a1089f8d930976d2a9875775d63646def090f2fdfa3f9e5 SHA512 2060ad1f65150043b254f820357eafe179483e3fd12bd0d85721841bfc9a15bf702dfbb34f99cb9b1566bafe64b79b8777d6e7c2ee77bc33ca7e87eb4b6fb240
+DIST gmapping-9999-hallway_slow_2011-03-04-21-41-33.bag 43648223 BLAKE2B 93d733a8ed4e959c0a786369ce95c51698849591de200b99da01cd4a3acd22dd2faeb0e532c0a29add1b04f0de88384df171bcc404cefb772a19171949d71a77 SHA512 dd97fa6a0c22a2802473d343ad9f9b26ba8ebd119c8baa6ae3bcf19e913742a1456aa2879aef64c1bd6aab987d5b164f6cb4c251a3fd0736a290465b7f0f92bc
+DIST gmapping-9999-test_replay_crash.bag 191247 BLAKE2B 348b6b1766cc2e2909106a544936538ced8a7d33536f5a964de03155df531ca57733386834804f81071b40a09c188e32ee23ef6d14f8436849e0d20a84bd7297 SHA512 e94b351d2a3406ee01c14b09237e9108812a0e65f3cbfceeb4b7def514f61ca934545764962b36804e28fc9cac8ce17f3f6d18a7cb7574dcb0a2f169cd7a1014
+DIST gmapping-9999-test_turtlebot.bag 3003517 BLAKE2B d5d9f468aa5ac700bc3a3f819fe3ab1bd2ea7a28fb468dac9ac82c0bbbc1d59146bce132482baf81cfd763c25e82f9fa5cfbac28c6cc2fea6e114063b0daaf17 SHA512 8a9d9a0d63da607a2fc220e15e37ea339a254433dcb9b91e3b3041f032924177078ddeaef50df00e2ca0e5a9bd80ec17eadd8bfb4f0f879faab62de54a0555a4
+DIST gmapping-9999-test_upside_down.bag 9353464 BLAKE2B e4835be6d70595e67c25eac28803857c6d14375b63e5c11991d50b7e47614e093728a628281241cfd5678e4ed84a776890ab68ccf129ddcdcb2b4c693afa4c5c SHA512 c8e193fd65c049b436c24677ba26e1e2e29f5ea744ea4e50f311224c4dbca685ba7da1804bcf3a41cea41ae79a1848158c8fdb0c4954cfa4ec4130089adfc7b4
 DIST slam_gmapping-1.4.2.tar.gz 21721 BLAKE2B 63ac4ccc1238cc4fecbf416e2fb716d1b679b4ae4d2d94508887ede8894402d77564af0f60a3b8d0b1661c91d755a5276aabd3894826af436ce11bd6119619b2 SHA512 d21810149ffe09cf57730e8657298f0d5c7aaa2cd6257b4e891ef990e2b6c727f2246d22d7272969a11604e33887e245d8d66980cb0c158f875810f4ff17072a
-EBUILD gmapping-1.4.1.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
-EBUILD gmapping-1.4.2.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
-EBUILD gmapping-9999.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
+EBUILD gmapping-1.4.2.ebuild 1461 BLAKE2B 6d20a4f7a076515fdd49730e6e707ed3da608e2a33837d9e092e03f76ad8c599851a1e87f9e5ffe4fcaf2cf0bb032224e5eab77f8c7b8ca2b38aebb4a1c75355 SHA512 945b40b16a934e12ddf993c732a68797a69039794fa345ea2574b2a6c02780ac7168d6a7241e549e253d3dcfcbbaca082544028456e8bf1347e6c20610e4280a
+EBUILD gmapping-9999.ebuild 1461 BLAKE2B 6d20a4f7a076515fdd49730e6e707ed3da608e2a33837d9e092e03f76ad8c599851a1e87f9e5ffe4fcaf2cf0bb032224e5eab77f8c7b8ca2b38aebb4a1c75355 SHA512 945b40b16a934e12ddf993c732a68797a69039794fa345ea2574b2a6c02780ac7168d6a7241e549e253d3dcfcbbaca082544028456e8bf1347e6c20610e4280a
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/gmapping-1.4.1.ebuild b/dev-ros/gmapping/gmapping-1.4.1.ebuild
deleted file mode 100644
index c3d87b4563b2..000000000000
--- a/dev-ros/gmapping/gmapping-1.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-	dev-ros/gmapping
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.4.2.ebuild b/dev-ros/gmapping/gmapping-1.4.2.ebuild
index c3d87b4563b2..b68005106277 100644
--- a/dev-ros/gmapping/gmapping-1.4.2.ebuild
+++ b/dev-ros/gmapping/gmapping-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,43 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
-	dev-ros/gmapping
+	dev-ros/nodelet
 "
 DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rostest"
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
+TEST_DATA="
+	basic_localization_stage_indexed.bag
+	hallway_slow_2011-03-04-21-41-33.bag
+	basic_localization_stage_groundtruth.pgm
+"
+PERCEPTION_TEST_DATA="
+	test_replay_crash.bag
+	test_turtlebot.bag
+	test_upside_down.bag
+"
+SRC_URI="${SRC_URI} test? ( "
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI} http://download.ros.org/data/gmapping/${i} -> ${P}-${i}"
+done
+for i in ${PERCEPTION_TEST_DATA}; do
+	SRC_URI="${SRC_URI} https://github.com/ros-perception/slam_gmapping_test_data/raw/master/${i} -> ${P}-${i}"
+done
+SRC_URI="${SRC_URI} )"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	if use test; then
+		for i in ${TEST_DATA} ${PERCEPTION_TEST_DATA}; do
+			cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+		done
+		sed \
+			-e "s#http://download.ros.org/data/gmapping#file://${S}#" \
+			-e "s#https://github.com/ros-perception/slam_gmapping_test_data/raw/master#file://${S}#" \
+			-i CMakeLists.txt || die
+	fi
+}
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index c3d87b4563b2..b68005106277 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,43 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
-	dev-ros/gmapping
+	dev-ros/nodelet
 "
 DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rostest"
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
+TEST_DATA="
+	basic_localization_stage_indexed.bag
+	hallway_slow_2011-03-04-21-41-33.bag
+	basic_localization_stage_groundtruth.pgm
+"
+PERCEPTION_TEST_DATA="
+	test_replay_crash.bag
+	test_turtlebot.bag
+	test_upside_down.bag
+"
+SRC_URI="${SRC_URI} test? ( "
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI} http://download.ros.org/data/gmapping/${i} -> ${P}-${i}"
+done
+for i in ${PERCEPTION_TEST_DATA}; do
+	SRC_URI="${SRC_URI} https://github.com/ros-perception/slam_gmapping_test_data/raw/master/${i} -> ${P}-${i}"
+done
+SRC_URI="${SRC_URI} )"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	if use test; then
+		for i in ${TEST_DATA} ${PERCEPTION_TEST_DATA}; do
+			cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+		done
+		sed \
+			-e "s#http://download.ros.org/data/gmapping#file://${S}#" \
+			-e "s#https://github.com/ros-perception/slam_gmapping_test_data/raw/master#file://${S}#" \
+			-i CMakeLists.txt || die
+	fi
+}