ros-catkin.eclass: Fix python handling

* Add missing REQUIRED_USE which otherwise could
  lead to spurious failures during the build.
* Do not directly depend on dev-lang/python-exec,
  this is done properly via ${PYTHON_DEPS}.
* python-utils-r1 never needs to be inherited
  explicitly.
Closes: https://github.com/gentoo/gentoo/pull/4444

diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index fec873a922cb209850e2813b7874e404407964f2..feb626341eb6c9d81368310ad434056d74a28325 100644 (file)
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -48,7 +48,7 @@ fi
 PYTHON_ECLASS=""
 CATKIN_PYTHON_USEDEP=""
 if [ -n "${PYTHON_COMPAT}" ] ; then
-       PYTHON_ECLASS="python-r1 python-utils-r1"
+       PYTHON_ECLASS="python-r1"
 fi
 
 inherit ${SCM} ${PYTHON_ECLASS} cmake-utils flag-o-matic
@@ -57,6 +57,7 @@ CATKIN_DO_PYTHON_MULTIBUILD=""
 if [ -n "${PYTHON_COMPAT}" ] ; then
        CATKIN_PYTHON_USEDEP="[${PYTHON_USEDEP}]"
        CATKIN_DO_PYTHON_MULTIBUILD="yes"
+       REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 fi
 
 IUSE="test"
@@ -67,7 +68,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 if [ -n "${CATKIN_DO_PYTHON_MULTIBUILD}" ] ; then
-       RDEPEND="${RDEPEND} dev-lang/python-exec:2 ${PYTHON_DEPS}"
+       RDEPEND="${RDEPEND} ${PYTHON_DEPS}"
        DEPEND="${DEPEND} ${PYTHON_DEPS}"
 fi