Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] dosym: revert deprecated prefix compat (bug 615594)
Date: Sun, 19 Jan 2020 18:49:59
Message-Id: 20200119184426.9954-1-zmedico@gentoo.org
1 According to PMS, dosym callers need to explicitly prefix the first
2 argument with ${EPREFIX} if that's desired.
3
4 https://bugs.gentoo.org/615594
5 Signed-off-by: Zac Medico <zmedico@g.o>
6 ---
7 bin/ebuild-helpers/dosym | 8 --------
8 1 file changed, 8 deletions(-)
9
10 diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym
11 index d5a651bf5..e869bb71c 100755
12 --- a/bin/ebuild-helpers/dosym
13 +++ b/bin/ebuild-helpers/dosym
14 @@ -21,14 +21,6 @@ fi
15 destdir=${2%/*}
16 [[ ! -d ${ED%/}/${destdir#/} ]] && dodir "${destdir}"
17 target="${1}"
18 -# DEPRECATED HACK: when absolute, prefix with offset for Gentoo Prefix
19 -# (but only if ${EPREFIX} is not there already)
20 -# this will eventually be removed, #615594
21 -if [[ ${target:0:1} == "/" && ${target}/ != "${EPREFIX}"/* ]]; then
22 - eqawarn "dosym: prepending EPREFIX to path implicitly. If this is desired,"
23 - eqawarn " please fix the ebuild to use \${EPREFIX} explicitly."
24 - target="${EPREFIX}${target}"
25 -fi
26 ln -snf "${target}" "${ED%/}/${2#/}"
27
28 ret=$?
29 --
30 2.24.1

Replies