[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-05-31 Thread Guilherme Amadio
commit: d032453480c537c876b756bbc1d70267a0baf7b2
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Fri May 31 08:24:21 2024 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Fri May 31 11:47:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0324534

dev-util/bpftool: sync unpack paths with perf, bug #933193

Bug: https://bugs.gentoo.org/933193
Signed-off-by: Guilherme Amadio  gentoo.org>

 dev-util/bpftool/bpftool-6.9.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/bpftool/bpftool-6.9.2.ebuild 
b/dev-util/bpftool/bpftool-6.9.2.ebuild
index 44879c17c473..ad96f3a3e5b0 100644
--- a/dev-util/bpftool/bpftool-6.9.2.ebuild
+++ b/dev-util/bpftool/bpftool-6.9.2.ebuild
@@ -52,8 +52,8 @@ CONFIG_CHECK="~DEBUG_INFO_BTF"
 # it's building from the same tarball, please keep it in sync with perf
 src_unpack() {
local paths=(
-   tools/bpf kernel/bpf
-   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts}
+   scripts include lib "arch/*/include" "arch/*/lib" "arch/*/tools"
)
 
# We expect the tar implementation to support the -j and --wildcards 
option



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-05-29 Thread Jakov Smolić
commit: 3b074535f20e2f44760c1f8b1d3079c99f587c93
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed May 29 07:08:05 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed May 29 07:27:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b074535

dev-util/bpftool: add 6.9.2

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   2 +
 dev-util/bpftool/bpftool-6.9.2.ebuild | 123 ++
 2 files changed, 125 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 8d640e2b0f2c..948aab2a184a 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,6 @@
 DIST linux-6.7.tar.xz 141406528 BLAKE2B 
cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e
 SHA512 
de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
 DIST linux-6.8.tar.xz 142502100 BLAKE2B 
c6f17f816cea16e629f63e9379b9713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2
 SHA512 
5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
+DIST linux-6.9.tar.xz 144034416 BLAKE2B 
4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e
 SHA512 
fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
 DIST patch-6.7.6.xz 583872 BLAKE2B 
123dfd4170680917ebf16c3c7f3ab31754637c962dca5e5f5d52dd702a46bb68b01ca3a5b3c2482db34841f139871126576d30703825f8ca2dda2d8bfc4ed7e2
 SHA512 
ab5bef028a6c61e3c6432d49e95d88aec97140d7f8b295a71ba96b08254199343f93f11da4b34ab2482015adb0d1816b6719a21f8a0f2b1dd1bd96fcd3a72d2e
 DIST patch-6.8.2.xz 247244 BLAKE2B 
a85078230548543c38550a5546689d0b44a54208cdad591ab34e10dec9348ce2f74e45bf85f373b14977d40556067e2e2c17ac4b6791fbb8aaba98feccd3cdac
 SHA512 
a8e32b89f7680670c69c62f356846bb65b57614f979114627a9a2f945d7dc97c921d30197dffa993e5b18e499ba8c7196046ffdf0e721528a5378d1ee65a9ba5
+DIST patch-6.9.2.xz 16184 BLAKE2B 
8a37e96c253b55b57c86f1654f2ea8bf65af96b1b38213e90032cb918bb8eea992d6ddbfa6a6774a229ab2e2288ab57bdb6cbad6e7e393c123f24850e06847c9
 SHA512 
a27af24f0caaa5de3811b6db5acc2d72b96df9ebb5c44bad99a949d871fb06c6ffd2be10cfc35b246d430c7be2291701f802aed47eaa8818ad12b8818a60f3ec

diff --git a/dev-util/bpftool/bpftool-6.9.2.ebuild 
b/dev-util/bpftool/bpftool-6.9.2.ebuild
new file mode 100644
index ..44879c17c473
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.9.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="caps +llvm"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+   llvm? ( sys-devel/llvm:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   )
+
+   # We expect the tar implementation to support the -j and --wildcards 
option
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-04-30 Thread Sam James
commit: 720920726dc1a3c6f0355e4739ce700a8bfaf7f4
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 07:15:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 07:15:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72092072

dev-util/bpftool: add missing filename arg to sed

Closes: https://bugs.gentoo.org/930965
Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-6.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.8.2.ebuild 
b/dev-util/bpftool/bpftool-6.8.2.ebuild
index d9eba8e311ae..44879c17c473 100644
--- a/dev-util/bpftool/bpftool-6.8.2.ebuild
+++ b/dev-util/bpftool/bpftool-6.8.2.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
fi
 
# Use rst2man or rst2man.py depending on which one exists (#930076)
-   type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g' || die
+   type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g' 
Documentation/Makefile || die
 
# remove -Werror (bug 887981)
sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-04-29 Thread Jakov Smolić
commit: adea930a417ec19cecca8c1b990ddf99fd3d59ee
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 29 18:55:19 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 29 18:55:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adea930a

dev-util/bpftool: Add missing die

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-6.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.8.2.ebuild 
b/dev-util/bpftool/bpftool-6.8.2.ebuild
index 0f0a2decef13..d9eba8e311ae 100644
--- a/dev-util/bpftool/bpftool-6.8.2.ebuild
+++ b/dev-util/bpftool/bpftool-6.8.2.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
fi
 
# Use rst2man or rst2man.py depending on which one exists (#930076)
-   type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g'
+   type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g' || die
 
# remove -Werror (bug 887981)
sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-04-29 Thread Jakov Smolić
commit: 6dd9e0a038bff6b6428654207aa55c02d0e4cb06
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 29 08:53:08 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 29 18:48:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd9e0a0

dev-util/bpftool: drop 6.5.7, 6.6.8

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   4 --
 dev-util/bpftool/bpftool-6.5.7.ebuild | 118 -
 dev-util/bpftool/bpftool-6.6.8.ebuild | 121 --
 3 files changed, 243 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 6fcde0c77d11..e26e5e9ae35e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,2 @@
-DIST linux-6.5.tar.xz 138898084 BLAKE2B 
2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39
 SHA512 
1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
-DIST linux-6.6.tar.xz 140064536 BLAKE2B 
5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
 SHA512 
458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST linux-6.7.tar.xz 141406528 BLAKE2B 
cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e
 SHA512 
de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
-DIST patch-6.5.7.xz 561404 BLAKE2B 
98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175
 SHA512 
4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392
-DIST patch-6.6.8.xz 587540 BLAKE2B 
4794b1b4415b8369b856a4b04d23931903a84d7f660e5cbf5677c359dba3c64cdb55606325ad2be1ce7878cd0daa95d2318dbf5ef12006ad37c9a69cd74b2dae
 SHA512 
1bdf6186ef52831d508dacf740ce6c18eccca71a6426e294d5d47ebfff26a716c58db1963c439760ef104a594db5fa888d3374bc113af229794cca9362692dfe
 DIST patch-6.7.6.xz 583872 BLAKE2B 
123dfd4170680917ebf16c3c7f3ab31754637c962dca5e5f5d52dd702a46bb68b01ca3a5b3c2482db34841f139871126576d30703825f8ca2dda2d8bfc4ed7e2
 SHA512 
ab5bef028a6c61e3c6432d49e95d88aec97140d7f8b295a71ba96b08254199343f93f11da4b34ab2482015adb0d1816b6719a21f8a0f2b1dd1bd96fcd3a72d2e

diff --git a/dev-util/bpftool/bpftool-6.5.7.ebuild 
b/dev-util/bpftool/bpftool-6.5.7.ebuild
deleted file mode 100644
index 01823047c46c..
--- a/dev-util/bpftool/bpftool-6.5.7.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   app-arch/tar
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
-   )
-
-   # We expect the tar implementation to support the -j and --wildcards 
option
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-04-29 Thread Jakov Smolić
commit: d06dc1b0de375ceeccc4f21b0d4e722809a8
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 29 09:26:20 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 29 18:48:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06dc1b0

dev-util/bpftool: Workaround rst2man extension change

Thanks to Ionen and Holger for providing the patch.

