Skip to content

Commit

Permalink
dev-lang/perl: 5.30.0-r2, fix QA issues MissingSlash+UnnessecaryStrip
Browse files Browse the repository at this point in the history
- 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 <[email protected]>
  • Loading branch information
kentfredric committed Jun 20, 2020
1 parent 53b7dd1 commit 066d4d1
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions dev-lang/perl/perl-5.30.3-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 066d4d1

Please sign in to comment.