[gentoo-commits] repo/gentoo:master commit in: dev-ros/calibration_estimation/

[Arthur Zamarin]

commit:     2a252bae48815e60c8ece831dfde13313947fcc2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  3 06:40:56 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov  3 06:53:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a252bae

dev-ros/calibration_estimation: update live template

- use one `python_gen_cond_dep` for rdeps
- convert internal python files, written in py2, to py3
- optimize python scripts

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 ...uild => calibration_estimation-0.10.15-r1.ebuild} |  0
 .../calibration_estimation-9999.ebuild               | 20 ++++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git 
a/dev-ros/calibration_estimation/calibration_estimation-0.10.15.ebuild 
b/dev-ros/calibration_estimation/calibration_estimation-0.10.15-r1.ebuild
similarity index 100%
rename from dev-ros/calibration_estimation/calibration_estimation-0.10.15.ebuild
rename to 
dev-ros/calibration_estimation/calibration_estimation-0.10.15-r1.ebuild

diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild 
b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
index 65951f6a974..860c62b9d87 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
@@ -14,16 +14,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-       $(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
        dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
        dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-       $(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
        dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
        dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-       $(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
-       $(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-       $(python_gen_cond_dep "dev-python/scipy[\${PYTHON_USEDEP}]")
-       $(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
+       $(python_gen_cond_dep '
+               dev-python/numpy[${PYTHON_USEDEP}]
+               dev-python/rospkg[${PYTHON_USEDEP}]
+               dev-python/matplotlib[${PYTHON_USEDEP}]
+               dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+               dev-python/scipy[${PYTHON_USEDEP}]
+               dev-python/urdf_parser_py[${PYTHON_USEDEP}]
+       ')
 "
 DEPEND="${RDEPEND}
        test? (
@@ -33,6 +35,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
        ros-catkin_src_prepare
+       2to3 -n -w --no-diffs test/*.py src/${PN}/{,sensors/}*.py || die
        sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
 }
 
@@ -40,3 +43,8 @@ src_test() {
        export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
        ros-catkin_src_test
 }
+
+src_install() {
+       ros-catkin_src_install
+       python_optimize
+}