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

[Jakov Smolić]

commit:     4736385904d0718d58339c8a05e43668e3e1d852
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 20:58:27 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 20:58:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47363859

dev-util/bcc: Improve style

Use LLVM_MAX_SLOT to declare max llvm and clang versions
in *DEPEND, and add missing `|| die` on find and basename
commands.

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

 dev-util/bcc/bcc-0.22.0-r1.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-util/bcc/bcc-0.22.0-r1.ebuild b/dev-util/bcc/bcc-0.22.0-r1.ebuild
index bca83ca19de..a5029626a40 100644
--- a/dev-util/bcc/bcc-0.22.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.22.0-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{7..10} )
+LLVM_MAX_SLOT=13
 
 inherit cmake linux-info llvm lua-single python-r1
 
@@ -25,8 +26,8 @@ RDEPEND="
 	>=dev-libs/elfutils-0.166:=
 	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
 	>=sys-kernel/linux-headers-5.13
-	<=sys-devel/clang-14:=
-	<=sys-devel/llvm-14:=[llvm_targets_BPF(+)]
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
 	${PYTHON_DEPS}
 	lua? ( ${LUA_DEPS} )
 "
@@ -58,7 +59,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	LLVM_MAX_SLOT=13 llvm_pkg_setup
+	llvm_pkg_setup
 	python_setup
 }
 
@@ -71,8 +72,8 @@ src_prepare() {
 
 	# bug 811288
 	local script scriptname
-	for script in $(find tools/old -type f -name "*.py"); do
-		scriptname=$(basename ${script})
+	for script in $(find tools/old -type f -name "*.py" || die); do
+		scriptname=$(basename ${script} || die)
 		mv ${script} tools/old/old-${scriptname} || die
 	done