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

[Miroslav Šulc]

commit:     813da433cbb8d25140ec9eb46728328f274181f5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 08:21:16 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 09:55:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=813da433

media-sound/jack2: bump to 1.9.16 + py3.9 + sync'd live

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/jack2/Manifest                            |  1 +
 .../jack2/{jack2-9999.ebuild => jack2-1.9.16.ebuild}  | 19 ++++++++++++-------
 media-sound/jack2/jack2-9999.ebuild                   | 15 ++++++++-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index fca4188fb5b..164a6c80b7b 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1 +1,2 @@
 DIST jack2-1.9.14.tar.gz 6495043 BLAKE2B 
9ace1cef2c15c2894831c79bb8d73637df27a21462f654e04b7fb8fc05731e6df898aaefc343a9be4799bcd70576aa7397f2d48b7d2530b682f62463ce3d4a07
 SHA512 
ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd
+DIST jack2-1.9.16.tar.gz 974652 BLAKE2B 
ff20d57f544bd636d93e77c2c6dec3af3afbafe4a217ba480c66247ddb6d8ca60755fa55599240fdd75e8ce2c1f7d8fb4f1bf68de8a212268588245f35731ead
 SHA512 
8e4717cad097806a436e3a7b7977faa65987ca0fe59fd285014d6207899c62f9abbb79474170d0e5a6e82d0dbfe998c1310b13c4de8cd68cea0a6935ba579fd1

diff --git a/media-sound/jack2/jack2-9999.ebuild 
b/media-sound/jack2/jack2-1.9.16.ebuild
similarity index 86%
copy from media-sound/jack2/jack2-9999.ebuild
copy to media-sound/jack2/jack2-1.9.16.ebuild
index a05c1b12109..d0bf48e4184 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-1.9.16.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}]
@@ -54,6 +55,10 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
 
+PATCHES=(
+       "${FILESDIR}/${PN}-1.9.14-fix-doc.patch"
+)
+
 src_prepare() {
        default
        multilib_copy_sources

diff --git a/media-sound/jack2/jack2-9999.ebuild 
b/media-sound/jack2/jack2-9999.ebuild
index a05c1b12109..d76f72a1625 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}]