amd64/x86 stable wrt #395745

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

3 files changed, 28 insertions, 23 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index cc97aeb3f541..4adc5ba75ac3 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/zynaddsubfx
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.37 2011/03/20 20:06:18 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.38 2012/01/05 17:30:12 ssuominen Exp $
+
+  05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> zynaddsubfx-2.4.1.ebuild:
+  amd64/x86 stable wrt #395745
 
   20 Mar 2011; Justin Lecher <jlec@gentoo.org> zynaddsubfx-2.2.1-r2.ebuild,
   zynaddsubfx-2.2.1-r4.ebuild, zynaddsubfx-2.4.0.ebuild,
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 93e214f23e70..6b6df3e00e5b 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -13,13 +13,17 @@ DIST ZynAddSubFX-2.4.1.tar.bz2 2449356 RMD160 b0cf8e16e17d5db2d2c1976c2c69f8abdf
 EBUILD zynaddsubfx-2.2.1-r2.ebuild 2060 RMD160 fc5fbacb00f63df9d2fa9025f4872445918a744f SHA1 73241c9172d2605825351969e892415e6303c353 SHA256 5c406cc8576fef4dfa21348e98b01316b62759919939b7add3255a4ec80accf0
 EBUILD zynaddsubfx-2.2.1-r4.ebuild 2360 RMD160 db8ee7e4f1214a71c76ff815434a3846d0d59f66 SHA1 2d5a89d8b4422585aed1ec10fb5d2eabcb4c857f SHA256 da4b8460d8a1a6450179e523f9c17094af438e3ca94a8af38a6b602b2f87f1db
 EBUILD zynaddsubfx-2.4.0.ebuild 2846 RMD160 2f163493f2af6d8299bf5a158dd60b546c527eb2 SHA1 a8e0b45a4bcf675df5d8e49dabb33d04247e5184 SHA256 734e5f8788bcf9681ad9f4417e6de814428f839af84ee7ce18b11de647776b5d
-EBUILD zynaddsubfx-2.4.1.ebuild 1769 RMD160 db792d5603f23d619876e1aef7067649695f10d9 SHA1 5df94a5cac03415c8e681a37543bf87bfec9963e SHA256 6df296c0dc9dee5ece9a8fc61083740aa987503aec045d18c8c086cdbd9da998
-MISC ChangeLog 6621 RMD160 3a78b0accf3c30de5fc802f24c34dcf4d1ddea6a SHA1 45d289db9384a2cf830ca3138cc906a6b7de957d SHA256 526b937586eae435a0fda487eb956192e85be129d96e5db891041642301207e6
+EBUILD zynaddsubfx-2.4.1.ebuild 1766 RMD160 7341f3966cd540e6317ac0ae30008217dbabd0a4 SHA1 6364dfeee58e4c32a8f555045dd13b20376f2b7b SHA256 106b402638962af18f9f2899345cf8180b035a2d5ccb17cd37ef95aa7d59f103
+MISC ChangeLog 6738 RMD160 daa04ec5570da060aa8a71d643b6ebb50899048c SHA1 26dcb548d16dca48de76df7c55f548a9726d30c6 SHA256 5b54c4c036c3a5f476c9728ee7b659d75c00df74db6da694c5001543dfd234bf
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2GXkAACgkQgAnW8HDreRbFywCgkrPFBgv/X78qpkp9hSxswzhk
-cRoAnAo1Sl/53+ny6EmsJ2JJyZJ/Noeq
-=p8w5
+iQEcBAEBAgAGBQJPBd2oAAoJEEdUh39IaPFNoAQH/0WPFvQ1KMQU/oG9XSwZ/8Wa
+dxU0AfyHiERiAMFEHjkB2e/RMWKiK2lNyEdM01uYnnTdwL7PSJYXj8QoRjZDmUo0
+wK0/higVO6Mh5Fnf3Pb/OOSpaJTJo9wioROzzNJq+YtDbs0H19w+bPwTO0DITUBe
+IJC+BMguhHfqb9kmGkOeFXtdwDqq1EMqG+okhqp3fbSRRi5SwEGYoKfQDtchOY28
+aczuKsUgSPhGobWzVaAfFLfys/U5F2CCNaWtmQ7ZSvBH6miIwuST0OWJMwZ6s135
+n3u4NsC4R9Gyi89IgQ10eclNtHSf99L+1YL8FtgvBY26WscLAyRByEYyyQmMPG4=
+=N5sx
 -----END PGP SIGNATURE-----
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
index 0ef8532082f7..5daa2e24b705 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.ebuild,v 1.2 2011/03/20 20:06:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild,v 1.3 2012/01/05 17:30:12 ssuominen Exp $
 
 EAPI=4
 inherit eutils cmake-utils
@@ -13,17 +13,15 @@ SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa +fltk jack lash"
 
-RDEPEND="
+RDEPEND=">=dev-libs/mini-xml-2.2.1
 	sci-libs/fftw:3.0
-	fltk? ( x11-libs/fltk:1 )
-	jack? ( media-sound/jack-audio-connection-kit )
 	alsa? ( media-libs/alsa-lib )
-	lash? ( media-sound/lash )
-	>=dev-libs/mini-xml-2.2.1"
+	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"
@@ -35,15 +33,15 @@ REQUIRED_USE="!alsa? ( jack )"
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${P}-fltk.patch"
-	"${FILESDIR}/${P}-fltk13.patch"
-	"${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}"/${P}-fltk.patch
+	"${FILESDIR}"/${P}-fltk13.patch
+	"${FILESDIR}"/${P}-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"
+	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"`
@@ -55,6 +53,6 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	insinto "/usr/share/${PN}"
-	doins -r "${S}/banks" "${S}/examples" || die
+	insinto /usr/share/${PN}
+	doins -r "${S}"/banks "${S}"/examples
 }