[gentoo-commits] repo/gentoo:master commit in: dev-ros/rospack/, dev-ros/rospack/files/

2018-04-12 Thread Alexis Ballier 
commit: b8cc095e1f60a7a0b498793a6a374f4b226ebd84
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Apr 12 18:40:21 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Apr 12 18:51:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8cc095e

dev-ros/rospack: bump to 2.5.0

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-ros/rospack/Manifest   |   1 +
 dev-ros/rospack/files/boost165.patch   | 231 -
 .../{rospack-.ebuild => rospack-2.5.0.ebuild}  |   4 +-
 dev-ros/rospack/rospack-.ebuild|   4 +-
 4 files changed, 5 insertions(+), 235 deletions(-)

diff --git a/dev-ros/rospack/Manifest b/dev-ros/rospack/Manifest
index eb9b17da7c2..7c5ab380bb9 100644
--- a/dev-ros/rospack/Manifest
+++ b/dev-ros/rospack/Manifest
@@ -1 +1,2 @@
 DIST rospack-2.4.3.tar.gz 72327 BLAKE2B 
b154ce307ed95403382030c0fe14bd6296174289333fea83356a4f77add0fe2a1e48c8e2b6ee037def2e823f61a7b6df4ea62fd9a6f84433f12247003823f86f
 SHA512 
4396ef24d0bd826235d7ac0da8a0b502557ecc0086eadcda96d44779ed5d8134e9a53cd861ee135a4b1da53074bdcf906dc4cb6ea0c36798326c17788ee1e2be
+DIST rospack-2.5.0.tar.gz 72447 BLAKE2B 
820e893544b38464bfc63b516697fac9e5875bfffb0922aa0da4b572af5e47a0f4a63134786131fd0ae97751916748b0a1e6af6ca29897ef72759b601bffb551
 SHA512 
8c9ed4566aa1456b2dd3c4249f7023121d21ee99427d0ef78a7237fbe418f333859091b66870572d5a80995ebda9d5208643ae92213827af40c63b49be4a2560

diff --git a/dev-ros/rospack/files/boost165.patch 
b/dev-ros/rospack/files/boost165.patch
deleted file mode 100644
index fda1c666810..000
--- a/dev-ros/rospack/files/boost165.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-commit 6fcee1b0d2b1c225c39a5820981166b99f0d8750
-Author: Tim Rakowski 
-Date:   Mon Sep 4 21:41:11 2017 +0200
-
-Replaced references to deprecated Boost.TR1
-
-boost/tr1 includes where removed with boost 1.65
-
-diff --git a/include/rospack/rospack.h b/include/rospack/rospack.h
-index 4389187..bb7bc2e 100644
 a/include/rospack/rospack.h
