gentoo resync : 31.03.2018

26 files changed, 86 insertions, 196 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 3ca53a66eea8..1deb2e0f709b 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest
index 354f935bd486..058ed9976d0b 100644
--- a/dev-ros/camera_calibration_parsers/Manifest
+++ b/dev-ros/camera_calibration_parsers/Manifest
@@ -1,7 +1,5 @@
 AUX boostpython.patch 848 BLAKE2B f9ca2e26e51f882735544245b0964d08c272643d7c786308d2ad5d1598d383e728c03bf7b609ca22cc7f24d365c00b5f802db138459e1af8d4b597d963e92358 SHA512 8fbb168908d3c0cc5f0b8fbe8e9f82970254a136284062c4daf27d9553fa04385e1bcae9b1da2943b37bf1d047faa262eca08409d5d364260fd529b59e44325d
-DIST image_common-1.11.12.tar.gz 53920 BLAKE2B 296601a14b0e18e6685924ae4557ead446a95ac91ddffb791f9b0b4d643b8f9e40c17f8ace1a705bb5193647bb07444ac81513c888864b0cdd9b45464c14916c SHA512 cd64edd658092c88060a99bbf2cd501cd27441123c34914fc4c8d8c8a8a1fe6d4a929211e71d813b6eb72e1d844842ee3e12567bc40d32981db9ee430e61fb10
 DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD camera_calibration_parsers-1.11.12.ebuild 684 BLAKE2B 94bc0373643066f2963e53e95e547ce276c950c16c2287f253fcd1a98cf114116c1c83afc26603eae35208d94cc3c6e00223dbf1be49206f45bdb057a19d1de0 SHA512 f99bfc7a5ac8a36c9940b97f8dd95c2ed841ac6b26f3ac93c8d67bd626f5b71aa14513263fae3aecfb59c2008beda71f09a6fc15c1f7a83227f5af98c35aa7ec
-EBUILD camera_calibration_parsers-1.11.13.ebuild 684 BLAKE2B 94bc0373643066f2963e53e95e547ce276c950c16c2287f253fcd1a98cf114116c1c83afc26603eae35208d94cc3c6e00223dbf1be49206f45bdb057a19d1de0 SHA512 f99bfc7a5ac8a36c9940b97f8dd95c2ed841ac6b26f3ac93c8d67bd626f5b71aa14513263fae3aecfb59c2008beda71f09a6fc15c1f7a83227f5af98c35aa7ec
-EBUILD camera_calibration_parsers-9999.ebuild 684 BLAKE2B 94bc0373643066f2963e53e95e547ce276c950c16c2287f253fcd1a98cf114116c1c83afc26603eae35208d94cc3c6e00223dbf1be49206f45bdb057a19d1de0 SHA512 f99bfc7a5ac8a36c9940b97f8dd95c2ed841ac6b26f3ac93c8d67bd626f5b71aa14513263fae3aecfb59c2008beda71f09a6fc15c1f7a83227f5af98c35aa7ec
+EBUILD camera_calibration_parsers-1.11.13-r1.ebuild 686 BLAKE2B 8676d4dda9e77b3954573e1ecaf49549b40aa8976f1c9781ceefd1dd187d72537db928e960b445c8556eefbc106249c676b3716e1176dbd5ed908e057c73ef35 SHA512 ba2c7ee4b8857b92c5f5045d8c2bbac8efa6936efbba77f874d65453156753c68c71fe22c7be79126006c73d184a50a6dea7937106d38a1b508a0dc8650e7ac2
+EBUILD camera_calibration_parsers-9999.ebuild 686 BLAKE2B 8676d4dda9e77b3954573e1ecaf49549b40aa8976f1c9781ceefd1dd187d72537db928e960b445c8556eefbc106249c676b3716e1176dbd5ed908e057c73ef35 SHA512 ba2c7ee4b8857b92c5f5045d8c2bbac8efa6936efbba77f874d65453156753c68c71fe22c7be79126006c73d184a50a6dea7937106d38a1b508a0dc8650e7ac2
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.12.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
index e319da058e83..5b75e5e3a185 100644
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.12.ebuild
+++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	dev-ros/rosconsole
-	>=dev-cpp/yaml-cpp-0.5
+	>=dev-cpp/yaml-cpp-0.5:=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13.ebuild
deleted file mode 100644
index e319da058e83..000000000000
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13.ebuild
+++ /dev/null
@@ -1,27 +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/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit ros-catkin
-
-DESCRIPTION="Routines for reading and writing camera calibration parameters"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/nose )
-"
-PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
index e319da058e83..5b75e5e3a185 100644
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
+++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	dev-ros/rosconsole
-	>=dev-cpp/yaml-cpp-0.5
+	>=dev-cpp/yaml-cpp-0.5:=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-ros/geodesy/Manifest b/dev-ros/geodesy/Manifest
index 69fd67a374ab..cae190019742 100644
--- a/dev-ros/geodesy/Manifest
+++ b/dev-ros/geodesy/Manifest
@@ -1,4 +1,6 @@
 DIST geographic_info-0.5.2.tar.gz 27336 BLAKE2B f864d8b70b5b0d797cec81e25a25d0dd708bcc49c169f68216616d900b1d11918583f6f5ec4a919ad03b08ee86b2a36cde575c1054c58a93974d4c4faf6e2aae SHA512 8b512399ef61ebfb9816c613ed4fcde23ec52a9b4bbd1bb7268c8ec7fe03b1a157435fef17b8af72fdf88ce6ed0b9130473183402e0875a25eac0ac46df0d00d
