[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/, bin/

[Ulrich Müller]

commit:     dafad634cc4d46b6d7b45ec1535044f281916ef4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 17:33:47 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 08:01:25 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=dafad634

prep{,all}strip: Ban in ebuild scope

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

 bin/ebuild-helpers/prepallstrip | 13 ++-----------
 bin/ebuild-helpers/prepstrip    |  9 ++-------
 bin/estrip                      |  4 +---
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/bin/ebuild-helpers/prepallstrip b/bin/ebuild-helpers/prepallstrip
index f22483a531..80fcecba60 100755
--- a/bin/ebuild-helpers/prepallstrip
+++ b/bin/ebuild-helpers/prepallstrip
@@ -4,14 +4,5 @@
 
 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
 
-if ___eapi_has_dostrip; then
-       die "${0##*/}: ${0##*/} has been banned for EAPI '${EAPI}'; use 
'dostrip' instead"
-fi
-
-eqawarn "QA Notice: '${0##*/}' is not allowed in ebuild scope"
-
-if ! ___eapi_has_prefix_variables; then
-       ED=${D}
-fi
-
-exec prepstrip "${ED}"
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 0da4c65166..80fcecba60 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -4,10 +4,5 @@
 
 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
 
-if ___eapi_has_dostrip; then
-       die "${0##*/}: ${0##*/} has been banned for EAPI '${EAPI}'; use 
'dostrip' instead"
-fi
-
-eqawarn "QA Notice: '${0##*/}' is not allowed in ebuild scope"
-
-__PORTAGE_HELPER=prepstrip exec "${PORTAGE_BIN_PATH}"/estrip "${@}"
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1

diff --git a/bin/estrip b/bin/estrip
index 8a2f5adc1f..3ac6a16927 100755
--- a/bin/estrip
+++ b/bin/estrip
@@ -30,9 +30,8 @@ if ${PORTAGE_RESTRICT_strip} || ${FEATURES_nostrip} ; then
        ${FEATURES_installsources} || exit 0
 fi
 
-[[ ${__PORTAGE_HELPER} == prepstrip ]] && prepstrip=true || prepstrip=false
+prepstrip=false
 
-if ! ${prepstrip}; then
 while [[ $# -gt 0 ]] ; do
        case $1 in
        --ignore)
@@ -130,7 +129,6 @@ while [[ $# -gt 0 ]] ; do
        shift
 done
 set -- "${ED}"
-fi
 
 PRESERVE_XATTR=false
 if [[ ${KERNEL} == linux ]] && ${FEATURES_xattr} ; then