[proaudio] [1543] Fix a few issues with the zynaddsubfx ebuilds

[subversion@xxxxxxxxxxxxx]

Revision: 1543
Author:   marcochapeau
Date:     2010-01-13 15:39:38 +0100 (Wed, 13 Jan 2010)
Log Message:
-----------
Fix a few issues with the zynaddsubfx ebuilds

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
    trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog	2010-01-13 14:11:34 UTC (rev 1542)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog	2010-01-13 14:39:38 UTC (rev 1543)
@@ -2,16 +2,19 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*zynaddsubfx-2.4.0 (06 Aug 2009)
+  13 Jan 2010; Marc-Olivier Barre <marco@xxxxxxxxxxxxxxxx>
+  * Fixed jack dependency on jack-audio-connection-kit for version 20070707
+  * Removed the une of unipatch from version 20070707-r1 which doesn't even work anymore
+  We'll have to find another way to apply those patches...
 
-  06 Aug 2009; Frieder Buerzele <evermind@xxxxxxxxxxxxx
+  06 Aug 2009; Frieder Buerzele <evermind@xxxxxxxxxxxxx>
   +zynaddsubfx-2.4.0.ebuild: bumped
 
-  15 Sep 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx;
+  15 Sep 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>
   zynaddsubfx-99999999.ebuild:
   fix wrong function-signature
 
-  13 Sep 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx;
+  13 Sep 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>
   zynaddsubfx-2.2.1-r8.ebuild, zynaddsubfx-20070707.ebuild,
   zynaddsubfx-20070707-r1.ebuild, zynaddsubfx-99999999.ebuild:
   fix wrong elif in zyn-patches and fix some repoman complaints

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest	2010-01-13 14:11:34 UTC (rev 1542)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest	2010-01-13 14:39:38 UTC (rev 1543)
@@ -14,8 +14,8 @@
 DIST zynaddsubfx-presets-0.1.tar.bz2 27052 RMD160 543ac277d424aee45c41d63124bb3bab46d96c8a SHA1 5cab265619eb66b6bce8ecb83b0e6d688436e68a SHA256 b2fc41cc8b45531007270efd81536c9a99a6a169d2433ec12d3d6854cb9a10d6
 EBUILD zynaddsubfx-2.2.1-r8.ebuild 3168 RMD160 da8109a2924bd1e04bff5517d971123591174cdf SHA1 c49fb309108577bcf39f6acb62a264e125411857 SHA256 c31231b6e35fbf65a930ddb8e3a6eee657aec87a80d89dbcef0189a4aa3620e5
 EBUILD zynaddsubfx-2.4.0.ebuild 2810 RMD160 0346f423bf50e63fcaf3044499d07c789c0049e3 SHA1 24c7a2703afc7192ed1387030cb9a5531c094816 SHA256 61748bfd4f8654768fb66fb8db358e4bf9a3c0f44db16f3934a406d4a7cfa52f
-EBUILD zynaddsubfx-20070707-r1.ebuild 3169 RMD160 a27ecb24a4a29879f7e8a919d6e05221761b3728 SHA1 fb2e0a5908e3f0412b06b40645fefcafaddd4a1c SHA256 9dc95ab2622af1bebd5edd19eaf8c95a3d162fc7fbc4a25e5cbc65f10fbc16f7
-EBUILD zynaddsubfx-20070707.ebuild 3106 RMD160 d22da200d6a7ecb6142fdab1e060f85470a981c7 SHA1 85dcb06abd58beaa7dc5676cd0a443559b86710f SHA256 37b61a5b38906be06f6c1fc6742183fd644ad1e0a30264c448a8b4dcd30a4fa6
+EBUILD zynaddsubfx-20070707-r1.ebuild 3105 RMD160 476db6add6572c00fd3b5a857ba752d2bb5169cb SHA1 ca037562627db6f8068c627ba10613a87397de0b SHA256 3a3acbeefc9575b440a3b346f2ba9c5bf5104baa641026db1771441ad86a1d02
+EBUILD zynaddsubfx-20070707.ebuild 3030 RMD160 9e566c022a824597668f21b4119b86581657211c SHA1 9776d866af998b1b5d4726be4e8cce170c2474a6 SHA256 bbf288c0277aa5c75a7a4696fec86a7f21937e513f6d2bc98ec8cced087d4225
 EBUILD zynaddsubfx-99999999.ebuild 3533 RMD160 17a125ca35213f91c9aed5d78cd01b722f3e6616 SHA1 c7c2182bee208d7ae54813a022cb812bec27c00d SHA256 12a881f3ebb2018270e78a217c789e951a7834d11cbc71d43bcd1fe021fb7a39
-MISC ChangeLog 716 RMD160 2f249b733c1acbd7581f3309d7fcff3b29103043 SHA1 949961835018cbfe653d0c314eb2916fbeb187ec SHA256 18509e1cf1b831b4f7ddf2deb78cbe16e659c1231602a2a857899dc56daf42e7
+MISC ChangeLog 967 RMD160 7a7eb4271767e6dacea0d1e68651c4702c329503 SHA1 377a0bccda46207a75ec22f5086871b74923bdfc SHA256 5a021b8b98bb35462169ebed25826c950b74c7f969c183e2ba8e7e62fa9c8873
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild	2010-01-13 14:11:34 UTC (rev 1542)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild	2010-01-13 14:39:38 UTC (rev 1543)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit exteutils jackmidi unipatch-001
+inherit exteutils jackmidi
 RESTRICT="mirror"
 MY_P=ZynAddSubFX-${PV}
 DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
@@ -40,8 +40,6 @@
 	cd "${S}"
 	unpack "zynaddsubfx-presets-0.1.tar.bz2"
 	# add our CXXFLAGS
-	UNIPATCH_LIST="${DISTDIR}/$zyn_patches"
-	unipatch
 	cd src/
 	esed_check -i "s@\(CXXFLAGS.\+=.*OS_PORT.*\)@\1 ${CXXFLAGS}@g" Makefile
 	esed_check -i "s@&master->mutex@\&master->processMutex@g" main.C

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild	2010-01-13 14:11:34 UTC (rev 1542)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild	2010-01-13 14:39:38 UTC (rev 1543)
@@ -18,8 +18,7 @@
 
 DEPEND=">=x11-libs/fltk-1.1.2
 	=sci-libs/fftw-3*
-    jackmidi?  ( >=media-sound/jack-audio-connection-kit-9999 )
-	!jackmidi? ( media-sound/jack-audio-connection-kit )
+    media-sound/jack-audio-connection-kit
 	>=dev-libs/mini-xml-2.2.1
 	lash? ( >=media-sound/lash-0.5 )"
 #	portaudio? ( media-libs/portaudio )"