gentoo resync : 03.11.2019

5 files changed, 190 insertions, 4 deletions

diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index d433862bf7fa..21d1462efdc9 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,7 @@
 DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
+DIST jack2-1.9.13.tar.gz 6485870 BLAKE2B 7acc0a1389af133dafa7368b4285c2a06607d84015601f2d8afbd63a9a08f40210f8206f2febbd0e5cc651513a59419e1d948a56163d2074c4b77da5edd84a52 SHA512 dd83a6535cf92a3c45b5ed31edda5f1cb4a6c1db2ac683d4ea709e226bc30d55b366ce80ee543dfaa600f871079f3754e9314124093e230dc7deeceb828de8aa
 EBUILD jack2-1.9.12-r1.ebuild 2248 BLAKE2B df3c7d95bdd19ebac930330209a968ea175fa410e88f792c6a2c2d514a4958c1d761916dee23c183f43c148d440381bcb3368aab43cbc158876065d9cec9af79 SHA512 fd3261aa55103089325e372af16d53a73035dde0b06ec048f04b0c4fe9ff376e05ac5184ec6de9db7f76270a3f32f13ebbc34ab12b719efcc190b7994a6633d4
-EBUILD jack2-9999.ebuild 2262 BLAKE2B 89548e80dab03db5f233396413b4fb7a6ecffdaeba8675890ea444482e6fd9633e2db1ef5f17ee7bc1b11f2f81d55f6c305f64d2f10dc8be0c1861c525b72516 SHA512 da88f72c8b05d6296026573be4f936cc5040b929a9e49588a5b3143a0161c45d8b0ec3f7c90ee15cb47d885d6fee42b32215a725b6f12f13d1f63ad4ecea14c1
-MISC metadata.xml 506 BLAKE2B ba66e2cbd670da4a3eb56f611f624ae64214475c131d53a54436c1dc1cb8f47585a31af583c44aa03bcd497b662d9bb91ae434b0d246bd4fd18519efb6ecbc35 SHA512 61c4dbd8d78c20d61fb52468ced23f4c77b0432bb066e32395b0f26b5bbf3d17231045451cbb3b390a978c9598d313d08df13389262c424bad78bcdf7cab528e
+EBUILD jack2-1.9.13-r1.ebuild 2333 BLAKE2B a0af3c55f071e3decef515a2958fd5e3eab280d61108570c74550a3007db584a6373122d2cf1312ad0c565ac42192345d912d53a45c0c8132ad627c6252fe6a4 SHA512 ae6bf28f27478d0c122e5840c619b02172b3b30012069960a83362652121d2b8ffbb0774676b115166b8284fef80e757663c96a22cf5a3ba32b7b64ae0286fdb
+EBUILD jack2-1.9.13.ebuild 2264 BLAKE2B 159e3a74eb6f3cebfdac5eb9597efc14b434c410e2b9d2191ca198b98d6edf8a8b4801831769382012cfd5226bcd53674d8576389f7be24ff54d1be847e3f5f7 SHA512 585e808d0a967e9cdd2f544f42b8c808dd6cc61f14ddf13806d63a948e992fc49aca1cb965d900c2b41646c9b57f3db71980bd63892be1650d000f3177429f43
+EBUILD jack2-9999.ebuild 2351 BLAKE2B a226227c67bd6b7630b8dbab44b33a50a5732dbe4181f64d630fd03bc613d78429cab6d07ea91b34e5adecb4f693e341c0b3d88c92a52b1e8f65954a1959d4c3 SHA512 ba3e3abe0a631e4d275d9f13b9bbe32bdd35925914c91c0f16d6426609ac1aa0c901bed47c483870ebfde97b81a74e4704f3fcf06f2c76e2b7f9affc93211ada
+MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.13-r1.ebuild b/media-sound/jack2/jack2-1.9.13-r1.ebuild
new file mode 100644
index 000000000000..0f479c637fbb
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.13-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://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/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~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? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
+
+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-1.9.13.ebuild b/media-sound/jack2/jack2-1.9.13.ebuild
new file mode 100644
index 000000000000..54bed398c30a
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.13.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://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/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate 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}] )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
+
+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
+		--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 e93c8733c184..9293ca615b0d 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
@@ -38,6 +38,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		sys-apps/dbus[${MULTILIB_USEDEP}]
 	)
 	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:* )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -61,6 +62,7 @@ multilib_src_configure() {
 		$(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
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 7956a5fa4618..61e6667c2b4e 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -10,6 +10,7 @@
 	</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>
 	</use>
 </pkgmetadata>