public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Ulrich Müller" <ulm@gentoo.org>
Subject: [gentoo-dev] [PATCH] vcs-snapshot.eclass: Drop support for EAPI 6
Date: Mon,  1 Jul 2024 23:37:16 +0200	[thread overview]
Message-ID: <20240701213728.31114-1-ulm@gentoo.org> (raw)

Signed-off-by: Ulrich Müller <ulm@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:
 # mgorny@gentoo.org
-# @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
 }
 
-- 
2.45.2



                 reply	other threads:[~2024-07-01 21:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240701213728.31114-1-ulm@gentoo.org \
    --to=ulm@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox