From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1731577-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 finch.gentoo.org (Postfix) with ESMTPS id 956321581EE
for <garchives@archives.gentoo.org>; Wed, 26 Mar 2025 22:54:33 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(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)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 7A241343168
for <garchives@archives.gentoo.org>; Wed, 26 Mar 2025 22:54:33 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 7C29F110296;
Wed, 26 Mar 2025 22:54:32 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 bobolink.gentoo.org (Postfix) with ESMTPS id 6DE3B110296
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Mar 2025 22:54:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 smtp.gentoo.org (Postfix) with ESMTPS id 1D05C343168
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Mar 2025 22:54:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A22931936
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Mar 2025 22:54:30 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1743029609.d33762e29e5a768a25abd7ca895d7b55e6f5951d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/unpacker.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d33762e29e5a768a25abd7ca895d7b55e6f5951d
X-VCS-Branch: master
Date: Wed, 26 Mar 2025 22:54:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: aa3deb69-74e1-4ec9-b79b-69041009b806
X-Archives-Hash: 536dcd69e8a1f0d4991c580b9b2348d8
commit: d33762e29e5a768a25abd7ca895d7b55e6f5951d
Author: NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Tue Mar 25 12:51:39 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 26 22:53:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d33762e2
Revert "unpacker.eclass: fix 7zip dep"
unpacker already checks for 7zz (always provided by
app-arch/7zip) and uses it if available and thus 7z symlink was
not necessary.
the problem was in app-arch/lzma using EAPI=7, unpacker doesn't
handle 7z files when below EAPI=8
This reverts commit b0d848e9ff18dff2ec1a47d4c4487e010edd80c8.
[sam: Add more Bug: trailers.]
Bug: https://bugs.gentoo.org/942397
Bug: https://bugs.gentoo.org/952020
Signed-off-by: NRK <nrk <AT> disroot.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/unpacker.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 85ea9921e560..0ace3ae53cb9 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -617,7 +617,7 @@ unpacker_src_uri_depends() {
*.7z)
deps[7z]="
|| (
- >=app-arch/7zip-24.09[symlink]
+ app-arch/7zip
app-arch/p7zip
)
"