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

[Maciej Barć]

commit:     df4279f3b92ee3c717d996863e6367f03f9a208f
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 10:18:00 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 10:22:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df4279f3

dev-util/0xtools: sync live 9999 version

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-util/0xtools/0xtools-9999.ebuild | 40 ++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/dev-util/0xtools/0xtools-9999.ebuild 
b/dev-util/0xtools/0xtools-9999.ebuild
index 3b7026647b97..395a7ccf798a 100644
--- a/dev-util/0xtools/0xtools-9999.ebuild
+++ b/dev-util/0xtools/0xtools-9999.ebuild
@@ -1,31 +1,41 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 
-inherit python-single-r1 systemd toolchain-funcs
+inherit python-single-r1 systemd toolchain-funcs wrapper
 
 DESCRIPTION="Always-on profiling for production systems"
 HOMEPAGE="https://0x.tools/
        https://github.com/tanelpoder/0xtools/";
 
-if [[ ${PV} == *9999* ]] ; then
+if [[ "${PV}" == *9999* ]] ; then
        inherit git-r3
+
        EGIT_REPO_URI="https://github.com/tanelpoder/${PN}.git";
 else
        SRC_URI="https://github.com/tanelpoder/${PN}/archive/v${PV}.tar.gz
                -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~x86"
+
+       KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="${RDEPEND}"
+BDEPEND="
+       ${PYTHON_DEPS}
+"
+RDEPEND="
+       ${BDEPEND}
+       sys-power/cpupower
+       $(python_gen_cond_dep '
+               dev-util/bcc[${PYTHON_USEDEP}]
+       ')
+"
 
 DOCS=( CHANGELOG.md README.md )
 
@@ -37,20 +47,32 @@ src_compile() {
 }
 
 src_install() {
+       # "cpumhzturbo" requires "turbostat", which is not packaged,
+       # see bug: https://bugs.gentoo.org/939913
+
        # C executables and scripts
        exeinto /usr/bin
-       doexe bin/{run_xcapture.sh,run_xcpu.sh,vmtop,xcapture}
+       doexe bin/{cpumhz,vmtop,xcapture,xtop}
+       doexe bin/{run_xcapture.sh,run_xcpu.sh}
 
        # Python executables
-       python_domodule lib/${PN}
+       python_domodule "lib/${PN}"
        python_doscript bin/psn
        python_doscript bin/schedlat
+       python_doscript bin/syscallargs
 
        # Service
        systemd_dounit xcapture.service
        systemd_dounit xcapture-restart.service
        systemd_dounit xcapture-restart.timer
 
+       # Setup for "xcapture-bpf".
+       exeinto "/lib/${PN}/xcapture"
+       doexe bin/xcapture-bpf
+       insinto "/lib/${PN}/xcapture"
+       doins bin/xcapture-bpf.c
+       make_wrapper xcapture-bpf "/lib/${PN}/xcapture/xcapture-bpf"
+
        # Service config
        insinto /etc/default
        newins xcapture.default xcapture