4 files changed, 17 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/gentoo2.patch b/dev-ros/pluginlib/files/gentoo2.patch
deleted file mode 100644
index 60fbd7fee41b..000000000000
--- a/dev-ros/pluginlib/files/gentoo2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Find package.xml in ros_packages/package_name too as we moved it here.
-
-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
-@@ -510,12 +510,17 @@ ClassLoader<T>::getPackageFromPluginXMLF
-   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) {
-     if (boost::filesystem::exists(parent / "package.xml")) {
-       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
-       std::string package = parent.filename().string();
-@@ -532,6 +537,7 @@ ClassLoader<T>::getPackageFromPluginXMLF
-     }
- 
-     // 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
diff --git a/dev-ros/pluginlib/pluginlib-1.11.1.ebuild b/dev-ros/pluginlib/pluginlib-1.11.1.ebuild
index 1e00a91c58ca..730a3b5305de 100644
--- a/dev-ros/pluginlib/pluginlib-1.11.1.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.11.1.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 1e00a91c58ca..730a3b5305de 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )