gentoo resync : 13.11.2021

4 files changed, 25 insertions, 125 deletions

diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index eb82a7f22334..10815b63e2e2 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,10 +1,7 @@
 AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168baa9f3ffe51205447c12eb9c3f06188fd32db591f21bce41edaff473a40b10320067447cd SHA512 a040c762df54a0218fb3fc4a6609b0e924003be689eaff629fabe69e1ed224fc38fdaac377624944718e5b174ac413edf3730cd0a228bd73bf8ef8678e97d73c
 AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7b319329ad45649edda0f7c9cbd8c8e90ce200c6f7df4913c3eceb0cc729e83d90b7dcc8af991e3f59b5a772f9cc8 SHA512 05f2c50e7daabe9118ea4e6dfd6d8dc155bb0311fbb2fbc491c2740d6f5081cc95ec7cb8faf19751eb161bcf60d30be87e0b6c88d032bf88ecae48af5119e0df
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
-DIST bcc-0.19.0.tar.gz 5171216 BLAKE2B 72f0364106f894f21990865209b445eaa9640c00a27060cef220418be87625150cdc8062168dacd1370ebd01c99c2d49853869b518a3a07bb601720412b9a970 SHA512 b6180462a45c768f219e026d8a4b43424b7cad4e07db8101725bd2bc31ee4de117774c0ad8d157502c97c1187057b45c7a491e7198ac2c59e6d56e58797f4df3
-DIST bcc-0.20.0.tar.gz 5193274 BLAKE2B ea78004d114e8187d82d6e58bf2c8e17d93b96a651a5557dcf3c405dfcf5ed0df3a2147f35d1b3831aa5aca5c1caf59742026740bb6da02dfda7c1dd7ef8161b SHA512 fa7c50a4fc64846ad798b6652101aa414cda53d08779cf48bd505191189cb23da2838f7511e700d59e086d35216f4e3bc9867b614738061630984dff3c4576dc
 DIST bcc-0.22.0.tar.gz 5247927 BLAKE2B 896d22c9540180e015f7be03b2ce8e6957fd7ba3e7f28fb57247bc8455b35bc82ecf321140e80f714bc01a2c01721e0544e249bc07be7b467c650788014793f0 SHA512 946ec8ed96a83cb7a9d7e44436901445588dc5e37c5cbc8b720a7a0d226b2769ab780294fa7c52099f579f4f1b6935f662be19c739d13979044723dce8ed7792
-EBUILD bcc-0.19.0-r1.ebuild 2258 BLAKE2B ce5df0ce4181d14c1836e52ea25f40d31cc3776cb823540c839b6890854859aaf08eb78e229b9ab69066a40157955f1a6eb68c566a499b842d520b091ce917a2 SHA512 ec0faa3ae0a97e31d6424c621fa5166929f98a0fdbc13aef749bce6e5beb98c4a765f8db67a3554f8380fd82de89db9004824990e4a9deba1a2bf4e616eb0cbc
-EBUILD bcc-0.20.0-r1.ebuild 2258 BLAKE2B 329dd78d04cc25a380fa4421a1553442e8084af2a615c160b06354e92bbef5003e2283969872eb608216443135848b397c9e15a78ade1e0d50a6849f2ce17035 SHA512 138bc254388898b03ebf0d17b95651753f6c08e5496e6b0306ad2380ba343333d2d32169f0851e2121e51d57c733574cde9557b6cb31e73e5023dc45bb870e3d
+EBUILD bcc-0.22.0-r1.ebuild 2502 BLAKE2B 4b48547c387bcf109adf746eb57eb04d93c41c6116b481beb9654dfaf82470ec34f5998cd9da0badbc308d4b0409ee7efcc4b2f1874265e5f12ca22fda4e9fbd SHA512 44f531b55f2a27be716276bf646ae2652b7e55134636c0c229fb1d327332842e8ec7211a8a9a4402e2362e17574e6fcbc375d2e0697c96250f35f5b02f554bee
 EBUILD bcc-0.22.0.ebuild 2533 BLAKE2B 948441d97a61b7ef0925bc6c03c130ebb56d25ada7be353bd087efaf8d37423c2b9ea407b93efffa963cd09c999e941f9f24efa20c863f07f3dc8b8b9a7084f8 SHA512 180d12f060eda41a33e57539f22eb7334e116a7d3227a2bc041e897213f19344ccb499b5d9e7ec4d455aac66e896ff88d989c866a727aad8ba304dc9dd4c4a29
