From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 070FE1581FB for ; Tue, 27 Aug 2024 15:18:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 782C7E2A56; Tue, 27 Aug 2024 15:16:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F864E2A53 for ; Tue, 27 Aug 2024 15:16:23 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 08/50] distutils-r1.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:14:53 +0200 Message-ID: <20240827151553.210835-8-soap@gentoo.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827151553.210835-1-soap@gentoo.org> References: <20240827151553.210835-1-soap@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 6f2f30a4-9259-4673-96d6-3c90743dd950 X-Archives-Hash: b0a1042ebc8bf47b79701b31ad73e8a3 Signed-off-by: David Seifert --- 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 shebang < "${f}" @@ -1535,7 +1535,7 @@ _distutils-r1_wrap_scripts() { non_python_files+=( "${f}" ) fi - mkdir -p "${D%/}${bindir}" || die + mkdir -p "${D}${bindir}" || die done for f in "${python_files[@]}"; do @@ -1551,8 +1551,8 @@ _distutils-r1_wrap_scripts() { for f in "${non_python_files[@]}"; do local basename=${f##*/} - debug-print "${FUNCNAME}: moving ${f#${D%/}/} to ${bindir}/${basename}" - mv "${f}" "${D%/}${bindir}/${basename}" || die + debug-print "${FUNCNAME}: moving ${f#${D}/} to ${bindir}/${basename}" + mv "${f}" "${D}${bindir}/${basename}" || die done fi } @@ -1660,8 +1660,8 @@ distutils-r1_python_install() { find "${BUILD_DIR}"/install -type d -empty -delete || die [[ -d ${BUILD_DIR}/install ]] && merge_root=1 else - local root=${D%/}/_${EPYTHON} - [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/} + local root=${D}/_${EPYTHON} + [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D} # inline DISTUTILS_ARGS logic from esetup.py in order to make # argv overwriting easier @@ -1715,7 +1715,7 @@ distutils-r1_python_install() { fi if [[ ${merge_root} ]]; then - multibuild_merge_root "${root}" "${D%/}" + multibuild_merge_root "${root}" "${D}" fi if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then _distutils-r1_wrap_scripts "${scriptdir}" @@ -2098,7 +2098,7 @@ _distutils-r1_strip_namespace_packages() { _distutils-r1_post_python_install() { debug-print-function ${FUNCNAME} "${@}" - local sitedir=${D%/}$(python_get_sitedir) + local sitedir=${D}$(python_get_sitedir) if [[ -d ${sitedir} ]]; then _distutils-r1_strip_namespace_packages "${sitedir}" @@ -2157,13 +2157,13 @@ _distutils-r1_check_namespace_pth() { while IFS= read -r -d '' f; do pth+=( "${f}" ) - done < <(find "${ED%/}" -name '*-nspkg.pth' -print0) + done < <(find "${ED}" -name '*-nspkg.pth' -print0) if [[ ${pth[@]} ]]; then eerror "The following *-nspkg.pth files were found installed:" eerror for f in "${pth[@]}"; do - eerror " ${f#${ED%/}}" + eerror " ${f#${ED}}" done eerror eerror "The presence of those files may break namespaces in Python 3.5+. Please" -- 2.46.0