[gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/files/, dev-ros/pluginlib/
commit: 2420081431444f63bccb9ae6cd7951388ed31d50
Author: Alexis Ballier gentoo org>
AuthorDate: Fri Mar 30 13:30:00 2018 +
Commit: Alexis Ballier gentoo org>
CommitDate: Fri Mar 30 13:32:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24200814
dev-ros/pluginlib: Remove old
Package-Manager: Portage-2.3.27, Repoman-2.3.9
dev-ros/pluginlib/Manifest | 1 -
dev-ros/pluginlib/files/catkin_prefix_path.patch | 15 -
dev-ros/pluginlib/pluginlib-1.11.1-r1.ebuild | 27
3 files changed, 43 deletions(-)
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index c6a0a36a4c5..dbfdb06e59f 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,2 +1 @@
-DIST pluginlib-1.11.1.tar.gz 21621 BLAKE2B
911cc5bb5752e74d90b6d2dc61cb67367fc69a3e375ef827fea49a0e0d4367f0bba6923960e7112c9ed5909b8e50738b2178a5c04d20abe4b8716559e5ebe0e1
SHA512
1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00
DIST pluginlib-1.11.2.tar.gz 22844 BLAKE2B
3f3090b2b41754c0989cbc2c0f31333cf404aca00c481c3062955b01274b1cddb76eef41a0bce9a01058b461a293d42beae7c9337e8780d1e9503968196f0a98
SHA512
579aeb2ae82d6607c62007a5be6ccc402856c135e69a500d530ce5569c4f77526a63fee8b948db997db2face37bdac929b58911b5245c6ad641d19af055e46c0
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 f5a19ec6d42..000
--- 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 catkinFindLib()
- {
- std::vector 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 catkin_prefix_paths;
diff --git a/dev-ros/pluginlib/pluginlib-1.11.1-r1.ebuild
b/dev-ros/pluginlib/pluginlib-1.11.1-r1.ebuild
deleted file mode 100644
index 730a3b5305d..000
--- a/dev-ros/pluginlib/pluginlib-1.11.1-r1.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/tinyxml2:=
- dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/files/, dev-ros/pluginlib/
commit: d2b13688e2aec80b26063c676c549e524d0dea5e
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Dec 4 21:46:40 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Dec 4 21:46:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b13688
dev-ros/pluginlib: bump to 1.11.2
Package-Manager: Portage-2.3.16, Repoman-2.3.6
dev-ros/pluginlib/Manifest| 3 ++-
dev-ros/pluginlib/files/catkin_prefix_path2.patch | 15 +++
.../{pluginlib-.ebuild => pluginlib-1.11.2.ebuild}| 2 +-
dev-ros/pluginlib/pluginlib-.ebuild | 2 +-
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index ccb761bb5d6..c6a0a36a4c5 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1 +1,2 @@
-DIST pluginlib-1.11.1.tar.gz 21621 SHA256
bee838a9e62c8e889e8354f6ec5c76493f3aa6df5d19c30110068c82feb927c0 SHA512
1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00
WHIRLPOOL
1d05ddb55c800e0272e6c203804fdd0cdc966a6213df55a999e2ab5f14ff157ec84654d6155a1de77cdd15821776ad51918e0fa1072efbc1c08e539dd10ebce3
+DIST pluginlib-1.11.1.tar.gz 21621 BLAKE2B
911cc5bb5752e74d90b6d2dc61cb67367fc69a3e375ef827fea49a0e0d4367f0bba6923960e7112c9ed5909b8e50738b2178a5c04d20abe4b8716559e5ebe0e1
SHA512
1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00
+DIST pluginlib-1.11.2.tar.gz 22844 BLAKE2B
3f3090b2b41754c0989cbc2c0f31333cf404aca00c481c3062955b01274b1cddb76eef41a0bce9a01058b461a293d42beae7c9337e8780d1e9503968196f0a98
SHA512
579aeb2ae82d6607c62007a5be6ccc402856c135e69a500d530ce5569c4f77526a63fee8b948db997db2face37bdac929b58911b5245c6ad641d19af055e46c0
diff --git a/dev-ros/pluginlib/files/catkin_prefix_path2.patch
b/dev-ros/pluginlib/files/catkin_prefix_path2.patch
new file mode 100644
index 000..12e759c6321
--- /dev/null
+++ b/dev-ros/pluginlib/files/catkin_prefix_path2.patch
@@ -0,0 +1,15 @@
+Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use
CMAKE_PREFIX_PATH.
+
+Index: pluginlib-1.11.2/include/pluginlib/class_loader_imp.hpp
+===
+--- pluginlib-1.11.2.orig/include/pluginlib/class_loader_imp.hpp
pluginlib-1.11.2/include/pluginlib/class_loader_imp.hpp
+@@ -68,7 +68,7 @@ namespace
+ std::vector catkinFindLib()
+ {
+ std::vector 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 catkin_prefix_paths;
diff --git a/dev-ros/pluginlib/pluginlib-.ebuild
b/dev-ros/pluginlib/pluginlib-1.11.2.ebuild
similarity index 91%
copy from dev-ros/pluginlib/pluginlib-.ebuild
copy to dev-ros/pluginlib/pluginlib-1.11.2.ebuild
index 730a3b5305d..d72ce338bb9 100644
--- a/dev-ros/pluginlib/pluginlib-.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.11.2.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-.ebuild
b/dev-ros/pluginlib/pluginlib-.ebuild
index 730a3b5305d..d72ce338bb9 100644
--- a/dev-ros/pluginlib/pluginlib-.ebuild
+++ b/dev-ros/pluginlib/pluginlib-.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/files/, dev-ros/pluginlib/
commit: 635aa9c605e2499959fecd625bba22e72e367918
Author: Alexis Ballier gentoo org>
AuthorDate: Fri Nov 10 08:50:53 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Fri Nov 10 08:51:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635aa9c6
dev-ros/pluginlib: Remove old
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-ros/pluginlib/Manifest| 2 --
dev-ros/pluginlib/files/gentoo.patch | 34 ---
dev-ros/pluginlib/pluginlib-1.10.5.ebuild | 27
dev-ros/pluginlib/pluginlib-1.11.0.ebuild | 27
4 files changed, 90 deletions(-)
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index a1d1aa7745e..ccb761bb5d6 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,3 +1 @@
-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
DIST pluginlib-1.11.1.tar.gz 21621 SHA256
bee838a9e62c8e889e8354f6ec5c76493f3aa6df5d19c30110068c82feb927c0 SHA512
1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00
WHIRLPOOL
1d05ddb55c800e0272e6c203804fdd0cdc966a6213df55a999e2ab5f14ff157ec84654d6155a1de77cdd15821776ad51918e0fa1072efbc1c08e539dd10ebce3
diff --git a/dev-ros/pluginlib/files/gentoo.patch
b/dev-ros/pluginlib/files/gentoo.patch
deleted file mode 100644
index 6737f7666df..000
--- 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 75c645625a1..000
--- 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.0.ebuild
deleted file mode 100644
index 4194e2cd13c..000
--- a/dev-ros/pluginlib/pluginlib-1.11.0.ebuild
+++ /dev/null
@@
