commit: 34858e23de6ac549ca662a1dcc7823173567a210 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 23 14:18:32 2024 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Thu Jul 11 20:54:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34858e23
vcs-snapshot.eclass: Drop support for EAPI 6 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eclass/vcs-snapshot.eclass | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass index 1b7299b92a3b..0279e89ec3ab 100644 --- a/eclass/vcs-snapshot.eclass +++ b/eclass/vcs-snapshot.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: vcs-snapshot.eclass # @MAINTAINER: # [email protected] -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: support eclass for unpacking VCS snapshot tarballs # @DESCRIPTION: # THIS ECLASS IS NOT NECESSARY FOR MODERN GITHUB AND GITLAB SNAPSHOTS. @@ -43,7 +43,6 @@ # in ${WORKDIR}/${P} and ${WORKDIR}/${P}-otherstuff respectively. case ${EAPI} in - 6) inherit eqawarn ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -103,13 +102,10 @@ vcs-snapshot_src_unpack() { done if [[ ! ${renamed_any} ]]; then - local w=eerror - [[ ${EAPI} == 6 ]] && w=eqawarn - "${w}" "${FUNCNAME} did not find any archives that needed renaming." - "${w}" "Please verify that its usage is really necessary, and remove" - "${w}" "the inherit if it is not." - - [[ ${w} == eerror ]] && die "${FUNCNAME}: Unnecessary usage detected" + eerror "${FUNCNAME} did not find any archives that needed renaming." + eerror "Please verify that its usage is really necessary, and remove" + eerror "the inherit if it is not." + die "${FUNCNAME}: Unnecessary usage detected" fi }
