dev-lang/python: Replace python_export usage

Closes: https://bugs.gentoo.org/716332
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/dev-lang/python/python-3.6.10-r2.ebuild b/dev-lang/python/python-3.6.10-r2.ebuild
index c0a16fb8d8c2dd06373619cc0e71c67df12b2206..2dd7f7dd1dd93c92fb806e4ba5cf421a4689646b 100644 (file)
--- a/dev-lang/python/python-3.6.10-r2.ebuild
+++ b/dev-lang/python/python-3.6.10-r2.ebuild
@@ -279,49 +279,47 @@ src_install() {
                -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
                "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
-       # for python-exec
-       local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
+       local -x EPYTHON=python${PYVER}
        # if not using a cross-compiler, use the fresh binary
        if ! tc-is-cross-compiler; then
                local -x PYTHON=./python
                local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
        else
-               vars=( PYTHON "${vars[@]}" )
+               local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
        fi
 
-       python_export "python${PYVER}" "${vars[@]}"
        echo "EPYTHON='${EPYTHON}'" > epython.py || die
        python_domodule epython.py
 
        # python-exec wrapping support
        local pymajor=${PYVER%.*}
-       mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+       local scriptdir=${D}$(python_get_scriptdir)
+       mkdir -p "${scriptdir}" || die
        # python and pythonX
        ln -s "../../../bin/${abiver}" \
-               "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-       ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
+               "${scriptdir}/python${pymajor}" || die
+       ln -s "python${pymajor}" "${scriptdir}/python" || die
        # python-config and pythonX-config
        # note: we need to create a wrapper rather than symlinking it due
        # to some random dirname(argv[0]) magic performed by python-config
-       cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+       cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
                #!/bin/sh
                exec "${abiver}-config" "\${@}"
        EOF
-       chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+       chmod +x "${scriptdir}/python${pymajor}-config" || die
        ln -s "python${pymajor}-config" \
-               "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+               "${scriptdir}/python-config" || die
        # 2to3, pydoc, pyvenv
        ln -s "../../../bin/2to3-${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+               "${scriptdir}/2to3" || die
        ln -s "../../../bin/pydoc${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+               "${scriptdir}/pydoc" || die
        ln -s "../../../bin/pyvenv-${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
+               "${scriptdir}/pyvenv" || die
        # idle
        if use tk; then
                ln -s "../../../bin/idle${PYVER}" \
-                       "${D}${PYTHON_SCRIPTDIR}/idle" || die
+                       "${scriptdir}/idle" || die
        fi
 }
 

diff --git a/dev-lang/python/python-3.7.7-r2.ebuild b/dev-lang/python/python-3.7.7-r2.ebuild
index 2491b8493fc3fd32e3585ab5b9469fd049d92fa9..e7611e9ad0474df34bb5ec7e6854873c55c47c5b 100644 (file)
--- a/dev-lang/python/python-3.7.7-r2.ebuild
+++ b/dev-lang/python/python-3.7.7-r2.ebuild
@@ -265,49 +265,47 @@ src_install() {
                -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
                "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
-       # for python-exec
-       local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
+       local -x EPYTHON=python${PYVER}
        # if not using a cross-compiler, use the fresh binary
        if ! tc-is-cross-compiler; then
                local -x PYTHON=./python
                local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
        else
-               vars=( PYTHON "${vars[@]}" )
+               local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
        fi
 
-       python_export "python${PYVER}" "${vars[@]}"
        echo "EPYTHON='${EPYTHON}'" > epython.py || die
        python_domodule epython.py
 
        # python-exec wrapping support
        local pymajor=${PYVER%.*}
-       mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+       local scriptdir=${D}$(python_get_scriptdir)
+       mkdir -p "${scriptdir}" || die
        # python and pythonX
        ln -s "../../../bin/${abiver}" \
-               "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-       ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
+               "${scriptdir}/python${pymajor}" || die
+       ln -s "python${pymajor}" "${scriptdir}/python" || die
        # python-config and pythonX-config
        # note: we need to create a wrapper rather than symlinking it due
        # to some random dirname(argv[0]) magic performed by python-config
-       cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+       cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
                #!/bin/sh
                exec "${abiver}-config" "\${@}"
        EOF
-       chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+       chmod +x "${scriptdir}/python${pymajor}-config" || die
        ln -s "python${pymajor}-config" \
-               "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+               "${scriptdir}/python-config" || die
        # 2to3, pydoc, pyvenv
        ln -s "../../../bin/2to3-${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+               "${scriptdir}/2to3" || die
        ln -s "../../../bin/pydoc${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+               "${scriptdir}/pydoc" || die
        ln -s "../../../bin/pyvenv-${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
+               "${scriptdir}/pyvenv" || die
        # idle
        if use tk; then
                ln -s "../../../bin/idle${PYVER}" \
-                       "${D}${PYTHON_SCRIPTDIR}/idle" || die
+                       "${scriptdir}/idle" || die
        fi
 }
 

