commit:     60a3b3747f67527f467ae1ae88ec940c160a40e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  1 21:25:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 21:36:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60a3b374

media-sound/csound: Restrict to <media-sound/fluidsynth-2

Bug: https://bugs.gentoo.org/659400
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/csound/csound-6.10.0.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.10.0.ebuild 
b/media-sound/csound/csound-6.10.0.ebuild
index 185ce6f382b..2c61ca708be 100644
--- a/media-sound/csound/csound-6.10.0.ebuild
+++ b/media-sound/csound/csound-6.10.0.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
                media-libs/dssi
                media-libs/ladspa-sdk
        )
-       fluidsynth? ( media-sound/fluidsynth:= )
+       fluidsynth? ( <media-sound/fluidsynth-2:= )
        fltk? ( x11-libs/fltk:1[threads?] )
        image? ( media-libs/libpng:0= )
        jack? ( media-sound/jack-audio-connection-kit )
@@ -111,6 +111,9 @@ pkg_setup() {
 src_prepare() {
        cmake-utils_src_prepare
 
+       has_version ">=media-sound/fluidsynth-2" &&
+               eapply "${FILESDIR}/${P}-fluidsynth2.patch" # 680062
+
        sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
                -e '/-O3/d' \
                -i CMakeLists.txt || die

Reply via email to