gentoo resync : 16.01.2021

6 files changed, 23 insertions, 244 deletions

diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index e2d4aace7085..ef199f10d30d 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -2,10 +2,8 @@ AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168
 AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7b319329ad45649edda0f7c9cbd8c8e90ce200c6f7df4913c3eceb0cc729e83d90b7dcc8af991e3f59b5a772f9cc8 SHA512 05f2c50e7daabe9118ea4e6dfd6d8dc155bb0311fbb2fbc491c2740d6f5081cc95ec7cb8faf19751eb161bcf60d30be87e0b6c88d032bf88ecae48af5119e0df
 AUX bcc-0.23.0-man-compress.patch 704 BLAKE2B 0eceb68e7d7a09b948d24e98c833031751421c829ba99564499b4e4ded9f0bc505b60a2648de7287185d85d847b65f3b929dd08b3fe9f97b1a7aaf9868750ec4 SHA512 7f7c4f4292ab5334201506ba523adc1c9a8e87cd3656a896cf31fe7f48f25e84bb52552f7d02d12442784a72cf7bcb01dec8a63eb2679aa9d84ff935f94d1863
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
-DIST bcc-0.22.0.tar.gz 5247927 BLAKE2B 896d22c9540180e015f7be03b2ce8e6957fd7ba3e7f28fb57247bc8455b35bc82ecf321140e80f714bc01a2c01721e0544e249bc07be7b467c650788014793f0 SHA512 946ec8ed96a83cb7a9d7e44436901445588dc5e37c5cbc8b720a7a0d226b2769ab780294fa7c52099f579f4f1b6935f662be19c739d13979044723dce8ed7792
 DIST bcc-0.23.0.tar.gz 5254103 BLAKE2B 011559f081dd8f95b45b64e347ed191f585f6f5e395aadc3ef9726785aa41735b263c0d6e7743c969e390792f0f4f286930fee585c1a59878f301c4b4026dce8 SHA512 531626c920f5ef7d05617b3b418d55fdeef2dc8014f942a6e68ca457433d63445cc98303bbe331ee982e4aefe5d2df84764d373a6166638bd457992b371f037c