Closes: https://bugs.gentoo.org/930076
Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-6.8.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/bpftool/bpftool-6.8.2.ebuild 
b/dev-util/bpftool/bpftool-6.8.2.ebuild
index acd42e33726c..0f0a2decef13 100644
--- a/dev-util/bpftool/bpftool-6.8.2.ebuild
+++ b/dev-util/bpftool/bpftool-6.8.2.ebuild
@@ -87,8 +87,8 @@ src_prepare() {
popd || die
fi
 
-   # dev-python/docutils installs rst2man.py, not rst2man
-   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+   # Use rst2man or rst2man.py depending on which one exists (#930076)
+   type -P rst2man >/dev/null || sed -i -e 's/rst2man/rst2man.py/g'
 
# remove -Werror (bug 887981)
sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-04-29 Thread Jakov Smolić
commit: 5d2f173ca28e2458e528debe2cb56db5b0b1f9ed
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 29 09:23:32 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 29 18:48:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2f173c

dev-util/bpftool: add 6.8.2

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   2 +
 dev-util/bpftool/bpftool-6.8.2.ebuild | 123 ++
 2 files changed, 125 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index e26e5e9ae35e..8d640e2b0f2c 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,2 +1,4 @@
 DIST linux-6.7.tar.xz 141406528 BLAKE2B 
cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e
 SHA512 
de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
+DIST linux-6.8.tar.xz 142502100 BLAKE2B 
c6f17f816cea16e629f63e9379b9713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2
 SHA512 
5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
 DIST patch-6.7.6.xz 583872 BLAKE2B 
123dfd4170680917ebf16c3c7f3ab31754637c962dca5e5f5d52dd702a46bb68b01ca3a5b3c2482db34841f139871126576d30703825f8ca2dda2d8bfc4ed7e2
 SHA512 
ab5bef028a6c61e3c6432d49e95d88aec97140d7f8b295a71ba96b08254199343f93f11da4b34ab2482015adb0d1816b6719a21f8a0f2b1dd1bd96fcd3a72d2e
+DIST patch-6.8.2.xz 247244 BLAKE2B 
a85078230548543c38550a5546689d0b44a54208cdad591ab34e10dec9348ce2f74e45bf85f373b14977d40556067e2e2c17ac4b6791fbb8aaba98feccd3cdac
 SHA512 
a8e32b89f7680670c69c62f356846bb65b57614f979114627a9a2f945d7dc97c921d30197dffa993e5b18e499ba8c7196046ffdf0e721528a5378d1ee65a9ba5

diff --git a/dev-util/bpftool/bpftool-6.8.2.ebuild 
b/dev-util/bpftool/bpftool-6.8.2.ebuild
new file mode 100644
index ..acd42e33726c
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.8.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="caps +llvm"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+   llvm? ( sys-devel/llvm:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   )
+
+   # We expect the tar implementation to support the -j and --wildcards 
option
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+
+   # remove -Werror (bug 887981)
+   sed 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-03-12 Thread Sam James
commit: 24172569fd17b55efd637aca8eebd2a929500e7e
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 13 04:47:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 13 04:47:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24172569

dev-util/bpftool: Stabilize 6.7.6-r1 arm64, #916522

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-6.7.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild 
b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
index 79776fea6019..fd04d9b6bbec 100644
--- a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="caps +llvm"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-03-10 Thread Jakov Smolić
commit: 1d41d4ee58bdebbd7590d187b3188bfcf627927a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Mar 10 23:21:42 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Mar 10 23:21:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d41d4ee

dev-util/bpftool: Stabilize 6.7.6-r1 arm, #916522

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-6.7.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild 
b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
index ec2607369331..79776fea6019 100644
--- a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="caps +llvm"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-03-10 Thread Arthur Zamarin
commit: b60a29f83a3d2c8ace14c5c7d846076cac5fa80f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Mar 10 20:00:31 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 10 20:00:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60a29f8

dev-util/bpftool: Stabilize 6.7.6-r1 ppc64, #916522

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-6.7.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild 
b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
index ba3cc0e648f7..3035895ff9d8 100644
--- a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
 IUSE="caps +llvm"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-03-10 Thread Arthur Zamarin
commit: bf0d8bf7c6b99b2054b62599e656daecc46067db
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Mar 10 20:00:34 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 10 20:00:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0d8bf7

dev-util/bpftool: Stabilize 6.7.6-r1 ppc, #916522

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-6.7.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild 
b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
index 3035895ff9d8..ec2607369331 100644
--- a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="caps +llvm"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-03-10 Thread Arthur Zamarin
commit: 17ff90ccfb6c2ab1f28a24a292126c6c75261b61
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Mar 10 19:52:10 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 10 19:52:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ff90cc

dev-util/bpftool: Stabilize 6.7.6-r1 x86, #916522

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-6.7.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild 
b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
index 359317b7dff7..ba3cc0e648f7 100644
--- a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="caps +llvm"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-03-10 Thread Arthur Zamarin
commit: 7956fefc6627468c9044144dbdf6796c90a818e5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Mar 10 19:52:07 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 10 19:52:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7956fefc

dev-util/bpftool: Stabilize 6.7.6-r1 amd64, #916522

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-6.7.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild 
b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
index acd42e33726c..359317b7dff7 100644
--- a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="caps +llvm"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-02-24 Thread Jakov Smolić
commit: bdfd15b0e299313dd6151e3e71e4274e9c21a2f9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Feb 24 21:28:47 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Feb 24 21:29:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdfd15b0

dev-util/bpftool: Fix automagic llvm depencency

Closes: https://bugs.gentoo.org/919699
Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/{bpftool-6.7.6.ebuild => bpftool-6.7.6-r1.ebuild} | 4 +++-
 dev-util/bpftool/metadata.xml  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.7.6.ebuild 
b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
similarity index 97%
rename from dev-util/bpftool/bpftool-6.7.6.ebuild
rename to dev-util/bpftool/bpftool-6.7.6-r1.ebuild
index d9aaf97df06f..acd42e33726c 100644
--- a/dev-util/bpftool/bpftool-6.7.6.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
@@ -26,13 +26,14 @@ S="${S_K}/tools/bpf/bpftool"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="caps"
+IUSE="caps +llvm"
 
 RDEPEND="
sys-libs/binutils-libs:=
sys-libs/zlib:=
virtual/libelf:=
caps? ( sys-libs/libcap:= )
+   llvm? ( sys-devel/llvm:= )
 "
 DEPEND="
${RDEPEND}
@@ -103,6 +104,7 @@ bpftool_make() {
prefix="${EPREFIX}"/usr \
bash_compdir="$(get_bashcompdir)" \
feature-libcap="$(usex caps 1 0)" \
+   feature-llvm="$(usex llvm 1 0)" \
"$@"
 }
 

diff --git a/dev-util/bpftool/metadata.xml b/dev-util/bpftool/metadata.xml
index 5e14e3b3c659..bfc94c6cdaaf 100644
--- a/dev-util/bpftool/metadata.xml
+++ b/dev-util/bpftool/metadata.xml
@@ -7,5 +7,6 @@


Use sys-libs/libcap to enable 
unprivileged run support
+   Use sys-devel/llvm

 



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-02-24 Thread Jakov Smolić
commit: 24220478c1224c5491223df28b8af6d58358d3e8
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Sat Feb 24 18:22:02 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Feb 24 19:24:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24220478

dev-util/bpftool: remove -Werror

Closes: https://bugs.gentoo.org/887981

Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-6.6.8.ebuild | 3 +++
 dev-util/bpftool/bpftool-6.7.6.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dev-util/bpftool/bpftool-6.6.8.ebuild 
b/dev-util/bpftool/bpftool-6.6.8.ebuild
index 8d18340895fc..2b872d7a7f85 100644
--- a/dev-util/bpftool/bpftool-6.6.8.ebuild
+++ b/dev-util/bpftool/bpftool-6.6.8.ebuild
@@ -88,6 +88,9 @@ src_prepare() {
 
# dev-python/docutils installs rst2man.py, not rst2man
sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+
+   # remove -Werror (bug 887981)
+   sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die
 }
 
 bpftool_make() {

diff --git a/dev-util/bpftool/bpftool-6.7.6.ebuild 
b/dev-util/bpftool/bpftool-6.7.6.ebuild
index 97be10f5b785..22dbd6e83235 100644
--- a/dev-util/bpftool/bpftool-6.7.6.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6.ebuild
@@ -88,6 +88,9 @@ src_prepare() {
 
# dev-python/docutils installs rst2man.py, not rst2man
sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+
+   # remove -Werror (bug 887981)
+   sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die
 }
 
 bpftool_make() {



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-02-24 Thread Jakov Smolić
commit: 542175a36df13a2808876ee14e8aa040c0a10c44
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Sat Feb 24 18:23:30 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Feb 24 19:24:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542175a3

dev-util/bpftool: add python-3.12

Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/35515
Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-6.6.8.ebuild | 2 +-
 dev-util/bpftool/bpftool-6.7.6.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/bpftool/bpftool-6.6.8.ebuild 
b/dev-util/bpftool/bpftool-6.6.8.ebuild
index 2b872d7a7f85..6bccebe1c3cf 100644
--- a/dev-util/bpftool/bpftool-6.6.8.ebuild
+++ b/dev-util/bpftool/bpftool-6.6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
 
 MY_PV="${PV/_/-}"

diff --git a/dev-util/bpftool/bpftool-6.7.6.ebuild 
b/dev-util/bpftool/bpftool-6.7.6.ebuild
index 22dbd6e83235..d9aaf97df06f 100644
--- a/dev-util/bpftool/bpftool-6.7.6.ebuild
+++ b/dev-util/bpftool/bpftool-6.7.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
 
 MY_PV="${PV/_/-}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2024-02-24 Thread Jakov Smolić
commit: a965dfc7b1674d411f130b82a28184257c0a6483
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Feb 24 12:09:46 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Feb 24 12:39:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a965dfc7

dev-util/bpftool: add 6.7.6

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   2 +
 dev-util/bpftool/bpftool-6.7.6.ebuild | 118 ++
 2 files changed, 120 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 0dc7e81f770b..6fcde0c77d11 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,6 @@
 DIST linux-6.5.tar.xz 138898084 BLAKE2B 
2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39
 SHA512 
1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 
5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
 SHA512 
458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
+DIST linux-6.7.tar.xz 141406528 BLAKE2B 
cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e
 SHA512 
de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
 DIST patch-6.5.7.xz 561404 BLAKE2B 
98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175
 SHA512 
4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392
 DIST patch-6.6.8.xz 587540 BLAKE2B 
4794b1b4415b8369b856a4b04d23931903a84d7f660e5cbf5677c359dba3c64cdb55606325ad2be1ce7878cd0daa95d2318dbf5ef12006ad37c9a69cd74b2dae
 SHA512 
1bdf6186ef52831d508dacf740ce6c18eccca71a6426e294d5d47ebfff26a716c58db1963c439760ef104a594db5fa888d3374bc113af229794cca9362692dfe
+DIST patch-6.7.6.xz 583872 BLAKE2B 
123dfd4170680917ebf16c3c7f3ab31754637c962dca5e5f5d52dd702a46bb68b01ca3a5b3c2482db34841f139871126576d30703825f8ca2dda2d8bfc4ed7e2
 SHA512 
ab5bef028a6c61e3c6432d49e95d88aec97140d7f8b295a71ba96b08254199343f93f11da4b34ab2482015adb0d1816b6719a21f8a0f2b1dd1bd96fcd3a72d2e

diff --git a/dev-util/bpftool/bpftool-6.7.6.ebuild 
b/dev-util/bpftool/bpftool-6.7.6.ebuild
new file mode 100644
index ..97be10f5b785
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.7.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   )
+
+   # We expect the tar implementation to support the -j and --wildcards 
option
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-12-26 Thread Jakov Smolić
commit: 896cdc33b503fac3e8fbd33f4f1ae0665fe7d10b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Dec 27 00:00:27 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Dec 27 00:02:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896cdc33

dev-util/bpftool: add 6.6.8

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   2 +
 dev-util/bpftool/bpftool-6.6.8.ebuild | 118 ++
 2 files changed, 120 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index d2e04609fea1..0dc7e81f770b 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,2 +1,4 @@
 DIST linux-6.5.tar.xz 138898084 BLAKE2B 
2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39
 SHA512 
1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
+DIST linux-6.6.tar.xz 140064536 BLAKE2B 
5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
 SHA512 
458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST patch-6.5.7.xz 561404 BLAKE2B 
98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175
 SHA512 
4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392
+DIST patch-6.6.8.xz 587540 BLAKE2B 
4794b1b4415b8369b856a4b04d23931903a84d7f660e5cbf5677c359dba3c64cdb55606325ad2be1ce7878cd0daa95d2318dbf5ef12006ad37c9a69cd74b2dae
 SHA512 
1bdf6186ef52831d508dacf740ce6c18eccca71a6426e294d5d47ebfff26a716c58db1963c439760ef104a594db5fa888d3374bc113af229794cca9362692dfe

diff --git a/dev-util/bpftool/bpftool-6.6.8.ebuild 
b/dev-util/bpftool/bpftool-6.6.8.ebuild
new file mode 100644
index ..8d18340895fc
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.6.8.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   )
+
+   # We expect the tar implementation to support the -j and --wildcards 
option
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local arch=$(tc-arch-kernel)
+   tc-export AR CC LD
+
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-11-22 Thread Jakov Smolić
commit: 2b067719f211c467871f5e3777393bffd1e8c056
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Nov 22 17:08:47 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Nov 22 17:09:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b067719

dev-util/bpftool: drop 6.3

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   2 -
 dev-util/bpftool/bpftool-6.3.ebuild | 118 
 2 files changed, 120 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index dbd7cfaa98be..d2e04609fea1 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,2 @@
-DIST linux-6.3.tar.xz 136891752 BLAKE2B 
f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69
 SHA512 
768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 DIST linux-6.5.tar.xz 138898084 BLAKE2B 
2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39
 SHA512 
1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
-DIST patch-6.3.xz 8617176 BLAKE2B 
cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3
 SHA512 
4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4
 DIST patch-6.5.7.xz 561404 BLAKE2B 
98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175
 SHA512 
4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392

diff --git a/dev-util/bpftool/bpftool-6.3.ebuild 
b/dev-util/bpftool/bpftool-6.3.ebuild
deleted file mode 100644
index 01823047c46c..
--- a/dev-util/bpftool/bpftool-6.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   app-arch/tar
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
-   )
-
-   # We expect the tar implementation to support the -j and --wildcards 
option
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply "${WORKDIR}"/${P}.patch
-   popd || die
-   fi
-
-   # dev-python/docutils installs rst2man.py, not rst2man
-   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-   local arch=$(tc-arch-kernel)
-   tc-export AR CC LD
-
-   emake 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-11-17 Thread Sam James
commit: cf9a42567228362e9d294769c915f011e2908c15
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 17 12:07:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 12:07:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9a4256

dev-util/bpftool: Stabilize 6.5.7 amd64, #917478

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-6.5.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.5.7.ebuild 
b/dev-util/bpftool/bpftool-6.5.7.ebuild
index 8d18340895fc..01823047c46c 100644
--- a/dev-util/bpftool/bpftool-6.5.7.ebuild
+++ b/dev-util/bpftool/bpftool-6.5.7.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-10-11 Thread Jakov Smolić
commit: 1024c7b3f3ecd9f92768dc2fb4ea7450221826d4
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Oct 11 20:57:41 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Oct 11 21:06:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1024c7b3

dev-util/bpftool: add 6.5.7

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   2 +
 dev-util/bpftool/bpftool-6.5.7.ebuild | 118 ++
 2 files changed, 120 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index ecc17649d6c1..dbd7cfaa98be 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,2 +1,4 @@
 DIST linux-6.3.tar.xz 136891752 BLAKE2B 
f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69
 SHA512 
768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
+DIST linux-6.5.tar.xz 138898084 BLAKE2B 
2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39
 SHA512 
1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
 DIST patch-6.3.xz 8617176 BLAKE2B 
cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3
 SHA512 
4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4
+DIST patch-6.5.7.xz 561404 BLAKE2B 
98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175
 SHA512 
4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392

diff --git a/dev-util/bpftool/bpftool-6.5.7.ebuild 
b/dev-util/bpftool/bpftool-6.5.7.ebuild
new file mode 100644
index ..8d18340895fc
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.5.7.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   )
+
+   # We expect the tar implementation to support the -j and --wildcards 
option
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local arch=$(tc-arch-kernel)
+   tc-export AR CC LD
+
+  

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-07-11 Thread WANG Xuerui
commit: c17c96fc4e200e89c9c76af5965e6a76a5b7a35b
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Jul 11 10:59:23 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue Jul 11 11:02:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17c96fc

dev-util/bpftool: keyword 6.3 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-util/bpftool/bpftool-6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.3.ebuild 
b/dev-util/bpftool/bpftool-6.3.ebuild
index fe2630be53e2..01823047c46c 100644
--- a/dev-util/bpftool/bpftool-6.3.ebuild
+++ b/dev-util/bpftool/bpftool-6.3.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-07-05 Thread Sam James
commit: df49f0e04def7ced84fbb1246a9275e5aa78d2f8
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul  5 21:41:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul  5 21:41:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df49f0e0

dev-util/bpftool: Keyword 6.3 ppc64, #909734

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.3.ebuild 
b/dev-util/bpftool/bpftool-6.3.ebuild
index f52a316a46fa..fe2630be53e2 100644
--- a/dev-util/bpftool/bpftool-6.3.ebuild
+++ b/dev-util/bpftool/bpftool-6.3.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-07-05 Thread Sam James
commit: a2f3e4a6540fa72fb50c6e49f67bfea31db7d0a1
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul  5 21:41:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul  5 21:41:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f3e4a6

dev-util/bpftool: Keyword 6.3 ppc, #909734

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.3.ebuild 
b/dev-util/bpftool/bpftool-6.3.ebuild
index 6d380fce5a6a..f52a316a46fa 100644
--- a/dev-util/bpftool/bpftool-6.3.ebuild
+++ b/dev-util/bpftool/bpftool-6.3.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/files/

2023-06-23 Thread Conrad Kostecki
commit: 084ead622832443d32771a931014ecaef71f750c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jun 13 16:42:42 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Jun 23 21:28:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084ead62

dev-util/bpftool: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31424
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-util/bpftool/files/5.19.12-no-stack-protector.patch | 14 --
 1 file changed, 14 deletions(-)

diff --git a/dev-util/bpftool/files/5.19.12-no-stack-protector.patch 
b/dev-util/bpftool/files/5.19.12-no-stack-protector.patch
deleted file mode 100644
index c9ae115ac20d..
--- a/dev-util/bpftool/files/5.19.12-no-stack-protector.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-https://bugs.gentoo.org/890638
-
 a/tools/bpf/bpftool/Makefile   2022-12-11 23:15:18.0 +0100
-+++ b/tools/bpf/bpftool/Makefile   2023-01-13 10:32:09.615048492 +0100
-@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT
-   -I$(or $(OUTPUT),.) \
-   -I$(srctree)/tools/include/uapi/ \
-   -I$(LIBBPF_BOOTSTRAP_INCLUDE) \
--  -g -O2 -Wall -target bpf -c $< -o $@
-+  -g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@
-   $(Q)$(LLVM_STRIP) -g $@
- 
- $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP)



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-06-09 Thread Jakov Smolić
commit: a28514ee786c77076c30e5233049f79bd9cde357
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jun 10 05:20:55 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jun 10 05:22:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28514ee

dev-util/bpftool: drop 6.2.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   2 -
 dev-util/bpftool/bpftool-6.2.1.ebuild | 123 --
 2 files changed, 125 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 62b3436b2664..ecc17649d6c1 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,2 @@
-DIST linux-6.2.tar.xz 136430892 BLAKE2B 
05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d
 SHA512 
a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST linux-6.3.tar.xz 136891752 BLAKE2B 
f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69
 SHA512 
768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
-DIST patch-6.2.1.xz 5688 BLAKE2B 
383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90
 SHA512 
e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
 DIST patch-6.3.xz 8617176 BLAKE2B 
cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3
 SHA512 
4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4

