gentoo resync : 31.03.2018

3 files changed, 4 insertions, 20 deletions

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" )