[gentoo-commits] repo/gentoo:master commit in: media-sound/jack2/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     8bdaa74cd9de0c0bbd74d5562eea7f113eb017ad
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 00:56:38 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May  6 01:05:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdaa74c

media-sound/jack2: enable py3.12 + tidy a bit

Still no release, so let's backport the waf bump which
thankfully is less trouble than it looked.

Does not touch anything but the build system. May be
safer to revbump but rather not re-stabilize over this.
Is fine on amd64 stable for a quick test.

Closes: https://bugs.gentoo.org/929660
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-sound/jack2/Manifest            |  1 +
 media-sound/jack2/jack2-1.9.22.ebuild | 24 ++++++++++++++++++------
 media-sound/jack2/jack2-9999.ebuild   |  5 ++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 5ffeac4b5e99..83521bcaf9c9 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1 +1,2 @@
+DIST jack2-1.9.22-python3.12.patch.xz 32080 BLAKE2B d581d38cd32d8933bf4a9fdb1c6f3445d8e05be5ae1775335180b6f5daea9e5bad036560a33027d09d0a996a22fcb068140e2b61483fa8a7c4e8091bda39d114 SHA512 e63b73526719dcd4276036e71a7dd8f44c01c3048330724ec3fa8cf5f189055ac58f57493e87163017fbbe201b76672a9115b64957b575f0f7a1b6d9f7ec40e3
 DIST jack2-1.9.22.tar.gz 933448 BLAKE2B 8c42cb996e132f711ad8b7071d44601e21bfc8fe24802113825b8434abc8734c981daa2b09f10a7ecb1492a51d631255a99649d6d76343622b5e38da07e0c598 SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4

diff --git a/media-sound/jack2/jack2-1.9.22.ebuild b/media-sound/jack2/jack2-1.9.22.ebuild
index 5c178c78a5d4..c52bbee4676b 100644
--- a/media-sound/jack2/jack2-1.9.22.ebuild
+++ b/media-sound/jack2/jack2-1.9.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
@@ -11,7 +11,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 else
-	SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://dev.gentoo.org/~ionen/distfiles/${P}-python3.12.patch.xz
+	"
 	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 fi
 
@@ -23,7 +27,8 @@ SLOT="2"
 IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
+	|| ( classic dbus )
+"
 
 DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
@@ -35,7 +40,8 @@ DEPEND="
 	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
 	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
-	systemd? ( classic? ( sys-apps/systemd:= ) )"
+	systemd? ( classic? ( sys-apps/systemd:= ) )
+"
 RDEPEND="
 	${DEPEND}
 	dbus? (
@@ -46,16 +52,22 @@ RDEPEND="
 	)
 	pam? ( sys-auth/realtime-base )
 	!media-sound/jack-audio-connection-kit
-	!media-video/pipewire[jack-sdk(-)]"
+	!media-video/pipewire[jack-sdk(-)]
+"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-text/doxygen )"
+	doc? ( app-text/doxygen )
+"
 # tools were formerly provided here, pull to maintain expectations
 PDEPEND="tools? ( media-sound/jack-example-tools )"
 
 DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
 
+PATCHES=(
+	"${WORKDIR}"/${P}-python3.12.patch
+)
+
 src_prepare() {
 	default
 

diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index c2b74cc94497..2241477aa20d 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -11,7 +11,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 else
-	SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi