From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A691915802E for ; Mon, 1 Jul 2024 21:37:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A361E2C4E; Mon, 1 Jul 2024 21:37:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10837E2C37 for ; Mon, 1 Jul 2024 21:37:03 +0000 (UTC) From: =?UTF-8?q?Ulrich=20M=C3=BCller?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Ulrich=20M=C3=BCller?= Subject: [gentoo-dev] [PATCH] unpacker.eclass: Drop support for EAPI 6 Date: Mon, 1 Jul 2024 23:36:44 +0200 Message-ID: <20240701213654.31029-1-ulm@gentoo.org> X-Mailer: git-send-email 2.45.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 132abaae-32de-462e-a695-55a242846714 X-Archives-Hash: 774a41fc6de8ec354576e16251e31dce Signed-off-by: Ulrich Müller --- 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