diff --git a/dev-util/bpftool/bpftool-6.2.1.ebuild 
b/dev-util/bpftool/bpftool-6.2.1.ebuild
deleted file mode 100644
index ac56b1006ed3..
--- a/dev-util/bpftool/bpftool-6.2.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   app-arch/tar
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
-   )
-
-   # We expect the tar implementation to support the -j and --wildcards 
option
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply "${WORKDIR}"/${P}.patch
-   popd || die
-   fi
-
-   pushd "${S_K}" >/dev/null || die
-   # bug #890638
-   eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
-   popd || die
-
-   # dev-python/docutils installs rst2man.py, not rst2man
-   sed -i -e 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-06-09 Thread Arthur Zamarin
commit: 52fdea125a9ee8ef5929ed6ca79b02dd6b4f4316
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 17:38:50 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 17:38:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52fdea12

dev-util/bpftool: Stabilize 6.3 amd64, #908167

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.3.ebuild 
b/dev-util/bpftool/bpftool-6.3.ebuild
index 7df12a6556bc..6d380fce5a6a 100644
--- a/dev-util/bpftool/bpftool-6.3.ebuild
+++ b/dev-util/bpftool/bpftool-6.3.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-05-18 Thread Jakov Smolić
commit: 65cbe41ef52176d753282518b32f10803875cd2d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu May 18 08:27:16 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu May 18 15:55:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65cbe41e

dev-util/bpftool: drop 6.2.11

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-6.2.11.ebuild | 123 -
 2 files changed, 124 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 8942f01741cb..62b3436b2664 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,4 @@
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 
05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d
 SHA512 
a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST linux-6.3.tar.xz 136891752 BLAKE2B 
f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69
 SHA512 
768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 DIST patch-6.2.1.xz 5688 BLAKE2B 
383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90
 SHA512 
e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
-DIST patch-6.2.11.xz 683356 BLAKE2B 
e77dabcfb28aa22afcfd57c80508d345497ae95c176e49112136e67f914013d9480c55395992a0a8ee4c02f61354af78de2db13ea92d0f0b8bd220b2404c8cda
 SHA512 
86fb459cd07b023014ec82f030189c732bb3717715b644f3b6012537465a26b9bda164b8f4a57e121a914ae7cae8209473505300ecd8c14d035266e7cf22dac6
 DIST patch-6.3.xz 8617176 BLAKE2B 
cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3
 SHA512 
4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4

diff --git a/dev-util/bpftool/bpftool-6.2.11.ebuild 
b/dev-util/bpftool/bpftool-6.2.11.ebuild
deleted file mode 100644
index 5e04ebcc3cf1..
--- a/dev-util/bpftool/bpftool-6.2.11.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   app-arch/tar
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
-   )
-
-   # We expect the tar implementation to support the -j and --wildcards 
option
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-04-25 Thread Jakov Smolić
commit: cd28ad30bdc765caed1e98b7324ed757b16fed59
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Apr 25 15:31:45 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Apr 25 18:43:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd28ad30

dev-util/bpftool: add 6.3

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   2 +
 dev-util/bpftool/bpftool-6.3.ebuild | 118 
 2 files changed, 120 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 2083bea69d8d..8942f01741cb 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,3 +1,5 @@
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 
05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d
 SHA512 
a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
+DIST linux-6.3.tar.xz 136891752 BLAKE2B 
f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69
 SHA512 
768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 DIST patch-6.2.1.xz 5688 BLAKE2B 
383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90
 SHA512 
e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
 DIST patch-6.2.11.xz 683356 BLAKE2B 
e77dabcfb28aa22afcfd57c80508d345497ae95c176e49112136e67f914013d9480c55395992a0a8ee4c02f61354af78de2db13ea92d0f0b8bd220b2404c8cda
 SHA512 
86fb459cd07b023014ec82f030189c732bb3717715b644f3b6012537465a26b9bda164b8f4a57e121a914ae7cae8209473505300ecd8c14d035266e7cf22dac6
+DIST patch-6.3.xz 8617176 BLAKE2B 
cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3
 SHA512 
4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4

diff --git a/dev-util/bpftool/bpftool-6.3.ebuild 
b/dev-util/bpftool/bpftool-6.3.ebuild
new file mode 100644
index ..7df12a6556bc
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   )
+
+   # We expect the tar implementation to support the -j and --wildcards 
option
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-04-21 Thread Jakov Smolić
commit: 383aa3a39d95af76597b402fe0d048e4933392ca
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Apr 20 07:25:49 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Apr 21 06:02:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383aa3a3

dev-util/bpftool: add 6.2.11

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-6.2.11.ebuild | 123 +
 2 files changed, 124 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index cb6a4e5c08b2..2083bea69d8d 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,2 +1,3 @@
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 
05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d
 SHA512 
a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST patch-6.2.1.xz 5688 BLAKE2B 
383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90
 SHA512 
e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
+DIST patch-6.2.11.xz 683356 BLAKE2B 
e77dabcfb28aa22afcfd57c80508d345497ae95c176e49112136e67f914013d9480c55395992a0a8ee4c02f61354af78de2db13ea92d0f0b8bd220b2404c8cda
 SHA512 
86fb459cd07b023014ec82f030189c732bb3717715b644f3b6012537465a26b9bda164b8f4a57e121a914ae7cae8209473505300ecd8c14d035266e7cf22dac6

diff --git a/dev-util/bpftool/bpftool-6.2.11.ebuild 
b/dev-util/bpftool/bpftool-6.2.11.ebuild
new file mode 100644
index ..5e04ebcc3cf1
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.2.11.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   )
+
+   # We expect the tar implementation to support the -j and --wildcards 
option
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   pushd "${S_K}" >/dev/null || die
+   # bug #890638
+   eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
+   popd || die
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local arch=$(tc-arch-kernel)
+   tc-export AR CC LD
+
+   emake V=1 VF=1 \
+   HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+   EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" 
BPFTOOL_VERSION="${MY_PV}" \

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-04-11 Thread Jakov Smolić
commit: 4836cee781c9fa036b064cf207f059a7fb377b45
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Apr 11 21:41:49 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Apr 11 21:41:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4836cee7

dev-util/bpftool: drop 5.19.12

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   3 -
 dev-util/bpftool/bpftool-5.19.12.ebuild | 127 
 2 files changed, 130 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 5ade2d90604f..cb6a4e5c08b2 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,2 @@
-DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 
05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d
 SHA512 
a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
-DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
 DIST patch-6.2.1.xz 5688 BLAKE2B 
383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90
 SHA512 
e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
-DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild 
b/dev-util/bpftool/bpftool-5.19.12.ebuild
deleted file mode 100644
index fa8315db60c6..
--- a/dev-util/bpftool/bpftool-5.19.12.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz;
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   app-arch/tar
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
-   )
-
-   # We expect the tar implementation to support the -j and --wildcards 
option
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-04-11 Thread Arthur Zamarin
commit: 12a26964bcf6ea58d58b35a77b96223437c269b3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr 11 18:46:25 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 11 18:46:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a26964

dev-util/bpftool: Stabilize 6.2.1 amd64, #904182

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-6.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.2.1.ebuild 
b/dev-util/bpftool/bpftool-6.2.1.ebuild
index 5e04ebcc3cf1..ac56b1006ed3 100644
--- a/dev-util/bpftool/bpftool-6.2.1.ebuild
+++ b/dev-util/bpftool/bpftool-6.2.1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-03-06 Thread Jakov Smolić
commit: 1fa7a6ea7c83d6f40be9d4698df44b5dc6726f91
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Mar  6 19:14:20 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Mar  6 19:18:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa7a6ea

dev-util/bpftool: drop 6.0.12, 6.1.7

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   4 --
 dev-util/bpftool/bpftool-6.0.12.ebuild | 123 -
 dev-util/bpftool/bpftool-6.1.7.ebuild  | 123 -
 3 files changed, 250 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index fabfa7344abf..5ade2d90604f 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,9 +1,5 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
-DIST linux-6.0.tar.xz 133886176 BLAKE2B 
c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa
 SHA512 
bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-DIST linux-6.1.tar.xz 134728520 BLAKE2B 
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
 SHA512 
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 
05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d
 SHA512 
a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
-DIST patch-6.0.12.xz 635356 BLAKE2B 
f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa
 SHA512 
d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00
-DIST patch-6.1.7.xz 533812 BLAKE2B 
b08005dfaa1247378fa2b3d1955537bcbbc6ee8c9171552e27ce51716c4c414e6b442d6ee33344431275e6b0140f315a5ea986977d102b298bb7651e5dbbbcef
 SHA512 
e824cca5bb1e98439b152b15674292f042a5df8567ba2439a111af58084277ff800df6b326d6ecf0e3ee325d5ab2d2d9dc31db7a0176828f1690bd855b2a
 DIST patch-6.2.1.xz 5688 BLAKE2B 
383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90
 SHA512 
e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild 
b/dev-util/bpftool/bpftool-6.0.12.ebuild
deleted file mode 100644
index 4f68a43259e9..
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   app-arch/tar
-   dev-python/docutils
-"
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-03-06 Thread Jakov Smolić
commit: 3860f60fb95660c5302bab87d672ae01643c7dd3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Mar  6 16:59:38 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Mar  6 19:18:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3860f60f

dev-util/bpftool: add 6.2.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   2 +
 dev-util/bpftool/bpftool-6.2.1.ebuild | 123 ++
 2 files changed, 125 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 6379bf4e6bb6..fabfa7344abf 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,7 +1,9 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.0.tar.xz 133886176 BLAKE2B 
c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa
 SHA512 
bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST linux-6.1.tar.xz 134728520 BLAKE2B 
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
 SHA512 
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
+DIST linux-6.2.tar.xz 136430892 BLAKE2B 
05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d
 SHA512 
a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
 DIST patch-6.0.12.xz 635356 BLAKE2B 
f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa
 SHA512 
d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00
 DIST patch-6.1.7.xz 533812 BLAKE2B 
b08005dfaa1247378fa2b3d1955537bcbbc6ee8c9171552e27ce51716c4c414e6b442d6ee33344431275e6b0140f315a5ea986977d102b298bb7651e5dbbbcef
 SHA512 
e824cca5bb1e98439b152b15674292f042a5df8567ba2439a111af58084277ff800df6b326d6ecf0e3ee325d5ab2d2d9dc31db7a0176828f1690bd855b2a
+DIST patch-6.2.1.xz 5688 BLAKE2B 
383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90
 SHA512 
e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-6.2.1.ebuild 
b/dev-util/bpftool/bpftool-6.2.1.ebuild
new file mode 100644
index ..5e04ebcc3cf1
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.2.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-03-06 Thread Arthur Zamarin
commit: 89cfc5a32680250d9420edd923013ef0720cc03c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Mar  6 13:44:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Mar  6 13:44:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89cfc5a3

dev-util/bpftool: Keyword 6.1.7 arm64, #899688

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-6.1.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.1.7.ebuild 
b/dev-util/bpftool/bpftool-6.1.7.ebuild
index a4951203b876..5e04ebcc3cf1 100644
--- a/dev-util/bpftool/bpftool-6.1.7.ebuild
+++ b/dev-util/bpftool/bpftool-6.1.7.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-03-06 Thread Arthur Zamarin
commit: 4afb8ded01b36ae445dfc7a055c590da3f2d0ffe
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Mar  6 12:51:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Mar  6 12:51:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4afb8ded

dev-util/bpftool: Keyword 6.1.7 arm, #899688

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-6.1.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.1.7.ebuild 
b/dev-util/bpftool/bpftool-6.1.7.ebuild
index 312ca35bf0e2..a4951203b876 100644
--- a/dev-util/bpftool/bpftool-6.1.7.ebuild
+++ b/dev-util/bpftool/bpftool-6.1.7.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-03-04 Thread Jakov Smolić
commit: 8d4a544394cb86801688a64b92d4ff506a179b06
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Mar  4 19:35:36 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Mar  4 22:17:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4a5443

dev-util/bpftool: enable py3.11

Closes: https://bugs.gentoo.org/896916
Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-6.1.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-6.1.7.ebuild 
b/dev-util/bpftool/bpftool-6.1.7.ebuild
index 4f68a43259e9..312ca35bf0e2 100644
--- a/dev-util/bpftool/bpftool-6.1.7.ebuild
+++ b/dev-util/bpftool/bpftool-6.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
 
 MY_PV="${PV/_/-}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-01-24 Thread Jakov Smolić
commit: 6b171e74a39049cade0c9499059210250d2a60df
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jan 25 06:40:36 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jan 25 06:40:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b171e74

dev-util/bpftool: add 6.1.7

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   2 +
 dev-util/bpftool/bpftool-6.1.7.ebuild | 123 ++
 2 files changed, 125 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index a9565ab90157..6379bf4e6bb6 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,7 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.0.tar.xz 133886176 BLAKE2B 
c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa
 SHA512 
bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
+DIST linux-6.1.tar.xz 134728520 BLAKE2B 
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
 SHA512 
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
 DIST patch-6.0.12.xz 635356 BLAKE2B 
f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa
 SHA512 
d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00
+DIST patch-6.1.7.xz 533812 BLAKE2B 
b08005dfaa1247378fa2b3d1955537bcbbc6ee8c9171552e27ce51716c4c414e6b442d6ee33344431275e6b0140f315a5ea986977d102b298bb7651e5dbbbcef
 SHA512 
e824cca5bb1e98439b152b15674292f042a5df8567ba2439a111af58084277ff800df6b326d6ecf0e3ee325d5ab2d2d9dc31db7a0176828f1690bd855b2a
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-6.1.7.ebuild 
b/dev-util/bpftool/bpftool-6.1.7.ebuild
new file mode 100644
index ..4f68a43259e9
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.1.7.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   app-arch/tar
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   tools/{arch,build,include,lib,perf,scripts} 
{scripts,include,lib} "arch/*/lib"
+   )
+
+   # We expect the tar implementation to support the -j and --wildcards 
option
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-01-17 Thread Sam James
commit: 0ff398c8011c20cc94fc5a5cd2dcb0be859de9fa
Author: YiFei Zhu  google  com>
AuthorDate: Tue Jan 17 23:21:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 00:46:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff398c8

dev-util/bpftool: Fix install in prefix

Without this patch install would cause:
  * QA Notice: the following files are outside of the prefix:
  * /usr
  * /usr/share
  * /usr/share/bash-completion
  * /usr/share/bash-completion/completions
  * /usr/share/bash-completion/completions/bpftool
  * ERROR: dev-util/bpftool-6.0.12::gentoo failed:
  *   Aborting due to QA concerns: there are files installed outside the prefix

The Makefile defines
  bash_compdir ?= /usr/share/bash-completion/completions
