gentoo resync : 25.11.2020

4 files changed, 112 insertions, 10 deletions

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 600622c5afce..92bd63cebece 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,7 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
 DIST jack2-1.9.14.tar.gz 6495043 BLAKE2B 9ace1cef2c15c2894831c79bb8d73637df27a21462f654e04b7fb8fc05731e6df898aaefc343a9be4799bcd70576aa7397f2d48b7d2530b682f62463ce3d4a07 SHA512 ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd
-EBUILD jack2-1.9.14.ebuild 2432 BLAKE2B 3902fe7a37ee2429232c90465d946a85bd101e0b9fb4f7440cb9217c6978503f5189bb90013018ddc2737fcd81dad66cb8517cc4e85c00bce135d5feb21635f7 SHA512 73c6eb3774ef227ffb6c8ad83077e9328c9a24e30f88a38808d978ffca5ea43be0bdb9f0912e37d6ce03b90363a93e933581ea936c1f48ef4fd87801f4a8c9d7
-EBUILD jack2-9999.ebuild 2406 BLAKE2B 4cf6581a7cf3bf8e9a60dd063fbe8d0dd2cad8734e91ff09c08c4af5431502d9f30f65a3571bf3f5e2b589a31da31b3aecf8f62338496a52d1caa20caa480744 SHA512 0abe0f5bee6a76730cd21737e6391783b1f2109b82a0b80ccf9cd2d72d5b6e2dcb52daf55465d5032882968c41da0e0f154c97386cb1c4d66e4d3d2c39aa8132
+DIST jack2-1.9.16.tar.gz 974652 BLAKE2B ff20d57f544bd636d93e77c2c6dec3af3afbafe4a217ba480c66247ddb6d8ca60755fa55599240fdd75e8ce2c1f7d8fb4f1bf68de8a212268588245f35731ead SHA512 8e4717cad097806a436e3a7b7977faa65987ca0fe59fd285014d6207899c62f9abbb79474170d0e5a6e82d0dbfe998c1310b13c4de8cd68cea0a6935ba579fd1
+EBUILD jack2-1.9.14.ebuild 2428 BLAKE2B b400fa2fa9949fac29d1b01a5caa917370357c160c8f4336ff358df5f294d2a044ff1b81cb231b05239c0454e63c4f8d4ec7f6a42e579f62a383cd772c7b0b26 SHA512 514103873e13a1cbc5fb946d12e8dad8739b8b7a68cac4c9bea0825ca6fddd473e8afb5874b8bcb8e5462859fb921b6cffeaf3f16127c260b24099b4927d7b1b
+EBUILD jack2-1.9.16.ebuild 2446 BLAKE2B 458db801cca023bf6b148deedac1e1c736dd9bc7851c4070a36d5f2be3f476d3b87322948a48be8b33f7b8a9b69b28acaba97c488234e3df546e60fc52e02e9f SHA512 a20fb21cc8fa2e18efe1d4d83ec6a1b0a496882618d2996027782401ad583e716617fea707617351a97640f38db849241299e243d899f1dfb31c7234a927f840
+EBUILD jack2-9999.ebuild 2391 BLAKE2B 0387559dc6fe6026a6cf52f23c9b83f86e15171809973c4e2ea9ebc1a13b21ec6436de1e4e0bb2b1a72e5d543032bc54b708251e1b62e6c4b8938afbeccf1bd7 SHA512 d9bf79c776b8f58ea33197bf7f97f01904e08f7a85174e363c1d0e54d46ead8d72401b8ee8ab91ba6fe06fc9dece0ce33523a2007a82ef982228a0e4178efbd4
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.14.ebuild b/media-sound/jack2/jack2-1.9.14.ebuild
index b321f22400c8..3e5b96e0d923 100644
--- a/media-sound/jack2/jack2-1.9.14.ebuild
+++ b/media-sound/jack2/jack2-1.9.14.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/jack2/jack2-1.9.16.ebuild b/media-sound/jack2/jack2-1.9.16.ebuild
new file mode 100644
index 000000000000..d0bf48e41848
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.16.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
+
+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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+CDEPEND="${PYTHON_DEPS}
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	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:* )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.14-fix-doc.patch"
+)
+
+src_prepare() {
+	default
+	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)
+		--celt=no
+		--db=$(usex metadata yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=$(usex ieee1394 yes no)
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index a05c1b121090..d76f72a16250 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -17,18 +17,19 @@ else
 	MY_PV="${PV/_rc/-RC}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz""
-	KEYWORDS="~amd64 ~ppc ~x86"
+	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="2"
 IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
 
-COMMON_DEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
 	media-libs/libsamplerate
 	media-libs/libsndfile
 	sys-libs/readline:0=
@@ -40,10 +41,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
 	metadata? ( sys-libs/db:* )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	dbus? (
 		$(python_gen_cond_dep '
 			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]