Due to python_replicate_scripts(), now python-r1 ebuilds can rely on
python-exec as well. It shouldn't hurt much, so let's just put it
in the PYTHON_DEPS.
---
gx86/eclass/distutils-r1.eclass | 3 +--
gx86/eclass/python-r1.eclass | 14 +++++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
index e0df9f6..8dfe6bb 100644
--- a/gx86/eclass/distutils-r1.eclass
+++ b/gx86/eclass/distutils-r1.eclass
@@ -56,8 +56,7 @@ inherit eutils python-r1
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-RDEPEND="${PYTHON_DEPS}
- dev-python/python-exec"
+RDEPEND=${PYTHON_DEPS}
DEPEND=${PYTHON_DEPS}
# @ECLASS-VARIABLE: PATCHES
diff --git a/gx86/eclass/python-r1.eclass b/gx86/eclass/python-r1.eclass
index 6178969..45dfcee 100644
--- a/gx86/eclass/python-r1.eclass
+++ b/gx86/eclass/python-r1.eclass
@@ -137,7 +137,14 @@ _python_set_globals() {
REQUIRED_USE="|| ( ${flags[*]} )"
PYTHON_USEDEP=${optflags// /,}
- PYTHON_DEPS=
+ local usestr
+ [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]"
+
+ # 1) well, python-exec would suffice as an RDEP
+ # but no point in making this overcomplex, BDEP doesn't hurt anyone
+ # 2) python-exec should be built with all targets forced anyway
+ # but if new targets were added, we may need to force a rebuild
+ PYTHON_DEPS="dev-python/python-exec[${PYTHON_USEDEP}]"
local i
for i in "${PYTHON_COMPAT[@]}"; do
local d
@@ -153,10 +160,7 @@ _python_set_globals() {
esac
local v=${i##*[a-z]}
- local usestr
- [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]"
- PYTHON_DEPS+=" python_targets_${i}? (
- ${d}:${v/_/.}${usestr} )"
+ PYTHON_DEPS+=" python_targets_${i}? ( ${d}:${v/_/.}${usestr} )"
done
}
_python_set_globals
--
1.7.12.4