and the install command is
  $(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)

We can just do a simple override with $(get_bashcompdir) from
bash-completion-r1.eclass.

Signed-off-by: YiFei Zhu  google.com>
Closes: https://github.com/gentoo/gentoo/pull/29151
Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-5.19.12.ebuild | 3 ++-
 dev-util/bpftool/bpftool-6.0.12.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild 
b/dev-util/bpftool/bpftool-5.19.12.ebuild
index 71df5aaddcfa..fa8315db60c6 100644
--- a/dev-util/bpftool/bpftool-5.19.12.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.12.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-pre/-git}"
@@ -107,6 +107,7 @@ bpftool_make() {
HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" 
BPFTOOL_VERSION="${MY_PV}" \
prefix="${EPREFIX}"/usr \
+   bash_compdir="$(get_bashcompdir)" \
feature-libcap="$(usex caps 1 0)" \
"$@"
 }

diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild 
b/dev-util/bpftool/bpftool-6.0.12.ebuild
index 15e5be3ce116..4f68a43259e9 100644
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ b/dev-util/bpftool/bpftool-6.0.12.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+inherit estack linux-info optfeature python-any-r1 bash-completion-r1 
toolchain-funcs
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-pre/-git}"
@@ -103,6 +103,7 @@ bpftool_make() {
HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" 
BPFTOOL_VERSION="${MY_PV}" \
prefix="${EPREFIX}"/usr \
+   bash_compdir="$(get_bashcompdir)" \
feature-libcap="$(usex caps 1 0)" \
"$@"
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/, dev-util/bpftool/files/

2023-01-13 Thread Sam James
commit: de78decd557db68c05c7b57875acf77c04281a79
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 10:24:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 10:24:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de78decd

dev-util/bpftool: avoid duplicate patch

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-6.0.12.ebuild |  2 +-
 dev-util/bpftool/files/6.0.12-no-stack-protector.patch | 14 --
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild 
b/dev-util/bpftool/bpftool-6.0.12.ebuild
index 5e3c53bae36d..0ea6f12c98cd 100644
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ b/dev-util/bpftool/bpftool-6.0.12.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 
pushd "${S_K}" >/dev/null || die
# bug #890638
-   eapply "${FILESDIR}"/${PV}-no-stack-protector.patch
+   eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
popd || die
 
# dev-python/docutils installs rst2man.py, not rst2man

diff --git a/dev-util/bpftool/files/6.0.12-no-stack-protector.patch 
b/dev-util/bpftool/files/6.0.12-no-stack-protector.patch
deleted file mode 100644
index c9ae115ac20d..
--- a/dev-util/bpftool/files/6.0.12-no-stack-protector.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-https://bugs.gentoo.org/890638
-
 a/tools/bpf/bpftool/Makefile   2022-12-11 23:15:18.0 +0100
-+++ b/tools/bpf/bpftool/Makefile   2023-01-13 10:32:09.615048492 +0100
-@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT
-   -I$(or $(OUTPUT),.) \
-   -I$(srctree)/tools/include/uapi/ \
-   -I$(LIBBPF_BOOTSTRAP_INCLUDE) \
--  -g -O2 -Wall -target bpf -c $< -o $@
-+  -g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@
-   $(Q)$(LLVM_STRIP) -g $@
- 
- $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP)



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/, dev-util/bpftool/files/

2023-01-13 Thread Sam James
commit: e6371538947cff10c0d6dba0f36dd93af9b555f9
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Fri Jan 13 10:04:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 10:22:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6371538

dev-util/bftool: fix build with clang+ssp

Closes: https://bugs.gentoo.org/890638
Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/29086
Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-5.19.12.ebuild |  1 +
 dev-util/bpftool/bpftool-6.0.12.ebuild  |  5 +
 dev-util/bpftool/files/5.19.12-no-stack-protector.patch | 14 ++
 dev-util/bpftool/files/6.0.12-no-stack-protector.patch  | 14 ++
 4 files changed, 34 insertions(+)

diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild 
b/dev-util/bpftool/bpftool-5.19.12.ebuild
index aa4096be5d13..49cf78ab56a8 100644
--- a/dev-util/bpftool/bpftool-5.19.12.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.12.ebuild
@@ -92,6 +92,7 @@ src_prepare() {
# Used `git format-patch 
00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00`
# bug #868123
eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches
+   eapply "${FILESDIR}"/${PV}-no-stack-protector.patch
popd || die
 
# dev-python/docutils installs rst2man.py, not rst2man

diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild 
b/dev-util/bpftool/bpftool-6.0.12.ebuild
index 35996f352094..5e3c53bae36d 100644
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ b/dev-util/bpftool/bpftool-6.0.12.ebuild
@@ -86,6 +86,11 @@ src_prepare() {
popd || die
fi
 
+   pushd "${S_K}" >/dev/null || die
+   # bug #890638
+   eapply "${FILESDIR}"/${PV}-no-stack-protector.patch
+   popd || die
+
# dev-python/docutils installs rst2man.py, not rst2man
sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
 }

diff --git a/dev-util/bpftool/files/5.19.12-no-stack-protector.patch 
b/dev-util/bpftool/files/5.19.12-no-stack-protector.patch
new file mode 100644
index ..c9ae115ac20d
--- /dev/null
+++ b/dev-util/bpftool/files/5.19.12-no-stack-protector.patch
@@ -0,0 +1,14 @@
+
+https://bugs.gentoo.org/890638
+
+--- a/tools/bpf/bpftool/Makefile   2022-12-11 23:15:18.0 +0100
 b/tools/bpf/bpftool/Makefile   2023-01-13 10:32:09.615048492 +0100
+@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT
+   -I$(or $(OUTPUT),.) \
+   -I$(srctree)/tools/include/uapi/ \
+   -I$(LIBBPF_BOOTSTRAP_INCLUDE) \
+-  -g -O2 -Wall -target bpf -c $< -o $@
++  -g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@
+   $(Q)$(LLVM_STRIP) -g $@
+ 
+ $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP)

diff --git a/dev-util/bpftool/files/6.0.12-no-stack-protector.patch 
b/dev-util/bpftool/files/6.0.12-no-stack-protector.patch
new file mode 100644
index ..c9ae115ac20d
--- /dev/null
+++ b/dev-util/bpftool/files/6.0.12-no-stack-protector.patch
@@ -0,0 +1,14 @@
+
+https://bugs.gentoo.org/890638
+
+--- a/tools/bpf/bpftool/Makefile   2022-12-11 23:15:18.0 +0100
 b/tools/bpf/bpftool/Makefile   2023-01-13 10:32:09.615048492 +0100
+@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT
+   -I$(or $(OUTPUT),.) \
+   -I$(srctree)/tools/include/uapi/ \
+   -I$(LIBBPF_BOOTSTRAP_INCLUDE) \
+-  -g -O2 -Wall -target bpf -c $< -o $@
++  -g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@
+   $(Q)$(LLVM_STRIP) -g $@
+ 
+ $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP)



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-01-12 Thread Sam James
commit: 835163cfa57c3052287ae852ad44df18fff6bacf
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 05:50:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 05:50:05 2023 +
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  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



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-01-08 Thread Jakov Smolić
commit: 9f7edc2b7b35c848b89f0a7d2c32b2a1fafb7a92
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Jan  8 17:06:11 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Jan  8 17:06:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f7edc2b

dev-util/bpftool: drop 5.19.8

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.19.8.ebuild | 125 -
 2 files changed, 126 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 1eebe18dd38e..a9565ab90157 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,5 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.0.tar.xz 133886176 BLAKE2B 
c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa
 SHA512 
bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
-DIST patch-5.19.8.xz 695676 BLAKE2B 
3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c
 SHA512 
16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161
 DIST patch-6.0.12.xz 635356 BLAKE2B 
f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa
 SHA512 
d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-5.19.8.ebuild 
b/dev-util/bpftool/bpftool-5.19.8.ebuild
deleted file mode 100644
index 43dec802c6e2..
--- a/dev-util/bpftool/bpftool-5.19.8.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz;
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2023-01-08 Thread Arthur Zamarin
commit: 70e5beb4ea86ba8bcbefd0ff51acc697217fa178
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jan  8 17:00:19 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jan  8 17:00:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e5beb4

dev-util/bpftool: Stabilize 5.19.12 amd64, #890230

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/bpftool/bpftool-5.19.12.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild 
b/dev-util/bpftool/bpftool-5.19.12.ebuild
index 3b2b5a406a29..276c46117bea 100644
--- a/dev-util/bpftool/bpftool-5.19.12.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.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
@@ -27,7 +27,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-12-22 Thread Jakov Smolić
commit: c7c9b0d3f7a21a0abacf5a3e031f9b6a5ebf00c3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Dec 21 13:59:30 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Dec 22 13:28:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c9b0d3

dev-util/bpftool: add 6.0.12

Closes: https://bugs.gentoo.org/887453
Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   2 +
 dev-util/bpftool/bpftool-6.0.12.ebuild | 117 +
 2 files changed, 119 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index c472e9343f53..1eebe18dd38e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,6 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
+DIST linux-6.0.tar.xz 133886176 BLAKE2B 
c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa
 SHA512 
bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
 DIST patch-5.19.8.xz 695676 BLAKE2B 
3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c
 SHA512 
16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161
+DIST patch-6.0.12.xz 635356 BLAKE2B 
f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa
 SHA512 
d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild 
b/dev-util/bpftool/bpftool-6.0.12.ebuild
new file mode 100644
index ..6833c60b6e2a
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.0.12.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-10-29 Thread Jakov Smolić
commit: b8f1dbf55cc768d8da938dd70fa1b90389745ccc
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Oct 29 10:52:42 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Oct 29 10:52:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f1dbf5

dev-util/bpftool: drop 5.19.2-r1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest |   1 -
 dev-util/bpftool/bpftool-5.19.2-r1.ebuild | 125 --
 2 files changed, 126 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 72425106615a..c472e9343f53 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,4 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
-DIST patch-5.19.2.xz 475316 BLAKE2B 
e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642
 SHA512 
53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299
 DIST patch-5.19.8.xz 695676 BLAKE2B 
3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c
 SHA512 
16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild 
b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
deleted file mode 100644
index 43dec802c6e2..
--- a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz;
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
- 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-10-20 Thread Jakov Smolić
commit: 7e9fa49e51fce383555849a29f985acba9024f09
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Oct 20 10:50:38 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct 20 10:50:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9fa49e

dev-util/bpftool: Stabilize 5.19.8 amd64, #877183

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-5.19.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.19.8.ebuild 
b/dev-util/bpftool/bpftool-5.19.8.ebuild
index 3b2b5a406a29..43dec802c6e2 100644
--- a/dev-util/bpftool/bpftool-5.19.8.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.8.ebuild
@@ -27,7 +27,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-10-07 Thread Jakov Smolić
commit: 037531248c696c612d870b79506029ac9d24e860
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Oct  7 12:25:07 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Oct  7 12:25:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03753124

dev-util/bpftool: drop 5.18.11

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   2 -
 dev-util/bpftool/bpftool-5.18.11.ebuild | 117 
 2 files changed, 119 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index f81974419b7e..72425106615a 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,4 @@
-DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
-DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
 DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
 DIST patch-5.19.2.xz 475316 BLAKE2B 
e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642
 SHA512 
53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299
 DIST patch-5.19.8.xz 695676 BLAKE2B 
3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c
 SHA512 
16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161

diff --git a/dev-util/bpftool/bpftool-5.18.11.ebuild 
b/dev-util/bpftool/bpftool-5.18.11.ebuild
deleted file mode 100644
index fe508400267f..
--- a/dev-util/bpftool/bpftool-5.18.11.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-10-05 Thread Sam James
commit: 9baaa222932fdfae948c0d3f19518aa0d5fbafd2
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  5 11:34:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  5 11:34:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9baaa222

dev-util/bpftool: Stabilize 5.19.2-r1 amd64, #875218

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-5.19.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild 
b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
index 3b2b5a406a29..43dec802c6e2 100644
--- a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
@@ -27,7 +27,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-10-04 Thread Jakov Smolić
commit: 7231209b76bb087db0a8c634784466c6949d2c2a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Oct  4 15:40:35 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Oct  4 15:42:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7231209b

dev-util/bpftool: add 5.19.12

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 +
 dev-util/bpftool/bpftool-5.19.12.ebuild | 125 
 2 files changed, 126 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index a54bc7639553..f81974419b7e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,7 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
+DIST patch-5.19.12.xz 828424 BLAKE2B 
fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1
 SHA512 
40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
 DIST patch-5.19.2.xz 475316 BLAKE2B 
e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642
 SHA512 
53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299
 DIST patch-5.19.8.xz 695676 BLAKE2B 
3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c
 SHA512 
16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild 
b/dev-util/bpftool/bpftool-5.19.12.ebuild
new file mode 100644
index ..3b2b5a406a29
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.19.12.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz;
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-09-13 Thread Jakov Smolić
commit: 503c74c884b3d293145be5c6859cda6f9547db25
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Sep 13 10:54:38 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Sep 13 10:55:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503c74c8

dev-util/bpftool: add 5.19.8

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.19.8.ebuild | 125 +
 2 files changed, 126 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 4a7ceaf7092e..3147cab86582 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -3,4 +3,5 @@ DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa
 DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
 DIST patch-5.19.1.xz 7644 BLAKE2B 
e0e31aa647bd6e5bbd62e7469f62718362c1d7434dd658de30e79a14dc009b64e748b81939abae6369149cb13e1e75dff3da0c8800a9780260e6d1df7b22
 SHA512 
a61c71c6fb935b4b256ff3cbdfdaba502af98f2b4b905dfc8f669aae502049bb4b44eb08e362cd6108e17190343e4cc6f39474b1a62287756401b359205708db
 DIST patch-5.19.2.xz 475316 BLAKE2B 
e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642
 SHA512 
53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299
+DIST patch-5.19.8.xz 695676 BLAKE2B 
3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c
 SHA512 
16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-5.19.8.ebuild 
b/dev-util/bpftool/bpftool-5.19.8.ebuild
new file mode 100644
index ..3b2b5a406a29
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.19.8.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz;
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-09-13 Thread Jakov Smolić
commit: 6e0dd6556ca61b8c011f49df658cb055dca08811
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Sep 13 10:55:18 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Sep 13 10:55:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0dd655

dev-util/bpftool: drop 5.19.1, 5.19.2

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.19.1.ebuild | 117 -
 dev-util/bpftool/bpftool-5.19.2.ebuild | 117 -
 3 files changed, 235 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 3147cab86582..a54bc7639553 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,7 +1,6 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
-DIST patch-5.19.1.xz 7644 BLAKE2B 
e0e31aa647bd6e5bbd62e7469f62718362c1d7434dd658de30e79a14dc009b64e748b81939abae6369149cb13e1e75dff3da0c8800a9780260e6d1df7b22
 SHA512 
a61c71c6fb935b4b256ff3cbdfdaba502af98f2b4b905dfc8f669aae502049bb4b44eb08e362cd6108e17190343e4cc6f39474b1a62287756401b359205708db
 DIST patch-5.19.2.xz 475316 BLAKE2B 
e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642
 SHA512 
53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299
 DIST patch-5.19.8.xz 695676 BLAKE2B 
3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c
 SHA512 
16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-5.19.1.ebuild 
b/dev-util/bpftool/bpftool-5.19.1.ebuild
deleted file mode 100644
index 6833c60b6e2a..
--- a/dev-util/bpftool/bpftool-5.19.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-09-04 Thread Sam James
commit: 6a9b6dc9c199622f24258322aa5bf5e3c03432ff
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep  5 01:14:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep  5 01:14:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9b6dc9

dev-util/bpftool: add comment re binutils-2.39 patches

Bug: https://bugs.gentoo.org/868123
Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-5.19.2-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild 
b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
index a0c1c2b4cfc2..3b2b5a406a29 100644
--- a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
@@ -89,6 +89,8 @@ src_prepare() {
fi
 
pushd "${S_K}" >/dev/null || die
+   # Used `git format-patch 
00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00`
+   # bug #868123
eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches
popd || die
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-09-04 Thread Sam James
commit: d262a0f0a5ecd88f076e66c734721a24334897dc
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep  5 00:42:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep  5 00:42:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d262a0f0

dev-util/bpftool: fix build w/ binutils-2.39

Closes: https://bugs.gentoo.org/868123
Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/Manifest |   1 +
 dev-util/bpftool/bpftool-5.19.2-r1.ebuild | 123 ++
 2 files changed, 124 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 4832ea6d7fbb..4a7ceaf7092e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -3,3 +3,4 @@ DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa
 DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
 DIST patch-5.19.1.xz 7644 BLAKE2B 
e0e31aa647bd6e5bbd62e7469f62718362c1d7434dd658de30e79a14dc009b64e748b81939abae6369149cb13e1e75dff3da0c8800a9780260e6d1df7b22
 SHA512 
a61c71c6fb935b4b256ff3cbdfdaba502af98f2b4b905dfc8f669aae502049bb4b44eb08e362cd6108e17190343e4cc6f39474b1a62287756401b359205708db
 DIST patch-5.19.2.xz 475316 BLAKE2B 
e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642
 SHA512 
53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299
+DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B 
ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e
 SHA512 
af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b

diff --git a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild 
b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
new file mode 100644
index ..a0c1c2b4cfc2
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz;
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-09-03 Thread Jakov Smolić
commit: b223a1fc57952d3ccfad0425e415666fb8d75478
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Sep  3 13:35:59 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Sep  3 13:58:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b223a1fc

dev-util/bpftool: drop 5.18.6

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.18.6.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index c3cdd1b20add..4832ea6d7fbb 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,5 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
-DIST patch-5.18.6.xz 486212 BLAKE2B 
59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15
 SHA512 
c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38
 DIST patch-5.19.1.xz 7644 BLAKE2B 
e0e31aa647bd6e5bbd62e7469f62718362c1d7434dd658de30e79a14dc009b64e748b81939abae6369149cb13e1e75dff3da0c8800a9780260e6d1df7b22
 SHA512 
a61c71c6fb935b4b256ff3cbdfdaba502af98f2b4b905dfc8f669aae502049bb4b44eb08e362cd6108e17190343e4cc6f39474b1a62287756401b359205708db
 DIST patch-5.19.2.xz 475316 BLAKE2B 
e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642
 SHA512 
53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299

diff --git a/dev-util/bpftool/bpftool-5.18.6.ebuild 
b/dev-util/bpftool/bpftool-5.18.6.ebuild
deleted file mode 100644
index fe508400267f..
--- a/dev-util/bpftool/bpftool-5.18.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-09-03 Thread Jakov Smolić
commit: 81db845330bf5c9b9f51c6fd06081808adad879a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Sep  3 13:35:05 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Sep  3 13:58:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81db8453

dev-util/bpftool: add 5.19.2

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.19.2.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 40dbe1817adc..c3cdd1b20add 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -3,3 +3,4 @@ DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa
 DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
 DIST patch-5.18.6.xz 486212 BLAKE2B 
59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15
 SHA512 
c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38
 DIST patch-5.19.1.xz 7644 BLAKE2B 
e0e31aa647bd6e5bbd62e7469f62718362c1d7434dd658de30e79a14dc009b64e748b81939abae6369149cb13e1e75dff3da0c8800a9780260e6d1df7b22
 SHA512 
a61c71c6fb935b4b256ff3cbdfdaba502af98f2b4b905dfc8f669aae502049bb4b44eb08e362cd6108e17190343e4cc6f39474b1a62287756401b359205708db
+DIST patch-5.19.2.xz 475316 BLAKE2B 
e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642
 SHA512 
53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299

diff --git a/dev-util/bpftool/bpftool-5.19.2.ebuild 
b/dev-util/bpftool/bpftool-5.19.2.ebuild
new file mode 100644
index ..6833c60b6e2a
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.19.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-08-31 Thread Jakov Smolić
commit: bf1a14f257beaf33377660797f91dc44835e915e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Aug 31 07:36:20 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Aug 31 07:36:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1a14f2

dev-util/bpftool: Stabilize 5.18.11 amd64, #867682

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-5.18.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.18.11.ebuild 
b/dev-util/bpftool/bpftool-5.18.11.ebuild
index 6833c60b6e2a..fe508400267f 100644
--- a/dev-util/bpftool/bpftool-5.18.11.ebuild
+++ b/dev-util/bpftool/bpftool-5.18.11.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-08-21 Thread Jakov Smolić
commit: 086c159a2276225627fcc7cd5190afca053efa0f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Aug 17 10:02:33 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Aug 21 14:54:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086c159a

dev-util/bpftool: add 5.19.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   2 +
 dev-util/bpftool/bpftool-5.19.1.ebuild | 117 +
 2 files changed, 119 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 3da8801b57d1..40dbe1817adc 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,3 +1,5 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
+DIST linux-5.19.tar.xz 131581464 BLAKE2B 
4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a
 SHA512 
00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
 DIST patch-5.18.6.xz 486212 BLAKE2B 
59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15
 SHA512 
c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38
+DIST patch-5.19.1.xz 7644 BLAKE2B 
e0e31aa647bd6e5bbd62e7469f62718362c1d7434dd658de30e79a14dc009b64e748b81939abae6369149cb13e1e75dff3da0c8800a9780260e6d1df7b22
 SHA512 
a61c71c6fb935b4b256ff3cbdfdaba502af98f2b4b905dfc8f669aae502049bb4b44eb08e362cd6108e17190343e4cc6f39474b1a62287756401b359205708db

diff --git a/dev-util/bpftool/bpftool-5.19.1.ebuild 
b/dev-util/bpftool/bpftool-5.19.1.ebuild
new file mode 100644
index ..6833c60b6e2a
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.19.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-08-21 Thread Jakov Smolić
commit: 5bd49a31db5838635d215b3c1b5662afca0267d2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Aug 17 09:41:08 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Aug 21 14:54:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd49a31

dev-util/bpftool: drop 5.18.4

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.18.4.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 281d2be10e43..3da8801b57d1 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,3 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
-DIST patch-5.18.4.xz 424880 BLAKE2B 
6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756
 SHA512 
4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949
 DIST patch-5.18.6.xz 486212 BLAKE2B 
59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15
 SHA512 
c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38

diff --git a/dev-util/bpftool/bpftool-5.18.4.ebuild 
b/dev-util/bpftool/bpftool-5.18.4.ebuild
deleted file mode 100644
index fe508400267f..
--- a/dev-util/bpftool/bpftool-5.18.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply "${WORKDIR}"/${P}.patch
-   popd || die
-   fi
-
-   # dev-python/docutils installs rst2man.py, not rst2man
-   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-   local arch=$(tc-arch-kernel)
-   tc-export AR CC LD
-
-   emake V=1 VF=1 \
-  

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-08-16 Thread Sam James
commit: 34e0d718b2c4d117b15239505ea9b78570cb1cc4
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 16 15:07:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 16 15:07:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34e0d718

dev-util/bpftool: Stabilize 5.18.6 amd64, #865373

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-5.18.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.18.6.ebuild 
b/dev-util/bpftool/bpftool-5.18.6.ebuild
index 6833c60b6e2a..fe508400267f 100644
--- a/dev-util/bpftool/bpftool-5.18.6.ebuild
+++ b/dev-util/bpftool/bpftool-5.18.6.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-07-23 Thread Jakov Smolić
commit: 5a0bd56c322f7b9a1f7fbf9d47b4c8eaaa9606c3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jul 23 15:24:36 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jul 23 15:41:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0bd56c

dev-util/bpftool: add 5.18.11

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 +
 dev-util/bpftool/bpftool-5.18.11.ebuild | 117 
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 624f2d09c23e..281d2be10e43 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,3 +1,4 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
+DIST patch-5.18.11.xz 595980 BLAKE2B 
74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa
 SHA512 
5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
 DIST patch-5.18.4.xz 424880 BLAKE2B 
6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756
 SHA512 
4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949
 DIST patch-5.18.6.xz 486212 BLAKE2B 
59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15
 SHA512 
c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38

diff --git a/dev-util/bpftool/bpftool-5.18.11.ebuild 
b/dev-util/bpftool/bpftool-5.18.11.ebuild
new file mode 100644
index ..6833c60b6e2a
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.18.11.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local arch=$(tc-arch-kernel)
+   tc-export AR CC LD
+
+   emake V=1 VF=1 \

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-07-23 Thread Jakov Smolić
commit: 246ffe74eb7ee0617666df3a44cc7a63b2ce9aa7
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jul 23 13:10:39 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jul 23 15:41:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246ffe74

dev-util/bpftool: drop 5.17.7

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   2 -
 dev-util/bpftool/bpftool-5.17.7.ebuild | 117 -
 2 files changed, 119 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index dbbf24e97ef0..624f2d09c23e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,3 @@
-DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
-DIST patch-5.17.7.xz 668120 BLAKE2B 
ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb
 SHA512 
b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
 DIST patch-5.18.4.xz 424880 BLAKE2B 
6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756
 SHA512 
4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949
 DIST patch-5.18.6.xz 486212 BLAKE2B 
59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15
 SHA512 
c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38

diff --git a/dev-util/bpftool/bpftool-5.17.7.ebuild 
b/dev-util/bpftool/bpftool-5.17.7.ebuild
deleted file mode 100644
index 6e1462d1df87..
--- a/dev-util/bpftool/bpftool-5.17.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-07-22 Thread Sam James
commit: 11eac38a41baa2aac5508342c3ec1b52c608501a
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 22 17:54:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 22 17:54:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11eac38a

dev-util/bpftool: Stabilize 5.18.4 amd64, #860138

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-5.18.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.18.4.ebuild 
b/dev-util/bpftool/bpftool-5.18.4.ebuild
index 6833c60b6e2a..fe508400267f 100644
--- a/dev-util/bpftool/bpftool-5.18.4.ebuild
+++ b/dev-util/bpftool/bpftool-5.18.4.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-07-02 Thread Jakov Smolić
commit: f39126aa955b6db7d4a30d9a121a6f0b82aed09a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jul  2 11:10:05 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jul  2 11:10:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39126aa

dev-util/bpftool: add 5.18.6

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.18.6.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 386929cb6746..dbbf24e97ef0 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,3 +2,4 @@ DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c3695441549
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.17.7.xz 668120 BLAKE2B 
ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb
 SHA512 
b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
 DIST patch-5.18.4.xz 424880 BLAKE2B 
6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756
 SHA512 
4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949
+DIST patch-5.18.6.xz 486212 BLAKE2B 
59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15
 SHA512 
c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38

diff --git a/dev-util/bpftool/bpftool-5.18.6.ebuild 
b/dev-util/bpftool/bpftool-5.18.6.ebuild
new file mode 100644
index ..6833c60b6e2a
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.18.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-06-27 Thread Jakov Smolić
commit: d788587695b04d93cc71b61359adb24025c386d5
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Jun 27 17:30:34 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Jun 27 17:30:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7885876

dev-util/bpftool: drop 5.18.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.18.1.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 40855f0fe2dd..386929cb6746 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,4 @@
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.17.7.xz 668120 BLAKE2B 
ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb
 SHA512 
b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
-DIST patch-5.18.1.xz 24248 BLAKE2B 
099b4185f9c7606c0b1d5aa1081651e3856ae9eee297e91c3e02c96e02d2f0b99f645fd998c02f4fd12c2fc2bda1c566c37f3525fcd6663de1607fa3b021097e
 SHA512 
d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e
 DIST patch-5.18.4.xz 424880 BLAKE2B 
6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756
 SHA512 
4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949

diff --git a/dev-util/bpftool/bpftool-5.18.1.ebuild 
b/dev-util/bpftool/bpftool-5.18.1.ebuild
deleted file mode 100644
index 6833c60b6e2a..
--- a/dev-util/bpftool/bpftool-5.18.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-06-22 Thread Jakov Smolić
commit: 71c0875744701c761bc6294aef0b885e4d4c1730
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jun 22 13:09:24 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jun 22 13:09:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c08757

dev-util/bpftool: add 5.18.4

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.18.4.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 139223bde397..40855f0fe2dd 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,3 +2,4 @@ DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c3695441549
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.17.7.xz 668120 BLAKE2B 
ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb
 SHA512 
b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
 DIST patch-5.18.1.xz 24248 BLAKE2B 
099b4185f9c7606c0b1d5aa1081651e3856ae9eee297e91c3e02c96e02d2f0b99f645fd998c02f4fd12c2fc2bda1c566c37f3525fcd6663de1607fa3b021097e
 SHA512 
d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e
+DIST patch-5.18.4.xz 424880 BLAKE2B 
6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756
 SHA512 
4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949

diff --git a/dev-util/bpftool/bpftool-5.18.4.ebuild 
b/dev-util/bpftool/bpftool-5.18.4.ebuild
new file mode 100644
index ..6833c60b6e2a
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.18.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-06-21 Thread Jakov Smolić
commit: 8b0e979a98df736c95367c79ab9c56c3ea98640a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun 21 16:48:25 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun 21 16:48:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0e979a

dev-util/bpftool: keyword 5.18.1 for ~riscv

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-5.18.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.18.1.ebuild 
b/dev-util/bpftool/bpftool-5.18.1.ebuild
index d4a6b8926868..6833c60b6e2a 100644
--- a/dev-util/bpftool/bpftool-5.18.1.ebuild
+++ b/dev-util/bpftool/bpftool-5.18.1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-06-21 Thread Jakov Smolić
commit: 2eeb9ee14e03ffe6854e60709b7d2e14f5a4074f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun 21 16:09:32 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun 21 16:09:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eeb9ee1

dev-util/bpftool: drop 5.17.4

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.17.4.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 51497c97b450..139223bde397 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,4 @@
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
-DIST patch-5.17.4.xz 547280 BLAKE2B 
453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f
 SHA512 
9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465
 DIST patch-5.17.7.xz 668120 BLAKE2B 
ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb
 SHA512 
b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
 DIST patch-5.18.1.xz 24248 BLAKE2B 
099b4185f9c7606c0b1d5aa1081651e3856ae9eee297e91c3e02c96e02d2f0b99f645fd998c02f4fd12c2fc2bda1c566c37f3525fcd6663de1607fa3b021097e
 SHA512 
d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e

diff --git a/dev-util/bpftool/bpftool-5.17.4.ebuild 
b/dev-util/bpftool/bpftool-5.17.4.ebuild
deleted file mode 100644
index 6e1462d1df87..
--- a/dev-util/bpftool/bpftool-5.17.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-06-21 Thread Jakov Smolić
commit: dbd7493e5fdb180a13f21e90518111d943193baf
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun 21 16:07:18 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun 21 16:07:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd7493e

dev-util/bpftool: Stabilize 5.17.7 amd64, #853307

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-5.17.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.17.7.ebuild 
b/dev-util/bpftool/bpftool-5.17.7.ebuild
index d4a6b8926868..6e1462d1df87 100644
--- a/dev-util/bpftool/bpftool-5.17.7.ebuild
+++ b/dev-util/bpftool/bpftool-5.17.7.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-06-06 Thread Jakov Smolić
commit: a14d3f4de7c3970e3d14212732fdd9925413bd6d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Jun  6 07:11:02 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Jun  6 07:11:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14d3f4d

dev-util/bpftool: add 5.18.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   2 +
 dev-util/bpftool/bpftool-5.18.1.ebuild | 117 +
 2 files changed, 119 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index b02d5fd209db..51497c97b450 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,3 +1,5 @@
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
+DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.17.4.xz 547280 BLAKE2B 
453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f
 SHA512 
9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465
 DIST patch-5.17.7.xz 668120 BLAKE2B 
ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb
 SHA512 
b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
+DIST patch-5.18.1.xz 24248 BLAKE2B 
099b4185f9c7606c0b1d5aa1081651e3856ae9eee297e91c3e02c96e02d2f0b99f645fd998c02f4fd12c2fc2bda1c566c37f3525fcd6663de1607fa3b021097e
 SHA512 
d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e

diff --git a/dev-util/bpftool/bpftool-5.18.1.ebuild 
b/dev-util/bpftool/bpftool-5.18.1.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.18.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-05-29 Thread Jakov Smolić
commit: 25ae57fea00a3923f05ef82cd3551d2b3decac02
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 29 17:27:21 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 29 17:27:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ae57fe

dev-util/bpftool: drop 5.16.15

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   2 -
 dev-util/bpftool/bpftool-5.16.15.ebuild | 117 
 2 files changed, 119 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index a6e30b48c4a1..b02d5fd209db 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,3 @@
-DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
-DIST patch-5.16.15.xz 721632 BLAKE2B 
650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25
 SHA512 
e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520
 DIST patch-5.17.4.xz 547280 BLAKE2B 
453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f
 SHA512 
9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465
 DIST patch-5.17.7.xz 668120 BLAKE2B 
ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb
 SHA512 
b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2

diff --git a/dev-util/bpftool/bpftool-5.16.15.ebuild 
b/dev-util/bpftool/bpftool-5.16.15.ebuild
deleted file mode 100644
index 6e1462d1df87..
--- a/dev-util/bpftool/bpftool-5.16.15.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-05-28 Thread Jakov Smolić
commit: ddc3cd27c00e69a1b0c2df17095d9c4ff70a0b4c
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat May 28 15:58:45 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat May 28 15:58:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc3cd27

dev-util/bpftool: Stabilize 5.17.4 amd64, #847937

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-5.17.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.17.4.ebuild 
b/dev-util/bpftool/bpftool-5.17.4.ebuild
index d4a6b8926868..6e1462d1df87 100644
--- a/dev-util/bpftool/bpftool-5.17.4.ebuild
+++ b/dev-util/bpftool/bpftool-5.17.4.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-05-20 Thread Jakov Smolić
commit: 4e471ea961079d5afba8f9f09aaf5b67df9a8e91
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu May 19 16:57:27 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri May 20 18:40:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e471ea9

dev-util/bpftool: add 5.17.7

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.17.7.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index ce726ec47e97..a6e30b48c4a1 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,3 +2,4 @@ DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST patch-5.16.15.xz 721632 BLAKE2B 
650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25
 SHA512 
e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520
 DIST patch-5.17.4.xz 547280 BLAKE2B 
453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f
 SHA512 
9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465
+DIST patch-5.17.7.xz 668120 BLAKE2B 
ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb
 SHA512 
b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2

diff --git a/dev-util/bpftool/bpftool-5.17.7.ebuild 
b/dev-util/bpftool/bpftool-5.17.7.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.17.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-04-27 Thread Jakov Smolić
commit: 6f616a747ab9089014489060643905c6845024f1
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Apr 27 21:30:27 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Apr 27 22:21:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f616a74

dev-util/bpftool: stabilize 5.16.15 for amd64

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-5.16.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.16.15.ebuild 
b/dev-util/bpftool/bpftool-5.16.15.ebuild
index d4a6b8926868..6e1462d1df87 100644
--- a/dev-util/bpftool/bpftool-5.16.15.ebuild
+++ b/dev-util/bpftool/bpftool-5.16.15.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-04-27 Thread Jakov Smolić
commit: 58ca1b8eda8b6242d59f94b0dbd5b570012218ad
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Apr 27 21:30:37 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Apr 27 22:21:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ca1b8e

dev-util/bpftool: drop 5.16.14, 5.17.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   2 -
 dev-util/bpftool/bpftool-5.16.14.ebuild | 117 
 dev-util/bpftool/bpftool-5.17.1.ebuild  | 117 
 3 files changed, 236 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 510971ecc9b9..ce726ec47e97 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,4 @@
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
-DIST patch-5.16.14.xz 685480 BLAKE2B 
5659f5fc0287ca2f8512d213ae535c82380496314b641f6f796ab5e4d6be28cbb06c1f2ae0edf86e90780b0301ff7d395e0001d08f6b8f6d83bbc2d06c74c2e5
 SHA512 
e6e4a5ff64fb9e0112a2688c8ceeb26425bb52d9981d34026a973e13b76891795c599ac5edbe22b57ef56bede99c44f8fe98825b3c5db8aadb359d84fbb776b2
 DIST patch-5.16.15.xz 721632 BLAKE2B 
650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25
 SHA512 
e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520
-DIST patch-5.17.1.xz 15244 BLAKE2B 
f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d
 SHA512 
fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
 DIST patch-5.17.4.xz 547280 BLAKE2B 
453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f
 SHA512 
9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465

diff --git a/dev-util/bpftool/bpftool-5.16.14.ebuild 
b/dev-util/bpftool/bpftool-5.16.14.ebuild
deleted file mode 100644
index 6e1462d1df87..
--- a/dev-util/bpftool/bpftool-5.16.14.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-  

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-04-27 Thread Jakov Smolić
commit: d112324d9baaad49703fa6de4963fc9864bea98c
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Apr 27 19:27:04 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Apr 27 19:46:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d112324d

dev-util/bpftool: add 5.17.4

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.17.4.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 38e770c99309..510971ecc9b9 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -3,3 +3,4 @@ DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c3695441549
 DIST patch-5.16.14.xz 685480 BLAKE2B 
5659f5fc0287ca2f8512d213ae535c82380496314b641f6f796ab5e4d6be28cbb06c1f2ae0edf86e90780b0301ff7d395e0001d08f6b8f6d83bbc2d06c74c2e5
 SHA512 
e6e4a5ff64fb9e0112a2688c8ceeb26425bb52d9981d34026a973e13b76891795c599ac5edbe22b57ef56bede99c44f8fe98825b3c5db8aadb359d84fbb776b2
 DIST patch-5.16.15.xz 721632 BLAKE2B 
650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25
 SHA512 
e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520
 DIST patch-5.17.1.xz 15244 BLAKE2B 
f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d
 SHA512 
fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
+DIST patch-5.17.4.xz 547280 BLAKE2B 
453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f
 SHA512 
9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465

diff --git a/dev-util/bpftool/bpftool-5.17.4.ebuild 
b/dev-util/bpftool/bpftool-5.17.4.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.17.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-04-19 Thread Jakov Smolić
commit: 19801cd1def5e0b0db10dc7b01c77f75b8654b1f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Apr 19 08:54:59 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Apr 19 08:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19801cd1

dev-util/bpftool: drop 5.16.2

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.16.2.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 538f9d81a6b4..38e770c99309 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,5 +2,4 @@ DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST patch-5.16.14.xz 685480 BLAKE2B 
5659f5fc0287ca2f8512d213ae535c82380496314b641f6f796ab5e4d6be28cbb06c1f2ae0edf86e90780b0301ff7d395e0001d08f6b8f6d83bbc2d06c74c2e5
 SHA512 
e6e4a5ff64fb9e0112a2688c8ceeb26425bb52d9981d34026a973e13b76891795c599ac5edbe22b57ef56bede99c44f8fe98825b3c5db8aadb359d84fbb776b2
 DIST patch-5.16.15.xz 721632 BLAKE2B 
650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25
 SHA512 
e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520
-DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530
 DIST patch-5.17.1.xz 15244 BLAKE2B 
f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d
 SHA512 
fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f

diff --git a/dev-util/bpftool/bpftool-5.16.2.ebuild 
b/dev-util/bpftool/bpftool-5.16.2.ebuild
deleted file mode 100644
index 6e1462d1df87..
--- a/dev-util/bpftool/bpftool-5.16.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-  

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-04-19 Thread Jakov Smolić
commit: 8a4af6d92a96e4c112cdcadc890b441990731aae
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Apr 19 08:52:45 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Apr 19 08:52:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4af6d9

dev-util/bpftool: Stabilize 5.16.14 amd64, #839381

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-5.16.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.16.14.ebuild 
b/dev-util/bpftool/bpftool-5.16.14.ebuild
index d4a6b8926868..6e1462d1df87 100644
--- a/dev-util/bpftool/bpftool-5.16.14.ebuild
+++ b/dev-util/bpftool/bpftool-5.16.14.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-04-04 Thread Jakov Smolić
commit: 2546c30f28436495b2d520ac2485cc3dd2bd6803
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr  4 11:02:54 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr  4 12:26:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2546c30f

dev-util/bpftool: add 5.17.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   2 +
 dev-util/bpftool/bpftool-5.17.1.ebuild | 117 +
 2 files changed, 119 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 38fc7a63a481..538f9d81a6b4 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,6 @@
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
+DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST patch-5.16.14.xz 685480 BLAKE2B 
5659f5fc0287ca2f8512d213ae535c82380496314b641f6f796ab5e4d6be28cbb06c1f2ae0edf86e90780b0301ff7d395e0001d08f6b8f6d83bbc2d06c74c2e5
 SHA512 
e6e4a5ff64fb9e0112a2688c8ceeb26425bb52d9981d34026a973e13b76891795c599ac5edbe22b57ef56bede99c44f8fe98825b3c5db8aadb359d84fbb776b2
 DIST patch-5.16.15.xz 721632 BLAKE2B 
650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25
 SHA512 
e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530
+DIST patch-5.17.1.xz 15244 BLAKE2B 
f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d
 SHA512 
fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f

diff --git a/dev-util/bpftool/bpftool-5.17.1.ebuild 
b/dev-util/bpftool/bpftool-5.17.1.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.17.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-03-22 Thread Jakov Smolić
commit: 90001d105c384128ecc205daf4689e2f43c88619
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Mar 22 10:04:32 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Mar 22 10:10:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90001d10

dev-util/bpftool: add 5.16.15

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 +
 dev-util/bpftool/bpftool-5.16.15.ebuild | 117 
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index e406ab86b37e..38fc7a63a481 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,3 +1,4 @@
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.16.14.xz 685480 BLAKE2B 
5659f5fc0287ca2f8512d213ae535c82380496314b641f6f796ab5e4d6be28cbb06c1f2ae0edf86e90780b0301ff7d395e0001d08f6b8f6d83bbc2d06c74c2e5
 SHA512 
e6e4a5ff64fb9e0112a2688c8ceeb26425bb52d9981d34026a973e13b76891795c599ac5edbe22b57ef56bede99c44f8fe98825b3c5db8aadb359d84fbb776b2
+DIST patch-5.16.15.xz 721632 BLAKE2B 
650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25
 SHA512 
e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.16.15.ebuild 
b/dev-util/bpftool/bpftool-5.16.15.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.16.15.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local arch=$(tc-arch-kernel)
+   tc-export AR CC LD
+
+   emake V=1 VF=1 \
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-03-16 Thread Jakov Smolić
commit: ea265aa43493961795e80be547db4759fda5b8b3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar 16 11:34:21 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar 16 11:46:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea265aa4

dev-util/bpftool: add 5.16.14

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 +
 dev-util/bpftool/bpftool-5.16.14.ebuild | 117 
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index b924a4e16a93..beacc811c6a0 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,3 +1,4 @@
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.16.11.xz 571384 BLAKE2B 
233f45175ec71c69b7893caccf8bc05a67d38d83b2f86db429e48b91f6d014f5a8646a5ded7a411b4d15205dbc9efd797dd07eeba4089cde5ebac004e204f96a
 SHA512 
df457cb78a2b9e5ee350d3f817a0663fdc09efff42c2c514faeb30252381701404ceefa10d15845f2a00b2f3c28211fbc5b0d46bfdf564b2c1cfd3dc36a6a06a
+DIST patch-5.16.14.xz 685480 BLAKE2B 
5659f5fc0287ca2f8512d213ae535c82380496314b641f6f796ab5e4d6be28cbb06c1f2ae0edf86e90780b0301ff7d395e0001d08f6b8f6d83bbc2d06c74c2e5
 SHA512 
e6e4a5ff64fb9e0112a2688c8ceeb26425bb52d9981d34026a973e13b76891795c599ac5edbe22b57ef56bede99c44f8fe98825b3c5db8aadb359d84fbb776b2
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.16.14.ebuild 
b/dev-util/bpftool/bpftool-5.16.14.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.16.14.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local arch=$(tc-arch-kernel)
+   tc-export AR CC LD
+
+   emake V=1 VF=1 \
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-03-16 Thread Jakov Smolić
commit: 6d2a37ad981f3a467f1acf695928e585a9861b27
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar 16 11:34:32 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar 16 11:46:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2a37ad

dev-util/bpftool: drop 5.16.11

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 -
 dev-util/bpftool/bpftool-5.16.11.ebuild | 117 
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index beacc811c6a0..e406ab86b37e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,3 @@
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
-DIST patch-5.16.11.xz 571384 BLAKE2B 
233f45175ec71c69b7893caccf8bc05a67d38d83b2f86db429e48b91f6d014f5a8646a5ded7a411b4d15205dbc9efd797dd07eeba4089cde5ebac004e204f96a
 SHA512 
df457cb78a2b9e5ee350d3f817a0663fdc09efff42c2c514faeb30252381701404ceefa10d15845f2a00b2f3c28211fbc5b0d46bfdf564b2c1cfd3dc36a6a06a
 DIST patch-5.16.14.xz 685480 BLAKE2B 
5659f5fc0287ca2f8512d213ae535c82380496314b641f6f796ab5e4d6be28cbb06c1f2ae0edf86e90780b0301ff7d395e0001d08f6b8f6d83bbc2d06c74c2e5
 SHA512 
e6e4a5ff64fb9e0112a2688c8ceeb26425bb52d9981d34026a973e13b76891795c599ac5edbe22b57ef56bede99c44f8fe98825b3c5db8aadb359d84fbb776b2
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.16.11.ebuild 
b/dev-util/bpftool/bpftool-5.16.11.ebuild
deleted file mode 100644
index d4a6b8926868..
--- a/dev-util/bpftool/bpftool-5.16.11.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply "${WORKDIR}"/${P}.patch
-   popd || die
-   fi
-
-   # dev-python/docutils installs rst2man.py, not rst2man
-   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-   local arch=$(tc-arch-kernel)
-   tc-export AR CC LD
-
-   emake V=1 VF=1 \
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-03-03 Thread Jakov Smolić
commit: 520827f522b028677b903be3362796658d1c1513
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  2 12:28:20 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Mar  3 15:11:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520827f5

dev-util/bpftool: drop 5.15.8

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   2 -
 dev-util/bpftool/bpftool-5.15.8.ebuild | 117 -
 2 files changed, 119 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index d006e63a166c..b924a4e16a93 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,3 @@
-DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
-DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.11.xz 571384 BLAKE2B 
233f45175ec71c69b7893caccf8bc05a67d38d83b2f86db429e48b91f6d014f5a8646a5ded7a411b4d15205dbc9efd797dd07eeba4089cde5ebac004e204f96a
 SHA512 
df457cb78a2b9e5ee350d3f817a0663fdc09efff42c2c514faeb30252381701404ceefa10d15845f2a00b2f3c28211fbc5b0d46bfdf564b2c1cfd3dc36a6a06a
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.15.8.ebuild 
b/dev-util/bpftool/bpftool-5.15.8.ebuild
deleted file mode 100644
index 6e1462d1df87..
--- a/dev-util/bpftool/bpftool-5.15.8.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-03-01 Thread Jakov Smolić
commit: 58d30bffb9e3bb64cbd50190de8fe6b27ce00354
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Mar  1 11:41:54 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Mar  1 11:41:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d30bff

dev-util/bpftool: Stabilize 5.16.2 amd64, #834436

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/bpftool-5.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.16.2.ebuild 
b/dev-util/bpftool/bpftool-5.16.2.ebuild
index d4a6b8926868..6e1462d1df87 100644
--- a/dev-util/bpftool/bpftool-5.16.2.ebuild
+++ b/dev-util/bpftool/bpftool-5.16.2.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-02-28 Thread Jakov Smolić
commit: 768b55c0011a87a19a60a13cea7a41f04d0291cb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Feb 28 09:58:28 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Feb 28 10:00:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=768b55c0

dev-util/bpftool: drop 5.16.10

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 -
 dev-util/bpftool/bpftool-5.16.10.ebuild | 117 
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 8146ca1bff8d..d006e63a166c 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,5 @@
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
-DIST patch-5.16.10.xz 501568 BLAKE2B 
9b3b86590d3b86b398c7ee2118df6944fe94dc872141706aca2e886ed7edf33d3e339847985208836f99c40858d1fe1efc6b6ef853854c9edfdb69b49d868798
 SHA512 
2e9917689f036b5b28ef9bb8d372148ed9dc0dd4460749d0e27aaa871adeb8e67aaeb557f0d891837be2ccb7f64c346e4f52fc23421917409f46d250fc793f53
 DIST patch-5.16.11.xz 571384 BLAKE2B 
233f45175ec71c69b7893caccf8bc05a67d38d83b2f86db429e48b91f6d014f5a8646a5ded7a411b4d15205dbc9efd797dd07eeba4089cde5ebac004e204f96a
 SHA512 
df457cb78a2b9e5ee350d3f817a0663fdc09efff42c2c514faeb30252381701404ceefa10d15845f2a00b2f3c28211fbc5b0d46bfdf564b2c1cfd3dc36a6a06a
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.16.10.ebuild 
b/dev-util/bpftool/bpftool-5.16.10.ebuild
deleted file mode 100644
index d4a6b8926868..
--- a/dev-util/bpftool/bpftool-5.16.10.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-  

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-02-28 Thread Jakov Smolić
commit: a3b68ef896bc8b6dd0e3a0ce0dd037f22a3cdde3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Feb 28 09:58:16 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Feb 28 10:00:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b68ef8

dev-util/bpftool: add 5.16.11

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 +
 dev-util/bpftool/bpftool-5.16.11.ebuild | 117 
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 6359d98a6f85..8146ca1bff8d 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,4 +2,5 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.10.xz 501568 BLAKE2B 
9b3b86590d3b86b398c7ee2118df6944fe94dc872141706aca2e886ed7edf33d3e339847985208836f99c40858d1fe1efc6b6ef853854c9edfdb69b49d868798
 SHA512 
2e9917689f036b5b28ef9bb8d372148ed9dc0dd4460749d0e27aaa871adeb8e67aaeb557f0d891837be2ccb7f64c346e4f52fc23421917409f46d250fc793f53
+DIST patch-5.16.11.xz 571384 BLAKE2B 
233f45175ec71c69b7893caccf8bc05a67d38d83b2f86db429e48b91f6d014f5a8646a5ded7a411b4d15205dbc9efd797dd07eeba4089cde5ebac004e204f96a
 SHA512 
df457cb78a2b9e5ee350d3f817a0663fdc09efff42c2c514faeb30252381701404ceefa10d15845f2a00b2f3c28211fbc5b0d46bfdf564b2c1cfd3dc36a6a06a
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.16.11.ebuild 
b/dev-util/bpftool/bpftool-5.16.11.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.16.11.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-02-24 Thread Jakov Smolić
commit: 0f4aefd305e3db75d478aa0c354b2faf96339b02
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Feb 24 11:54:00 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Feb 24 11:55:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4aefd3

dev-util/bpftool: add 5.16.10

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 +
 dev-util/bpftool/bpftool-5.16.10.ebuild | 117 
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index e45d03f52264..f00ed52bc07d 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,6 @@
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
+DIST patch-5.16.10.xz 501568 BLAKE2B 
9b3b86590d3b86b398c7ee2118df6944fe94dc872141706aca2e886ed7edf33d3e339847985208836f99c40858d1fe1efc6b6ef853854c9edfdb69b49d868798
 SHA512 
2e9917689f036b5b28ef9bb8d372148ed9dc0dd4460749d0e27aaa871adeb8e67aaeb557f0d891837be2ccb7f64c346e4f52fc23421917409f46d250fc793f53
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530
 DIST patch-5.16.5.xz 401000 BLAKE2B 
e58ef6f70b283a9d357472e4e9b148ba1038edb2473d299d367f1293c66051ae2b5aad2131df3f5b99052edc6ca885cc0f2140b727cb5277c776a6a0e01012a4
 SHA512 
8944096f994207522640b4fc7c0be97677ea44924875870f2dc3734e2e9fa3df871821780e7d459348fbe25db1b22cdfca8e852aed11c823ee489a174fb7d9c3

diff --git a/dev-util/bpftool/bpftool-5.16.10.ebuild 
b/dev-util/bpftool/bpftool-5.16.10.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.16.10.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-02-24 Thread Jakov Smolić
commit: 7c6ecce21e254e152be89c59e57396866896b4bf
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Feb 24 11:54:55 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Feb 24 11:55:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6ecce2

dev-util/bpftool: drop 5.16.5

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.16.5.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index f00ed52bc07d..6359d98a6f85 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -3,4 +3,3 @@ DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.10.xz 501568 BLAKE2B 
9b3b86590d3b86b398c7ee2118df6944fe94dc872141706aca2e886ed7edf33d3e339847985208836f99c40858d1fe1efc6b6ef853854c9edfdb69b49d868798
 SHA512 
2e9917689f036b5b28ef9bb8d372148ed9dc0dd4460749d0e27aaa871adeb8e67aaeb557f0d891837be2ccb7f64c346e4f52fc23421917409f46d250fc793f53
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530
-DIST patch-5.16.5.xz 401000 BLAKE2B 
e58ef6f70b283a9d357472e4e9b148ba1038edb2473d299d367f1293c66051ae2b5aad2131df3f5b99052edc6ca885cc0f2140b727cb5277c776a6a0e01012a4
 SHA512 
8944096f994207522640b4fc7c0be97677ea44924875870f2dc3734e2e9fa3df871821780e7d459348fbe25db1b22cdfca8e852aed11c823ee489a174fb7d9c3

diff --git a/dev-util/bpftool/bpftool-5.16.5.ebuild 
b/dev-util/bpftool/bpftool-5.16.5.ebuild
deleted file mode 100644
index d4a6b8926868..
--- a/dev-util/bpftool/bpftool-5.16.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   pushd "${S_K}" >/dev/null || die
-   eapply "${WORKDIR}"/${P}.patch
-   popd || die
-   fi
-
-   # dev-python/docutils installs rst2man.py, not rst2man
-   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-02-11 Thread Jakov Smolić
commit: 39ac714f44002a00d80fa0d2eebba2566e62635c
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Feb 11 19:13:54 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Feb 11 19:18:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ac714f

dev-util/bpftool: add 5.16.5

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.16.5.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index c967ee4514b8..c87661561b39 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -3,3 +3,4 @@ DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530
 DIST patch-5.16.4.xz 343964 BLAKE2B 
1fa1b90cecafe11ea0be1c099c4e2b4775ab87fd204a3ab2985e1ed479866763663db62a4de15c6aae243c0c34356f72c51df7437ce9a8fa8e257c4b3bc6cf20
 SHA512 
504d02a825dc9e06f2f6802567f179d5b956f3be4ccf3dae97ec31eefb0826f784292215e85fbb51ea98198288db9735de8d87f84551ff85f389cb713ee1cff5
+DIST patch-5.16.5.xz 401000 BLAKE2B 
e58ef6f70b283a9d357472e4e9b148ba1038edb2473d299d367f1293c66051ae2b5aad2131df3f5b99052edc6ca885cc0f2140b727cb5277c776a6a0e01012a4
 SHA512 
8944096f994207522640b4fc7c0be97677ea44924875870f2dc3734e2e9fa3df871821780e7d459348fbe25db1b22cdfca8e852aed11c823ee489a174fb7d9c3

diff --git a/dev-util/bpftool/bpftool-5.16.5.ebuild 
b/dev-util/bpftool/bpftool-5.16.5.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.16.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-02-11 Thread Jakov Smolić
commit: e85950d7972bbc612fe7363e798d4c6ae0355b10
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Feb 11 19:18:22 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Feb 11 19:18:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85950d7

dev-util/bpftool: drop 5.16.4

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.16.4.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index c87661561b39..e45d03f52264 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,5 +2,4 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530
-DIST patch-5.16.4.xz 343964 BLAKE2B 
1fa1b90cecafe11ea0be1c099c4e2b4775ab87fd204a3ab2985e1ed479866763663db62a4de15c6aae243c0c34356f72c51df7437ce9a8fa8e257c4b3bc6cf20
 SHA512 
504d02a825dc9e06f2f6802567f179d5b956f3be4ccf3dae97ec31eefb0826f784292215e85fbb51ea98198288db9735de8d87f84551ff85f389cb713ee1cff5
 DIST patch-5.16.5.xz 401000 BLAKE2B 
e58ef6f70b283a9d357472e4e9b148ba1038edb2473d299d367f1293c66051ae2b5aad2131df3f5b99052edc6ca885cc0f2140b727cb5277c776a6a0e01012a4
 SHA512 
8944096f994207522640b4fc7c0be97677ea44924875870f2dc3734e2e9fa3df871821780e7d459348fbe25db1b22cdfca8e852aed11c823ee489a174fb7d9c3

diff --git a/dev-util/bpftool/bpftool-5.16.4.ebuild 
b/dev-util/bpftool/bpftool-5.16.4.ebuild
deleted file mode 100644
index d4a6b8926868..
--- a/dev-util/bpftool/bpftool-5.16.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-  

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-02-07 Thread Jakov Smolić
commit: 3b1a8cbe4763b1575b4567e57fe964f88369c521
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Feb  7 09:15:14 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Feb  7 09:33:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1a8cbe

dev-util/bpftool: add 5.16.4

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.16.4.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 9e2cbd5347ad..c967ee4514b8 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,3 +2,4 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530
+DIST patch-5.16.4.xz 343964 BLAKE2B 
1fa1b90cecafe11ea0be1c099c4e2b4775ab87fd204a3ab2985e1ed479866763663db62a4de15c6aae243c0c34356f72c51df7437ce9a8fa8e257c4b3bc6cf20
 SHA512 
504d02a825dc9e06f2f6802567f179d5b956f3be4ccf3dae97ec31eefb0826f784292215e85fbb51ea98198288db9735de8d87f84551ff85f389cb713ee1cff5

diff --git a/dev-util/bpftool/bpftool-5.16.4.ebuild 
b/dev-util/bpftool/bpftool-5.16.4.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.16.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-01-29 Thread Jakov Smolić
commit: a9368e172ebdb1d048afdfeb8d82cbf34a194ff0
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 29 21:15:49 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 29 21:21:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9368e17

dev-util/bpftool: add 5.16.2

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.16.2.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index b6dd031e6422..07ba673ff532 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -4,3 +4,4 @@ DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9
 DIST patch-5.14.14.xz 528644 BLAKE2B 
3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f
 SHA512 
258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.1.xz 10492 BLAKE2B 
dcdef3f247252ac7cbbdd7892fb017b8181ea4028d56b1d710144effaf59498c42703b85ea3ecaa85f513f1813dc4ce6bb24adbfe54395a119f9ad20d35ea523
 SHA512 
0506dd2b6758107cdd66bb75d51e263d77115c79529bd64f206119f809adb11fdeaa4cf4595d38051390bf9afca63b5af4d886a8e1a799caf0927d4858273b24
+DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.16.2.ebuild 
b/dev-util/bpftool/bpftool-5.16.2.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.16.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-01-29 Thread Jakov Smolić
commit: db4f43bd40a6808261151bdd64e2ab055bc38c04
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 29 21:15:59 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 29 21:21:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db4f43bd

dev-util/bpftool: drop 5.16.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 -
 dev-util/bpftool/bpftool-5.16.1.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 07ba673ff532..11d3b683ad0f 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -3,5 +3,4 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.14.14.xz 528644 BLAKE2B 
3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f
 SHA512 
258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
-DIST patch-5.16.1.xz 10492 BLAKE2B 
dcdef3f247252ac7cbbdd7892fb017b8181ea4028d56b1d710144effaf59498c42703b85ea3ecaa85f513f1813dc4ce6bb24adbfe54395a119f9ad20d35ea523
 SHA512 
0506dd2b6758107cdd66bb75d51e263d77115c79529bd64f206119f809adb11fdeaa4cf4595d38051390bf9afca63b5af4d886a8e1a799caf0927d4858273b24
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.16.1.ebuild 
b/dev-util/bpftool/bpftool-5.16.1.ebuild
deleted file mode 100644
index d4a6b8926868..
--- a/dev-util/bpftool/bpftool-5.16.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   [[ ${a} == ${LINUX_SOURCES} ]] && continue
-   [[ ${a} == ${LINUX_PATCH} ]] && continue
-   unpack ${a}
-   done
-}
-
-src_prepare() {
-   default
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-  

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-01-29 Thread Jakov Smolić
commit: ecb208006db9448b7ce1e006fd95c85a3fab9065
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 29 21:16:08 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 29 21:21:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecb20800

dev-util/bpftool: drop 5.14.14

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   2 -
 dev-util/bpftool/bpftool-5.14.14.ebuild | 117 
 2 files changed, 119 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 11d3b683ad0f..9e2cbd5347ad 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,6 +1,4 @@
-DIST linux-5.14.tar.xz 120669872 BLAKE2B 
0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524
 SHA512 
8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
-DIST patch-5.14.14.xz 528644 BLAKE2B 
3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f
 SHA512 
258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.2.xz 20432 BLAKE2B 
9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425
 SHA512 
50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f530

diff --git a/dev-util/bpftool/bpftool-5.14.14.ebuild 
b/dev-util/bpftool/bpftool-5.14.14.ebuild
deleted file mode 100644
index 96d2e40cb699..
--- a/dev-util/bpftool/bpftool-5.14.14.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   eshopts_pop
-   fi
-
-   local a
-   for a in ${A}; do
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-01-25 Thread Sam James
commit: 77618a0f0fd88ca825dbde57dfdfd7c3a81b1b46
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 25 21:23:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 25 21:23:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77618a0f

dev-util/bpftool: Stabilize 5.15.8 amd64, #832055

Signed-off-by: Sam James  gentoo.org>

 dev-util/bpftool/bpftool-5.15.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/bpftool/bpftool-5.15.8.ebuild 
b/dev-util/bpftool/bpftool-5.15.8.ebuild
index e3fa3487cfe7..6e1462d1df87 100644
--- a/dev-util/bpftool/bpftool-5.15.8.ebuild
+++ b/dev-util/bpftool/bpftool-5.15.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-01-18 Thread Jakov Smolić
commit: f807b80c4d04980ad94d5f6599de190137ee8637
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jan 18 13:03:10 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jan 18 13:09:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f807b80c

dev-util/bpftool: drop 5.15.12

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 -
 dev-util/bpftool/bpftool-5.15.12.ebuild | 117 
 2 files changed, 118 deletions(-)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 9d6f6469b007..b6dd031e6422 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,6 +2,5 @@ DIST linux-5.14.tar.xz 120669872 BLAKE2B 
0047f5aaa3940dff97f4055ef544faafbbb5282
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.14.14.xz 528644 BLAKE2B 
3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f
 SHA512 
258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
-DIST patch-5.15.12.xz 620100 BLAKE2B 
8ac09e5cff7465641818e24e846a014bc936e2e2f61b7d1973319d5665d45acd6be24d28430173b5646e80cf67351044165b949575baf76ccdfb46ae34fc1468
 SHA512 
0e2dbfa675f00ddcb72369d1aed76470ed37a0968856e00d620bdc4bc7891a1646b4f9dcf864a57c26a5b9ab6afec43c8a62ad5c7e0549aaf0e8bae2852a752b
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
 DIST patch-5.16.1.xz 10492 BLAKE2B 
dcdef3f247252ac7cbbdd7892fb017b8181ea4028d56b1d710144effaf59498c42703b85ea3ecaa85f513f1813dc4ce6bb24adbfe54395a119f9ad20d35ea523
 SHA512 
0506dd2b6758107cdd66bb75d51e263d77115c79529bd64f206119f809adb11fdeaa4cf4595d38051390bf9afca63b5af4d886a8e1a799caf0927d4858273b24

diff --git a/dev-util/bpftool/bpftool-5.15.12.ebuild 
b/dev-util/bpftool/bpftool-5.15.12.ebuild
deleted file mode 100644
index d4a6b8926868..
--- a/dev-util/bpftool/bpftool-5.15.12.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
-HOMEPAGE="https://kernel.org/;
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-   sys-libs/binutils-libs:=
-   sys-libs/zlib:=
-   virtual/libelf:=
-   caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-   ${LINUX_PATCH+dev-util/patchutils}
-   ${PYTHON_DEPS}
-   dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-   local paths=(
-   tools/bpf kernel/bpf
-   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).
-   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-   "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-   if [[ -n ${LINUX_PATCH} ]] ; then
-   eshopts_push -o noglob
-   ebegin "Filtering partial source patch"
-   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-   > ${P}.patch
-   eend $? || die "filterdiff failed"
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-01-18 Thread Jakov Smolić
commit: 6205ed6120eb2e52e57f23b4039bc95900980ec1
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jan 18 13:02:54 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jan 18 13:09:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6205ed61

dev-util/bpftool: add 5.16.1

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   2 +
 dev-util/bpftool/bpftool-5.16.1.ebuild | 117 +
 2 files changed, 119 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 322f4dfb2319..9d6f6469b007 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,7 @@
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 
0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524
 SHA512 
8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
+DIST linux-5.16.tar.xz 123114100 BLAKE2B 
07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb
 SHA512 
7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.14.14.xz 528644 BLAKE2B 
3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f
 SHA512 
258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
 DIST patch-5.15.12.xz 620100 BLAKE2B 
8ac09e5cff7465641818e24e846a014bc936e2e2f61b7d1973319d5665d45acd6be24d28430173b5646e80cf67351044165b949575baf76ccdfb46ae34fc1468
 SHA512 
0e2dbfa675f00ddcb72369d1aed76470ed37a0968856e00d620bdc4bc7891a1646b4f9dcf864a57c26a5b9ab6afec43c8a62ad5c7e0549aaf0e8bae2852a752b
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
+DIST patch-5.16.1.xz 10492 BLAKE2B 
dcdef3f247252ac7cbbdd7892fb017b8181ea4028d56b1d710144effaf59498c42703b85ea3ecaa85f513f1813dc4ce6bb24adbfe54395a119f9ad20d35ea523
 SHA512 
0506dd2b6758107cdd66bb75d51e263d77115c79529bd64f206119f809adb11fdeaa4cf4595d38051390bf9afca63b5af4d886a8e1a799caf0927d4858273b24

diff --git a/dev-util/bpftool/bpftool-5.16.1.ebuild 
b/dev-util/bpftool/bpftool-5.16.1.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.16.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2022-01-04 Thread Jakov Smolić
commit: 3199825b5b7f1c621bfc79c4900d8fdd7f0f182a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jan  4 17:54:31 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jan  4 18:08:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3199825b

dev-util/bpftool: add 5.15.12

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest   |   1 +
 dev-util/bpftool/bpftool-5.15.12.ebuild | 117 
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 186a14d39b6d..322f4dfb2319 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,5 @@
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 
0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524
 SHA512 
8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST patch-5.14.14.xz 528644 BLAKE2B 
3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f
 SHA512 
258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
+DIST patch-5.15.12.xz 620100 BLAKE2B 
8ac09e5cff7465641818e24e846a014bc936e2e2f61b7d1973319d5665d45acd6be24d28430173b5646e80cf67351044165b949575baf76ccdfb46ae34fc1468
 SHA512 
0e2dbfa675f00ddcb72369d1aed76470ed37a0968856e00d620bdc4bc7891a1646b4f9dcf864a57c26a5b9ab6afec43c8a62ad5c7e0549aaf0e8bae2852a752b
 DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d

diff --git a/dev-util/bpftool/bpftool-5.15.12.ebuild 
b/dev-util/bpftool/bpftool-5.15.12.ebuild
new file mode 100644
index ..d4a6b8926868
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.15.12.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply 

[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2021-12-26 Thread Agostino Sarubbo
commit: 7b921338a1f5b3689e06e133faeb25a5b01ba716
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Dec 26 08:07:24 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Dec 26 08:07:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b921338

dev-util/bpftool: amd64 stable wrt bug #829947

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/bpftool/bpftool-5.14.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/bpftool/bpftool-5.14.14.ebuild 
b/dev-util/bpftool/bpftool-5.14.14.ebuild
index e3fa3487cfe7..96d2e40cb699 100644
--- a/dev-util/bpftool/bpftool-5.14.14.ebuild
+++ b/dev-util/bpftool/bpftool-5.14.14.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/

2021-12-20 Thread Jakov Smolić
commit: 273957549841b25f9afce5e923552917d74c7c15
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Dec 20 10:41:11 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Dec 20 10:41:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27395754

dev-util/bpftool: add 5.15.8

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/bpftool/Manifest  |   1 +
 dev-util/bpftool/bpftool-5.15.8.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 08cc9090ece1..b248cca764bc 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,3 +2,4 @@ DIST linux-5.14.tar.xz 120669872 BLAKE2B 
0047f5aaa3940dff97f4055ef544faafbbb5282
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST patch-5.14.14.xz 528644 BLAKE2B 
3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f
 SHA512 
258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
 DIST patch-5.15.7.xz 491544 BLAKE2B 
3dbf6bcc894d8a35c052e70fd1b724dfbee1a3cec9f26a6c4b7b5cd74b35c8b3fd3c480382d7bc45b31066f66ddd1f011a268ec184dc2ab21e96d6df64a5cffc
 SHA512 
49720c2b26773ad1962f41d10fd62283a249206b58b77cc7095780f12ac91a226dac8450667f60ecdcd58d474c664da73695330bf3c0ffb7c54642b20460cf5b
+DIST patch-5.15.8.xz 537596 BLAKE2B 
0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72
 SHA512 
ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d

diff --git a/dev-util/bpftool/bpftool-5.15.8.ebuild 
b/dev-util/bpftool/bpftool-5.15.8.ebuild
new file mode 100644
index ..e3fa3487cfe7
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.15.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and 
maps"
+HOMEPAGE="https://kernel.org/;
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH};
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" 
https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES};
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+RDEPEND="
+   sys-libs/binutils-libs:=
+   sys-libs/zlib:=
+   virtual/libelf:=
+   caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+   ${LINUX_PATCH+dev-util/patchutils}
+   ${PYTHON_DEPS}
+   dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+   local paths=(
+   tools/bpf kernel/bpf
+   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).
+   echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+   tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+   "${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   eshopts_push -o noglob
+   ebegin "Filtering partial source patch"
+   filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
+   > ${P}.patch
+   eend $? || die "filterdiff failed"
+   eshopts_pop
+   fi
+
+   local a
+   for a in ${A}; do
+   [[ ${a} == ${LINUX_SOURCES} ]] && continue
+   [[ ${a} == ${LINUX_PATCH} ]] && continue
+   unpack ${a}
+   done
+}
+
+src_prepare() {
+   default
+
+   if [[ -n ${LINUX_PATCH} ]] ; then
+   pushd "${S_K}" >/dev/null || die
+   eapply "${WORKDIR}"/${P}.patch
+   popd || die
+   fi
+
+   # dev-python/docutils installs rst2man.py, not rst2man
+   sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+   local 

  1   2   >