[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     e4333a984533c5d42d637f42a388f90b5eb8b856
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 18:33:07 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 18:35:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4333a98

rebar.eclass: Fix EPREFIX and ED usage

The path returned by $(get_erl_libs) starts with a slash, so
${EPREFIX}/$(get_erl_libs) resulted in a double slash.

Fixes: 7ee6937e6219f250559ee26eb64e5991b27cd289
Closes: https://bugs.gentoo.org/770283
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eclass/rebar.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/rebar.eclass b/eclass/rebar.eclass
index c1a3aca67b54..1c131dd496be 100644
--- a/eclass/rebar.eclass
+++ b/eclass/rebar.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: rebar.eclass
@@ -63,7 +63,7 @@ _rebar_find_dep() {
        local p
        local result
 
-       pushd "${EPREFIX}/$(get_erl_libs)" >/dev/null || return 1
+       pushd "${EPREFIX}$(get_erl_libs)" >/dev/null || return 1
        for p in ${pn} ${pn}-*; do
                if [[ -d ${p} ]]; then
                        # Ensure there's at most one matching.
@@ -102,7 +102,7 @@ erebar() {
 
        (( $# > 0 )) || die "erebar: at least one target is required"
 
-       local -x ERL_LIBS="${EPREFIX}/$(get_erl_libs)"
+       local -x ERL_LIBS="${EPREFIX}$(get_erl_libs)"
        [[ ${1} == eunit ]] && local -x ERL_LIBS="."
 
        rebar -v skip_deps=true "$@" || die -n "rebar $@ failed"
@@ -123,7 +123,7 @@ rebar_fix_include_path() {
 
        local pn="${1}"
        local rebar_config="${2:-rebar.config}"
-       local erl_libs="${EPREFIX}/$(get_erl_libs)"
+       local erl_libs="${EPREFIX}$(get_erl_libs)"
        local p
 
        p="$(_rebar_find_dep "${pn}")" \
@@ -212,7 +212,7 @@ rebar_src_prepare() {
 rebar_src_configure() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       local -x ERL_LIBS="${EPREFIX}/$(get_erl_libs)"
+       local -x ERL_LIBS="${EPREFIX}$(get_erl_libs)"
        default
 }
 
@@ -252,7 +252,7 @@ rebar_src_install() {
        [[ -d bin ]] && for bin in bin/*; do dobin "$bin"; done
 
        if [[ -d priv ]]; then
-               cp -pR priv "${ED%/}/${dest}/" || die "failed to install priv/"
+               cp -pR priv "${ED%/}${dest}/" || die "failed to install priv/"
        fi
 
        einstalldocs