version bump

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 68 insertions, 9 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index 95b14d07d8e0..b3cd86188ffa 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/zynaddsubfx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.39 2012/01/05 17:34:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.40 2012/03/07 10:06:10 aballier Exp $
+
+*zynaddsubfx-2.4.2 (07 Mar 2012)
+
+  07 Mar 2012; Alexis Ballier <aballier@gentoo.org> +zynaddsubfx-2.4.2.ebuild:
+  version bump
 
   05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   -zynaddsubfx-2.2.1-r2.ebuild, -zynaddsubfx-2.2.1-r4.ebuild,
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index f6439678c709..222ef6eb93e5 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -5,17 +5,15 @@ AUX zynaddsubfx-2.4.1-docs.patch 420 RMD160 4a47f9fbcd150c19e8e0cb208694cf82e998
 AUX zynaddsubfx-2.4.1-fltk.patch 1492 RMD160 4abefa4db84b5a7663cc4e97e2d119db19773159 SHA1 2a4a8c4eb23bd5093c68a6fcf3f4d5afb5a81c58 SHA256 b4fab50f4fd3f91d655e9c613973b2a50750b73577044301cf6b7017d0714c47
 AUX zynaddsubfx-2.4.1-fltk13.patch 1978 RMD160 9a81931bc5d9fefb045c2d09e29b21f22b2cbbd8 SHA1 a91a54d02e65e271bde6c3b4fca5d66c92cc33a8 SHA256 34b328ae07ec901e0508914ae76f0b9b38cb0cf2e12afed585900eaee7048d22
 DIST ZynAddSubFX-2.4.1.tar.bz2 2449356 RMD160 b0cf8e16e17d5db2d2c1976c2c69f8abdf753b13 SHA1 5abffff4ff2710dc427c4888a167c8f8a74d7c7e SHA256 cf796e23c1f268307373dca3d0dacaf80a19d813da4bd290742b6773e0a3c5fe
+DIST ZynAddSubFX-2.4.2.tar.bz2 2447485 RMD160 f7ad1fc9e6df5f911fbe4de1d6c2e439218cd3f1 SHA1 2dfbaaffdb69a09e7c8b7327ef9b7bd26629c391 SHA256 7d43bfece3b02625528dab7139e0fbada5768ac2722df137794b157602f8e802
 EBUILD zynaddsubfx-2.4.1.ebuild 1766 RMD160 7341f3966cd540e6317ac0ae30008217dbabd0a4 SHA1 6364dfeee58e4c32a8f555045dd13b20376f2b7b SHA256 106b402638962af18f9f2899345cf8180b035a2d5ccb17cd37ef95aa7d59f103
-MISC ChangeLog 7016 RMD160 7235e9c5e40e71564bc08f514fafbabb4ea65992 SHA1 c85207c723c71143a86189775832a5ed690dbb70 SHA256 f6d26f5a080eaf07e8e186e74a4ad708ecff2108e8a8444e4960fc6a939c6aa2
+EBUILD zynaddsubfx-2.4.2.ebuild 1710 RMD160 c80f90d864f2f4903166ec0ebe6c698693399193 SHA1 d35ad515e714ff739b5178dd641f7b9c9be3c531 SHA256 88a915d734e5d400f71624eeabb9d694dcad96be8703b1d71c08573c10f405c3
+MISC ChangeLog 7144 RMD160 4c8f8463e3cc6554956f15dff2a146a8357dfb98 SHA1 5a9f5789c3f631c6246ac3f4b238fc813f0c24b6 SHA256 7aed336dad8a959da6c1279368cb0a7bcdffae4f06b4ed955802de2f5d640d6c
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPBd6nAAoJEEdUh39IaPFNX2QH/jP+63aIgytJ0XukzshYAdfP
-UZ4FlEnLH3wJgywjJU2/8tQVNlrgpJHZlApL5I1dlkitBLedarGNCybMmpMbvfbD
-qwgs10HWfHGhUebIj1bWc5LK5ShD/KYl+DkwyAJPVUTbHZZGDzmV/asr7zYLvBUv
-jnWXOJurPtBAu6b7MELFcCSFYqLaNUlxIFkSFiWhK2p7blxSHO8rdYgCGVK0IBA+
-4XOyAvRTn6mDoaGp7oSd9aArP9GPGCea7k/oFS/QZbFX2JEQHzAInTid+shRLVAM
-Id2KUi8ohqxh03q6VEhq3eZPCw+oqzkpAtZbHxDaVAxb/A15Bj1zrjEr7ysRGO0=
-=jlIH
+iEYEARECAAYFAk9XMxcACgkQvFcC4BYPU0p+YwCgp6qUfAUV+nFO7KiaHU2N3rfX
+rKAAmwZMmHPYfVHvLWHlrIFAVcZ+zCkP
+=SOD3
 -----END PGP SIGNATURE-----
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild
new file mode 100644
index 000000000000..ab926982fdca
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild,v 1.1 2012/03/07 10:06:10 aballier Exp $
+
+EAPI=4
+inherit eutils cmake-utils
+
+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="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.1-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
+
+src_configure() {
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/banks "${S}"/examples
+}