gentoo auto-resync : 05:11:2022 - 03:17:06

5 files changed, 188 insertions, 47 deletions

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 16d6c10dbf01..95f2d1529dae 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,7 @@
+AUX jack2-1.9.21-python3.11.patch 635 BLAKE2B 8e9168c2d44e087c20f0b6b1ac7a08bf957a5427f3c396e88ba3d0918e636500265e8182a39a8831b9cd37f9db3e86ff3ff6222e191d18f110b964a36c446982 SHA512 be0bb5fb4d65f99dc8355393a02c79ac36f64f7bb0e36a0e6c08ca99cc5c5340a5457fa13e7937d70349a4e0b86074c69232f69cab26779a7e53de5710b4b7fe
 DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
+DIST jack2-1.9.21.tar.gz 1006157 BLAKE2B 052486300bd17860964115427d4b5755ce7a4e4607bf9eb4e2b94d5b0cc61cf6a6b56d3a3eae9e91a1195a3316dd1f1ec1357275803805957e4b6f7a76424e24 SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
 EBUILD jack2-1.9.19.ebuild 2406 BLAKE2B 43cef82b53dc0f37ca9114e90a1419031ba5bf7fa7fd02f8f5a5c9e87c3b030b97b16c063f20f593740c88ec077f4690d493059cd827e3e86ee63e155ff2e8fa SHA512 1e6ae9ceb32b43b2008d9f2687a8e8dbc42f6a099d36c096b5a30aa6c9b4e1cf9e494b343724454e0fc2f764fea195aec6a7466ecbdba953e2d024c1a51a21dd
