From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1476525-garchives=archives.gentoo.org@lists.gentoo.org>
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 B423115800F
for <garchives@archives.gentoo.org>; Fri, 13 Jan 2023 05:51:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EB006E0950;
Fri, 13 Jan 2023 05:51:24 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CBBBDE0950
for <gentoo-commits@lists.gentoo.org>; Fri, 13 Jan 2023 05:51:24 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id F138633BF0B
for <gentoo-commits@lists.gentoo.org>; Fri, 13 Jan 2023 05:51:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 58050803
for <gentoo-commits@lists.gentoo.org>; Fri, 13 Jan 2023 05:51:22 +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: <1673589005.835163cfa57c3052287ae852ad44df18fff6bacf.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/bpftool/bpftool-5.19.12.ebuild dev-util/bpftool/bpftool-6.0.12.ebuild
X-VCS-Directories: dev-util/bpftool/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 835163cfa57c3052287ae852ad44df18fff6bacf
X-VCS-Branch: master
Date: Fri, 13 Jan 2023 05:51:22 +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: ff3f6941-3403-45ab-b6fa-5ed6fe23de80
X-Archives-Hash: 01e0d220d21cd4930d16ed2d0577aeea
commit: 835163cfa57c3052287ae852ad44df18fff6bacf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 05:50:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 05:50:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835163cf
dev-util/bpftool: fix build w/ app-alternatives/tar[libarchive]
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/bpftool/bpftool-5.19.12.ebuild | 6 +++---
dev-util/bpftool/bpftool-6.0.12.ebuild | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild b/dev-util/bpftool/bpftool-5.19.12.ebuild
index 276c46117bea..aa4096be5d13 100644
--- a/dev-util/bpftool/bpftool-5.19.12.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.12.ebuild
@@ -43,6 +43,7 @@ DEPEND="
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
+ app-arch/tar
dev-python/docutils
"
@@ -56,10 +57,9 @@ src_unpack() {
tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
)
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
+ # We expect the tar implementation to support the -j and --wildcards option
echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
"${paths[@]/#/linux-${LINUX_VER}/}" || die
if [[ -n ${LINUX_PATCH} ]] ; then
diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild b/dev-util/bpftool/bpftool-6.0.12.ebuild
index 6833c60b6e2a..35996f352094 100644
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ b/dev-util/bpftool/bpftool-6.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -41,6 +41,7 @@ DEPEND="
BDEPEND="
${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
+ app-arch/tar
dev-python/docutils
"
@@ -54,10 +55,9 @@ src_unpack() {
tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
)
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
+ # We expect the tar implementation to support the -j and --wildcards option
echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+ gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
"${paths[@]/#/linux-${LINUX_VER}/}" || die
if [[ -n ${LINUX_PATCH} ]] ; then