-MISC metadata.xml 387 BLAKE2B 01669ac6fdf60ea78bc4c7fff0838ea0877a961591fd5fd069e4e4f44a991978c1de7966ae175d761d06ab5c78a142ddb451b116f29c182944795362f3c219f9 SHA512 6fc774ad3f929b31dbe44ab2413c480e4ddb5fb7eec0566fac65190391facd50fc65b6bd91a4dde51b00be2e1c1ef157e74e0f4bff0a5417df1e56a0e79f700c
+MISC metadata.xml 501 BLAKE2B b958c89640d4cfe0cd5951fbfe65394b84a606c2ac4e73893b46fb950ce7a53f9a9623636bb8f3926c0637539c1aed3107cbf1e6aa52fc0d8a9b948977fab747 SHA512 32e576ce7431409c9c3a69f3ac1d5f757b6ec9807fa86d38a93db02721b0e10771dea786c646513f952fc6603e64df2eefa5797ef2103c55a9b1be60bee522b9
diff --git a/dev-util/bcc/bcc-0.20.0-r1.ebuild b/dev-util/bcc/bcc-0.20.0-r1.ebuild
deleted file mode 100644
index 5e202f2d11a0..000000000000
--- a/dev-util/bcc/bcc-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	~dev-libs/libbpf-0.3:=[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-13:=
-	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=12 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.19.0-r1.ebuild b/dev-util/bcc/bcc-0.22.0-r1.ebuild
index c331a015d805..a5029626a40d 100644
--- a/dev-util/bcc/bcc-0.19.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.22.0-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=7
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
+LLVM_MAX_SLOT=13
 
 inherit cmake linux-info llvm lua-single python-r1
 
 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
 HOMEPAGE="https://iovisor.github.io/bcc/"
-
 SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -19,15 +19,17 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+lua test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )"
+# tests need root access
+RESTRICT="test"
 
 RDEPEND="
-	~dev-libs/libbpf-0.3:=[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
 	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-13:=
-	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
+	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
+	>=sys-kernel/linux-headers-5.13
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
 	${PYTHON_DEPS}
+	lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -40,7 +42,6 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	dev-util/cmake
 	virtual/pkgconfig
 "
 
@@ -49,9 +50,6 @@ PATCHES=(
 	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
 )
 
-# tests need root access
-RESTRICT="test"
-
 pkg_pretend() {
 	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
 		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
@@ -61,7 +59,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
+	llvm_pkg_setup
 	python_setup
 }
 
@@ -72,6 +70,13 @@ src_prepare() {
 	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
 	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
 
+	# bug 811288
+	local script scriptname
+	for script in $(find tools/old -type f -name "*.py" || die); do
+		scriptname=$(basename ${script} || die)
+		mv ${script} tools/old/old-${scriptname} || die
+	done
+
 	cmake_src_prepare
 }
 
@@ -89,7 +94,7 @@ src_configure() {
 		-DCMAKE_USE_LIBBPF_PACKAGE=ON
 		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
 		-DPYTHON_CMD="${bcc_python_impls%;}"
-
+		-Wno-dev
 	)
 	if use lua && use lua_single_target_luajit; then
 		mycmakeargs+=( -DWITH_LUAJIT=1 )
@@ -100,6 +105,7 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
+
 	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
 	python_foreach_impl python_optimize
 
diff --git a/dev-util/bcc/metadata.xml b/dev-util/bcc/metadata.xml
index d8e5feab7aa9..b1c79adcf2e9 100644
--- a/dev-util/bcc/metadata.xml
+++ b/dev-util/bcc/metadata.xml
@@ -7,6 +7,10 @@
   <maintainer type="person">
     <email>chutzpah@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">iovisor/bcc</remote-id>
   </upstream>