gentoo resync : 12.11.2017

6 files changed, 21 insertions, 69 deletions

diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index 216432301e9e..730b8ad5b8ac 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,8 +1,6 @@
-AUX gentoo.patch 1550 SHA256 ac2f1db9819175d75b48e2c127003611379a561320d45a900097ae8f4bc0f78f SHA512 f2c85583c713f7f8657e1f478f36211cc39e89254bae3b970110b99ea4b7507aa1103caa6bbd91994d4d8c59f26e957645bd9980573dccf1864aa4ac066b16b6 WHIRLPOOL 0bf0b6e0209e2ea4e615534849bc8b1463802aea6c5e0a145d247f003a1894ce8a009055944f2d952882d7e895c5baf510a08b566a7c42af65145025b773db94
-DIST pluginlib-1.10.5.tar.gz 21470 SHA256 53a0ccb7a4654d464271189fc44ba23d6be8d3ecdfb40506b9d9fb4a87f19d6c SHA512 619c552c7f6d59f02f580204477e789e2adf15ea53dfdf1d3fe3fc6e65e34dbfe1d7e7ae60b833bbf589c2afd49dc09187222e989de902758475509b8cf7cd88 WHIRLPOOL c441fbee18fa152d900e0b49198cc2b0f75a85f801bc756bc1d56f4153360e2ddfc3c63223a57fbc7ee299aef4313bd55c147fe614d6fcca708f7302ac9c52fd
-DIST pluginlib-1.11.0.tar.gz 21555 SHA256 f5acf838cdf15538505b670dfdf93a0c5e453d222464d729d71a22513a60e2ca SHA512 2ef27759a6fb3db0354ffd28f2de5781405d4515dad028cbba6e108aa2eb79da56bbcb8ad4dab5686a9dc59d031bfd06ca713382e99258ecdf78fc45a877e588 WHIRLPOOL 71fa457e3bd0c93f2ea68729086b6f9b1b2653f126bdec3f461ad26cb37237c27397cca8d1c5dcf74e96b72988c025738d20ef303ac6d12ae7fc17d4b3bb8a02
-EBUILD pluginlib-1.10.5.ebuild 625 SHA256 6f8459357ec77a7a5aa87d8eb2e1412ab925b22a54e4b76222cc5c5a5daf4303 SHA512 7d6070b2b6916753439eb67fd40067b3efffed09ccf55dcf05ff76b3ba243bbf76245889f27abcdd805bceef0e7b8fc3e84bf7eb85db1429279ed8c4c2550e4b WHIRLPOOL 783f387b59a4599c09794bd49a0340f72f9c7430d86c2da6107215f26c408465b2a7a5b500e93c70c8ae1c6f6fb70ea0f6da26a04ce91d46925f7f1f5ba52762
-EBUILD pluginlib-1.11.0.ebuild 628 SHA256 df2c4fb7563018ea8d2ffcc28e9a747713f8c3a3a8bab25e260cc0974d6c51f5 SHA512 f8d57f5b2535f4d2f6e407e8f538360c018887857c9f82ce81c0807278ec73a392ac05236fc13aceda9ee67d3ad0142c1fa52ec38e0f482d3ced4a556dccc2ba WHIRLPOOL e4f527330962c15c94d0fee3fbec6ecc9d4af4a57949e2137a66372a836162615f7f8ccbd8187e6adee90cd7d13fa17940e9766b419f2757c78538451e22e578
-EBUILD pluginlib-9999.ebuild 628 SHA256 df2c4fb7563018ea8d2ffcc28e9a747713f8c3a3a8bab25e260cc0974d6c51f5 SHA512 f8d57f5b2535f4d2f6e407e8f538360c018887857c9f82ce81c0807278ec73a392ac05236fc13aceda9ee67d3ad0142c1fa52ec38e0f482d3ced4a556dccc2ba WHIRLPOOL e4f527330962c15c94d0fee3fbec6ecc9d4af4a57949e2137a66372a836162615f7f8ccbd8187e6adee90cd7d13fa17940e9766b419f2757c78538451e22e578
+AUX catkin_prefix_path.patch 672 SHA256 29ad1d016f354ead131f565df30f261073497fcceee0faa173aa5cdce5bb2e3d SHA512 64a93c1577259e5e62bc8084b91003eba60da2600227092e49333340a2ab634fc89e35d72ad7cca70d342e27df41a4ff9745e1654bd053596db5bd48e2f54b01 WHIRLPOOL 4b67e7d464957ede575fb9bf9c44c456f5178d586ad74f4104650431133a3dbc7f53cde347e8acefce528eff719771dd710824b15a0c021b1dac21d9d32da25d
+DIST pluginlib-1.11.1.tar.gz 21621 SHA256 bee838a9e62c8e889e8354f6ec5c76493f3aa6df5d19c30110068c82feb927c0 SHA512 1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00 WHIRLPOOL 1d05ddb55c800e0272e6c203804fdd0cdc966a6213df55a999e2ab5f14ff157ec84654d6155a1de77cdd15821776ad51918e0fa1072efbc1c08e539dd10ebce3
+EBUILD pluginlib-1.11.1-r1.ebuild 640 SHA256 39b41748d2328c4788be41c75f27b6624b725d6a4720b2f128329fe32038a5e9 SHA512 3e2ae77ced916ada14341ad3038105f60e3ab0deb489b7115467009349d40504dee188d14df8f4ee40593e8e2c116d12003157500f68830ba574208dfcfba135 WHIRLPOOL fb1c5dcf610262cf2d05754cda3dd388e8e15fc7d9d368391fe021ac6196ec618fe6c50300bc9fb95e690c58f1192cf5649661aaa80669114228a2798a69644e
+EBUILD pluginlib-9999.ebuild 640 SHA256 39b41748d2328c4788be41c75f27b6624b725d6a4720b2f128329fe32038a5e9 SHA512 3e2ae77ced916ada14341ad3038105f60e3ab0deb489b7115467009349d40504dee188d14df8f4ee40593e8e2c116d12003157500f68830ba574208dfcfba135 WHIRLPOOL fb1c5dcf610262cf2d05754cda3dd388e8e15fc7d9d368391fe021ac6196ec618fe6c50300bc9fb95e690c58f1192cf5649661aaa80669114228a2798a69644e
 MISC ChangeLog 2975 SHA256 69703d55c7841843d27b82c701801815085a11a1927c7bab6923c8282a2818e5 SHA512 d364e7a419dd7019845586d73f9a4f9d56ccbca99f5f76d1b81e3939e05e6cbbfb9f95436009711aceb9e6ee58d202f2f7286bc72cef7ad31dc59ceda80e2dda WHIRLPOOL b31daedf332940e9909a30c529b51182b4f7e01c6afcfdc44bc325c383f5f67cf74961635e5f0fd9b00a21b6df2ab3343ce531602b280afcafb03ade22a72391
 MISC metadata.xml 327 SHA256 233475d2165beb2567b9973ba09d86f380f251c2cccf83f8ddf7c0360e66c3b3 SHA512 cf53258133948a2b0d201af3f0d439f5dcfc9c43691ae4d2b175a70258dd26ffd0fd99511aa02df57cfafb8fc4a1a8185759de0b23f7a1496a227f706900b7a2 WHIRLPOOL 996b784e1384922ab21b5bb7efd7371f5e36be14f97d39b38ab630d049c059eeb2fb00e5f1815ba2ab8f71acb7af04fa6b7de2236a56bfb2c01760015386410d
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
diff --git a/dev-ros/pluginlib/pluginlib-1.10.5.ebuild b/dev-ros/pluginlib/pluginlib-1.10.5.ebuild
deleted file mode 100644
index 75c645625a19..000000000000
--- a/dev-ros/pluginlib/pluginlib-1.10.5.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/pluginlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-1.11.0.ebuild b/dev-ros/pluginlib/pluginlib-1.11.1-r1.ebuild
index 4194e2cd13c4..730a3b5305de 100644
--- a/dev-ros/pluginlib/pluginlib-1.11.0.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.11.1-r1.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 4194e2cd13c4..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}/gentoo.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )