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

[Patrick McLean]

commit:     de258b4c9d6795ad94f67bb7afcd3bfdfc93b90d
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Jan  6 02:29:18 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 02:29:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de258b4c

dev-util/bcc-0.18.0-r1: revbump, re-add new lua eclass code

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-util/bcc/{bcc-0.18.0.ebuild => bcc-0.18.0-r1.ebuild} | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev-util/bcc/bcc-0.18.0.ebuild b/dev-util/bcc/bcc-0.18.0-r1.ebuild
similarity index 88%
rename from dev-util/bcc/bcc-0.18.0.ebuild
rename to dev-util/bcc/bcc-0.18.0-r1.ebuild
index 34a22d563db..bb9b2a8339f 100644
--- a/dev-util/bcc/bcc-0.18.0.ebuild
+++ b/dev-util/bcc/bcc-0.18.0-r1.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit cmake linux-info llvm python-r1
+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/";
@@ -15,8 +16,9 @@ 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}"
+IUSE="+lua test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+       lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
        >=dev-libs/libbpf-0.3[static-libs(-)]
@@ -24,7 +26,7 @@ RDEPEND="
        >=dev-libs/elfutils-0.166:=
        <=sys-devel/clang-12:=
        <=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-       luajit? ( dev-lang/luajit )
+       lua? ( ${LUA_DEPS} )
        ${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
@@ -87,8 +89,11 @@ src_configure() {
                -DCMAKE_USE_LIBBPF_PACKAGE=ON
                -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
                -DPYTHON_CMD="${bcc_python_impls%;}"
-               $(usex luajit '-DWITH_LUAJIT=1')
+
        )
+       if use lua && use lua_single_target_luajit; then
+               mycmakeargs+=( -DWITH_LUAJIT=1 )
+       fi
 
        cmake_src_configure
 }