From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Ulrich Müller" <ulm@gentoo.org>
Subject: [gentoo-dev] [PATCH] unpacker.eclass: Drop support for EAPI 6
Date: Mon, 1 Jul 2024 23:36:44 +0200 [thread overview]
Message-ID: <20240701213654.31029-1-ulm@gentoo.org> (raw)
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/unpacker.eclass | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 2957ca02d3f4..91520a36d16a 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -4,7 +4,7 @@
# @ECLASS: unpacker.eclass
# @MAINTAINER:
# base-system@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: helpers for extraneous file formats and consistent behavior across EAPIs
# @DESCRIPTION:
# Some extraneous file formats are not part of PMS, or are only in certain
@@ -16,7 +16,7 @@
# - support partial unpacks?
case ${EAPI} in
- 6|7|8) ;;
+ 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -430,10 +430,7 @@ _unpacker_get_decompressor() {
echo "xz -T$(makeopts_jobs) -dc" ;;
*.lz)
find_lz_unpacker() {
- local has_version_arg="-b"
-
- [[ ${EAPI} == 6 ]] && has_version_arg="--host-root"
- if has_version "${has_version_arg}" ">=app-arch/xz-utils-5.4.0" ; then
+ if has_version -b ">=app-arch/xz-utils-5.4.0" ; then
echo xz
return
fi
@@ -537,7 +534,7 @@ _unpacker() {
esac
# 7z, rar and lha/lzh are handled by package manager in EAPI < 8
- if [[ ${EAPI} != [67] ]]; then
+ if [[ ${EAPI} != 7 ]]; then
case ${m} in
*.7z)
arch="unpack_7z" ;;
--
2.45.2
next reply other threads:[~2024-07-01 21:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-01 21:36 Ulrich Müller [this message]
2024-07-01 22:04 ` [gentoo-dev] [PATCH] unpacker.eclass: Drop support for EAPI 6 James Le Cuirot
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=20240701213654.31029-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