gentoo resync : 15.12.2019

6 files changed, 31 insertions, 89 deletions

diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index bdb2825030ee..6b7a46b0bc14 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1,9 +1,6 @@
 AUX pgm_h_location.patch 900 BLAKE2B 2816bc6803bce70d14f5fcf10161316961ffd265d94a36e90f7d98bd381a4966bd924e352cda2f859e07ea25547e62e0d6381afa1fa3b488364634b20730830c SHA512 4c3286e18d922d292858e8fc574cc440c344ae182133539efca93cb25e16dc78149efe521499024751a46f2b4d1b63516276f1e0510028114357520d4a560d81
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-EBUILD navfn-1.16.0.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
-EBUILD navfn-1.16.1.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
-EBUILD navfn-1.16.2.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
-EBUILD navfn-9999.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
+AUX tests.patch 460 BLAKE2B 06814e0e141d4b7b75ef36bcea6dff20aadc324c700e0aa219110efac9b27316829f7faa0b83a99795998428e825568325e87e6ca52fa3696772e6e95b655aa2 SHA512 c02fa62a1446b403a535d028a1b36c1deac8a4cf09f0596ada560e696288412566c5b8e2719fd368e098f9ccfe23dec02c9d6e066cb837ea2cdf5b15523c21a2
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
+EBUILD navfn-1.16.3.ebuild 1130 BLAKE2B a748a50eb55edda7e08aff9f500732246780baf7333df7e8e80e56fe44d6ce5c130095cd069583c9f922c5f43d99834f0f98a85aea46982eddfc847b512e96ec SHA512 f667fac0acb101b32877466ad83b8f84113a2bd3f24e60d298575ecac91ae27fbed39ce1e2a2601c1361c60797fd4347bc43f4721d6f4695f6f420f7e7bbbb3c
+EBUILD navfn-9999.ebuild 1130 BLAKE2B a748a50eb55edda7e08aff9f500732246780baf7333df7e8e80e56fe44d6ce5c130095cd069583c9f922c5f43d99834f0f98a85aea46982eddfc847b512e96ec SHA512 f667fac0acb101b32877466ad83b8f84113a2bd3f24e60d298575ecac91ae27fbed39ce1e2a2601c1361c60797fd4347bc43f4721d6f4695f6f420f7e7bbbb3c
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/navfn/files/tests.patch b/dev-ros/navfn/files/tests.patch
new file mode 100644
index 000000000000..2dcd222f6082
--- /dev/null
+++ b/dev-ros/navfn/files/tests.patch
@@ -0,0 +1,13 @@
+Index: navfn/test/path_calc_test.cpp
+===================================================================
+--- navfn.orig/test/path_calc_test.cpp
++++ navfn/test/path_calc_test.cpp
+@@ -38,7 +38,7 @@
+ navfn::NavFn* make_willow_nav()
+ {
+   int sx,sy;
+-  std::string path = ros::package::getPath( ROS_PACKAGE_NAME ) + "/test/willow_costmap.pgm";
++  std::string path = @PGM_PATH@ ;
+ 
+   COSTTYPE *cmap = readPGM( path.c_str(), &sx, &sy, true );
+   if( cmap == NULL )
diff --git a/dev-ros/navfn/navfn-1.16.1.ebuild b/dev-ros/navfn/navfn-1.16.1.ebuild
deleted file mode 100644
index da9427d6977b..000000000000
--- a/dev-ros/navfn/navfn-1.16.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-cpp/eigen:3
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/navfn/navfn-1.16.2.ebuild b/dev-ros/navfn/navfn-1.16.2.ebuild
deleted file mode 100644
index da9427d6977b..000000000000
--- a/dev-ros/navfn/navfn-1.16.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
-	dev-cpp/eigen:3
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/navfn/navfn-1.16.0.ebuild b/dev-ros/navfn/navfn-1.16.3.ebuild
index da9427d6977b..a65e0eb3f75f 100644
--- a/dev-ros/navfn/navfn-1.16.0.ebuild
+++ b/dev-ros/navfn/navfn-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,4 +36,9 @@ DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
 	dev-ros/cmake_modules"
 
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
+PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${FILESDIR}/tests.patch" )
+
+src_prepare() {
+	ros-catkin_src_prepare
+	sed -e "s#@PGM_PATH@#\"${S}/test/willow_costmap.pgm\"#" -i test/path_calc_test.cpp || die
+}
diff --git a/dev-ros/navfn/navfn-9999.ebuild b/dev-ros/navfn/navfn-9999.ebuild
index da9427d6977b..a65e0eb3f75f 100644
--- a/dev-ros/navfn/navfn-9999.ebuild
+++ b/dev-ros/navfn/navfn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,4 +36,9 @@ DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
 	dev-ros/cmake_modules"
 
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
+PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${FILESDIR}/tests.patch" )
+
+src_prepare() {
+	ros-catkin_src_prepare
+	sed -e "s#@PGM_PATH@#\"${S}/test/willow_costmap.pgm\"#" -i test/path_calc_test.cpp || die
+}