Merge updates from master

11 files changed, 3 insertions, 150 deletions

diff --git a/dev-ros/actionlib/Manifest b/dev-ros/actionlib/Manifest
index 09dab93833a6..6e83a8057229 100644
--- a/dev-ros/actionlib/Manifest
+++ b/dev-ros/actionlib/Manifest
@@ -1,3 +1,2 @@
-DIST actionlib-1.11.11.tar.gz 98427 BLAKE2B 2ec632d8266557c1c74d3b2de672728f53e0bac10bc0d0346d255d78ac59d39ac1d3cc2af157d67d5988a95f52f51dc57f3a0d5ccacca209b5a09ad44fee8f1c SHA512 a2a02abfb3e192082143d83ceab6a612f501bbd1ec38d108e3a841afb331d1a98e8a602fac7d627a62c336a52ffe70331d2001394b134511c89349567b49d83d
-DIST actionlib-1.11.12.tar.gz 98435 BLAKE2B f35a12b6628d1a3545a805ca924d71899583c2c67259b552681e4ec7f984e9d1b55df5b976d3d8787e51ffc4f193979ba08a13fee97aaf4826f7284a710cc041 SHA512 319150a7094d063770c2193edf8665fc52fc099620740dfe7cf033b1e445aedf55621c93284dd4a4c4f49f12a9e414f650a61d73a64cdd012945e27cfac16458
 DIST actionlib-1.11.13.tar.gz 98518 BLAKE2B 918c541f3a6192ee9b89e4b2759651e027d447acc305aaf9bdeabb9587a527b6bd924eb812314c8c83baec3b6829ca0b5d126550ea70acc5d2739f7cd83e065d SHA512 273499a0a5b1c9b40147ba0bba61b44a2530c0a16d757a51f6b6211c95790e18ffe2c397582a429de84a639209779c2641a3013f71f75a2fd76d422115033601
+DIST actionlib-1.11.14.tar.gz 98789 BLAKE2B fb4f7afbc2836f43ccfbb5d477a7e54ec4feb13244a797a057922b02cb97886052b2b6b2f2cb3cdf0ecb1b0c7dd09a24768ad9bc459498e0606ba534a82598c7 SHA512 147fc8642e8d46cf6dc353b4f8850c2682204a6f256a7e0a065db5adb67b72c54e2f40ff4cabbec2fab6d1a1b0c82ff0abbea571ae4202774892c3dae01ad8bd
diff --git a/dev-ros/actionlib/actionlib-1.11.12.ebuild b/dev-ros/actionlib/actionlib-1.11.12.ebuild
deleted file mode 100644
index cb76b829848c..000000000000
--- a/dev-ros/actionlib/actionlib-1.11.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 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/actionlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
-RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-"
diff --git a/dev-ros/actionlib/actionlib-1.11.11.ebuild b/dev-ros/actionlib/actionlib-1.11.14.ebuild
index cb76b829848c..72617b6f8b23 100644
--- a/dev-ros/actionlib/actionlib-1.11.11.ebuild
+++ b/dev-ros/actionlib/actionlib-1.11.14.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
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index 4bc29c3999ee..0889f782d7dd 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,7 +1 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.0.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.13.0.ebuild
deleted file mode 100644
index dcc5fc87cd25..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.0.ebuild
+++ /dev/null
@@ -1,18 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.1.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.13.1.ebuild
deleted file mode 100644
index dcc5fc87cd25..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.1.ebuild
+++ /dev/null
@@ -1,18 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.2.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.13.2.ebuild
deleted file mode 100644
index dcc5fc87cd25..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.2.ebuild
+++ /dev/null
@@ -1,18 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.4.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.13.4.ebuild
deleted file mode 100644
index dcc5fc87cd25..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.4.ebuild
+++ /dev/null
@@ -1,18 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.5.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.13.5.ebuild
deleted file mode 100644
index dcc5fc87cd25..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.5.ebuild
+++ /dev/null
@@ -1,18 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.6.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.13.6.ebuild
deleted file mode 100644
index e20aad21511f..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.6.ebuild
+++ /dev/null
@@ -1,18 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index a556f28b4c95..17745d72ecaf 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -224,11 +224,7 @@ ros-catkin_src_test() {
 		einfo "Regenerating setup_cached.sh for tests"
 		${PYTHON:-python} catkin_generated/generate_cached_setup.py || die
 	fi
-	# Using cmake-utils_src_make with nonfatal does not work and breaks e.g.
-	# dev-ros/rviz.
-	if nonfatal emake tests -n &> /dev/null ; then
-		cmake-utils_src_make tests
-	fi
+	nonfatal cmake-utils_src_make tests
 	cmake-utils_src_test "${@}"
 }