-+++ b/include/rospack/rospack.h
-@@ -105,8 +105,8 @@ and Rosstack.
- #ifndef ROSPACK_ROSPACK_H
- #define ROSPACK_ROSPACK_H
- 
--#include 
--#include 
-+#include 
-+#include 
- #include 
- #include 
- #include 
-@@ -148,8 +148,8 @@ class ROSPACK_DECL Rosstackage
- std::string tag_;
- bool quiet_;
- std::vector search_paths_;
--std::tr1::unordered_map dups_;
--std::tr1::unordered_map stackages_;
-+boost::unordered_map dups_;
-+boost::unordered_map stackages_;
- Stackage* findWithRecrawl(const std::string& name);
- void log(const std::string& level, const std::string& msg, bool 
append_errno);
- void clearStackages();
-@@ -159,7 +159,7 @@ class ROSPACK_DECL Rosstackage
-  int depth,
-  bool collect_profile_data,
-  std::vector& profile_data,
-- std::tr1::unordered_set& profile_hash);
-+ boost::unordered_set& profile_hash);
- bool isStackage(const std::string& path);
- void loadManifest(Stackage* stackage);
- void computeDeps(Stackage* stackage, bool ignore_errors=false, bool 
ignore_missing=false);
-@@ -171,7 +171,7 @@ class ROSPACK_DECL Rosstackage
- bool no_recursion_on_wet=false);
- void gatherDepsFull(Stackage* stackage, bool direct,
- traversal_order_t order, int depth,
--std::tr1::unordered_set& deps_hash,
-+boost::unordered_set& deps_hash,
- std::vector& deps,
- bool get_indented_deps,
- std::vector& indented_deps,
-diff --git a/src/rospack.cpp b/src/rospack.cpp
-index 6b88a36..a3e08a3 100644
 a/src/rospack.cpp
-+++ b/src/rospack.cpp
-@@ -259,7 +259,7 @@ Rosstackage::~Rosstackage()
- 
- void Rosstackage::clearStackages()
- {
--  for(std::tr1::unordered_map::const_iterator it = 
stackages_.begin();
-+  for(boost::unordered_map::const_iterator it = 
stackages_.begin();
-   it != stackages_.end();
-   ++it)
-   {
-@@ -382,7 +382,7 @@ Rosstackage::crawl(std::vector search_path,
-   search_paths_ = search_path;
- 
-   std::vector dummy;
--  std::tr1::unordered_set dummy2;
-+  boost::unordered_set dummy2;
-   for(std::vector::const_iterator p = search_paths_.begin();
-   p != search_paths_.end();
-   ++p)
-@@ -447,7 +447,7 @@ Rosstackage::contents(const std::string& name,
-   std::set& packages)
- {
-   Rospack rp2;
--  std::tr1::unordered_map::const_iterator it = 
stackages_.find(name);
-+  boost::unordered_map::const_iterator

[gentoo-commits] repo/gentoo:master commit in: dev-ros/rospack/, dev-ros/rospack/files/

2017-09-08 Thread Alexis Ballier 
commit: 23735e06d572cf187f5ed4a6b32d3deabba4a7b9
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Sep  8 07:16:10 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Sep  8 07:16:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23735e06

dev-ros/rospack: backport upstream patch to build with boost 1.65, bug #629900

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-ros/rospack/files/boost165.patch | 231 +++
 dev-ros/rospack/rospack-2.4.2.ebuild |   1 +
 2 files changed, 232 insertions(+)

diff --git a/dev-ros/rospack/files/boost165.patch 
b/dev-ros/rospack/files/boost165.patch
new file mode 100644
index 000..fda1c666810
--- /dev/null
+++ b/dev-ros/rospack/files/boost165.patch
@@ -0,0 +1,231 @@
+commit 6fcee1b0d2b1c225c39a5820981166b99f0d8750
+Author: Tim Rakowski 
+Date:   Mon Sep 4 21:41:11 2017 +0200
+
+Replaced references to deprecated Boost.TR1
+
+boost/tr1 includes where removed with boost 1.65
+
+diff --git a/include/rospack/rospack.h b/include/rospack/rospack.h
+index 4389187..bb7bc2e 100644
+--- a/include/rospack/rospack.h
 b/include/rospack/rospack.h
+@@ -105,8 +105,8 @@ and Rosstack.
+ #ifndef ROSPACK_ROSPACK_H
+ #define ROSPACK_ROSPACK_H
+ 
+-#include 
+-#include 
++#include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -148,8 +148,8 @@ class ROSPACK_DECL Rosstackage
+ std::string tag_;
+ bool quiet_;
+ std::vector search_paths_;
+-std::tr1::unordered_map dups_;
+-std::tr1::unordered_map stackages_;
++boost::unordered_map dups_;
++boost::unordered_map stackages_;
+ Stackage* findWithRecrawl(const std::string& name);
+ void log(const std::string& level, const std::string& msg, bool 
append_errno);
+ void clearStackages();
+@@ -159,7 +159,7 @@ class ROSPACK_DECL Rosstackage
+  int depth,
+  bool collect_profile_data,
+  std::vector& profile_data,
+- std::tr1::unordered_set& profile_hash);
++ boost::unordered_set& profile_hash);
+ bool isStackage(const std::string& path);
+ void loadManifest(Stackage* stackage);
+ void computeDeps(Stackage* stackage, bool ignore_errors=false, bool 
ignore_missing=false);
+@@ -171,7 +171,7 @@ class ROSPACK_DECL Rosstackage
+ bool no_recursion_on_wet=false);
+ void gatherDepsFull(Stackage* stackage, bool direct,
+ traversal_order_t order, int depth,
+-std::tr1::unordered_set& deps_hash,
++boost::unordered_set& deps_hash,
+ std::vector& deps,
+ bool get_indented_deps,
+ std::vector& indented_deps,
+diff --git a/src/rospack.cpp b/src/rospack.cpp
+index 6b88a36..a3e08a3 100644
+--- a/src/rospack.cpp
 b/src/rospack.cpp
+@@ -259,7 +259,7 @@ Rosstackage::~Rosstackage()
+ 
+ void Rosstackage::clearStackages()
+ {
+-  for(std::tr1::unordered_map::const_iterator it = 
stackages_.begin();
++  for(boost::unordered_map::const_iterator it = 
stackages_.begin();
+   it != stackages_.end();
+   ++it)
+   {
+@@ -382,7 +382,7 @@ Rosstackage::crawl(std::vector search_path,
+   search_paths_ = search_path;
+ 
+   std::vector dummy;
+-  std::tr1::unordered_set dummy2;
++  boost::unordered_set dummy2;
+   for(std::vector::const_iterator p = search_paths_.begin();
+   p != search_paths_.end();
+   ++p)
+@@ -447,7 +447,7 @@ Rosstackage::contents(const std::string& name,
+   std::set& packages)
+ {
+   Rospack rp2;
+-  std::tr1::unordered_map::const_iterator it = 
stackages_.find(name);
++  boost::unordered_map::const_iterator it = 
stackages_.find(name);
+   if(it != stackages_.end())
+   {
+ std::vector search_paths;
+@@ -474,7 +474,7 @@ Rosstackage::contains(const std::string& name,
+   std::string& path)
+ {
+   Rospack rp2;
+-  for(std::tr1::unordered_map::const_iterator it = 
stackages_.begin();
++  for(boost::unordered_map::const_iterator it = 
stackages_.begin();
+   it != stackages_.end();
+   ++it)
+   {
+@@ -503,7 +503,7 @@ Rosstackage::contains(const std::string& name,
+ void
+ Rosstackage::list(std::set >& list)
+ {
+-  for(std::tr1::unordered_map::const_iterator it = 
stackages_.begin();
++  for(boost::unordered_map::const_iterator it = 
stackages_.begin();
+   it != stackages_.end();
+   ++it)
+   {
+@@ -519,7 +519,7 @@

[gentoo-commits] repo/gentoo:master commit in: dev-ros/rospack/, dev-ros/rospack/files/

2017-07-07 Thread Alexis Ballier 
commit: 2acf3a14236e928d6a3c3a3323bd825cd4d593ea
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jul  7 07:05:46 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Jul  7 07:10:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2acf3a14

dev-ros/rospack: simplify on top of recent ros-catkin.eclass changes.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ros/rospack/files/multipy.patch  | 40 
 dev-ros/rospack/rospack-2.4.1.ebuild | 10 -
 dev-ros/rospack/rospack-.ebuild  | 10 -
 3 files changed, 60 deletions(-)

diff --git a/dev-ros/rospack/files/multipy.patch 
b/dev-ros/rospack/files/multipy.patch
deleted file mode 100644
index 8350cc0a8da..000
--- a/dev-ros/rospack/files/multipy.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Install separate libraries linking to different python implementations.
-
-Index: rospack-2.4.1/CMakeLists.txt
-===
 rospack-2.4.1.orig/CMakeLists.txt
-+++ rospack-2.4.1/CMakeLists.txt
-@@ -23,28 +23,28 @@ endif()
- 
- include_directories(include ${TinyXML2_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} 
${PYTHON_INCLUDE_DIRS})
- 
--add_library(rospack
-+add_library(rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
-   src/rospack.cpp
-   ${backcompat_source}
-   src/rospack_cmdline.cpp
-   src/utils.cpp
- )
--target_link_libraries(rospack ${TinyXML2_LIBRARIES} ${Boost_LIBRARIES} 
${PYTHON_LIBRARIES})
-+target_link_libraries(rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
 ${TinyXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
- 
- add_executable(rospackexe src/rospack_main.cpp)
- # Set the name, and make it a "global" executable
- set_target_properties(rospackexe PROPERTIES
-   OUTPUT_NAME rospack
-   RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin)
--target_link_libraries(rospackexe rospack ${Boost_LIBRARIES})
-+target_link_libraries(rospackexe 
rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${Boost_LIBRARIES})
- add_executable(rosstackexe src/rosstack_main.cpp)
--target_link_libraries(rosstackexe rospack ${Boost_LIBRARIES})
-+target_link_libraries(rosstackexe 
rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${Boost_LIBRARIES})
- # Set the name, and make it a "global" executable
- set_target_properties(rosstackexe PROPERTIES
-   OUTPUT_NAME rosstack
-   RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin)
- 
--install(TARGETS rospack rospackexe rosstackexe
-+install(TARGETS rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} 
rospackexe rosstackexe
-   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})

diff --git a/dev-ros/rospack/rospack-2.4.1.ebuild 
b/dev-ros/rospack/rospack-2.4.1.ebuild
index 7d49abfd959..18b9f633ad3 100644
--- a/dev-ros/rospack/rospack-2.4.1.ebuild
+++ b/dev-ros/rospack/rospack-2.4.1.ebuild
@@ -5,7 +5,6 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/rospack;
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit ros-catkin
 
@@ -29,13 +28,4 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/gentoo.patch"
-   "${FILESDIR}/multipy.patch"
 )
-
-src_install() {
-   ros-catkin_src_install
-   # Assume greatest alphabetically is what we want as default 
implementation
-   for i in "${ED}"/usr/$(get_libdir)/librospack*.so ; do
-   dosym $(basename "${i}") /usr/$(get_libdir)/librospack.so
-   done
-}

diff --git a/dev-ros/rospack/rospack-.ebuild 
b/dev-ros/rospack/rospack-.ebuild
index 7d49abfd959..18b9f633ad3 100644
--- a/dev-ros/rospack/rospack-.ebuild
+++ b/dev-ros/rospack/rospack-.ebuild
@@ -5,7 +5,6 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/rospack;
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit ros-catkin
 
@@ -29,13 +28,4 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/gentoo.patch"
-   "${FILESDIR}/multipy.patch"
 )
-
-src_install() {
-   ros-catkin_src_install
-   # Assume greatest alphabetically is what we want as default 
implementation
-   for i in "${ED}"/usr/$(get_libdir)/librospack*.so ; do
-   dosym $(basename "${i}") /usr/$(get_libdir)/librospack.so
-   done
-}

[gentoo-commits] repo/gentoo:master commit in: dev-ros/rospack/, dev-ros/rospack/files/

2016-11-28 Thread Alexis Ballier 
commit: e504013dc705a9ab392b14b65716f9b02833ad3c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Nov 28 14:30:30 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e504013d

dev-ros/rospack: add custom patch to return proper package paths with our 
package.xml moved to ros_packages.

Package-Manager: portage-2.3.2

 dev-ros/rospack/files/gentoo.patch | 18 ++
 .../{rospack-2.3.1.ebuild => rospack-2.3.1-r1.ebuild}  |  1 +
 dev-ros/rospack/rospack-.ebuild|  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dev-ros/rospack/files/gentoo.patch 
b/dev-ros/rospack/files/gentoo.patch
new file mode 100644
index ..7090d7b
--- /dev/null
+++ b/dev-ros/rospack/files/gentoo.patch
@@ -0,0 +1,18 @@
+Index: rospack-2.3.1/src/rospack.cpp
+===
+--- rospack-2.3.1.orig/src/rospack.cpp
 rospack-2.3.1/src/rospack.cpp
+@@ -191,6 +191,13 @@ class Stackage
+   break;
+ }
+   }
++
++  // On Gentoo we move package.xml to /usr/share/ros_packages/... but 
need to keep standard stuff in /usr/share, so correct this here.
++  try {
++  fs::path p = fs::canonical("../../" + name_, path_);
++  path_ = p.string();
++  }
++  catch(fs::filesystem_error& e) {};
+ }
+ 
+ bool isStack() const

diff --git a/dev-ros/rospack/rospack-2.3.1.ebuild 
b/dev-ros/rospack/rospack-2.3.1-r1.ebuild
similarity index 93%
rename from dev-ros/rospack/rospack-2.3.1.ebuild
rename to dev-ros/rospack/rospack-2.3.1-r1.ebuild
index 60535c5..61b544e 100644
--- a/dev-ros/rospack/rospack-2.3.1.ebuild
+++ b/dev-ros/rospack/rospack-2.3.1-r1.ebuild
@@ -17,6 +17,7 @@ DESCRIPTION="Retrieves information about ROS packages 
available on the filesyste
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
+PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 RDEPEND="dev-libs/boost:=
dev-libs/tinyxml

diff --git a/dev-ros/rospack/rospack-.ebuild 
b/dev-ros/rospack/rospack-.ebuild
index 4d7f1ab..61b544e 100644
--- a/dev-ros/rospack/rospack-.ebuild
+++ b/dev-ros/rospack/rospack-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,6 +17,7 @@ DESCRIPTION="Retrieves information about ROS packages 
available on the filesyste
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
+PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 RDEPEND="dev-libs/boost:=
dev-libs/tinyxml