| 1 |
commit: 3d2f3b95a33db7b630e93463583b1e8b23312e89 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 18 17:57:39 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 18 18:22:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d2f3b95 |
| 7 |
|
| 8 |
ros-catkin.eclass: Fix python handling |
| 9 |
|
| 10 |
* Add missing REQUIRED_USE which otherwise could |
| 11 |
lead to spurious failures during the build. |
| 12 |
* Do not directly depend on dev-lang/python-exec, |
| 13 |
this is done properly via ${PYTHON_DEPS}. |
| 14 |
* python-utils-r1 never needs to be inherited |
| 15 |
explicitly. |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/4444 |
| 17 |
|
| 18 |
eclass/ros-catkin.eclass | 5 +++-- |
| 19 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass |
| 22 |
index fec873a922c..feb626341eb 100644 |
| 23 |
--- a/eclass/ros-catkin.eclass |
| 24 |
+++ b/eclass/ros-catkin.eclass |
| 25 |
@@ -48,7 +48,7 @@ fi |
| 26 |
PYTHON_ECLASS="" |
| 27 |
CATKIN_PYTHON_USEDEP="" |
| 28 |
if [ -n "${PYTHON_COMPAT}" ] ; then |
| 29 |
- PYTHON_ECLASS="python-r1 python-utils-r1" |
| 30 |
+ PYTHON_ECLASS="python-r1" |
| 31 |
fi |
| 32 |
|
| 33 |
inherit ${SCM} ${PYTHON_ECLASS} cmake-utils flag-o-matic |
| 34 |
@@ -57,6 +57,7 @@ CATKIN_DO_PYTHON_MULTIBUILD="" |
| 35 |
if [ -n "${PYTHON_COMPAT}" ] ; then |
| 36 |
CATKIN_PYTHON_USEDEP="[${PYTHON_USEDEP}]" |
| 37 |
CATKIN_DO_PYTHON_MULTIBUILD="yes" |
| 38 |
+ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 39 |
fi |
| 40 |
|
| 41 |
IUSE="test" |
| 42 |
@@ -67,7 +68,7 @@ RDEPEND=" |
| 43 |
DEPEND="${RDEPEND}" |
| 44 |
|
| 45 |
if [ -n "${CATKIN_DO_PYTHON_MULTIBUILD}" ] ; then |
| 46 |
- RDEPEND="${RDEPEND} dev-lang/python-exec:2 ${PYTHON_DEPS}" |
| 47 |
+ RDEPEND="${RDEPEND} ${PYTHON_DEPS}" |
| 48 |
DEPEND="${DEPEND} ${PYTHON_DEPS}" |
| 49 |
fi |
Archives