-EBUILD bcc-0.22.0-r1.ebuild 2502 BLAKE2B 4b48547c387bcf109adf746eb57eb04d93c41c6116b481beb9654dfaf82470ec34f5998cd9da0badbc308d4b0409ee7efcc4b2f1874265e5f12ca22fda4e9fbd SHA512 44f531b55f2a27be716276bf646ae2652b7e55134636c0c229fb1d327332842e8ec7211a8a9a4402e2362e17574e6fcbc375d2e0697c96250f35f5b02f554bee
-EBUILD bcc-0.22.0.ebuild 2533 BLAKE2B 948441d97a61b7ef0925bc6c03c130ebb56d25ada7be353bd087efaf8d37423c2b9ea407b93efffa963cd09c999e941f9f24efa20c863f07f3dc8b8b9a7084f8 SHA512 180d12f060eda41a33e57539f22eb7334e116a7d3227a2bc041e897213f19344ccb499b5d9e7ec4d455aac66e896ff88d989c866a727aad8ba304dc9dd4c4a29
-EBUILD bcc-0.23.0-r3.ebuild 2969 BLAKE2B 803465e0955b7e896c1baf05d4eed95879439407b248df17e738a61ec1b863f400166113ab7ff65fab0c58ebcd5667cc8b7683e939ee675578a89a8393a8da3f SHA512 309fc7d9c8e710bc7a2311b513352225a13049bc93abf6fa7b641c3b474c8b298c5275222eebc9aedb54fd70057a165ecf245b9847355814b4c64d33d4e9089b
-EBUILD bcc-0.23.0-r4.ebuild 3069 BLAKE2B 4317e7c2ba6be3721f07296b5dc7f877ef3394f236b056ea39f6e10a9a9705f59f6173401299cfca0b5c2cdc6a321caac1b601572433d7c9b02277b2b7f7bbe2 SHA512 4f6f09c1cab99e29fdc3985e273d719e2455d3c4bd30a1793aec6329683ffb3fe931ca9c98516960b3c48ebb441b2da23edda1cb0649637e24ee3d8f496bbc30
-MISC metadata.xml 501 BLAKE2B b958c89640d4cfe0cd5951fbfe65394b84a606c2ac4e73893b46fb950ce7a53f9a9623636bb8f3926c0637539c1aed3107cbf1e6aa52fc0d8a9b948977fab747 SHA512 32e576ce7431409c9c3a69f3ac1d5f757b6ec9807fa86d38a93db02721b0e10771dea786c646513f952fc6603e64df2eefa5797ef2103c55a9b1be60bee522b9
+DIST bcc-0.24.0.tar.gz 4640711 BLAKE2B 91d333c21c55de6a0ae78f9bb0b003803578525746e63ca5047896c0b2ed03ee880e03a84511470576e888e46559c67a8ebfdfe49d8785d094e2361bb20c5c2e SHA512 951672e3a8e5ad56eedf513477317ec3d3b4cf2d594bbfce20f3d19ddf7ce255e9dcfc69d9b05bb765a16e769c8e42d7c57071ddb86fb32437f527d3d25d19b6
+EBUILD bcc-0.23.0-r5.ebuild 3065 BLAKE2B be459f9fec8bcb46a1ca7c30abe20b3be11ff39b113214e676a0d323da2b2e31c5381a5a024f07e4c4d303d05d1496aff554a6e7ff2ee316b9637b66c1896f49 SHA512 ab602946077f47e56711a703107048cc72cf2fed7cafecbf19bd82a3786680baab20b36a33390f33b76d5922b5e896b2bf293e03ea63a6969f92117da7cb532a
+EBUILD bcc-0.24.0.ebuild 3073 BLAKE2B 7cbb878889a2e8ffd7e466a81e8da65244397b8da4e2907b777cff46bca4711fdc42aad8a257d2c4db9aa355404f2998851c1072b797d3985c38759e7a784a74 SHA512 7a8c7487cd5522068b426443927d51ff6ca4fe9ca5ca925e8f69260e25717c3bd788ce56fc6246d61711ace7461b97b199843606be4008cc06aa27a5878a9ed1
+MISC metadata.xml 533 BLAKE2B b34e30baea99e82348b7f925ab1b4899ea9e4119d2f24f59e11b48dd8efc61edb3029580af40184acd0dfa180caa7e558ef0303247658cc1b3136940f7a735f6 SHA512 c7d4a450c8fe534fd9ab3aede95ac1192aa62f94858b9e0b1efc1b8982d49b0546e012f2d60c1aefc96155b8641d6ebba059af8fbea798827cc8dfeee15390e9
diff --git a/dev-util/bcc/bcc-0.22.0-r1.ebuild b/dev-util/bcc/bcc-0.22.0-r1.ebuild
deleted file mode 100644
index a5029626a40d..000000000000
--- a/dev-util/bcc/bcc-0.22.0-r1.ebuild
+++ /dev/null
@@ -1,113 +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..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"
-SLOT="0"
-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/elfutils-0.166:=
-	>=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? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-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_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
-
-	# 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
-}
-
-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%;}"
-		-Wno-dev
-	)
-	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.22.0.ebuild b/dev-util/bcc/bcc-0.22.0.ebuild
deleted file mode 100644
index d3f591ee94f5..000000000000
--- a/dev-util/bcc/bcc-0.22.0.ebuild
+++ /dev/null
@@ -1,116 +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..10} )
-
-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.5.0
-		~dev-libs/libbpf-9999
-	)
-	dev-libs/libbpf:=[static-libs(-)]
-	>=sys-kernel/linux-headers-5.13
-	>=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%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	local script scriptname
-	cmake_src_install
-	find "${ED}/usr/share/bcc/tools/old" -type f | while read script; do
-		scriptname=$(basename "${pythonScript}")
-		mv "${script}" "${ED}/usr/share/bcc/tools/old/old-${scriptname}"
-	done
-	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.23.0-r4.ebuild b/dev-util/bcc/bcc-0.23.0-r5.ebuild
index 4f45cf6e2a90..7ff16dec0b5d 100644
--- a/dev-util/bcc/bcc-0.23.0-r4.ebuild
+++ b/dev-util/bcc/bcc-0.23.0-r5.ebuild
@@ -120,7 +120,7 @@ src_install() {
 	for tool in "${ED}"/usr/share/bcc/tools/*; do
 		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
 		name=${tool##*/}
-		[[ -n ${rename_tools[${tool##*/}]} ]] && name=bcc-${tool}
+		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
 		dosym8 -r "${tool#${ED}}" /usr/sbin/${name}
 	done
 
diff --git a/dev-util/bcc/bcc-0.23.0-r3.ebuild b/dev-util/bcc/bcc-0.24.0.ebuild
index 20e896fce14b..019bdcd9fa81 100644
--- a/dev-util/bcc/bcc-0.23.0-r3.ebuild
+++ b/dev-util/bcc/bcc-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,23 +15,28 @@ 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"
+#KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
 # tests need root access
 RESTRICT="test"
 
 RDEPEND="
 	>=dev-libs/elfutils-0.166:=
-	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
+	>=dev-libs/libbpf-0.7.0:=[static-libs(-)]
 	sys-kernel/linux-headers
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
 	${PYTHON_DEPS}
 	lua? ( ${LUA_DEPS} )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	test? (
 		|| (
 			net-misc/iputils[arping]
@@ -112,11 +117,15 @@ src_install() {
 	python_foreach_impl python_optimize
 
 	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+	local -A rename_tools=(
+		[trace]=1
+	)
 
 	local tool name
 	for tool in "${ED}"/usr/share/bcc/tools/*; do
 		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
 		name=${tool##*/}
+		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
 		dosym8 -r "${tool#${ED}}" /usr/sbin/${name}
 	done
 
diff --git a/dev-util/bcc/metadata.xml b/dev-util/bcc/metadata.xml
index b1c79adcf2e9..0964cdb4976b 100644
--- a/dev-util/bcc/metadata.xml
+++ b/dev-util/bcc/metadata.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
   </maintainer>
   <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
+    <email>zmedico@gentoo.org</email>
   </maintainer>
   <maintainer type="person">
     <email>jsmolic@gentoo.org</email>