commit: b971d8812605a9a459f650f7c3e54e784d8a67e5 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Wed Aug 23 07:03:18 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Wed Aug 23 07:30:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b971d881
dev-ros/amcl: Remove old Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-ros/amcl/Manifest | 2 -- dev-ros/amcl/amcl-1.14.0.ebuild | 30 ------------------------------ dev-ros/amcl/amcl-1.14.2.ebuild | 28 ---------------------------- dev-ros/amcl/files/gcc7.patch | 41 ----------------------------------------- 4 files changed, 101 deletions(-) diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest index 5f02d97a23e..84d0ae863fe 100644 --- a/dev-ros/amcl/Manifest +++ b/dev-ros/amcl/Manifest @@ -1,3 +1 @@ -DIST navigation-1.14.0.tar.gz 340196 SHA256 3974bb52af21cf0a6e4da8eb231b3101b4c5da700793bdac1cdc97e69d6e5cac SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a WHIRLPOOL 12e8b7f5043a9473033df772021c3ebae1cdf87bde52988874489e490e7dfdcb07623c588ffd1297fbbd3fc336813fc6f4e9ae812dc80dfcad3062cceb82ef0b -DIST navigation-1.14.2.tar.gz 345166 SHA256 b8be76079876ff866bce634caf862f1e2fd8e017d82c207b6aed27ca94cf0f6c SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b WHIRLPOOL d4fbea98ccf9d7d75ce6cdec54b32132b67a962b047fbf25ea2dd0c2be874e1f981d1f2de66e4a03567680e32c3bd01904429a072b99d9265c50e0baa44cdb5b DIST navigation-1.15.1.tar.gz 346480 SHA256 630f5aae5bae931e0bae9d2df85b82cfeab250c9deaee275c3c274c8987abda1 SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0 WHIRLPOOL 14c73786a595ab91cdc9e0998880518edaf2b40360f639159561d77b3f27a5d1a0d63604232ccc1f81712d592249d0723c2a5c56573475d6c486cca3c0c1aaab diff --git a/dev-ros/amcl/amcl-1.14.0.ebuild b/dev-ros/amcl/amcl-1.14.0.ebuild deleted file mode 100644 index 0e1fb5f0dbd..00000000000 --- a/dev-ros/amcl/amcl-1.14.0.ebuild +++ /dev/null @@ -1,30 +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-planning/navigation"; -ROS_SUBDIR=${PN} -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Probabilistic localization system for a robot moving in 2D" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roscpp - dev-ros/tf - dev-ros/rosbag - dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] - dev-libs/boost:= - dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-ros/rostest[${PYTHON_USEDEP}] ) -" - -PATCHES=( "${FILESDIR}/gcc7.patch" ) diff --git a/dev-ros/amcl/amcl-1.14.2.ebuild b/dev-ros/amcl/amcl-1.14.2.ebuild deleted file mode 100644 index 8f46c6b1be8..00000000000 --- a/dev-ros/amcl/amcl-1.14.2.ebuild +++ /dev/null @@ -1,28 +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-planning/navigation"; -ROS_SUBDIR=${PN} -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Probabilistic localization system for a robot moving in 2D" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roscpp - dev-ros/tf - dev-ros/rosbag - dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] - dev-libs/boost:= - dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-ros/rostest[${PYTHON_USEDEP}] ) -" diff --git a/dev-ros/amcl/files/gcc7.patch b/dev-ros/amcl/files/gcc7.patch deleted file mode 100644 index 12c19bbdd67..00000000000 --- a/dev-ros/amcl/files/gcc7.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 65261a83e7269906f726f14d7e8cc30e5f9901f0 -Author: Dmitry Rozhkov <[email protected]> -Date: Fri Jun 16 14:50:52 2017 +0300 - - amcl: fix compilation with gcc v7 - - When building amcl with recent enough gcc v7 compilation fails with - the error - - src/amcl/map/map_cspace.cpp: In function 'void enqueue(map_t*, unsigned int, unsigned int, unsigned int, unsigned int, std::priority_queue<CellData>&, CachedDistanceMap*, unsigned char*)': - src/amcl/map/map_cspace.cpp:98:34: error: call of overloaded 'abs(unsigned int)' is ambiguous - unsigned int di = abs(i - src_i); - - Use `int abs(int)` flavour of the abs() function. - -diff --git a/amcl/src/amcl/map/map_cspace.cpp b/amcl/src/amcl/map/map_cspace.cpp -index 421f718..5b4cf9c 100644 ---- a/amcl/src/amcl/map/map_cspace.cpp -+++ b/amcl/src/amcl/map/map_cspace.cpp -@@ -86,8 +86,8 @@ get_distance_map(double scale, double max_dist) - return cdm; - } - --void enqueue(map_t* map, unsigned int i, unsigned int j, -- unsigned int src_i, unsigned int src_j, -+void enqueue(map_t* map, int i, int j, -+ int src_i, int src_j, - std::priority_queue<CellData>& Q, - CachedDistanceMap* cdm, - unsigned char* marked) -@@ -95,8 +95,8 @@ void enqueue(map_t* map, unsigned int i, unsigned int j, - if(marked[MAP_INDEX(map, i, j)]) - return; - -- unsigned int di = abs(i - src_i); -- unsigned int dj = abs(j - src_j); -+ int di = abs(i - src_i); -+ int dj = abs(j - src_j); - double distance = cdm->distances_[di][dj]; - - if(distance > cdm->cell_radius_)
