From 8d379e4d1ef9498b15e1ed5d52371076dbff30fc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Miroslav=20=C5=A0ulc?= <fordfrog@gentoo.org>
Date: Wed, 13 Nov 2019 10:52:29 +0100
Subject: [PATCH] media-sound/cadence: added a2jmidid use flag
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

1) added a2jmidid use flag
2) organized dependencies

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Å ulc <fordfrog@gentoo.org>
---
 media-sound/cadence/cadence-0.9.0-r2.ebuild | 18 ++++++++++++------
 media-sound/cadence/cadence-9999.ebuild     | 18 ++++++++++++------
 media-sound/cadence/metadata.xml            |  3 +++
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/media-sound/cadence/cadence-0.9.0-r2.ebuild b/media-sound/cadence/cadence-0.9.0-r2.ebuild
index c3fac92fcd8d..556bcfae995c 100644
--- a/media-sound/cadence/cadence-0.9.0-r2.ebuild
+++ b/media-sound/cadence/cadence-0.9.0-r2.ebuild
@@ -13,17 +13,21 @@ 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]
+	a2jmidid? ( media-sound/a2jmidid[dbus] )
+	pulseaudio? ( media-sound/pulseaudio[jack] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
 
 S="${WORKDIR}/Cadence-${PV}"
 
@@ -41,6 +45,7 @@ src_prepare() {
 		data/catia \
 		data/claudia \
 		data/claudia-launcher || die "sed failed"
+
 	default
 }
 
@@ -48,6 +53,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..aaaa9ffa518f 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -13,17 +13,21 @@ 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]
+	a2jmidid? ( media-sound/a2jmidid[dbus] )
+	pulseaudio? ( media-sound/pulseaudio[jack] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
 
@@ -39,6 +43,7 @@ src_prepare() {
 		data/catia \
 		data/claudia \
 		data/claudia-launcher || die "sed failed"
+
 	default
 }
 
@@ -46,6 +51,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>
-- 
2.26.2