Discard python-exec from python2

mhiretskiy
parent 2a78639c1c
commit 44d7008f64

@ -25,7 +25,6 @@ RESTRICT="test"
RDEPEND="
!dev-python/${ORIG_PN}[python_targets_python2_7]
dev-lang/python-exec:2[${PYTHON_USEDEP}]
>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
dev-libs/glib:2
dev-python/setuptools-python2[${PYTHON_USEDEP}]
@ -95,7 +94,7 @@ python_install() {
# wrappers are common to all impls, so a parallel run may
# move it for us. ln+rm is more failure-proof.
ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
#ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
rm -f "${ED}usr/bin/${file}"
done
}

@ -836,8 +836,8 @@ _distutils2_wrap_scripts() {
local basename=${f##*/}
debug-print "${FUNCNAME}: installing wrapper at ${bindir}/${basename}"
_python_ln_rel "${path}${EPREFIX}"/usr/lib/python-exec/python-exec2 \
"${path}${bindir}/${basename}" || die
#_python_ln_rel "${path}${EPREFIX}"/usr/lib/python-exec/python-exec2 \
# "${path}${bindir}/${basename}" || die
done
for f in "${non_python_files[@]}"; do

@ -229,10 +229,10 @@ _python_single_set_globals() {
# 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
deps+="python_single_target_${i}? (
${PYTHON_PKG_DEP}
>=dev-lang/python-exec-2:=[python_targets_${i}]
) "
#deps+="python_single_target_${i}? (
# ${PYTHON_PKG_DEP}
# >=dev-lang/python-exec-2:=[python_targets_${i}]
#) "
done
if [[ ${PYTHON_DEPS+1} ]]; then

@ -422,7 +422,7 @@ _python_export() {
;;
PYTHON_SCRIPTDIR)
local dir
export PYTHON_SCRIPTDIR=${EPREFIX}/usr/lib/python-exec/${impl}
export PYTHON_SCRIPTDIR=${EPREFIX}/usr/lib/python-exec/python2.7
debug-print "${FUNCNAME}: PYTHON_SCRIPTDIR = ${PYTHON_SCRIPTDIR}"
;;
*)
@ -711,8 +711,8 @@ python_newexe() {
)
# install the wrapper
_python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
"${ED%/}/${wrapd}/${newfn}" || die
#_python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
# "${ED%/}/${wrapd}/${newfn}" || die
# don't use this at home, just call python_doscript() instead
if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then

@ -221,7 +221,7 @@ _python_set_globals() {
# 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
deps+=">=dev-lang/python-exec-2:=[${usedep}]"
# deps+=">=dev-lang/python-exec-2:=[${usedep}]"
if [[ ${PYTHON_DEPS+1} ]]; then
# IUSE is magical, so we can't really check it
@ -856,12 +856,6 @@ python_replicate_script() {
local files=( "${@}" )
python_foreach_impl _python_replicate_script
unset -f _python_replicate_script
# install the wrappers
local f
for f; do
_python_ln_rel "${ED%/}/usr/lib/python-exec/python-exec2" "${f}" || die
done
}
_PYTHON_R1=1

Loading…
Cancel
Save