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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD4D01382C5 for ; Sat, 20 Jun 2020 14:03:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 121FCE08E2; Sat, 20 Jun 2020 14:03:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5E1DE08E2 for ; Sat, 20 Jun 2020 14:03:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 753DE34F48D for ; Sat, 20 Jun 2020 14:03:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 505F32A4 for ; Sat, 20 Jun 2020 14:03:49 +0000 (UTC) From: "Kent Fredric" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kent Fredric" Message-ID: <1592661798.066d4d16a1d7f1972bf2514bf4126c82e4f1a3a8.kentnl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/perl/perl-5.30.3-r2.ebuild X-VCS-Directories: dev-lang/perl/ X-VCS-Committer: kentnl X-VCS-Committer-Name: Kent Fredric X-VCS-Revision: 066d4d16a1d7f1972bf2514bf4126c82e4f1a3a8 X-VCS-Branch: master Date: Sat, 20 Jun 2020 14:03:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f20d1dc1-810e-46f1-aa39-715b9c6d1f06 X-Archives-Hash: f3a932581ae03db3a3d5cd8379ad1610 commit: 066d4d16a1d7f1972bf2514bf4126c82e4f1a3a8 Author: Kent Fredric gentoo org> AuthorDate: Sat Jun 20 14:02:57 2020 +0000 Commit: Kent Fredric gentoo 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 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"