On Mon, 2024-07-01 at 23:36 +0200, Ulrich Müller wrote:
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" ;;
Cool. 👍
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEEPxcZ3tkwcedKm2a8EiZBXQDdMTcFAmaDJ9ERHGNoZXdpQGdl bnRvby5vcmcACgkQEiZBXQDdMTe3sxAAqeqcO8LDfYWqgVbJ9Z9cMi78SvckAufg xjFrtZlJFLJuIcKz2HYukdyo4JGufI9lVX1fDg0hJCrwQhyLzarxQEvpEpZendsg QVV+GQ+aiMi00VRsJqKdCprbft0ZeLmzLrhOCw1m7CZ/6d+382a3iAG75ZlwcQe1 oYqOKQF1/kem3YEshaWJ2OdtoIPtW71uc3tXmUqMbd5dBVkpUMyPt3upBLuHm/tV otsJ9TPRdB9rqGy5SJfvrYyny6NzGGH7BfHTWiVeHhpWOIXLO7WjFdDgE0PR2IRV F2GezUFIrg066JBK2H/qbIsseNPQ3E5kc6q+KfoAiYgN9hfPZAlw2WgmXzBd5fk0 y4GVLu4mQjlhJEeYKc1zPI4Wbxt5Ro6gp3gtMCrKICKXfoBHzD+4xKEoDjCShRwL cJTZjrkubgwVpJ9voCpXXPTN4xBwaNXIcTbpYGeP/bnN9hCSAia6C6Pz1DHM2G7/ Dz7xCeY0LIFAe0pabn5X5FDtUjKJtsmxQ7SvVETZHgg8G6ph+vnErlJLdatnEPl4 G+6RZuvjTXV3pKmqIB+K7ZE9AZuGBVY4Q2gUlxbVSchzKQPoFQCeDcFKt/NGj7le 5n7c90ioAxXwCSHXOCyL8XAVf6XDDKSmpi2IkRre1F/FUSqMLj/krTxjFj6s7kR5
HD95p7BvJ/s=
=Ld70
-----END PGP SIGNATURE-----
--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)