+DIST geographic_info-0.5.3.tar.gz 27446 BLAKE2B 51463f872829224c618b1d37c3d07ba53ee00b4f3e48bbc202d9ab4abfe8db8148dbbfdb6780af5aaf36ab9e9a7dca973b603a22139a192a96f6bcef87fa52a5 SHA512 681aad5ba62363cf96255351e884c8ba8d3110571e6e97c9340f8d15f38183900c2a04e109416b4113a0a042ebd9cdb8fe075c507200dac06052b444f4212ab3
 EBUILD geodesy-0.5.2.ebuild 922 BLAKE2B 170b34114ed6956bfdc5ef882506f98fc204eba06c7d8170a856a4755227f04e89fddabfa136b440bf41b392535a6380cbb62f7fa460158560af70d8f684b331 SHA512 f6bfc50f7a3a6ee2adc0d289b8c228d6ef6a5b81cbb871aa2bc5eb199dc3279ac31dcb53ee21024e98eab14f6a9192c8d3043dfee53ce3a686955770361105a6
+EBUILD geodesy-0.5.3.ebuild 922 BLAKE2B 64d71fb96af8e464eef79ace35a2dbde3e872f700722564954749db2340915e52ee2fd2024e748e32e73deb2582645d0b23ee16fff098e7b2d22bf7d0afd34c4 SHA512 c700061f025f946a9ff4d53172c55a3df92c4f32cfaff97454c471293f978b39e46c05ebbeea7ce0d92cb1ba891e6d5d43c24157cf197159886a9d1a59a19f00
 EBUILD geodesy-9999.ebuild 922 BLAKE2B 170b34114ed6956bfdc5ef882506f98fc204eba06c7d8170a856a4755227f04e89fddabfa136b440bf41b392535a6380cbb62f7fa460158560af70d8f684b331 SHA512 f6bfc50f7a3a6ee2adc0d289b8c228d6ef6a5b81cbb871aa2bc5eb199dc3279ac31dcb53ee21024e98eab14f6a9192c8d3043dfee53ce3a686955770361105a6
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geodesy/geodesy-0.5.3.ebuild b/dev-ros/geodesy/geodesy-0.5.3.ebuild
new file mode 100644
index 000000000000..c2cd15d3b654
--- /dev/null
+++ b/dev-ros/geodesy/geodesy-0.5.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
+VER_PREFIX=geographic_info-
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-ros/unique_id
+	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-python/pyproj[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/geographic_msgs/Manifest b/dev-ros/geographic_msgs/Manifest
index cb9c906f9ef7..fee1a5340877 100644
--- a/dev-ros/geographic_msgs/Manifest
+++ b/dev-ros/geographic_msgs/Manifest
@@ -1,6 +1,8 @@
 DIST geographic_info-0.5.0.tar.gz 27102 BLAKE2B 40d635f8fdd0fbb034649e03f8917f9f7be207a5e30ba3afb25bbbf3b24a83a23ec3d4a94ff9f91ececda46e8ea167c989552b414c87b3c448513f2ea72e4d40 SHA512 c6c4937a7c9873c071be9e3fc4fcdb99f831028dce93793e537f8819e2fb8633b995e7d46d7192ddc3457a3b79d27c54c3e0b6656af30e2daabf1f0e7dff9f05
 DIST geographic_info-0.5.2.tar.gz 27336 BLAKE2B f864d8b70b5b0d797cec81e25a25d0dd708bcc49c169f68216616d900b1d11918583f6f5ec4a919ad03b08ee86b2a36cde575c1054c58a93974d4c4faf6e2aae SHA512 8b512399ef61ebfb9816c613ed4fcde23ec52a9b4bbd1bb7268c8ec7fe03b1a157435fef17b8af72fdf88ce6ed0b9130473183402e0875a25eac0ac46df0d00d
+DIST geographic_info-0.5.3.tar.gz 27446 BLAKE2B 51463f872829224c618b1d37c3d07ba53ee00b4f3e48bbc202d9ab4abfe8db8148dbbfdb6780af5aaf36ab9e9a7dca973b603a22139a192a96f6bcef87fa52a5 SHA512 681aad5ba62363cf96255351e884c8ba8d3110571e6e97c9340f8d15f38183900c2a04e109416b4113a0a042ebd9cdb8fe075c507200dac06052b444f4212ab3
 EBUILD geographic_msgs-0.5.0.ebuild 565 BLAKE2B 77f3ca56a079954db4963efe44f83c06453de95f23361620502228cf55d031b158c4230c0326d0fdc8fd7bc2e8f3cf2b46d9eb73de62b230943eb1fd37d4afb1 SHA512 8d9f02c5736e5ac0a8d1434a933992c8fe7c99e19c5bd55f0f5eb3f020c66068b3b780437c84ebe33a259609aaba8213f53a99de4382dd3dbb0d82da1b963de1
 EBUILD geographic_msgs-0.5.2.ebuild 565 BLAKE2B 77f3ca56a079954db4963efe44f83c06453de95f23361620502228cf55d031b158c4230c0326d0fdc8fd7bc2e8f3cf2b46d9eb73de62b230943eb1fd37d4afb1 SHA512 8d9f02c5736e5ac0a8d1434a933992c8fe7c99e19c5bd55f0f5eb3f020c66068b3b780437c84ebe33a259609aaba8213f53a99de4382dd3dbb0d82da1b963de1
+EBUILD geographic_msgs-0.5.3.ebuild 565 BLAKE2B 2cce1474f1ee84928dd9394f6e0fc2d65bb91ca24af4736620d311d74de969a1abb3b2b302e0c3abcffd88e09a1b940ca22973b76b1c56e53493e770ca4d6e70 SHA512 c3590f19b3a36b8b4795f934b786d5d7df0ef84a93fef4209919f1ca19ba43a59a4441c6362f568524b096f6e21d07573ef7aec54c74bec872402af25bc129ac
 EBUILD geographic_msgs-9999.ebuild 565 BLAKE2B 77f3ca56a079954db4963efe44f83c06453de95f23361620502228cf55d031b158c4230c0326d0fdc8fd7bc2e8f3cf2b46d9eb73de62b230943eb1fd37d4afb1 SHA512 8d9f02c5736e5ac0a8d1434a933992c8fe7c99e19c5bd55f0f5eb3f020c66068b3b780437c84ebe33a259609aaba8213f53a99de4382dd3dbb0d82da1b963de1
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geographic_msgs/geographic_msgs-0.5.3.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.3.ebuild
new file mode 100644
index 000000000000..b2e026572daa
--- /dev/null
+++ b/dev-ros/geographic_msgs/geographic_msgs-0.5.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
+VER_PREFIX=geographic_info-
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS messages for Geographic Information Systems"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index 2b10cf45bb1f..269821371475 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -1,6 +1,4 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
 DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-EBUILD map_server-1.15.1-r1.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
-EBUILD map_server-1.15.2.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
-EBUILD map_server-9999.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
+EBUILD map_server-1.15.2-r1.ebuild 570 BLAKE2B 105eb30a5c157083a2811379144364e93cacf7a8de44c132e0712a708edb646a4779464c76bc4f59f7844ea0875e5851950eba733c2b032c8635369b1e8c6575 SHA512 a846dba6800fa08ee1ddaed6543a0632404b02bb3d105a21c9f7a4bc159520e85b6d5578aa7c8945ed3e84cce125474045c2d415e9fc25afc77b3d6a3e63377b
+EBUILD map_server-9999.ebuild 570 BLAKE2B 105eb30a5c157083a2811379144364e93cacf7a8de44c132e0712a708edb646a4779464c76bc4f59f7844ea0875e5851950eba733c2b032c8635369b1e8c6575 SHA512 a846dba6800fa08ee1ddaed6543a0632404b02bb3d105a21c9f7a4bc159520e85b6d5578aa7c8945ed3e84cce125474045c2d415e9fc25afc77b3d6a3e63377b
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/map_server/map_server-1.15.1-r1.ebuild b/dev-ros/map_server/map_server-1.15.2-r1.ebuild
index 8ed4e749308a..989e42b78ece 100644
--- a/dev-ros/map_server/map_server-1.15.1-r1.ebuild
+++ b/dev-ros/map_server/map_server-1.15.2-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
+	>=dev-cpp/yaml-cpp-0.5:=
 	sci-physics/bullet:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-ros/map_server/map_server-1.15.2.ebuild b/dev-ros/map_server/map_server-1.15.2.ebuild
deleted file mode 100644
index 8ed4e749308a..000000000000
--- a/dev-ros/map_server/map_server-1.15.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-	sci-physics/bullet:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-9999.ebuild b/dev-ros/map_server/map_server-9999.ebuild
index 8ed4e749308a..989e42b78ece 100644
--- a/dev-ros/map_server/map_server-9999.ebuild
+++ b/dev-ros/map_server/map_server-9999.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
+	>=dev-cpp/yaml-cpp-0.5:=
 	sci-physics/bullet:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index 40f3b8634883..dab6498bf099 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,8 +1,7 @@
-AUX catkin_prefix_path.patch 672 BLAKE2B f64b06833a03edc9811a226e965e4925c3b7cb77a956da9db050f8b8c89e6ee5c340eefda95bb3cc908a17ef61de79032e776981414c8511500b7559563852f4 SHA512 64a93c1577259e5e62bc8084b91003eba60da2600227092e49333340a2ab634fc89e35d72ad7cca70d342e27df41a4ff9745e1654bd053596db5bd48e2f54b01
 AUX catkin_prefix_path2.patch 678 BLAKE2B c494700f8d2cfce884b65ef87963cbf414dc4af1a9c9390978e7f458ad7f93b28c54bcd9831ff3edf4d6a421c4ec9ad1859bafff5f8ed209662ea1d14a70c299 SHA512 3b91fac26a2e48087fc70a773f5416e6cc3f7758adcddea6d50ba97a2d1ff8ae2f14fd5b74ba043a5546a8809def8b2154c70a97b10c451ba3773a82eda67100
-DIST pluginlib-1.11.1.tar.gz 21621 BLAKE2B 911cc5bb5752e74d90b6d2dc61cb67367fc69a3e375ef827fea49a0e0d4367f0bba6923960e7112c9ed5909b8e50738b2178a5c04d20abe4b8716559e5ebe0e1 SHA512 1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00
 DIST pluginlib-1.11.2.tar.gz 22844 BLAKE2B 3f3090b2b41754c0989cbc2c0f31333cf404aca00c481c3062955b01274b1cddb76eef41a0bce9a01058b461a293d42beae7c9337e8780d1e9503968196f0a98 SHA512 579aeb2ae82d6607c62007a5be6ccc402856c135e69a500d530ce5569c4f77526a63fee8b948db997db2face37bdac929b58911b5245c6ad641d19af055e46c0
-EBUILD pluginlib-1.11.1-r1.ebuild 640 BLAKE2B 2d3e00417d92182d1cfceb095db00ab643175e87a897f9636287517a529c54496ff2d7c6553a5abda8e93ffc7b4b41ab40ed13637934469d0b4985502f180c3e SHA512 3e2ae77ced916ada14341ad3038105f60e3ab0deb489b7115467009349d40504dee188d14df8f4ee40593e8e2c116d12003157500f68830ba574208dfcfba135
+DIST pluginlib-1.11.3.tar.gz 23465 BLAKE2B 64725b7bd3896362168db324dbbdc9a0de24d6c79b77d3b21e6d6a95091bfe7bca35fe93617200ed993a20aa8ce5604b90eadf546ca0d3ab5cca79dd47e182a0 SHA512 5d0acadf69362137041b6f08724ef0c0b0209ca901d1d082df38224e08ad990e43133979e9462128f0b9fb313ad4c9398bf5c075e5669a1cd3cd8dd715e9355b
 EBUILD pluginlib-1.11.2.ebuild 641 BLAKE2B 2c4329a647af34803aa7397cbe4a4a15bef5e4bcc986791136a18df732729e6b75e1a3e4612d8a17a8f738a17e247e133e2d69cb4af934bca2fac4ec9654fa88 SHA512 cd565b244ea1b067e1a01c8011cc132f579f7a11d642bb9c7309899e014a0cf5d61518d84d74d66bfe48686e979237babfea8efc9085b8f842ccd52137b22da4
+EBUILD pluginlib-1.11.3.ebuild 641 BLAKE2B e2c20cda0913569bb214bee0b9f3f9e1d97dafcfb9d11b71855c424914a7f2849e872bbc12e6c5ebb293e4167e1799ae1956e60d9f4230af89e9789c4bd4a9cc SHA512 614abf141b20bb02351988fc06b48a97a2f37ef514a340e1d81fcb78c6e89d3b811c08dff2432dd9d2b4b0e3acb790f010a30d84d98661b5bd8628bb082b0fa0
 EBUILD pluginlib-9999.ebuild 641 BLAKE2B 2c4329a647af34803aa7397cbe4a4a15bef5e4bcc986791136a18df732729e6b75e1a3e4612d8a17a8f738a17e247e133e2d69cb4af934bca2fac4ec9654fa88 SHA512 cd565b244ea1b067e1a01c8011cc132f579f7a11d642bb9c7309899e014a0cf5d61518d84d74d66bfe48686e979237babfea8efc9085b8f842ccd52137b22da4
 MISC metadata.xml 327 BLAKE2B f94cb82ca7e89f9c45d423a4b56a573d7d220a5bf218838163659dc027554338b845539ae4090df944e0053ce3e0264c0323a442732619147116a583926fc405 SHA512 cf53258133948a2b0d201af3f0d439f5dcfc9c43691ae4d2b175a70258dd26ffd0fd99511aa02df57cfafb8fc4a1a8185759de0b23f7a1496a227f706900b7a2
diff --git a/dev-ros/pluginlib/files/catkin_prefix_path.patch b/dev-ros/pluginlib/files/catkin_prefix_path.patch
deleted file mode 100644
index f5a19ec6d42b..000000000000
--- a/dev-ros/pluginlib/files/catkin_prefix_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use CMAKE_PREFIX_PATH.
-
-Index: pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
-===================================================================
---- pluginlib-1.11.1.orig/include/pluginlib/class_loader_imp.h
-+++ pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
-@@ -66,7 +66,7 @@ namespace
- std::vector<std::string> catkinFindLib()
- {
-   std::vector<std::string> lib_paths;
--  const char * env = std::getenv("CMAKE_PREFIX_PATH");
-+  const char * env = std::getenv("CATKIN_PREFIX_PATH");
-   if (env) {
-     std::string env_catkin_prefix_paths(env);
-     std::vector<std::string> catkin_prefix_paths;
diff --git a/dev-ros/pluginlib/pluginlib-1.11.1-r1.ebuild b/dev-ros/pluginlib/pluginlib-1.11.3.ebuild
index 730a3b5305de..01682d753b10 100644
--- a/dev-ros/pluginlib/pluginlib-1.11.1-r1.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,4 +24,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
diff --git a/dev-ros/robot_localization/Manifest b/dev-ros/robot_localization/Manifest
index b2d8292df8de..0161373f319c 100644
--- a/dev-ros/robot_localization/Manifest
+++ b/dev-ros/robot_localization/Manifest
@@ -1,4 +1,4 @@
 DIST robot_localization-2.5.1.tar.gz 6466840 BLAKE2B bb6f6dc935837d4891230bb26c649646586fb26032f5985ccaa736aaf1f2641eafe0d97e397900cef44a415a499bdd7acdf5c460fea8712d49e4c22aaba8e45b SHA512 0eb0ba81ae0cf85b7117a39b67a3b5ec0ebe09f55a85ac370695b7c281ab076bb7ede8495876c5917c34b6c912ce92fb05ddd7bcfe231b519c45fe9215b63dc2
-EBUILD robot_localization-2.5.1.ebuild 1222 BLAKE2B 994b89879922db1b33e1604398ab64277b83a841004b41369ece2593cf3ad8f7746c3bd2cf229e587c8ca4ccbb993503f0ed0611c2c41ff458d10e0ff96b03d4 SHA512 70305c75e28c266ff5ca55d102a5b340dd7d3e1d683ffd830eabcfefba864853065909cd872a5ff96071e49c6ffbcfefcd362c9535a3af2a879ce887a93ade57
-EBUILD robot_localization-9999.ebuild 1222 BLAKE2B 85b5a68123b8e3edf746192d8e25af0b22c717a70f2558bd65071fab6d7849faa5fdfd930946217265f72f9580a5ed4d26f67f871c7a1079142dc69485c0caa5 SHA512 70e3fd12472a4251db8edff62c2f8e66b2a55c6f3fa509552440ec101378e38586a23f3a7a2284c7950c5a390e1efe4267a88ca27d152e65e8659336bb65314d
+EBUILD robot_localization-2.5.1-r1.ebuild 1224 BLAKE2B 34905ba92ef6d0201e2281041b744d020727eb61de67a9b1e16d2e947a66fb6c628d710dc6aa56ad473f86e55ab58014e909350a42803ef8db8f341b675c0c7c SHA512 06e0e6fdb1246a1623ff43f7617b28d73d9b9938b07391215df6d5c07f605a9e4762c0bfc73680e5dba67bcf99b921c55b15a59cce06d9397ae3cd30af5117e2
+EBUILD robot_localization-9999.ebuild 1224 BLAKE2B 34905ba92ef6d0201e2281041b744d020727eb61de67a9b1e16d2e947a66fb6c628d710dc6aa56ad473f86e55ab58014e909350a42803ef8db8f341b675c0c7c SHA512 06e0e6fdb1246a1623ff43f7617b28d73d9b9938b07391215df6d5c07f605a9e4762c0bfc73680e5dba67bcf99b921c55b15a59cce06d9397ae3cd30af5117e2
 MISC metadata.xml 344 BLAKE2B 96e3dfb26e972a619ecd9e986e67272c46186bf0fe88721d42fcce8f94329417a30ddfb0b3b7a5f6b4dee8094bdeb842ba74da67a46db1270c4932dd3548d8d3 SHA512 682ee23502ff9b98b82cc8edb5dffafb1bde520ffa42ce8ab417e9c5dabab929286bb572e0988108201e29363315d12c8a5f55f841324fa339effe82ac1595c1
diff --git a/dev-ros/robot_localization/robot_localization-2.5.1.ebuild b/dev-ros/robot_localization/robot_localization-2.5.1-r1.ebuild
index 474ef66b9734..939215f937b7 100644
--- a/dev-ros/robot_localization/robot_localization-2.5.1.ebuild
+++ b/dev-ros/robot_localization/robot_localization-2.5.1-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-ros/tf2_ros
 	dev-ros/xmlrpcpp
 	dev-libs/boost:=
-	dev-cpp/yaml-cpp
+	dev-cpp/yaml-cpp:=
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 "
diff --git a/dev-ros/robot_localization/robot_localization-9999.ebuild b/dev-ros/robot_localization/robot_localization-9999.ebuild
index 1c508af6daf1..939215f937b7 100644
--- a/dev-ros/robot_localization/robot_localization-9999.ebuild
+++ b/dev-ros/robot_localization/robot_localization-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-ros/tf2_ros
 	dev-ros/xmlrpcpp
 	dev-libs/boost:=
-	dev-cpp/yaml-cpp
+	dev-cpp/yaml-cpp:=
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 "
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 671d232ddb0f..00f55b881d27 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,6 +1,4 @@
-DIST rviz-1.12.14.tar.gz 5087682 BLAKE2B 0ff42da139419b819e224459826d0bcc49bb70c9ca1c878487abee188321030f1c5535ff3ce7a1462b6946f2a9eac1cc1022f31289c5d138b0a64cef213228bc SHA512 748e3daf3fef53086f9056532e1fc9d3ca5a9130656b880487b50a557115e603ad843dd7f363241eb0b4d300f9fbe601fbd645f1e629ac2760a8a54666028e68
 DIST rviz-1.12.15.tar.gz 5088184 BLAKE2B 9096cd707ff265847fdb0ddc71b31ec50dcfb9af0cb658ccbe8530d75cf82abcfa7d5a76f220e1bf2393e28807b44fec3d8690463f19dfb6482bc7b51a07f2c2 SHA512 d12ca4b56a7a2a19f37ca69a4efc0f474ff1409cdd9e1f1d357d6c2b6033a21183e469c712b5583ddc41f579f697d55145516c79797e846d3345019e57615ad6
-EBUILD rviz-1.12.14-r1.ebuild 1692 BLAKE2B a31df46f2a1005c6abd422f46bf5c86ecf0010e11df7d5a4fbf7c977791715fd75e7e84f5aa0afcc35583c55de69ef904c0d008fa54ab462a03be75b395d391c SHA512 32cf80f7a5905012493bbdfce94783ac1b527be8d9bbe87ac446a55b8e81e4a78d05292e9fe34c52625144988cbf5b704802bed4f5ea315ea072a46d7522612e
-EBUILD rviz-1.12.15.ebuild 1692 BLAKE2B ae4b0343cb36b8b23fd91d50b9446346d861f9902aceec2f47a0e89f6a1ca012cc111061bf5bfcc5031913636db97a1f8cec0f0193cd426d4b9118653870c896 SHA512 4c02fdf00f49e8a080b7bf6b9417f7027f90678e000130174b19db764b4bb3034b35e3dcc52c97f88b1eed812ff4f0a946e3fa3fd2c4f9a307905ab6a5dc35c9
-EBUILD rviz-9999.ebuild 1692 BLAKE2B a31df46f2a1005c6abd422f46bf5c86ecf0010e11df7d5a4fbf7c977791715fd75e7e84f5aa0afcc35583c55de69ef904c0d008fa54ab462a03be75b395d391c SHA512 32cf80f7a5905012493bbdfce94783ac1b527be8d9bbe87ac446a55b8e81e4a78d05292e9fe34c52625144988cbf5b704802bed4f5ea315ea072a46d7522612e
+EBUILD rviz-1.12.15-r1.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
+EBUILD rviz-9999.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.12.14-r1.ebuild b/dev-ros/rviz/rviz-1.12.14-r1.ebuild
deleted file mode 100644
index ef99e3dce197..000000000000
--- a/dev-ros/rviz/rviz-1.12.14-r1.ebuild
+++ /dev/null
@@ -1,69 +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-visualization/rviz"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	dev-games/ogre
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp
-	dev-libs/urdfdom:=
-	dev-libs/tinyxml:=
-
-	dev-ros/angles
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rviz/rviz-1.12.15.ebuild b/dev-ros/rviz/rviz-1.12.15-r1.ebuild
index f13960c9eecb..e91a1a39c000 100644
--- a/dev-ros/rviz/rviz-1.12.15.ebuild
+++ b/dev-ros/rviz/rviz-1.12.15-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtopengl:5
 	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp
+	dev-cpp/yaml-cpp:=
 	dev-libs/urdfdom:=
 	dev-libs/tinyxml:=
 
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index ef99e3dce197..e91a1a39c000 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtopengl:5
 	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp
+	dev-cpp/yaml-cpp:=
 	dev-libs/urdfdom:=
 	dev-libs/tinyxml:=
 
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 061b83d2cacc..d0b1b7d4e873 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,8 +1,6 @@
-DIST xacro-1.11.1.tar.gz 78665 BLAKE2B 576933e8be679c3aa89466a0b2cdf4e852b2d2604316f95ba8c46e141c5797e82f4a4d1a5d939ad901539932dcbb621400a6210c482f14d4ac3b9a8ae548dd9b SHA512 8e25bf721402eb3611977f2091567d109a02ad7aebc9e76e86760fef969501d9a132d61efbb86452ea117661c60650fce24b79c3c44cb40a145340160f507195
-DIST xacro-1.11.2.tar.gz 78752 BLAKE2B 50666f26f7f6d5b58ab124b088469fbdc950e9da10716995e68d7c5739d5e31a2e7fa45be6782f2546398b41e34ebf8bf52723425956b560ada285dd9d9ef88a SHA512 44b5decfe93ece0691a214917f9c643db52a8e14e3fdbf236a76da78e1270793a6e6ca41d06639aa982e64c5284baf5abd02138814a52744a5e6c2d2d95996f7
 DIST xacro-1.12.0.tar.gz 78767 BLAKE2B 537ceaa1b0c795ff57e4774fba6b76f599a77ec427955a46891712f87e8a68cbd99aad2891c6ad10118596b99a333279f8d5dfae68372a0770dd1e89c237d02c SHA512 f6af679942e5ff6d57288df2e9c7896282827420b766e43fc4609b8a633763b7c42bcc69cf3a2afa5d740c6038a5a90da97e7bcf433d3cc47a45a1769fd71d42
-EBUILD xacro-1.11.1.ebuild 494 BLAKE2B 73b001a42cfbf313e59d4ae3f6e0ed0b718f5d0c66bd795964177485fed28afa1e945c11ce68a777d612cb29ccb4fba83d7b31ac63ad8602b5956e20b578beba SHA512 b515c81d0cfcbaa3379457b2fc505f7c3e08054b857b0722c26e17fe7df4ff2c2765e113ba6d43be0f9e945cdc85ebf30ab77cd15580a0829ee852b5c4ea321f
-EBUILD xacro-1.11.2.ebuild 494 BLAKE2B 086f3e922a245b788840b20ff74179b846af1b6e76f050e4741cbb41f54b26a3bb2c6e120a7b7d406cc9d81f0a1f6ad0ee603c8a971579339e4d82de4ad7a694 SHA512 e99cc9fe7041f491e100deace58d1f69b60e034573ea25777b3cc0e5765499d2c01e7e24e6ce999b2ea948c8403b3c30dd5b4865559234941998e21fe11858a5
+DIST xacro-1.12.1.tar.gz 80708 BLAKE2B 21c9521f0e7cfd4373746546da330b32ebe98a9bbce84ed5a940861e5845ca2fadef5aa49f40d923746e8e2cbcedfd08a462d18a2ee5839f2ecbe3b3ad531bc7 SHA512 04883d3f8ad16896bfe9ef57443805477b1979a53b35f0331515ec69b4a765b4a6d78506d527fc31bb85028003c8d1d79c26f7df90a3cba87203469cbdf53f3f
 EBUILD xacro-1.12.0.ebuild 494 BLAKE2B 086f3e922a245b788840b20ff74179b846af1b6e76f050e4741cbb41f54b26a3bb2c6e120a7b7d406cc9d81f0a1f6ad0ee603c8a971579339e4d82de4ad7a694 SHA512 e99cc9fe7041f491e100deace58d1f69b60e034573ea25777b3cc0e5765499d2c01e7e24e6ce999b2ea948c8403b3c30dd5b4865559234941998e21fe11858a5
+EBUILD xacro-1.12.1.ebuild 494 BLAKE2B 7a6b16056e1fde6ecc980f7aa4319c0e1fc604e786a12d7700ca4fd239772bb7bc9b4255d57e5f6107ef41eb64d8c6cb9b2ca5da0c08e86a63f3fd72edc748aa SHA512 0dbe3e599a3a84b3fa810fdecbc63be4ac547a74dd74b19225c90513f6145c4f765b5474156d5402731773fc0d2984b1e8d0a7a7c3048eb976eb569d791f94b0
 EBUILD xacro-9999.ebuild 494 BLAKE2B 6d35cfe8f1b31cd28a38bc06c462267cdadc569afab8fea4234e79aa3aa273b3508058b159276ac44cebbe5fb55de4fbd9749f25aeee4c4705f05938f7118229 SHA512 8d869a3a6a2b070affb22353d619d4ca8fb00ad7a7c1ecee3c908d82580a9bc71fb9066171cf88a4098d17a0296c304d925919aa7af2618c7ab762ae90eb49a1
 MISC metadata.xml 323 BLAKE2B d43754a1147a95e3536569c858b3dafecbc9dd4ec06ef00d23d7948de3aaf40d15aabf502f6c1b5579c03139c06579517c86fddc6eaa61f970baf101d9fef68e SHA512 9c6fccac3f7ab699969eb90199aa9690d064f1d66cc003c157bf85bc3147ae42f1433ac1589f57ce5b05ebd78a44c7f1a92f99e3af29bdee58727c1a676afd37
diff --git a/dev-ros/xacro/xacro-1.11.1.ebuild b/dev-ros/xacro/xacro-1.11.1.ebuild
deleted file mode 100644
index 035951cc6bc9..000000000000
--- a/dev-ros/xacro/xacro-1.11.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/xacro"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="XML macro language"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}
-	dev-ros/roslaunch[${PYTHON_USEDEP}]"
diff --git a/dev-ros/xacro/xacro-1.11.2.ebuild b/dev-ros/xacro/xacro-1.12.1.ebuild
index 78e761763db7..a7b93c3df7f6 100644
--- a/dev-ros/xacro/xacro-1.11.2.ebuild
+++ b/dev-ros/xacro/xacro-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5