commit: d3693d88561489c4235c967abcb9832e7ca86755 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Aug 12 20:08:32 2019 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Aug 12 20:09:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3693d88
perl-functions.eclass: Add EAPI=7 support Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> eclass/perl-functions.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass index e7775f31b8e..e6168a07534 100644 --- a/eclass/perl-functions.eclass +++ b/eclass/perl-functions.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: perl-functions.eclass @@ -8,7 +8,7 @@ # Seemant Kulleen <[email protected]> # Andreas K. Huettel <[email protected]> # Kent Fredric <[email protected]> -# @SUPPORTED_EAPIS: 5 6 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: helper functions eclass for perl modules # @DESCRIPTION: # The perl-functions eclass is designed to allow easier installation of perl @@ -19,7 +19,7 @@ [[ ${CATEGORY} == "perl-core" ]] && inherit alternatives case "${EAPI:-0}" in - 5|6) + 5|6|7) ;; *) die "EAPI=${EAPI} is not supported by perl-functions.eclass" @@ -142,7 +142,7 @@ 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}" # remove duplicate entries sort -u "${f}" > "${packlist_temp}" @@ -170,7 +170,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}" fi done }
