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

[Ulrich Müller]

commit:     13c48b178beee52c5eccc023fd3e8c0feead4de4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 03:31:45 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 15:22:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c48b17

wrapper.eclass: Drop support for EAPIs 0 to 4

- Add EAPI conditional
- Use sed instead of cat, to preserve indentation of output

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eclass/wrapper.eclass | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/eclass/wrapper.eclass b/eclass/wrapper.eclass
index 399c7cc269d4..8d3d273d81c6 100644
--- a/eclass/wrapper.eclass
+++ b/eclass/wrapper.eclass
@@ -1,11 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: wrapper.eclass
 # @MAINTAINER:
 # base-sys...@gentoo.org
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: create a shell wrapper script
 
+case ${EAPI} in
+       5|6|7|8) ;;
+       *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 if [[ -z ${_WRAPPER_ECLASS} ]]; then
 _WRAPPER_ECLASS=1
 
@@ -19,7 +25,6 @@ _WRAPPER_ECLASS=1
 make_wrapper() {
        local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
        local tmpwrapper="${T}/tmp.wrapper.${wrapper##*/}"
-       has "${EAPI:-0}" 0 1 2 && local EPREFIX=""
 
        (
        echo '#!/bin/sh'
@@ -30,11 +35,11 @@ make_wrapper() {
                else
                        var=LD_LIBRARY_PATH
                fi
-               cat <<-EOF
+               sed 's/^X//' <<-EOF || die
                        if [ "\${${var}+set}" = "set" ] ; then
-                               export ${var}="\${${var}}:${EPREFIX}${libdir}"
+                       X       export ${var}="\${${var}}:${EPREFIX}${libdir}"
                        else
-                               export ${var}="${EPREFIX}${libdir}"
+                       X       export ${var}="${EPREFIX}${libdir}"
                        fi
                EOF
        fi
@@ -52,7 +57,7 @@ make_wrapper() {
                newexe "${tmpwrapper}" "${wrapper}"
                ) || die
        else
-               newbin "${tmpwrapper}" "${wrapper}" || die
+               newbin "${tmpwrapper}" "${wrapper}"
        fi
 }