[gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     b1d7684da16b55f8e0f3b9283e757167b399951b
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Wed Jan  3 12:32:26 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 10:32:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d7684d

media-sound/guitarix: restore parallel build

Build system messes with the build jobs count, so that waf build
always respects the number of jobs passed to waf configure. And
since waf-utils eclass passes --jobs=1 to waf configure, we are
always building using only 1 job.

Pass --jobs with the correct number of jobs to waf configure as a
workaround.

Closes: https://bugs.gentoo.org/908690
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/34639
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{guitarix-0.41.0-py3.11.patch => guitarix-0.44.1-py3.11.patch} | 0
 media-sound/guitarix/guitarix-0.44.1.ebuild                        | 7 ++++---
 media-sound/guitarix/guitarix-9999.ebuild                          | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch b/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch
similarity index 100%
rename from media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch
rename to media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch

diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 60b76beb379f..7296f64747af 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-any-r1 waf-utils xdg
+inherit multiprocessing python-any-r1 waf-utils xdg
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
@@ -63,8 +63,8 @@ DOCS=( changelog README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
-	"${FILESDIR}"/${PN}-0.41.0-py3.11.patch
-	"${FILESDIR}"/${PN}-0.44.1-zita-resampler-1.10.patch
+	"${FILESDIR}"/${P}-py3.11.patch
+	"${FILESDIR}"/${P}-zita-resampler-1.10.patch
 	"${FILESDIR}"/${P}-gcc-13.patch
 )
 
@@ -82,6 +82,7 @@ src_configure() {
 		--no-faust
 		--no-ldconfig
 		--shared-lib
+		--jobs=$(makeopts_jobs)
 		$(use_enable nls)
 		$(usex bluetooth "" "--no-bluez")
 		$(usex debug "--debug" "")

diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index ed2429d53f6d..490d308775b1 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
 EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git"
 EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master"
 
-inherit python-any-r1 waf-utils xdg git-r3
+inherit multiprocessing python-any-r1 waf-utils xdg git-r3
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
@@ -79,6 +79,7 @@ src_configure() {
 		--no-faust
 		--no-ldconfig
 		--shared-lib
+		--jobs=$(makeopts_jobs)
 		$(use_enable nls)
 		$(usex bluetooth "" "--no-bluez")
 		$(usex debug "--debug" "")