gentoo resync : 18.11.2019

4 files changed, 32 insertions, 15 deletions

diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 70f35da22ad1..c5fa40344e51 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
 AUX cadence-add-skip-stripping.patch 2184 BLAKE2B 61db0094b2ae8059c1cf162d553db9624cf84e0d92483bd42678b6be8dd0e25aaf7eb5cde6983e65c54cbe61d2f0f1a507d74a73572662c64e489e8c30b7cc56 SHA512 dda75f3b7f23c9303206fde30ca9c90eaf3999edd8b1d02f5cd3e0680d72dc59b0966ce9100d4274490595f7aa6df3ed6ef6f91ed672840341f9d5083805b239
 DIST cadence-0.9.0.tar.gz 2202265 BLAKE2B 03d38f611df05597d2b4016f263d36f2386be421383a38b51dee519514e6d1ed79bf92ea2a789ea868a25d4c805e9e94cd0971f479b772799bf6bf3170349b4a SHA512 381c9c57c1d96452a91969e134420d63ef06f5ec144050779d0a06a1098e8ed1693c70165b6640e04acc448d382e717e71ead1b29ba5043f0668675850cad7d1
-EBUILD cadence-0.9.0-r2.ebuild 2025 BLAKE2B 835876e65e5f69cbd1f9ad8632596fb5a67264f03efc1bcd06dc6e1b77f84fd6404b49a8aaa6585b5c5244480d5cbb1fa0a60d63dc41d3eacd55db60d2fc831b SHA512 606f7bd2eaccb3d810d20cb7d188b7326f9910a8d1fa469bba08de6f13ae173a05165fa309c1774d170c3a9330255f3adb5dd27cfc5f1e5593d5c9a4702213d2
-EBUILD cadence-9999.ebuild 1969 BLAKE2B e34691fbb5340837032dea941239af229644c03a789c12ef8ad6a7cb3bd7241fc71c6e52a06f0b7629ce99b1dafe701eb7ba1667002a94add3bb592b79a35527 SHA512 1357bce659a45656c0ea11362a18e93731be7b0f9e2d3ec3bd774a101c3149738493c54b57ff2ee188c1a22714508784408b3bee816496d79586eeee07a0f911
-MISC metadata.xml 368 BLAKE2B eeadd7ce43e144ac8baaa0d55a1943cee1b277d2a9bb1a79977c86603035f12d40489c2ae7c6771f36dabccc29ce6b86b66b4f1f6ddefb08cb29d0977794153d SHA512 e851ae0de3b73af5ecc7be20d4dec0fc74bd6c5d976001cfcea1af0a0a79db294b95ca82454efa9883b4a9a6ae2f538b3cd51f77e34032efe8162186f73562da
+EBUILD cadence-0.9.0-r3.ebuild 2130 BLAKE2B 9005e7559a7240592f8d73c90b1cd4c2d57cc3af381a28a717968583b228232ba850ed4a57242591b2456205ff1ba112b78033d286f197de622af642216cce79 SHA512 f0ab2d5fcead875e1736e785d6383f745a3ce78fb7afe090144a61c8a05e5290b770dcc84fc7420dbb1fffe56adf23b97c11f3c165aa3e1722ac85e153e9e86f
+EBUILD cadence-9999.ebuild 2074 BLAKE2B 25fc6d2f008ea2f32249fb4b365008a9eec566f0ad252c9632fd0e3d6150d6ec35d2b2feb78f334d0259d30d9b8a4028a54dab39fa085390148f418f9e52a3b1 SHA512 f769b9f08d787650a884e94435c047b10639b4b1785654c318acbefebc9fc3b4471a3014fd06f8012c4688b88178ac0b39a8bd35e4104c3d0cfeb625f5b54e6e
+MISC metadata.xml 486 BLAKE2B 58cf78a035486def369b21d2b1da269e2766681d26317f5c25cf46fe00e79c78c4e0e0dae020ae9842684953d4b621f565adf3909c44c6294d7f3e9c4a9ce078 SHA512 5af8ba22da556ab2cc9a266afd3cede8618f389dd298758aaa60a1d398ac2f754a5e823fd518154a226a10f8568ac548f33a916034ec0c04e96fffcc08ed8232
diff --git a/media-sound/cadence/cadence-0.9.0-r2.ebuild b/media-sound/cadence/cadence-0.9.0-r3.ebuild
index c3fac92fcd8d..ed7a5e91ff18 100644
--- a/media-sound/cadence/cadence-0.9.0-r2.ebuild
+++ b/media-sound/cadence/cadence-0.9.0-r3.ebuild
@@ -13,17 +13,22 @@ KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="-pulseaudio opengl"
+IUSE="a2jmidid -pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
-RDEPEND="${PYTHON_DEPS}
-	media-sound/jack2[dbus]
-	dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+CDEPEND="
+	${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	pulseaudio? ( media-sound/pulseaudio[jack] )"
-DEPEND=${RDEPEND}
+	dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+	media-sound/jack2[dbus]
+	media-sound/jack_capture
+	a2jmidid? ( media-sound/a2jmidid[dbus] )
+	pulseaudio? ( media-sound/pulseaudio[jack] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
 
 S="${WORKDIR}/Cadence-${PV}"
 
@@ -41,6 +46,7 @@ src_prepare() {
 		data/catia \
 		data/claudia \
 		data/claudia-launcher || die "sed failed"
+
 	default
 }
 
@@ -48,6 +54,7 @@ src_compile() {
 	myemakeargs=(PREFIX="/usr"
 		SKIP_STRIPPING=true
 	)
+
 	emake "${myemakeargs[@]}"
 }
 
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index b8f9be329785..de44214ae7ca 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -13,17 +13,22 @@ KEYWORDS=""
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="-pulseaudio opengl"
+IUSE="a2jmidid -pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
-RDEPEND="${PYTHON_DEPS}
-	media-sound/jack2[dbus]
-	dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+CDEPEND="
+	${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	pulseaudio? ( media-sound/pulseaudio[jack] )"
-DEPEND=${RDEPEND}
+	dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+	media-sound/jack2[dbus]
+	media-sound/jack_capture
+	a2jmidid? ( media-sound/a2jmidid[dbus] )
+	pulseaudio? ( media-sound/pulseaudio[jack] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
 
@@ -39,6 +44,7 @@ src_prepare() {
 		data/catia \
 		data/claudia \
 		data/claudia-launcher || die "sed failed"
+
 	default
 }
 
@@ -46,6 +52,7 @@ src_compile() {
 	myemakeargs=(PREFIX="/usr"
 		SKIP_STRIPPING=true
 	)
+
 	emake "${myemakeargs[@]}"
 }
 
diff --git a/media-sound/cadence/metadata.xml b/media-sound/cadence/metadata.xml
index fd782eeb253b..e72e0a80aa33 100644
--- a/media-sound/cadence/metadata.xml
+++ b/media-sound/cadence/metadata.xml
@@ -9,4 +9,7 @@
 	<email>proaudio@gentoo.org</email>
 	<name>Gentoo ProAudio Project</name>
 </maintainer>
+<use>
+	<flag name="a2jmidid">Enables support for legacy ALSA sequencer applications in JACK MIDI system</flag>
+</use>
 </pkgmetadata>