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 B9DE61581FB for ; Tue, 27 Aug 2024 15:22:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9053E2B1D; Tue, 27 Aug 2024 15:16:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 AD95CE2B1A for ; Tue, 27 Aug 2024 15:16:38 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 24/50] perl-functions.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:15:09 +0200 Message-ID: <20240827151553.210835-24-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: 62d75ba4-d41f-4d09-91c2-db26460b4339 X-Archives-Hash: c6e2133a57b27140bdecd06c5cb025f4 Signed-off-by: David Seifert --- eclass/perl-functions.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass index 142fdeb8cfbd..ce511cbefa0a 100644 --- a/eclass/perl-functions.eclass +++ b/eclass/perl-functions.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: perl-functions.eclass @@ -157,18 +157,18 @@ perl_fix_packlist() { einfo "Fixing packlist file /${f#${D}}" # remove the temporary build dir path - sed -i -e "s:${D%/}/:/:g" "${f}" + sed -i -e "s:${D}/:/:g" "${f}" || die # remove duplicate entries - sort -u "${f}" > "${packlist_temp}" - mv "${packlist_temp}" "${f}" + sort -u "${f}" > "${packlist_temp}" || die + mv "${packlist_temp}" "${f}" || die # remove files that dont exist cat "${f}" | while read -r entry; do if [[ ! -e ${D}/${entry} ]]; then einfo "Pruning surplus packlist entry ${entry}" grep -v -x -F "${entry}" "${f}" > "${packlist_temp}" - mv "${packlist_temp}" "${f}" + mv "${packlist_temp}" "${f}" || die fi done fi @@ -185,7 +185,7 @@ perl_remove_temppath() { find "${D}" -type f -not -name '*.so' -print0 | while read -rd '' f ; do if file "${f}" | grep -q -i " text" ; then grep -q "${D}" "${f}" && ewarn "QA: File contains a temporary path ${f}" - sed -i -e "s:${D%/}/:/:g" "${f}" + sed -i -e "s:${D}/:/:g" "${f}" || die fi done } -- 2.46.0