commit: 138c818c2a468c91ba8cc2f279f7b701a95934d0 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> AuthorDate: Tue Sep 9 09:06:34 2025 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Tue Sep 9 10:23:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138c818c
dev-util/perf: move to python-single-r1, bug 958519 The perf binary links to a specific version of python, so we can really only have one working python extension. This moves perf from python-r1 to python-single-r1 to fix this problem. Closes: https://bugs.gentoo.org/958519 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> dev-util/perf/perf-6.16-r1.ebuild | 14 ++++++-------- dev-util/perf/perf-6.16.5.ebuild | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dev-util/perf/perf-6.16-r1.ebuild b/dev-util/perf/perf-6.16-r1.ebuild index 24f98d5ae493..918a9e75c682 100644 --- a/dev-util/perf/perf-6.16-r1.ebuild +++ b/dev-util/perf/perf-6.16-r1.ebuild @@ -3,9 +3,9 @@ EAPI=8 -LLVM_COMPAT=( {18..20} ) +LLVM_COMPAT=( {18..21} ) PYTHON_COMPAT=( python3_{10..14} python3_{13,14}t) -inherit bash-completion-r1 estack flag-o-matic linux-info llvm-r1 toolchain-funcs python-r1 +inherit bash-completion-r1 estack flag-o-matic linux-info llvm-r1 toolchain-funcs python-single-r1 DESCRIPTION="Userland tools for Linux Performance Counters" HOMEPAGE="https://perfwiki.github.io/main/"; @@ -46,7 +46,9 @@ BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} ${PYTHON_DEPS} >=app-arch/tar-1.34-r2 - dev-python/setuptools[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') app-alternatives/yacc app-alternatives/lex sys-apps/which @@ -307,14 +309,10 @@ src_test() { } src_install() { - _install_python_ext() { - perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" - } - perf_make -f Makefile.perf install DESTDIR="${D}" if use python; then - python_foreach_impl _install_python_ext + perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" fi if use gtk; then diff --git a/dev-util/perf/perf-6.16.5.ebuild b/dev-util/perf/perf-6.16.5.ebuild index 24f98d5ae493..918a9e75c682 100644 --- a/dev-util/perf/perf-6.16.5.ebuild +++ b/dev-util/perf/perf-6.16.5.ebuild @@ -3,9 +3,9 @@ EAPI=8 -LLVM_COMPAT=( {18..20} ) +LLVM_COMPAT=( {18..21} ) PYTHON_COMPAT=( python3_{10..14} python3_{13,14}t) -inherit bash-completion-r1 estack flag-o-matic linux-info llvm-r1 toolchain-funcs python-r1 +inherit bash-completion-r1 estack flag-o-matic linux-info llvm-r1 toolchain-funcs python-single-r1 DESCRIPTION="Userland tools for Linux Performance Counters" HOMEPAGE="https://perfwiki.github.io/main/"; @@ -46,7 +46,9 @@ BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} ${PYTHON_DEPS} >=app-arch/tar-1.34-r2 - dev-python/setuptools[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') app-alternatives/yacc app-alternatives/lex sys-apps/which @@ -307,14 +309,10 @@ src_test() { } src_install() { - _install_python_ext() { - perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" - } - perf_make -f Makefile.perf install DESTDIR="${D}" if use python; then - python_foreach_impl _install_python_ext + perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" fi if use gtk; then
