gentoo resync : 15.02.2018

5 files changed, 5 insertions, 57 deletions

diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index 87c86257257b..8f539baa8058 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,8 +1,4 @@
 DIST slam_gmapping-1.3.10.tar.gz 21032 BLAKE2B cca0779e64d45622dad4ec29cb3c1d0162176038288c0aa7b117f1a76a7655f3af3024dba7ff1025948e400e0176794a553e357a235187d9196161a635ab6d01 SHA512 fa4485ddc9fcfaac63a63d209a5a994e33e78546a39edcf47eb3c3f1775f0d87a1f562319058868838990bbf85a9515ff0228779dce7531148f208b3522e7e7a
-DIST slam_gmapping-1.3.8.tar.gz 20533 BLAKE2B 5e096b4863077941843b966f2991a23c24e5396d42d0d8cd8beb7123805d085d07b8ac7e8e4a3c3ea43a6f4605ada40eb28b8c10207536dcdb7ef92cc1a5fcd8 SHA512 d7b054296f286a5e61e5f952a29ccff2165503123ab6a89724ec34180fb0f4c452fc0ae81ec853cac170b304095e62cef420431e5aca85a262febc2b5ab5ccf2
-DIST slam_gmapping-1.3.9.tar.gz 20951 BLAKE2B 989c28fe60668f0b37bf4766656764095157734c1ae0f41f6b95faa9ed9c20ed91de18534bfc99ea7ee035f2df213f8004adefcf06d269be55b27c37156da542 SHA512 fcab88127507206274e903de804aa9167b30c1dd9fbf2875aeafb990285923223a2ce71edecede60d2c93dba2d8fffd0d371abd643647755094abd9ffe0aba73
-EBUILD gmapping-1.3.10.ebuild 528 BLAKE2B b5399648f9ba344b1663932b02cec6ccdc22ae9cc55e90db76d9a55d8148f59eea12224b84759555bcc73a8beff135c89610230ddcd3253d1d8ced37a66a6c20 SHA512 59bfab00cb4003039a7dbcab9559970d2e79a43038d83b510635b3ef8524ffe001670fa372c4cc7905fe70e18f28ff72ae70266f292f2236b9cfb1089c62e853
-EBUILD gmapping-1.3.8.ebuild 528 BLAKE2B 905b5d54e0335b7b979714b0072654d77f556eccc7819ae2f730da8bbf1c6617cde388391147ab9202d2a84c1203225f4f70e2b589cd11a638d7e64d018d1e79 SHA512 92d31dccbad5f5e345b011779d386e3e4ea670f7447a566fc1628ef586d409e8b4d2bf07074ebb4899505ce8d131d8d80b5751501c4c87622c2ce32b276b93c2
-EBUILD gmapping-1.3.9.ebuild 528 BLAKE2B 76e9d437945d2d0dcb9a3dab407f8118f2f3865b8b44f26dba6be90c47d99d123311f7bb72f70f9c65e22e588d11afabd9bc3280861a699e92155b31ddfd51a1 SHA512 30b6fbbe860cdef1da38582e07f5030c4e748e7a4312409ce8f9eb115bc090daaaf6522483363858c990e87033d0557690fbe9bfc513f3c23b54f681a30c0d2c
-EBUILD gmapping-9999.ebuild 528 BLAKE2B 905b5d54e0335b7b979714b0072654d77f556eccc7819ae2f730da8bbf1c6617cde388391147ab9202d2a84c1203225f4f70e2b589cd11a638d7e64d018d1e79 SHA512 92d31dccbad5f5e345b011779d386e3e4ea670f7447a566fc1628ef586d409e8b4d2bf07074ebb4899505ce8d131d8d80b5751501c4c87622c2ce32b276b93c2
+EBUILD gmapping-1.3.10.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
+EBUILD gmapping-9999.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/gmapping-1.3.10.ebuild b/dev-ros/gmapping/gmapping-1.3.10.ebuild
index 7cdf9ee6b7a1..ca6f43afe50c 100644
--- a/dev-ros/gmapping/gmapping-1.3.10.ebuild
+++ b/dev-ros/gmapping/gmapping-1.3.10.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
+	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
 	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.3.8.ebuild b/dev-ros/gmapping/gmapping-1.3.8.ebuild
deleted file mode 100644
index 5c4afd8f8aa4..000000000000
--- a/dev-ros/gmapping/gmapping-1.3.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.3.9.ebuild b/dev-ros/gmapping/gmapping-1.3.9.ebuild
deleted file mode 100644
index fe84880698b1..000000000000
--- a/dev-ros/gmapping/gmapping-1.3.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index 5c4afd8f8aa4..ca6f43afe50c 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
+	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
 	dev-ros/rostest"