Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 27 Sep 2022 20:28:59
Message-Id: 1664310480.9b78899586d18da0c53eb588affcd8e6ffaa8bbb.mgorny@gentoo
1 commit: 9b78899586d18da0c53eb588affcd8e6ffaa8bbb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 24 14:33:34 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 27 20:28:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b788995
7
8 unpacker.eclass: Remove uppercase RAR/LHA variants
9
10 Remove the uppercase variants of RAR/LHA that were copied from Portage
11 implementation. The functions always convert filenames to lowercase,
12 so accounting for them is redundant.
13
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 eclass/unpacker.eclass | 8 ++++----
17 1 file changed, 4 insertions(+), 4 deletions(-)
18
19 diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
20 index e07c25d0ffa9..ca6761488100 100644
21 --- a/eclass/unpacker.eclass
22 +++ b/eclass/unpacker.eclass
23 @@ -444,9 +444,9 @@ _unpacker() {
24 case ${m} in
25 *.7z)
26 arch="unpack_7z" ;;
27 - *.rar|*.RAR)
28 + *.rar)
29 arch="unpack_rar" ;;
30 - *.LHA|*.LHa|*.lha|*.lzh)
31 + *.lha|*.lzh)
32 arch="unpack_lha" ;;
33 esac
34 fi
35 @@ -513,7 +513,7 @@ unpacker_src_uri_depends() {
36 case ${m} in
37 *.cpio.*|*.cpio)
38 d="app-arch/cpio" ;;
39 - *.rar|*.RAR)
40 + *.rar)
41 d="app-arch/unrar" ;;
42 *.7z)
43 d="app-arch/p7zip" ;;
44 @@ -525,7 +525,7 @@ unpacker_src_uri_depends() {
45 d="|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )" ;;
46 *.zst)
47 d="app-arch/zstd" ;;
48 - *.LHA|*.LHa|*.lha|*.lzh)
49 + *.lha|*.lzh)
50 d="app-arch/lha" ;;
51 esac
52 deps+=" ${d}"