public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/
Date: Sat, 19 Apr 2025 01:27:55 +0000 (UTC)	[thread overview]
Message-ID: <1745025967.ace8b37ca275ab88fec31daf59f369d2aa25ecef.sam@gentoo> (raw)

commit:     ace8b37ca275ab88fec31daf59f369d2aa25ecef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 19 01:26:01 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 19 01:26:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace8b37c

app-benchmarks/bootchart2: fix python_setup

* Call python-single-r1_pkg_setup (i.e. python_setup) conditionally
  based on USE=cairo to match the other Python conditionals
* Fix style (conditional last, not first in *DEPEND; whitespace; variable
  order)

Closes: https://bugs.gentoo.org/950448
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
index a32f40e5e391..b2a8b7474111 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
 
 inherit linux-info python-single-r1 systemd toolchain-funcs
 
 DESCRIPTION="Performance analysis and visualization of the system boot process"
 HOMEPAGE="https://github.com/xrmx/bootchart"
 SRC_URI="https://github.com/xrmx/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN%2}-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,13 +21,14 @@ REQUIRED_USE="cairo? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!cairo? ( test )"
 
 RDEPEND="
-	cairo? ( ${PYTHON_DEPS} $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') )
 	sys-apps/lsb-release
+	cairo? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	)
 "
 BDEPEND="cairo? ( ${PYTHON_DEPS} )"
 
-S="${WORKDIR}"/${PN%2}-${PV}
-
 CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
 
 PATCHES=(
@@ -34,9 +36,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-glibc-2.36.patch
 )
 
+pkg_setup() {
+	use cairo && python-single_r1_pkg_setup
+}
+
 src_prepare() {
 	default
-	python_setup
+
 	tc-export CC
 
 	# Redirects systemd unit directory,


             reply	other threads:[~2025-04-19  1:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-19  1:27 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-05-06  5:20 [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/ Miroslav Šulc
2022-01-30 16:17 Florian Schmaus
2022-01-28 10:45 Florian Schmaus
2020-04-30 15:10 Andreas Sturmlechner
2017-09-22 21:30 Mike Gilbert
2016-10-09  7:47 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1745025967.ace8b37ca275ab88fec31daf59f369d2aa25ecef.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox