gentoo resync : 25.08.2020

4 files changed, 75 insertions, 65 deletions

diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 99bc2088146a..d2a51cf3e105 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,5 @@
-AUX pcl111.patch 39097 BLAKE2B c9612c7a10f9bf92d4aa3b1d053035f13c682ecdd3cabfdb23cc0152a31fa7b1da0f9d0e18a22242a76ab7e8601b0fb3c52d300baf3839e84c6b127c58daf39b SHA512 fe8330ca9c1991a274310918a0f575cbb5b83e48969cb8cb285032f7a5e8d571c9dae131837aeaf1edbec18baaedf27ece82e428d4d960d73f5b0aa86e5861f3
+AUX pcl111.patch 38649 BLAKE2B 8895cde34c315ba81f522d55fd6b692725ded70f7dbfd38d7e502b2303dd48041cd1e0bef1a685f204d82c9d42f76f3bf4b957c2859a97b761ee4b2790224ff0 SHA512 b745640d86c9b01a0c7d2777ac8c6a8ce81c9544ae7f74ea0aff7d31823c66eca47ac82ad150980b009d702113412501deed7c700d55a44d2307f4dce444be03
 DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
-EBUILD pcl_ros-1.7.1.ebuild 954 BLAKE2B baa8161e13c24fb884917b21f9d6d5cc80f69d345bdb6903a1775f7bc4f0eb49d1675381ff86eb9d5595005496d829f273f09f1422839958e6ad4c5963277c86 SHA512 ff793a450e3b1e9891a433291b9ca2957a18e17f63bc7a9d9b0ec818a8af039cc902148d6cb172d1f7450673ebbd72dabd03533e7be134b2abb4cd22cee6eccc
-EBUILD pcl_ros-9999.ebuild 915 BLAKE2B e15107eeae1fa3524c5f217a4bb58d07e90ff54a04557081d3792dfdd98d8f508175b43b11ef17da4f59946c64c627b103cdebaad1b79b4bb8f32be2867015c7 SHA512 8e3fa2c8ddb14638e2995b2bc857fb4dc8ffa0342f45be94ce59fc1887fed001fc1ce89792d4094a07a1553a43d73d38cb99e65c27d27cdb9fa4e91b2fd0700c
+EBUILD pcl_ros-1.7.1.ebuild 1033 BLAKE2B ef5a8708cf349a21b0956f8bcb8cab54955efb6ff57298979eb9c903534dbced365b2349e6694df0149871126583c78815c942d6d8459f76f8bb7c67d2977be4 SHA512 5e160e32e0d85079a670ed4d34a982a728cc0ad58245e6cfe1df5a827327551d7396f9f0e02f020ccbf414dd7b35da697c5d23b95c50de7f96640d0d2c2b7d78
+EBUILD pcl_ros-9999.ebuild 994 BLAKE2B 1c511a19b65338b27ecbe38ed5dc2301b0571271b56dc5d9b873ae6b43cdd6d385dae70fa7b4f33ddfb96aa40c3d42e30bb6fc8d74d047a0138b85f5cf8ce6f6 SHA512 8e642915515fd6b7016f8e23306f1cb95b6f753c80d7aebdd6531f398f9b1b2168ef932f00b717fbce5192f3c55039a53f7a8ee5f17d1115cc1346471050ebd4
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/files/pcl111.patch b/dev-ros/pcl_ros/files/pcl111.patch
index 8f3433ffccaa..839e87dcf0a1 100644
--- a/dev-ros/pcl_ros/files/pcl111.patch
+++ b/dev-ros/pcl_ros/files/pcl111.patch
@@ -45,8 +45,8 @@ Subject: [PATCH] Changes in preparation for PCL 1.11 (#273)
 
 diff --git a/pcl_ros/include/pcl_ros/features/feature.h b/pcl_ros/include/pcl_ros/features/feature.h
 index 26bcfe6b..098c20bc 100644
---- a/pcl_ros/include/pcl_ros/features/feature.h
-+++ b/pcl_ros/include/pcl_ros/features/feature.h
+--- a/include/pcl_ros/features/feature.h
++++ b/include/pcl_ros/features/feature.h
 @@ -69,11 +69,11 @@ namespace pcl_ros
        typedef pcl::KdTree<pcl::PointXYZ>::Ptr KdTreePtr;
  
@@ -85,8 +85,8 @@ index 26bcfe6b..098c20bc 100644
  
 diff --git a/pcl_ros/include/pcl_ros/filters/filter.h b/pcl_ros/include/pcl_ros/filters/filter.h
 index 94c1e883..b4e79538 100644
---- a/pcl_ros/include/pcl_ros/filters/filter.h
-+++ b/pcl_ros/include/pcl_ros/filters/filter.h
+--- a/include/pcl_ros/filters/filter.h
++++ b/include/pcl_ros/filters/filter.h
 @@ -58,8 +58,8 @@ namespace pcl_ros
      public:
        typedef sensor_msgs::PointCloud2 PointCloud2;
@@ -100,8 +100,8 @@ index 94c1e883..b4e79538 100644
  
 diff --git a/pcl_ros/include/pcl_ros/pcl_nodelet.h b/pcl_ros/include/pcl_ros/pcl_nodelet.h
 index f12e62d7..279d6730 100644
---- a/pcl_ros/include/pcl_ros/pcl_nodelet.h
-+++ b/pcl_ros/include/pcl_ros/pcl_nodelet.h
+--- a/include/pcl_ros/pcl_nodelet.h
++++ b/include/pcl_ros/pcl_nodelet.h
 @@ -48,6 +48,7 @@
  // PCL includes
  #include <pcl_msgs/PointIndices.h>
@@ -134,8 +134,8 @@ index f12e62d7..279d6730 100644
        PCLNodelet () : use_indices_ (false), latched_indices_ (false),
 diff --git a/pcl_ros/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.h
 index bbf30ad1..93df7365 100644
---- a/pcl_ros/include/pcl_ros/point_cloud.h
-+++ b/pcl_ros/include/pcl_ros/point_cloud.h
+--- a/include/pcl_ros/point_cloud.h
++++ b/include/pcl_ros/point_cloud.h
 @@ -270,4 +270,125 @@ namespace ros
  
  } // namespace ros
