[gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/

[Kent Fredric]

commit:     066d4d16a1d7f1972bf2514bf4126c82e4f1a3a8
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 14:02:57 2020 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 14:03:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066d4d16

dev-lang/perl: 5.30.0-r2, fix QA issues MissingSlash+UnnessecaryStrip

- One instance of MissingSlash which pukes its brains over, thanks EAPI7
- Seven instances of unnecessary slash stripping

I suspect the fixes I do for the slash-stripping might later barf about
not adding an explict slash, which will be bonkers if that happens,
    because the variables in question have leading slashes! Joys.

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>

 dev-lang/perl/perl-5.30.3-r2.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-lang/perl/perl-5.30.3-r2.ebuild 
b/dev-lang/perl/perl-5.30.3-r2.ebuild
index 2483914929e..18013a31588 100644
--- a/dev-lang/perl/perl-5.30.3-r2.ebuild
+++ b/dev-lang/perl/perl-5.30.3-r2.ebuild
@@ -341,7 +341,7 @@ src_prepare() {
        tc-is-static-only || src_prepare_dynamic
 
        if use gdbm; then
-               sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
+               sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
                        ext/NDBM_File/Makefile.PL || die
        fi
 
@@ -385,9 +385,9 @@ find_candidate_inc_versions() {
                regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
        fi
        local dirs=(
-               "${EROOT%/}${PRIV_BASE}"
-               "${EROOT%/}${SITE_BASE}"
-               "${EROOT%/}${VENDOR_BASE}"
+               "${EROOT}${PRIV_BASE}"
+               "${EROOT}${SITE_BASE}"
+               "${EROOT}${VENDOR_BASE}"
        )
        for dir in "${dirs[@]}"; do
                if [[ ! -e "${dir}" ]]; then
@@ -443,7 +443,7 @@ versions_to_gentoolibdirs() {
        fi
        for v;  do
                for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-                       local fullpath="${EROOT%/}${root}/${v}"
+                       local fullpath="${EROOT}${root}/${v}"
                        if [[ -e "${fullpath}" ]]; then
                                has "${v}" ${oldv} && printf "%s:" 
"${fullpath}/${myarch}${mythreading}";
                                printf "%s:" "${fullpath}"
@@ -531,9 +531,9 @@ src_configure() {
                einfo "This version of perl may partially support modules 
previously"
                einfo "installed in any of the following paths:"
                for incpath in ${inclist}; do
-                       [[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo 
" ${EROOT%/}${VENDOR_BASE}/${incpath}"
-                       [[ -e "${EROOT%/}${PRIV_BASE}/${incpath}"   ]] && einfo 
" ${EROOT%/}${PRIV_BASE}/${incpath}"
-                       [[ -e "${EROOT%/}${SITE_BASE}/${incpath}"   ]] && einfo 
" ${EROOT%/}${SITE_BASE}/${incpath}"
+                       [[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " 
${EROOT}${VENDOR_BASE}/${incpath}"
+                       [[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " 
${EROOT}${PRIV_BASE}/${incpath}"
+                       [[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " 
${EROOT}${SITE_BASE}/${incpath}"
                done
                einfo "This is a temporary measure and you should aim to 
cleanup these paths"
                einfo "via world updates and perl-cleaner"