summaryrefslogtreecommitdiff
path: root/dev-ros/geodesy
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/geodesy
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/geodesy')
-rw-r--r--dev-ros/geodesy/Manifest9
-rw-r--r--dev-ros/geodesy/files/py3.patch41
-rw-r--r--dev-ros/geodesy/geodesy-0.5.3.ebuild34
-rw-r--r--dev-ros/geodesy/geodesy-0.5.5.ebuild (renamed from dev-ros/geodesy/geodesy-0.5.2.ebuild)21
-rw-r--r--dev-ros/geodesy/geodesy-9999.ebuild21
5 files changed, 67 insertions, 59 deletions
diff --git a/dev-ros/geodesy/Manifest b/dev-ros/geodesy/Manifest
index cae190019742..4dd262bc9ca1 100644
--- a/dev-ros/geodesy/Manifest
+++ b/dev-ros/geodesy/Manifest
@@ -1,6 +1,5 @@
-DIST geographic_info-0.5.2.tar.gz 27336 BLAKE2B f864d8b70b5b0d797cec81e25a25d0dd708bcc49c169f68216616d900b1d11918583f6f5ec4a919ad03b08ee86b2a36cde575c1054c58a93974d4c4faf6e2aae SHA512 8b512399ef61ebfb9816c613ed4fcde23ec52a9b4bbd1bb7268c8ec7fe03b1a157435fef17b8af72fdf88ce6ed0b9130473183402e0875a25eac0ac46df0d00d
-DIST geographic_info-0.5.3.tar.gz 27446 BLAKE2B 51463f872829224c618b1d37c3d07ba53ee00b4f3e48bbc202d9ab4abfe8db8148dbbfdb6780af5aaf36ab9e9a7dca973b603a22139a192a96f6bcef87fa52a5 SHA512 681aad5ba62363cf96255351e884c8ba8d3110571e6e97c9340f8d15f38183900c2a04e109416b4113a0a042ebd9cdb8fe075c507200dac06052b444f4212ab3
-EBUILD geodesy-0.5.2.ebuild 922 BLAKE2B 170b34114ed6956bfdc5ef882506f98fc204eba06c7d8170a856a4755227f04e89fddabfa136b440bf41b392535a6380cbb62f7fa460158560af70d8f684b331 SHA512 f6bfc50f7a3a6ee2adc0d289b8c228d6ef6a5b81cbb871aa2bc5eb199dc3279ac31dcb53ee21024e98eab14f6a9192c8d3043dfee53ce3a686955770361105a6
-EBUILD geodesy-0.5.3.ebuild 922 BLAKE2B 64d71fb96af8e464eef79ace35a2dbde3e872f700722564954749db2340915e52ee2fd2024e748e32e73deb2582645d0b23ee16fff098e7b2d22bf7d0afd34c4 SHA512 c700061f025f946a9ff4d53172c55a3df92c4f32cfaff97454c471293f978b39e46c05ebbeea7ce0d92cb1ba891e6d5d43c24157cf197159886a9d1a59a19f00
-EBUILD geodesy-9999.ebuild 922 BLAKE2B 170b34114ed6956bfdc5ef882506f98fc204eba06c7d8170a856a4755227f04e89fddabfa136b440bf41b392535a6380cbb62f7fa460158560af70d8f684b331 SHA512 f6bfc50f7a3a6ee2adc0d289b8c228d6ef6a5b81cbb871aa2bc5eb199dc3279ac31dcb53ee21024e98eab14f6a9192c8d3043dfee53ce3a686955770361105a6
+AUX py3.patch 1627 BLAKE2B 050e4fe368d65e09ff9074c07e430d695fb5d0829ca75716146f861ad13a522bb364d70482840b225a4f71b5fed06f093bc8e5069e7d22c7156c615e6cf2792d SHA512 d2fd39c0c797dee88da86efc1a10e49f3bd8383b0f97e0e0f20461347aeaa2649ca7e426a872c7f2c5f2323d914e1beda5de7022c5cb7561e29b942c1d92ce8f
+DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
+EBUILD geodesy-0.5.5.ebuild 1008 BLAKE2B f5f79e5f165f7277ae83f9fd363c3458c8496d4f9d315f457a22c8e8281089b5d916015d259e9ec4509fb2891580da63b6054ecd06e9c72da50fa2c154bb3696 SHA512 64a105b628a9d5adbb6d1ee222f34736acd065e93c45e2c23922e063fd480364efb165cdc14f022ea789ced48efa744a244246a5bfdd270563e0283f016563f3
+EBUILD geodesy-9999.ebuild 1008 BLAKE2B f5f79e5f165f7277ae83f9fd363c3458c8496d4f9d315f457a22c8e8281089b5d916015d259e9ec4509fb2891580da63b6054ecd06e9c72da50fa2c154bb3696 SHA512 64a105b628a9d5adbb6d1ee222f34736acd065e93c45e2c23922e063fd480364efb165cdc14f022ea789ced48efa744a244246a5bfdd270563e0283f016563f3
MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geodesy/files/py3.patch b/dev-ros/geodesy/files/py3.patch
new file mode 100644
index 000000000000..08259ee976c1
--- /dev/null
+++ b/dev-ros/geodesy/files/py3.patch
@@ -0,0 +1,41 @@
+Index: geodesy/src/geodesy/wu_point.py
+===================================================================
+--- geodesy.orig/src/geodesy/wu_point.py
++++ geodesy/src/geodesy/wu_point.py
+@@ -159,12 +159,12 @@ class WuPointSet():
+ # Initialize way point information.
+ self.way_point_ids = {} # points symbol table
+ self.n_points = len(self.points)
+- for wid in xrange(self.n_points):
++ for wid in range(self.n_points):
+ self.way_point_ids[self.points[wid].id.uuid] = wid
+
+ # Create empty list of UTM points, corresponding to map points.
+ # They will be evaluated lazily, when first needed.
+- self.utm_points = [None for wid in xrange(self.n_points)]
++ self.utm_points = [None for wid in range(self.n_points)]
+
+ def __contains__(self, item):
+ """ Point set membership. """
+@@ -259,7 +259,7 @@ class WuPointSet():
+ """
+ return self.way_point_ids.get(key, default)
+
+- def next(self):
++ def __next__(self):
+ """ Next iteration point.
+
+ :returns: Next :class:`WuPoint`.
+Index: geodesy/tests/test_wu_point.py
+===================================================================
+--- geodesy.orig/tests/test_wu_point.py
++++ geodesy/tests/test_wu_point.py
+@@ -127,7 +127,7 @@ class TestWuPoint(unittest.TestCase):
+ self.assertEqual(wupts.get(uu).uuid(), uu)
+
+ # test index() function
+- for i in xrange(len(uuids)):
++ for i in range(len(uuids)):
+ self.assertEqual(wupts.index(uuids[i]), i)
+ self.assertEqual(wupts.points[i].id.uuid, uuids[i])
+
diff --git a/dev-ros/geodesy/geodesy-0.5.3.ebuild b/dev-ros/geodesy/geodesy-0.5.3.ebuild
deleted file mode 100644
index c2cd15d3b654..000000000000
--- a/dev-ros/geodesy/geodesy-0.5.3.ebuild
+++ /dev/null
@@ -1,34 +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-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/angles
- dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf
- dev-ros/unique_id
- dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-python/pyproj[${PYTHON_USEDEP}]
- dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/geodesy/geodesy-0.5.2.ebuild b/dev-ros/geodesy/geodesy-0.5.5.ebuild
index ea8aaeb6424f..88ea377b0cc7 100644
--- a/dev-ros/geodesy/geodesy-0.5.2.ebuild
+++ b/dev-ros/geodesy/geodesy-0.5.5.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
@@ -17,18 +15,21 @@ IUSE=""
RDEPEND="
dev-ros/angles
- dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geographic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/tf
dev-ros/unique_id
dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-python/pyproj[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep "dev-python/pyproj[\${PYTHON_USEDEP}]")
dev-libs/boost:=
"
DEPEND="${RDEPEND}
+ dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? (
- dev-ros/rosunit[${PYTHON_USEDEP}]
+ dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/geodesy/geodesy-9999.ebuild b/dev-ros/geodesy/geodesy-9999.ebuild
index ea8aaeb6424f..88ea377b0cc7 100644
--- a/dev-ros/geodesy/geodesy-9999.ebuild
+++ b/dev-ros/geodesy/geodesy-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
inherit ros-catkin
@@ -17,18 +15,21 @@ IUSE=""
RDEPEND="
dev-ros/angles
- dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geographic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/tf
dev-ros/unique_id
dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-python/pyproj[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep "dev-python/pyproj[\${PYTHON_USEDEP}]")
dev-libs/boost:=
"
DEPEND="${RDEPEND}
+ dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? (
- dev-ros/rosunit[${PYTHON_USEDEP}]
+ dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+PATCHES=( "${FILESDIR}/py3.patch" )
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 05:24:25 +0000