Add a check for alsa-lib's midi useflag on all ebuilds, or the package will not build. Revision bump with a version that honours CXX and CXXFLAGS.

(Portage version: 2.1.3_rc3)

7 files changed, 155 insertions, 9 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index 33db6e43b696..d4468d8da935 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/zynaddsubfx
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.25 2007/02/03 20:52:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.26 2007/06/16 12:00:35 flameeyes Exp $
+
+*zynaddsubfx-2.2.1-r3 (16 Jun 2007)
+
+  16 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  zynaddsubfx-2.2.0.ebuild, zynaddsubfx-2.2.1.ebuild,
+  zynaddsubfx-2.2.1-r1.ebuild, zynaddsubfx-2.2.1-r2.ebuild,
+  +zynaddsubfx-2.2.1-r3.ebuild:
+  Add a check for alsa-lib's midi useflag on all ebuilds, or the package will
+  not build. Revision bump with a version that honours CXX and CXXFLAGS.
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.2.1-r3 b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.2.1-r3
new file mode 100644
index 000000000000..ec539743b528
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.2.1-r3
@@ -0,0 +1,3 @@
+MD5 fca8560e37d799bd20d17e22b11674d6 ZynAddSubFX-2.2.1.tar.bz2 927022
+RMD160 d21b7988182d2cf9a9c8ee873e708adec33e40fc ZynAddSubFX-2.2.1.tar.bz2 927022
+SHA256 dab5dc86e0a2459fa2a870da133c7dda0aa2e1d895839594f4b520ca05cc80d2 ZynAddSubFX-2.2.1.tar.bz2 927022
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild
index 940de00c341c..1627b846571f 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild,v 1.1 2005/04/17 03:20:23 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.0.ebuild,v 1.2 2007/06/16 12:00:35 flameeyes Exp $
 
 inherit eutils
 
@@ -24,6 +24,15 @@ DEPEND=">=x11-libs/fltk-1.1.2
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ZynAddSubFx with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${MY_P}.tar.bz2 || die
 #	epatch ${FILESDIR}/${P}-*.patch
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild
index 3feb3a6de3d2..a5f5c4e1327c 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild,v 1.1 2005/05/17 22:53:22 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r1.ebuild,v 1.2 2007/06/16 12:00:35 flameeyes Exp $
 
 inherit eutils
 
@@ -24,6 +24,15 @@ DEPEND=">=x11-libs/fltk-1.1.2
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ZynAddSubFx with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${MY_P}.tar.bz2 || die
 }
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild
index f955627a0ecc..69fc5a3ddf45 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild,v 1.2 2005/06/30 13:25:03 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild,v 1.3 2007/06/16 12:00:35 flameeyes Exp $
 
 inherit eutils
 
@@ -24,6 +24,16 @@ DEPEND=">=x11-libs/fltk-1.1.2
 
 S="${WORKDIR}/${MY_P}"
 
+
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ZynAddSubFx with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${MY_P}.tar.bz2 || die
 }
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r3.ebuild
new file mode 100644
index 000000000000..5a97da23771a
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r3.ebuild,v 1.1 2007/06/16 12:00:35 flameeyes Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=ZynAddSubFX-${PV}
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+#IUSE="oss alsa jack mmx"
+IUSE="oss alsa jack"
+
+DEPEND=">=x11-libs/fltk-1.1.2
+	=sci-libs/fftw-3*
+	media-sound/jack-audio-connection-kit
+	>=dev-libs/mini-xml-2.2.1"
+#	portaudio? ( media-libs/portaudio )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ZynAddSubFx with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2 || die
+
+	sed -i -e '/CXXFLAGS +=/s:CXXFLAGS +=:override CXXFLAGS +=:' \
+		-e '/export CXXFLAGS/d' \
+		-e '/\$(MAKE) -C UI/s:$: CXXFLAGS="${CXXFLAGS}":' \
+		"${S}/src/Makefile" || die "unable to reset CXXFLAGS overrides."
+}
+
+src_compile() {
+	local FFTW_VERSION=3
+	local ASM_F2I=NO
+	local LINUX_MIDIIN=NONE
+	local LINUX_AUDIOOUT=NONE
+
+	if use oss ; then
+		LINUX_MIDIIN=OSS
+		LINUX_AUDIOOUT=OSS
+		use jack && LINUX_AUDIOOUT=OSS_AND_JACK
+	else
+		use jack && LINUX_AUDIOOUT=JACK
+	fi
+
+	use alsa && LINUX_MIDIIN=ALSA
+#	use portaudio && LINUX_AUDIOOUT=PA
+#	use mmx && ASM_F2I=YES
+
+	cd ${S}/src
+	make \
+		FFTW_VERSION=${FFTW_VERSION} \
+		ASM_F2I=${ASM_F2I} \
+		LINUX_MIDIIN=${LINUX_MIDIIN} \
+		LINUX_AUDIOOUT=${LINUX_AUDIOOUT} \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		|| die "compile failed"
+	cd ${S}/ExternalPrograms/Spliter
+	./compile.sh
+	cd ${S}/ExternalPrograms/Controller
+	./compile.sh
+}
+
+src_install() {
+	dobin ${S}/src/zynaddsubfx
+	dobin ${S}/ExternalPrograms/Spliter/spliter
+	dobin ${S}/ExternalPrograms/Controller/controller
+	dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
+
+	for i in "Arpeggios" "Bass" "Brass" "Choir and Voice" "Drums" \
+			 "Dual" "Fantasy" "Guitar" "Misc" "Noises" "Organ" \
+			 "Pads" "Plucked" "Reed and Wind" "Rhodes" "Splited" \
+			 "Strings" "Synth" "SynthPiano"
+	do
+		insinto "/usr/share/${PN}/banks/${i}"
+		doins "${S}/banks/${i}/"*
+	done
+
+	insinto /usr/share/${PN}/presets
+	doins "${S}/presets/"*
+	insinto /usr/share/${PN}
+	doins "${S}/examples/"*
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild
index ed12b47fecd5..f65175a2783d 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild,v 1.1 2005/05/03 23:09:41 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1.ebuild,v 1.2 2007/06/16 12:00:35 flameeyes Exp $
 
 inherit eutils
 
@@ -24,6 +24,15 @@ DEPEND=">=x11-libs/fltk-1.1.2
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ZynAddSubFx with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${MY_P}.tar.bz2 || die
 #	epatch ${FILESDIR}/${P}-*.patch