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

[David Seifert]

commit:     ca471955da9c82ea8565147bbe5cc1740248b00c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  8 15:31:48 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 15:31:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca471955

wrapper.eclass: drop support for EAPI 5 and 6

Signed-off-by: David Seifert <soap <AT> gentoo.org>

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

diff --git a/eclass/wrapper.eclass b/eclass/wrapper.eclass
index a62bb51d0fe7..1f995a60509f 100644
--- a/eclass/wrapper.eclass
+++ b/eclass/wrapper.eclass
@@ -4,17 +4,13 @@
 # @ECLASS: wrapper.eclass
 # @MAINTAINER:
 # base-sys...@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: create a shell wrapper script
 
 if [[ -z ${_WRAPPER_ECLASS} ]]; then
 _WRAPPER_ECLASS=1
 
 case ${EAPI} in
-       5|6)
-               ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated 
EAPI ${EAPI}!"
-               ewarn "${CATEGORY}/${PF}: Support will be removed on 
2024-10-08. Please port to newer EAPI."
-               ;;
        7|8) ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
@@ -59,7 +55,7 @@ make_wrapper() {
                exeopts -m 0755
                exeinto "${path}"
                newexe "${tmpwrapper}" "${wrapper}"
-               ) || die
+               )
        else
                newbin "${tmpwrapper}" "${wrapper}"
        fi