gentoo resync : 12.11.2017

2 files changed, 15 insertions, 34 deletions

diff --git a/dev-ros/pluginlib/files/catkin_prefix_path.patch b/dev-ros/pluginlib/files/catkin_prefix_path.patch
new file mode 100644
index 000000000000..f5a19ec6d42b
--- /dev/null
+++ b/dev-ros/pluginlib/files/catkin_prefix_path.patch
@@ -0,0 +1,15 @@
+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/files/gentoo.patch b/dev-ros/pluginlib/files/gentoo.patch
deleted file mode 100644
index 6737f7666df1..000000000000
--- a/dev-ros/pluginlib/files/gentoo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Find package.xml in ros_packages/package_name too as we moved it here.
-
-Index: pluginlib-1.10.4/include/pluginlib/class_loader_imp.h
-===================================================================
---- pluginlib-1.10.4.orig/include/pluginlib/class_loader_imp.h
-+++ pluginlib-1.10.4/include/pluginlib/class_loader_imp.h
-@@ -444,6 +444,7 @@ namespace pluginlib
-     std::string package_name;
-     boost::filesystem::path p(plugin_xml_file_path);
-     boost::filesystem::path parent = p.parent_path();
-+    boost::filesystem::path basename = p.filename();
- 
-     //Figure out exactly which package the passed XML file is exported by.
-     while (true)
-@@ -453,6 +454,11 @@ namespace pluginlib
-         std::string package_file_path = (boost::filesystem::path(parent / "package.xml")).string();
-         return(extractPackageNameFromPackageXML(package_file_path));
-       }
-+      else if(boost::filesystem::exists(parent / "ros_packages" / basename / "package.xml"))
-+      {
-+        std::string package_file_path = (boost::filesystem::path(parent / "ros_packages" / basename / "package.xml")).string();
-+        return(extractPackageNameFromPackageXML(package_file_path));
-+      }
-       else if (boost::filesystem::exists(parent / "manifest.xml"))
-       {
- #if BOOST_FILESYSTEM_VERSION >= 3
-@@ -470,6 +476,7 @@ namespace pluginlib
-       }
- 
-       //Recursive case - hop one folder up
-+      basename = parent.filename();
-       parent = parent.parent_path().string();
- 
-       //Base case - reached root and cannot find what we're looking for