@@ -264,8 +264,8 @@ index bbf30ad1..93df7365 100644
  #endif
 diff --git a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
 index 7134f905..13b85316 100644
---- a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
+--- a/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
++++ b/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
 @@ -64,8 +64,8 @@ namespace pcl_ros
    class ExtractPolygonalPrismData : public PCLNodelet
    {
@@ -279,8 +279,8 @@ index 7134f905..13b85316 100644
         /** \brief The output PointIndices publisher. */
 diff --git a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
 index af2c9126..9243e363 100644
---- a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
+--- a/include/pcl_ros/segmentation/sac_segmentation.h
++++ b/include/pcl_ros/segmentation/sac_segmentation.h
 @@ -61,8 +61,8 @@ namespace pcl_ros
    class SACSegmentation : public PCLNodelet
    {
@@ -311,8 +311,8 @@ index af2c9126..9243e363 100644
        /** \brief Set the input TF frame the data should be transformed into before processing, if input.header.frame_id is different.
 diff --git a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h b/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
 index 4914bc86..da767ab3 100644
---- a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
+--- a/include/pcl_ros/segmentation/segment_differences.h
++++ b/include/pcl_ros/segmentation/segment_differences.h
 @@ -60,8 +60,8 @@ namespace pcl_ros
    class SegmentDifferences : public PCLNodelet
    {
@@ -326,8 +326,8 @@ index 4914bc86..da767ab3 100644
        /** \brief Empty constructor. */
 diff --git a/pcl_ros/include/pcl_ros/surface/convex_hull.h b/pcl_ros/include/pcl_ros/surface/convex_hull.h
 index e419c0f8..54a1f367 100644
---- a/pcl_ros/include/pcl_ros/surface/convex_hull.h
-+++ b/pcl_ros/include/pcl_ros/surface/convex_hull.h
+--- a/include/pcl_ros/surface/convex_hull.h
++++ b/include/pcl_ros/surface/convex_hull.h
 @@ -53,8 +53,8 @@ namespace pcl_ros
    class ConvexHull2D : public PCLNodelet
    {
@@ -341,8 +341,8 @@ index e419c0f8..54a1f367 100644
        /** \brief Nodelet initialization routine. */
 diff --git a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h b/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
 index b909edf8..e90f562a 100644
---- a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
-+++ b/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
+--- a/include/pcl_ros/surface/moving_least_squares.h
++++ b/include/pcl_ros/surface/moving_least_squares.h
 @@ -62,8 +62,8 @@ namespace pcl_ros
      typedef pcl::PointNormal NormalOut;
  
@@ -356,8 +356,8 @@ index b909edf8..e90f562a 100644
      typedef pcl::KdTree<PointIn> KdTree;
 diff --git a/pcl_ros/src/pcl_ros/features/boundary.cpp b/pcl_ros/src/pcl_ros/features/boundary.cpp
 index 9334641a..26ee07c1 100644
---- a/pcl_ros/src/pcl_ros/features/boundary.cpp
-+++ b/pcl_ros/src/pcl_ros/features/boundary.cpp
+--- a/src/pcl_ros/features/boundary.cpp
++++ b/src/pcl_ros/features/boundary.cpp
 @@ -43,7 +43,7 @@ pcl_ros::BoundaryEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -391,8 +391,8 @@ index 9334641a..26ee07c1 100644
  typedef pcl_ros::BoundaryEstimation BoundaryEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/fpfh.cpp b/pcl_ros/src/pcl_ros/features/fpfh.cpp
 index 3f698aad..53be549c 100644
---- a/pcl_ros/src/pcl_ros/features/fpfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/fpfh.cpp
+--- a/src/pcl_ros/features/fpfh.cpp
++++ b/src/pcl_ros/features/fpfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::FPFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -427,8 +427,8 @@ index 3f698aad..53be549c 100644
  typedef pcl_ros::FPFHEstimation FPFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
 index 58dd911f..e4adcabb 100644
---- a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
+--- a/src/pcl_ros/features/fpfh_omp.cpp
++++ b/src/pcl_ros/features/fpfh_omp.cpp
 @@ -43,7 +43,7 @@ pcl_ros::FPFHEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -463,8 +463,8 @@ index 58dd911f..e4adcabb 100644
  typedef pcl_ros::FPFHEstimationOMP FPFHEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
 index d0ec3441..a6e2249a 100644
---- a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
-+++ b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
+--- a/src/pcl_ros/features/moment_invariants.cpp
++++ b/src/pcl_ros/features/moment_invariants.cpp
 @@ -43,7 +43,7 @@ pcl_ros::MomentInvariantsEstimation::emptyPublish (const PointCloudInConstPtr &c
  {
    PointCloudOut output;
@@ -497,8 +497,8 @@ index d0ec3441..a6e2249a 100644
  typedef pcl_ros::MomentInvariantsEstimation MomentInvariantsEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d.cpp b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
 index 9e700f78..042186a9 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
+--- a/src/pcl_ros/features/normal_3d.cpp
++++ b/src/pcl_ros/features/normal_3d.cpp
 @@ -43,7 +43,7 @@ pcl_ros::NormalEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -531,8 +531,8 @@ index 9e700f78..042186a9 100644
  typedef pcl_ros::NormalEstimation NormalEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
 index a741c052..3e92d2f2 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
+--- a/src/pcl_ros/features/normal_3d_omp.cpp
++++ b/src/pcl_ros/features/normal_3d_omp.cpp
 @@ -43,7 +43,7 @@ pcl_ros::NormalEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -565,8 +565,8 @@ index a741c052..3e92d2f2 100644
  typedef pcl_ros::NormalEstimationOMP NormalEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
 index a4a8581e..680a4a02 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
+--- a/src/pcl_ros/features/normal_3d_tbb.cpp
++++ b/src/pcl_ros/features/normal_3d_tbb.cpp
 @@ -45,7 +45,7 @@ pcl_ros::NormalEstimationTBB::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloud output;
@@ -587,8 +587,8 @@ index a4a8581e..680a4a02 100644
  typedef pcl_ros::NormalEstimationTBB NormalEstimationTBB;
 diff --git a/pcl_ros/src/pcl_ros/features/pfh.cpp b/pcl_ros/src/pcl_ros/features/pfh.cpp
 index 38b4d19c..dd8409e2 100644
---- a/pcl_ros/src/pcl_ros/features/pfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/pfh.cpp
+--- a/src/pcl_ros/features/pfh.cpp
++++ b/src/pcl_ros/features/pfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::PFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -623,8 +623,8 @@ index 38b4d19c..dd8409e2 100644
  typedef pcl_ros::PFHEstimation PFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
 index 113124dc..501d686e 100644
---- a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
-+++ b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
+--- a/src/pcl_ros/features/principal_curvatures.cpp
++++ b/src/pcl_ros/features/principal_curvatures.cpp
 @@ -43,7 +43,7 @@ pcl_ros::PrincipalCurvaturesEstimation::emptyPublish (const PointCloudInConstPtr
  {
    PointCloudOut output;
@@ -659,8 +659,8 @@ index 113124dc..501d686e 100644
  typedef pcl_ros::PrincipalCurvaturesEstimation PrincipalCurvaturesEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/shot.cpp b/pcl_ros/src/pcl_ros/features/shot.cpp
 index d051ab0f..ed6ba44b 100644
---- a/pcl_ros/src/pcl_ros/features/shot.cpp
-+++ b/pcl_ros/src/pcl_ros/features/shot.cpp
+--- a/src/pcl_ros/features/shot.cpp
++++ b/src/pcl_ros/features/shot.cpp
 @@ -42,7 +42,7 @@ pcl_ros::SHOTEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -695,8 +695,8 @@ index d051ab0f..ed6ba44b 100644
  typedef pcl_ros::SHOTEstimation SHOTEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/shot_omp.cpp b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
 index 1ac1b065..4563f123 100644
---- a/pcl_ros/src/pcl_ros/features/shot_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
+--- a/src/pcl_ros/features/shot_omp.cpp
++++ b/src/pcl_ros/features/shot_omp.cpp
 @@ -42,7 +42,7 @@ pcl_ros::SHOTEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -731,8 +731,8 @@ index 1ac1b065..4563f123 100644
  typedef pcl_ros::SHOTEstimationOMP SHOTEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/vfh.cpp b/pcl_ros/src/pcl_ros/features/vfh.cpp
 index 9d0fe361..ece448fd 100644
---- a/pcl_ros/src/pcl_ros/features/vfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/vfh.cpp
+--- a/src/pcl_ros/features/vfh.cpp
++++ b/src/pcl_ros/features/vfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::VFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -767,8 +767,8 @@ index 9d0fe361..ece448fd 100644
  typedef pcl_ros::VFHEstimation VFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
 index 17adec46..5599b408 100644
---- a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
+--- a/src/pcl_ros/segmentation/extract_clusters.cpp
++++ b/src/pcl_ros/segmentation/extract_clusters.cpp
 @@ -202,7 +202,7 @@ pcl_ros::EuclideanClusterExtraction::input_indices_callback (
    if (indices)
      indices_ptr.reset (new std::vector<int> (indices->indices));
@@ -789,8 +789,8 @@ index 17adec46..5599b408 100644
      }
 diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
 index 0185bfbe..ff823b19 100644
---- a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
+--- a/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
++++ b/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
 @@ -189,16 +189,16 @@ pcl_ros::ExtractPolygonalPrismData::input_hull_indices_callback (
        pub_output_.publish (inliers);
        return;
@@ -813,8 +813,8 @@ index 0185bfbe..ff823b19 100644
    // Final check if the data is empty (remember that indices are set to the size of the data -- if indices* = NULL)
 diff --git a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
 index b73dd3fd..bc7b97e7 100644
---- a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
+--- a/src/pcl_ros/segmentation/sac_segmentation.cpp
++++ b/src/pcl_ros/segmentation/sac_segmentation.cpp
 @@ -324,7 +324,7 @@ pcl_ros::SACSegmentation::input_indices_callback (const PointCloudConstPtr &clou
    if (indices && !indices->header.frame_id.empty ())
      indices_ptr.reset (new std::vector<int> (indices->indices));
@@ -837,8 +837,8 @@ index b73dd3fd..bc7b97e7 100644
    if (indices && !indices->header.frame_id.empty ())
 diff --git a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
 index 4c934152..e3979549 100644
---- a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
+--- a/src/pcl_ros/segmentation/segment_differences.cpp
++++ b/src/pcl_ros/segmentation/segment_differences.cpp
 @@ -115,7 +115,7 @@ pcl_ros::SegmentDifferences::input_target_callback (const PointCloudConstPtr &cl
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
      PointCloud output;
@@ -867,8 +867,8 @@ index 4c934152..e3979549 100644
  }
 diff --git a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
 index 4b7eeaf5..75903889 100644
---- a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
-+++ b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
+--- a/src/pcl_ros/surface/convex_hull.cpp
++++ b/src/pcl_ros/surface/convex_hull.cpp
 @@ -121,7 +121,7 @@ void
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
      // Publish an empty message
@@ -907,8 +907,8 @@ index 4b7eeaf5..75903889 100644
  typedef pcl_ros::ConvexHull2D ConvexHull2D;
 diff --git a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
 index b9a01e64..99e5d481 100644
---- a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
-+++ b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
+--- a/src/pcl_ros/surface/moving_least_squares.cpp
++++ b/src/pcl_ros/surface/moving_least_squares.cpp
 @@ -141,7 +141,7 @@ pcl_ros::MovingLeastSquares::input_indices_callback (const PointCloudInConstPtr
    {
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
@@ -950,8 +950,8 @@ index b9a01e64..99e5d481 100644
  //////////////////////////////////////////////////////////////////////////////////////////////
 diff --git a/pcl_ros/tools/pointcloud_to_pcd.cpp b/pcl_ros/tools/pointcloud_to_pcd.cpp
 index 484113da..fb149b46 100644
---- a/pcl_ros/tools/pointcloud_to_pcd.cpp
-+++ b/pcl_ros/tools/pointcloud_to_pcd.cpp
+--- a/tools/pointcloud_to_pcd.cpp
++++ b/tools/pointcloud_to_pcd.cpp
 @@ -78,7 +78,7 @@ class PointCloudToPCD
      ////////////////////////////////////////////////////////////////////////////////
      // Callback
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
index 0ffd456d66af..5d3ff3e64a29 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-ros/rosbag
 	dev-ros/rosconsole
 	dev-ros/roslib
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/message_filters
 	>=dev-cpp/eigen-3.2.5:3
 	dev-ros/pluginlib
@@ -32,9 +32,14 @@ RDEPEND="
 	sci-libs/pcl:=[qhull]
 	>=dev-ros/pcl_conversions-0.2.1-r1
 	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
 	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
 "
-DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/pcl111.patch" )
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index 2101a7b6837e..95393ac0ab86 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-ros/rosbag
 	dev-ros/rosconsole
 	dev-ros/roslib
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/message_filters
 	>=dev-cpp/eigen-3.2.5:3
 	dev-ros/pluginlib
@@ -32,8 +32,13 @@ RDEPEND="
 	sci-libs/pcl:=[qhull]
 	>=dev-ros/pcl_conversions-0.2.1-r1
 	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
 	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
 "
-DEPEND="${RDEPEND}"