summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2017-04-18 19:57:39 +0200
committerDavid Seifert <soap@gentoo.org>2017-04-18 20:22:27 +0200
commit3d2f3b95a33db7b630e93463583b1e8b23312e89 (patch)
tree26368412dc7ebbc6dcc399ff1b0352d9a50ffba3 /eclass/ros-catkin.eclass
parentapp-emulation/docker: add ip_vs_rr config check for #614306 (diff)
downloadgentoo-3d2f3b95a33db7b630e93463583b1e8b23312e89.tar.gz
gentoo-3d2f3b95a33db7b630e93463583b1e8b23312e89.tar.bz2
gentoo-3d2f3b95a33db7b630e93463583b1e8b23312e89.zip
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
Diffstat (limited to 'eclass/ros-catkin.eclass')
-rw-r--r--eclass/ros-catkin.eclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index fec873a922c..feb626341eb 100644
--- 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