gentoo resync : 25.11.2020

9 files changed, 114 insertions, 473 deletions

diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index d7fee002414e..f681f0f10af9 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,20 +1,8 @@
+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.11.0.tar.gz 2611511 BLAKE2B db12e10a3da11b1d3691ca5e0e036f56af4c5765d49e2edefc3e30bc90036a5f521d196db797e3725e618efa68ba2550848b3dc044015f6aea6b2da6ca2a34f5 SHA512 4854a5a15a89a8bd3a10daa6f0e831428316751280902cbdc74f3c6f78263ee1c58521ae9125804e72fec6482702818a5fec781436400640627e4b7c2fc189fb
-DIST bcc-0.12.0.tar.gz 2627075 BLAKE2B 44c435eaaf6233ad24249cf5da4e778cd31e41573199ded97d1f411c7424128fb11f838c55fa48c692b4d5f267ea594d6cab9992dc76137da1b41453285c98c5 SHA512 db3ea929b1296f4d9d82d2a11e89e11a1c31512d3f7f935475a7613e0128a5cf9441f3138969535ef41de0c0f677c7446f62f1c64575d41a9896e5339f3f112b
-DIST bcc-0.13.0.tar.gz 3928016 BLAKE2B ecaf2dc077a5e0b808ea1d588a89793291ed56de8747e1cb59f0e841b70e4a4f0333e2941ee2b42b5b9a570cd8d4f9941be772e7790186be156e452a416d40bb SHA512 7c82007979814ac11d1dfc81fe8e00d988f518f7fbba3e115851e17500c22eca23b33b84f9053acc10aefda0ee3b80429f8daf1389590c2d3686ee8d7ced72cb
-DIST bcc-0.14.0.tar.gz 4021098 BLAKE2B 2c66c82e14ee7f858f2e4ff8aa158d03c1580686f4023e920f643454283ed26265ec1e122695a308c4e570c369a0f66e6b0a9347fd9046f2eeb6cd4b536e4dc6 SHA512 216033a6944134c9f9b03a254c83236ff49b02c87808d2719a51a5ebe3b2e3f6b283e905cfbbc85084eab60cf8ef89c3135b4e07ddb9bd83348c69f6e49a84b8
-DIST bcc-0.15.0.tar.gz 4056782 BLAKE2B 4ae1ee615111b7fadc29fecc0799e3bd65da4f741c83f86e75b7376dca397ed83e6b159dba149a5e675110a0fae92397c0685085b9691786361cfbedff31d4dd SHA512 d340ff54138cb44f610804edc7c8f7424d7182d81fd48c1e3edc6b45977eca8171b6367242abc4418e1baf2c8d3b53a77d0a408d053f246a0c169ddeeea2a68e
 DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a18696295d58e87aaf2aeb833c394047cd0d87b3bf1da52d5512b889f8873b788e8141bdd91c9463e27cf30a1ef6 SHA512 50d09d6d02335a63d7c01c22f16a706584f231ee16973a80df5b640c31b8e25775da13a2bdff9e57c04c7f6181bb8c46cf3bd11c1e59741234024da71c7f6cdb
-DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
-DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
-DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
-DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
-DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a
-EBUILD bcc-0.11.0.ebuild 1862 BLAKE2B ed50015774cd375e2bbbf7a5be10ddc53c7864314fbb839027952860e25fafd5bcace7a42936ee316db1e18c13082be994a9b1084d94468f8293b1b780dcb978 SHA512 9701b5a605c19d4fe78ccb68477be41aac1b9fbc9990932e25d28b8e074cc528746893dc7fd70d919366d3b94e83d2b45cf806da94e793b683d07f8611b4d09c
-EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0213be90ee17ecba036b76798529de61b159dd7af7ce56000e071d44923f2707d366383c5f6ed228fb78b10858 SHA512 492110b8a4dd64c30bf8d8f5af5dce183976ee31d3ee5652efe61e7734c779b8a08d9334fdb2c4c0aa4a90df71a5a1d5374677eb9c9566ce534ee760b135caf5
-EBUILD bcc-0.13.0.ebuild 1925 BLAKE2B 4cf4fcfd74ca4a941be56ec92c003be585b81105dc0986e0a63cdcafbb0a9c22f7803aded42ff0214338312463019f6ba7938775dcd6538afd80d85a92b0d523 SHA512 69e3e78d7f6ead73c007e821f5ea2a6e3f5244cf716703b763427bb49e89f5012ec0327fdf142dee93b6c9091c572985a8cc3738b6b238e19e9ceef0a4a9e0d6
-EBUILD bcc-0.14.0.ebuild 1968 BLAKE2B 00d8a66ef59c00a518ee27211236327d883972d4d71eeb9906c0fc20e1eb764dccadaf807937b8c15b67fba45c881f04b6cf8ef866bb24817506d39a2b7bd1e4 SHA512 4620985b4d093c7f436f9d9a7e10f5077afff49f21bf4664bb55c8eb41f2dbac8d9b70ccc91ae6d852f8cabe65e0056540894ea1ba7659e7df7aa691fe75170c
-EBUILD bcc-0.15.0.ebuild 1968 BLAKE2B d26398d364cd3737535b7b2edd992f731cacca839f96fc53908321c86eb40d8944b5c4eaf0b337a61076532dee73e9e99b2a856cafbfa90048f2cba5f7ddcf75 SHA512 c45482e2f910d9b1e17c2531530161cb81f9d240b510092c9890c32aeb628a6572dd785eac846758256fe79e4b15f9c307b86cf299f48c788f9cc061c31177b0
-EBUILD bcc-0.16.0.ebuild 2054 BLAKE2B 8ea20763614fbc217bf29cd38f29af9f66a04e36742fc0bd4ba0fd6e732e70c61e73d5c34ac0c0d7a07a95f798bb5aa35353bb46f4c40c92d370f80ab53e6098 SHA512 3677dedc28cbbb04cc2741d36bc331f3d78f7578696c7c2846b43593e468e00208b9d2d758e874cdbe7eeecba714b114eb195aa3896619f5ec34f62cf6db5b87
+DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf
+EBUILD bcc-0.16.0-r1.ebuild 2191 BLAKE2B 9a69c08e0244f91b42301fd0d9cbb4b22454c90ffbf1f605e33ae8aa76f29256309af1a36623a035bb2bfed2556a5d94820d17effa333fe3ba13171577d42863 SHA512 1e60b696e69194f12f5c13df237e2b19132536e4a98a25a3f118de9988919099173a0d9f7f0f50ecbfa935ad5a7d19b7c7d70e10a0a778faa7bc418cb0d6843b
+EBUILD bcc-0.17.0.ebuild 2149 BLAKE2B cbd5d044ead7d7dc1cf07fff28a63b7682091b91f5becf42c14d99aa34dc89a1998cbeeae53b965ca547ca1d6f94cd537b88d4e4c7c1523b3c0f5487ad6ce073 SHA512 285aed71c15830e54efed7d75867e92fb54f06882a0514b539a4986b3ae8438036a56f068f624bbb512c1f18fb8d39fb5861be787b6dbddff5f80fe22c1d7f5c
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.11.0.ebuild b/dev-util/bcc/bcc-0.11.0.ebuild
deleted file mode 100644
index 06720965ca28..000000000000
--- a/dev-util/bcc/bcc-0.11.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils linux-info python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.5"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=sys-kernel/linux-headers-4.18
-	>=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)"
-BDEPEND="dev-util/cmake
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.12.0-r1.ebuild b/dev-util/bcc/bcc-0.12.0-r1.ebuild
deleted file mode 100644
index f14150fc76e6..000000000000
--- a/dev-util/bcc/bcc-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils linux-info python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.6"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/bcc/bcc-0.13.0.ebuild b/dev-util/bcc/bcc-0.13.0.ebuild
deleted file mode 100644
index 748cd29f46e9..000000000000
--- a/dev-util/bcc/bcc-0.13.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils linux-info llvm python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.7"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=9 llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/bcc/bcc-0.14.0.ebuild b/dev-util/bcc/bcc-0.14.0.ebuild
deleted file mode 100644
index 5b4acaeb9b3b..000000000000
--- a/dev-util/bcc/bcc-0.14.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils linux-info llvm python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.8"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-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
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=9 llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/bcc/bcc-0.15.0.ebuild b/dev-util/bcc/bcc-0.15.0.ebuild
deleted file mode 100644
index 18274e39b788..000000000000
--- a/dev-util/bcc/bcc-0.15.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils linux-info llvm python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.9"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-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
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=9 llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/bcc/bcc-0.16.0.ebuild b/dev-util/bcc/bcc-0.16.0-r1.ebuild
index e1c3279fc72e..52f59488240d 100644
--- a/dev-util/bcc/bcc-0.16.0.ebuild
+++ b/dev-util/bcc/bcc-0.16.0-r1.ebuild
@@ -20,10 +20,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	>=dev-libs/libbpf-0.1.0-r1[static-libs(-)]
+	<dev-libs/libbpf-0.2[static-libs(-)]
 	>=sys-kernel/linux-headers-4.14
 	>=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	sys-devel/llvm:=[llvm_targets_BPF(+)]
+	<=sys-devel/clang-12:=
+	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
 	luajit? ( dev-lang/luajit )
 	${PYTHON_DEPS}
 "
@@ -52,7 +53,7 @@ RESTRICT="test"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~HAVE_BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
 		~KPROBES"
 
 	check_extra_config
@@ -85,6 +86,7 @@ src_configure() {
 		-DREVISION=${PV%%_*}
 		-DENABLE_LLVM_SHARED=ON
 		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
 		-DPYTHON_CMD="${bcc_python_impls%;}"
 		$(usex luajit '-DWITH_LUAJIT=1')
 	)
@@ -96,4 +98,6 @@ src_install() {
 	cmake_src_install
 	python_foreach_impl python_optimize
 	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
 }
diff --git a/dev-util/bcc/bcc-0.17.0.ebuild b/dev-util/bcc/bcc-0.17.0.ebuild
new file mode 100644
index 000000000000..29d6cc3139dd
--- /dev/null
+++ b/dev-util/bcc/bcc-0.17.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake linux-info llvm 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="+luajit test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/libbpf-0.2[static-libs(-)]
+	>=sys-kernel/linux-headers-4.14
+	>=dev-libs/elfutils-0.166:=
+	<=sys-devel/clang-12:=
+	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+	luajit? ( dev-lang/luajit )
+	${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=11 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%;}"
+		$(usex luajit '-DWITH_LUAJIT=1')
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_optimize
+	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+}
diff --git a/dev-util/bcc/files/60bcc.env b/dev-util/bcc/files/60bcc.env
new file mode 100644
index 000000000000..9bbcc95cff50
--- /dev/null
+++ b/dev-util/bcc/files/60bcc.env
@@ -0,0 +1 @@
+ROOTPATH="/usr/share/bcc/tools"