From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1103577-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 69D56138334
	for <garchives@archives.gentoo.org>; Thu,  1 Aug 2019 21:36:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7D359E0828;
	Thu,  1 Aug 2019 21:36:43 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 68B90E0828
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Aug 2019 21:36:43 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C3EF034928C
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Aug 2019 21:36:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B3516DB
	for <gentoo-commits@lists.gentoo.org>; Thu,  1 Aug 2019 21:36:39 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1564695382.60a3b3747f67527f467ae1ae88ec940c160a40e8.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/csound/csound-6.10.0.ebuild
X-VCS-Directories: media-sound/csound/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 60a3b3747f67527f467ae1ae88ec940c160a40e8
X-VCS-Branch: master
Date: Thu,  1 Aug 2019 21:36:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1c5b519f-8bd7-4d94-982d-a98c202def53
X-Archives-Hash: 86af98179a97dd14f697abfccbb41564

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