diff --git a/dev-lang/python/python-3.8.2-r2.ebuild b/dev-lang/python/python-3.8.2-r2.ebuild
index a84bd5948c93cb954dae6769b12c2dd9fbc2b311..c453f0eb07d8871a2a3825dc949c919996d8def0 100644 (file)
--- a/dev-lang/python/python-3.8.2-r2.ebuild
+++ b/dev-lang/python/python-3.8.2-r2.ebuild
@@ -270,47 +270,45 @@ src_install() {
                -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
                "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
-       # for python-exec
-       local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
+       local -x EPYTHON=python${PYVER}
        # if not using a cross-compiler, use the fresh binary
        if ! tc-is-cross-compiler; then
                local -x PYTHON=./python
                local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
        else
-               vars=( PYTHON "${vars[@]}" )
+               local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
        fi
 
-       python_export "python${PYVER}" "${vars[@]}"
        echo "EPYTHON='${EPYTHON}'" > epython.py || die
        python_domodule epython.py
 
        # python-exec wrapping support
        local pymajor=${PYVER%.*}
-       mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+       local scriptdir=${D}$(python_get_scriptdir)
+       mkdir -p "${scriptdir}" || die
        # python and pythonX
        ln -s "../../../bin/${abiver}" \
-               "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-       ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
+               "${scriptdir}/python${pymajor}" || die
+       ln -s "python${pymajor}" "${scriptdir}/python" || die
        # python-config and pythonX-config
        # note: we need to create a wrapper rather than symlinking it due
        # to some random dirname(argv[0]) magic performed by python-config
-       cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+       cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
                #!/bin/sh
                exec "${abiver}-config" "\${@}"
        EOF
-       chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+       chmod +x "${scriptdir}/python${pymajor}-config" || die
        ln -s "python${pymajor}-config" \
-               "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+               "${scriptdir}/python-config" || die
        # 2to3, pydoc
        ln -s "../../../bin/2to3-${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+               "${scriptdir}/2to3" || die
        ln -s "../../../bin/pydoc${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+               "${scriptdir}/pydoc" || die
        # idle
        if use tk; then
                ln -s "../../../bin/idle${PYVER}" \
-                       "${D}${PYTHON_SCRIPTDIR}/idle" || die
+                       "${scriptdir}/idle" || die
        fi
 }
 

diff --git a/dev-lang/python/python-3.9.0_alpha5-r1.ebuild b/dev-lang/python/python-3.9.0_alpha5-r1.ebuild
index 6425e8a14219d6b7a5bb2fc5169b20be8c6d1f26..12c8b78e873d4a8cfae9cbed68c041bb7b344c23 100644 (file)
--- a/dev-lang/python/python-3.9.0_alpha5-r1.ebuild
+++ b/dev-lang/python/python-3.9.0_alpha5-r1.ebuild
@@ -284,46 +284,44 @@ src_install() {
                -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
                "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
-       # for python-exec
-       local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
+       local -x EPYTHON=python${PYVER}
        # if not using a cross-compiler, use the fresh binary
        if ! tc-is-cross-compiler; then
                local -x PYTHON=./python
                local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
        else
-               vars=( PYTHON "${vars[@]}" )
+               local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
        fi
 
-       python_export "python${PYVER}" "${vars[@]}"
        echo "EPYTHON='${EPYTHON}'" > epython.py || die
        python_domodule epython.py
 
        # python-exec wrapping support
        local pymajor=${PYVER%.*}
-       mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+       local scriptdir=${D}$(python_get_scriptdir)
+       mkdir -p "${scriptdir}" || die
        # python and pythonX
        ln -s "../../../bin/${abiver}" \
-               "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-       ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
+               "${scriptdir}/python${pymajor}" || die
+       ln -s "python${pymajor}" "${scriptdir}/python" || die
        # python-config and pythonX-config
        # note: we need to create a wrapper rather than symlinking it due
        # to some random dirname(argv[0]) magic performed by python-config
-       cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+       cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
                #!/bin/sh
                exec "${abiver}-config" "\${@}"
        EOF
-       chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+       chmod +x "${scriptdir}/python${pymajor}-config" || die
        ln -s "python${pymajor}-config" \
-               "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+               "${scriptdir}/python-config" || die
        # 2to3, pydoc
        ln -s "../../../bin/2to3-${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+               "${scriptdir}/2to3" || die
        ln -s "../../../bin/pydoc${PYVER}" \
-               "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+               "${scriptdir}/pydoc" || die
        # idle
        if use tk; then
                ln -s "../../../bin/idle${PYVER}" \
-                       "${D}${PYTHON_SCRIPTDIR}/idle" || die
+                       "${scriptdir}/idle" || die
        fi
 }