-EBUILD jack2-9999.ebuild 2412 BLAKE2B 65194019b04dc690d6010c8ac55c5988cea668126a8dc70ee9f263bd4836ab24d2a5b415dba4c29b184a85bff6291a8ddef288c0241613775104abe8171125a5 SHA512 62abc0b9716462d37c5625bfd6ec2b9d1fe1e2598400a0c33b9bd5d0d365378339d1a907084e1803baacf85768255c3f064b0a865d25a2d0292dbea33753f24d
-MISC metadata.xml 558 BLAKE2B ed8d67f5415217b100f387357fc1aab1cbe86e85b13c3b62a0a2f9635a69393cae4448cbee23f98cf82c1b4fe8ead065bd454ba2e1bbc3ec792b04fdd4f41801 SHA512 fe988bb462c83872e12031977f135454b331e41ec293cdb7a3247a52b170321d5c438fe5fdc54be93d7dc81a72ecd6e963a901e31d1bd40e9aa9644871b85bf9
+EBUILD jack2-1.9.21.ebuild 2598 BLAKE2B 30670a94216baba2d8ba5efde9fd1f8039256e864d180545f7c4d9150bffad016306b30c88efb0b3f03594f804a7a9ff79d83ec101b16178516ccbd3111774bf SHA512 c4c70f5f8afdbaa4a66a955118b939f3ecb8bcda38da2f777b8e7c9460ccd3a2fea39e0280e5750420aeb1874f37598d28d73b79b8ee3defb626d54b83e712df
+EBUILD jack2-9999.ebuild 2447 BLAKE2B 7d8a8a69e3bc2e15e355ee9a6ea43cb5673024d1e540bda2e5b447ba1dd3e4c09de9190cd346f302c7ff0c9acfc275fee5b861218a5a43ac22717acc4167c614 SHA512 4c7523fcc1e0116aadce1f92b9441f0bff768483942513bfd043223ee5b78e09f138db60be9599ec624321632278dcdf5fd65d2825dafbc89d12b4d5fd0e5167
+MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16
diff --git a/media-sound/jack2/files/jack2-1.9.21-python3.11.patch b/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
new file mode 100644
index 000000000000..f4aafcf16aed
--- /dev/null
+++ b/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
@@ -0,0 +1,19 @@
+'U' is default and deprecated since python-3.3, becomes a failure in 3.11.
+
+Just a quick fix (rather than bump waf) while waiting for upstream's
+plans to migrate to meson:
+https://github.com/jackaudio/jack2/issues/898
+--- a/waflib/ConfigSet.py
++++ b/waflib/ConfigSet.py
+@@ -314,3 +314,3 @@
+ 		tbl = self.table
+-		code = Utils.readf(filename, m='rU')
++		code = Utils.readf(filename, m='r')
+ 		for m in re_imp.finditer(code):
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -664,3 +664,3 @@
+ 	try:
+-		code = Utils.readf(path, m='rU', encoding=encoding)
++		code = Utils.readf(path, m='r', encoding=encoding)
+ 	except EnvironmentError:
diff --git a/media-sound/jack2/jack2-1.9.21.ebuild b/media-sound/jack2/jack2-1.9.21.ebuild
new file mode 100644
index 000000000000..a4ebc078d4c1
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.21.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
+
+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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+DEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${DEPEND}
+	dbus? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit
+	!media-video/pipewire[jack-sdk(-)]"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/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=(
+	"${FILESDIR}"/${PN}-1.9.21-python3.11.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang waf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# clients crash if built with lto
+	# https://github.com/jackaudio/jack2/issues/485
+	filter-lto
+
+	local wafargs=(
+		--alsa=$(usex alsa)
+		--celt=no
+		$(usev classic --classic)
+		--db=$(usex metadata)
+		$(usev dbus --dbus)
+		--doxygen=$(multilib_native_usex doc)
+		--firewire=$(usex ieee1394)
+		--iio=no
+		--opus=$(usex opus)
+		--portaudio=no
+		--samplerate=$(usex libsamplerate)
+		--winmme=no
+
+		# obsolete options, migrated to media-sound/jack-example-tools
+		# and will be removed entirely next version
+		--example-tools=no
+		--readline=no
+		--sndfile=no
+		--zalsa=no
+	)
+
+	waf-utils_src_configure "${wafargs[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control
+}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index eb214ebbb404..49be304b89f7 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -1,97 +1,102 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
+inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_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
 
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
 
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
 
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
+DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	dbus? (
 		dev-libs/expat[${MULTILIB_USEDEP}]
 		sys-apps/dbus[${MULTILIB_USEDEP}]
 	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	dbus? (
+		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
+	!media-sound/jack-audio-connection-kit
+	!media-video/pipewire[jack-sdk(-)]"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/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=(
+	"${FILESDIR}"/${PN}-1.9.21-python3.11.patch
+)
+
 src_prepare() {
 	default
+
 	python_fix_shebang waf
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
+	# clients crash if built with lto
+	# https://github.com/jackaudio/jack2/issues/485
+	filter-lto
+
+	local wafargs=(
+		--alsa=$(usex alsa)
 		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
+		$(usev classic --classic)
+		--db=$(usex metadata)
+		$(usev dbus --dbus)
+		--doxygen=$(multilib_native_usex doc)
+		--firewire=$(usex ieee1394)
 		--iio=no
-		--opus=$(usex opus yes no)
+		--opus=$(usex opus)
 		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
+		--samplerate=$(usex libsamplerate)
 		--winmme=no
 	)
 
-	waf-utils_src_configure ${mywafconfargs[@]}
+	waf-utils_src_configure "${wafargs[@]}"
 }
 
 multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+	waf-utils_src_compile
 }
 
 multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+	waf-utils_src_install
 }
 
 multilib_src_install_all() {
-	python_fix_shebang "${ED}"
+	use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control
 }
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 0c2531717ee9..70cba767c741 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">jackaudio/jack2</remote-id>
-	</upstream>
 	<use>
 		<flag name="classic">Enable building of jackd</flag>
 		<flag name="metadata">Enable metadata API</flag>
 		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+		<flag name="tools">Pull basic tools (e.g. jack_lsp/connect) from <pkg>media-sound/jack-example-tools</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jackaudio/jack2</remote-id>
+	</upstream>
 </pkgmetadata>