• [gentoo-dev] [PATCH 08/50] distutils-r1.eclass: drop support for EAPI 6

    From David Seifert@21:1/5 to All on Tue Aug 27 17:20:01 2024
    Signed-off-by: David Seifert <soap@gentoo.org>
    ---
    eclass/distutils-r1.eclass | 26 +++++++++++++-------------
    1 file changed, 13 insertions(+), 13 deletions(-)

    diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
    index 0f9dc8d14d5e..11ac961f8c9d 100644
    --- a/eclass/distutils-r1.eclass
    +++ b/eclass/distutils-r1.eclass
    @@ -1022,7 +1022,7 @@ _distutils-r1_create_setup_cfg() {
    [install]
    compile = True
    optimize = 2
    - root = ${D%/}
    + root = ${D}
    _EOF_

    if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
    @@ -1520,10 +1520,10 @@ _distutils-r1_wrap_scripts() {
    local scriptdir=$(python_get_scriptdir)
    local f python_files=() non_python_files=()

    - if [[ -d ${D%/}${scriptdir} ]]; then
    - for f in "${D%/}${scriptdir}"/*; do
    + if [[ -d ${D}${scriptdir} ]]; then
    + for f in "${D}${scriptdir}"/*; do
    [[ -d ${f} ]] && die "Unexpected directory: ${f}"
    - debug-print "${FUNCNAME}: found executable at ${f#${D%/}/}"
    + debug-print "${FUNCNAME}: found executable at ${f#${D}/}"

    local shebang
    read -r