Bumped to version 2.1.1 as per Bug #67164. Thanks to Eric Shattow for working on the ebuild and pathches. Fixes some nice little stability issues.

9 files changed, 481 insertions, 2 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index 20841a066693..3b82937064e7 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/zynaddsubfx
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.13 2004/09/28 23:15:40 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.14 2004/10/18 05:15:15 chriswhite Exp $
+
+*zynaddsubfx-2.1.1 (18 Oct 2004)
+
+  18 Oct 2004; Chris White <chriswhite@gentoo.org>
+  +files/zynaddsubfx-2.1.1-fltk_flags.patch,
+  +files/zynaddsubfx-2.1.1-fltk_version.patch,
+  +files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch,
+  +files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch,
+  +files/zynaddsubfx-2.1.1-sanitize_makefile.patch, +zynaddsubfx-2.1.1.ebuild:
+  Bumped to version 2.1.1 as per Bug #67164. Thanks to Eric Shattow for working
+  on the ebuild and pathches. Fixes some nice little stability issues.
 
 *zynaddsubfx-2.0.0 (29 Sep 2004)
 
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index e886b2a5e4ab..8c01f2ff6e39 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -2,9 +2,16 @@ MD5 cee10875b6a389633306695af3afa408 ChangeLog 2179
 MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
 MD5 eb7c2cc720f696c9fbbc9f08bc302510 zynaddsubfx-1.4.3.ebuild 1142
 MD5 bc76c5a3cd58132b3868b789b5a0d045 zynaddsubfx-2.0.0.ebuild 1207
+MD5 c930ae857599dc4aeb4bab5152e0a3a5 zynaddsubfx-2.1.1.ebuild 2045
 MD5 7eb2c2f2ba9a5bf80ce3945bbbeb803c files/digest-zynaddsubfx-1.4.3 69
 MD5 2820dd087232ba392d957abc60e4b8bf files/zynaddsubfx-1.4.0.patch 2050
 MD5 2820dd087232ba392d957abc60e4b8bf files/zynaddsubfx-1.4.2.patch 2050
 MD5 2820dd087232ba392d957abc60e4b8bf files/zynaddsubfx-1.4.3.patch 2050
-MD5 a67819493977e20890a96bf84836e319 files/zynaddsubfx-2.0.0.patch 12720
 MD5 dfd9304194ba37ba35a78cc8b53a061f files/digest-zynaddsubfx-2.0.0 70
+MD5 a67819493977e20890a96bf84836e319 files/zynaddsubfx-2.0.0.patch 12720
+MD5 5f8f148faeaa1e1fa03f084a40515aa4 files/zynaddsubfx-2.1.1-fltk_version.patch 10611
+MD5 3a9cf8fb487fa84f9d81a7046ef6176f files/zynaddsubfx-2.1.1-fltk_flags.patch 1508
+MD5 41af4c94f32d7ced5e6a7966a68fbea0 files/zynaddsubfx-2.1.1-sanitize_makefile.patch 554
+MD5 f863053d3f2d521ca1de5946a89c4210 files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch 1894
+MD5 231dd10bada5a14518a5c47ce9ca2920 files/digest-zynaddsubfx-2.1.1 70
+MD5 b4ed2c2e9a47c4a32f9ebd7c92c6f1b1 files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch 3699
diff --git a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1 b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1
new file mode 100644
index 000000000000..9b2441e6179d
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1
@@ -0,0 +1 @@
+MD5 a078a85fc140bad8da6dd8114b9e5f41 ZynAddSubFX-2.1.1.tar.bz2 784495
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_flags.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_flags.patch
new file mode 100644
index 000000000000..25e02dc9454a
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_flags.patch
@@ -0,0 +1,32 @@
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Controller/compile.sh ZynAddSubFX-2.1.1/ExternalPrograms/Controller/compile.sh
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Controller/compile.sh	2003-11-28 14:45:03.000000000 -0600
++++ ZynAddSubFX-2.1.1/ExternalPrograms/Controller/compile.sh	2004-10-12 17:37:01.049827687 -0500
+@@ -1,8 +1,8 @@
+-clean.sh
++./clean.sh
+ fluid -c ControllerUI.fl
+-gcc -c ControllerUI.cxx -o ControllerUI.o
+-gcc -c Controller.C -o Controller.o
+-gcc -c main.C -o main.o
++gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
++gcc `fltk-config --cflags` -c Controller.C -o Controller.o
++gcc `fltk-config --cflags` -c main.C -o main.o
+ 
+ 
+ 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/compile.sh ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/compile.sh
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/compile.sh	2003-11-28 14:45:03.000000000 -0600
++++ ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/compile.sh	2004-10-12 17:37:04.809589979 -0500
+@@ -1,8 +1,8 @@
+-clean.sh
++./clean.sh
+ fluid -c SpliterUI.fl
+-gcc -c SpliterUI.cxx -o SpliterUI.o
+-gcc -c Spliter.C -o Spliter.o
+-gcc -c main.C -o main.o
++gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
++gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
++gcc `fltk-config --cflags` -c main.C -o main.o
+ 
+ gcc -o spliter *.o `fltk-config --ldflags` -lasound
+ 
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_version.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_version.patch
new file mode 100644
index 000000000000..714eb03f1a7e
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_version.patch
@@ -0,0 +1,200 @@
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Controller/ControllerUI.fl ZynAddSubFX-2.1.1/ExternalPrograms/Controller/ControllerUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Controller/ControllerUI.fl	2003-11-28 14:45:03.000000000 -0600
++++ ZynAddSubFX-2.1.1/ExternalPrograms/Controller/ControllerUI.fl	2004-10-13 02:10:17.574969844 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0103 
++#version 1.0103 
+ header_name {.h} 
+ code_name {.cxx}
+ decl {\#include <FL/Fl_Box.h>} {public
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/SpliterUI.fl ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/SpliterUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/SpliterUI.fl	2003-11-28 14:45:03.000000000 -0600
++++ ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/SpliterUI.fl	2004-10-13 02:10:17.572970503 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0102 
++#version 1.0102 
+ header_name {.h} 
+ code_name {.cxx}
+ decl {//Copyright (c) 2002-2003 Nasca Octavian Paul} {selected
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ADnoteUI.fl ZynAddSubFX-2.1.1/src/UI/ADnoteUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ADnoteUI.fl	2004-09-27 11:11:47.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/ADnoteUI.fl	2004-10-13 02:10:17.567972148 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0104 
++#version 1.0104 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/BankUI.fl ZynAddSubFX-2.1.1/src/UI/BankUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/BankUI.fl	2004-10-01 12:46:51.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/BankUI.fl	2004-10-13 02:10:17.483000122 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0104 
++#version 1.0104 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ConfigUI.fl ZynAddSubFX-2.1.1/src/UI/ConfigUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ConfigUI.fl	2004-08-27 15:50:55.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/ConfigUI.fl	2004-10-13 02:10:17.539981363 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/EffUI.fl ZynAddSubFX-2.1.1/src/UI/EffUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/EffUI.fl	2004-09-30 15:08:07.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/EffUI.fl	2004-10-13 02:10:17.561974123 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0104 
++#version 1.0104 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/EnvelopeUI.fl ZynAddSubFX-2.1.1/src/UI/EnvelopeUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/EnvelopeUI.fl	2004-08-17 18:56:44.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/EnvelopeUI.fl	2004-10-13 02:10:17.550977743 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/FilterUI.fl ZynAddSubFX-2.1.1/src/UI/FilterUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/FilterUI.fl	2004-08-17 18:58:54.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/FilterUI.fl	2004-10-13 02:10:17.570971161 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/LFOUI.fl ZynAddSubFX-2.1.1/src/UI/LFOUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/LFOUI.fl	2004-08-17 15:13:05.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/LFOUI.fl	2004-10-13 02:10:17.508991565 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/MasterUI.fl ZynAddSubFX-2.1.1/src/UI/MasterUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/MasterUI.fl	2004-10-02 15:09:57.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/MasterUI.fl	2004-10-13 02:10:17.500994198 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0104 
++#version 1.0104 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/MicrotonalUI.fl ZynAddSubFX-2.1.1/src/UI/MicrotonalUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/MicrotonalUI.fl	2004-08-22 08:51:24.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/MicrotonalUI.fl	2004-10-13 02:10:17.510990907 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/OscilGenUI.fl ZynAddSubFX-2.1.1/src/UI/OscilGenUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/OscilGenUI.fl	2004-08-15 12:00:56.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/OscilGenUI.fl	2004-10-13 02:10:17.516988932 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PADnoteUI.fl ZynAddSubFX-2.1.1/src/UI/PADnoteUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PADnoteUI.fl	2004-08-17 14:08:34.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/PADnoteUI.fl	2004-10-13 02:10:17.536982350 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {\#include "../Params/PADnoteParameters.h"} {public
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PartUI.fl ZynAddSubFX-2.1.1/src/UI/PartUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PartUI.fl	2004-09-30 14:59:25.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/PartUI.fl	2004-10-13 02:10:17.506992223 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0104 
++#version 1.0104 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PresetsUI.fl ZynAddSubFX-2.1.1/src/UI/PresetsUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PresetsUI.fl	2004-08-22 16:11:15.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/PresetsUI.fl	2004-10-13 02:10:17.541980705 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {\#include <FL/fl_ask.h>} {public
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ResonanceUI.fl ZynAddSubFX-2.1.1/src/UI/ResonanceUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ResonanceUI.fl	2004-08-15 09:07:09.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/ResonanceUI.fl	2004-10-13 02:10:17.544979717 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/SUBnoteUI.fl ZynAddSubFX-2.1.1/src/UI/SUBnoteUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/SUBnoteUI.fl	2004-08-16 18:48:23.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/SUBnoteUI.fl	2004-10-13 02:10:17.520987616 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/SeqUI.fl ZynAddSubFX-2.1.1/src/UI/SeqUI.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/SeqUI.fl	2004-07-15 17:00:10.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/SeqUI.fl	2004-10-13 02:10:17.517988603 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/VirKeyboard.fl ZynAddSubFX-2.1.1/src/UI/VirKeyboard.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/VirKeyboard.fl	2004-07-03 10:11:58.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/VirKeyboard.fl	2004-10-13 02:10:17.530984325 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {} 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/WidgetPDial.fl ZynAddSubFX-2.1.1/src/UI/WidgetPDial.fl
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/WidgetPDial.fl	2004-07-28 15:41:51.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/UI/WidgetPDial.fl	2004-10-13 02:10:17.546979059 -0500
+@@ -1,5 +1,5 @@
+ # data file for the Fltk User Interface Designer (fluid)
+-version 1.0105 
++#version 1.0105 
+ header_name {.h} 
+ code_name {.cc}
+ decl {//Copyright (c) 2004 Nasca Octavian Paul} {} 
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch
new file mode 100644
index 000000000000..c01058513379
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch
@@ -0,0 +1,49 @@
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/DSP/AnalogFilter.C ZynAddSubFX-2.1.1/src/DSP/AnalogFilter.C
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/DSP/AnalogFilter.C	2004-07-30 19:02:17.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/DSP/AnalogFilter.C	2004-10-17 02:08:08.819079515 -0500
+@@ -144,7 +144,10 @@
+ 		tmp=1+alpha;
+ 		c[0]=alpha/tmp*sqrt(tmpq+1);
+ 		c[1]=0;
++        char *gcc34_mem_hack = new char[600];
++        sprintf(gcc34_mem_hack, "%f", c[2]);
+ 		c[2]=-alpha/tmp*sqrt(tmpq+1);
++        delete gcc34_mem_hack; gcc34_mem_hack = NULL; /* new char[600]; */
+ 		d[1]=-2*cs/tmp*(-1);
+ 		d[2]=(1-alpha)/tmp*(-1);
+ 	    } else {
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Synth/OscilGen.C ZynAddSubFX-2.1.1/src/Synth/OscilGen.C
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Synth/OscilGen.C	2004-08-25 17:12:40.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/Synth/OscilGen.C	2004-10-17 02:07:51.383828815 -0500
+@@ -674,10 +674,31 @@
+ 
+    for (i=0;i<OSCIL_SIZE;i++) oscilFFTfreqs[i]=0.0;
+    if (Pcurrentbasefunc==0) {//the sine case
++	char *gcc34_mem_hack = new char[600];
+ 	for (i=0;i<MAX_AD_HARMONICS;i++){
++		sprintf(gcc34_mem_hack,
++			"i=%d " \
++			"MAX_AD_HARMONICS=%d " \
++			"oscilFFTfreqs[i+1]=%f " \
++			"hmag[i]=%f" \
++			"hphase[i]=%f" \
++			"oscilFFTfreqs[OSCIL_SIZE-i-1]=%f" \
++			"OSCIL_SIZE-i-1=%d" \
++			"OSCIL_SIZE=%d" \
++			"\n",
++			i,
++			MAX_AD_HARMONICS,
++			oscilFFTfreqs[i+1],
++			hmag[i],
++			hphase[i],
++			oscilFFTfreqs[OSCIL_SIZE-i-1],
++			OSCIL_SIZE-i-1,
++			OSCIL_SIZE
++		);
+ 	    oscilFFTfreqs[i+1]=-hmag[i]*sin(hphase[i]*(i+1))/2.0;
+ 	    oscilFFTfreqs[OSCIL_SIZE-i-1]=hmag[i]*cos(hphase[i]*(i+1))/2.0;
+ 	};
++	delete gcc34_mem_hack; gcc34_mem_hack = NULL; /* new char[600]; */
+    } else {
+ 	for (j=0;j<MAX_AD_HARMONICS;j++){
+ 	    if (Phmag[j]==64) continue;
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch
new file mode 100644
index 000000000000..76b7b9e60249
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch
@@ -0,0 +1,86 @@
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C	2004-07-30 19:15:30.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C	2004-10-13 02:05:05.836598554 -0500
+@@ -231,7 +231,7 @@
+     ///test 
+ //    ntrack=0;
+     
+-    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
++    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
+     
+ };
+ 
+@@ -251,7 +251,7 @@
+     me->tmpevent.par1=note;
+     me->tmpevent.par2=vel;
+     me->tmpevent.channel=chan;
+-    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
++    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
+ 
+     
+     
+@@ -271,7 +271,7 @@
+     me->tmpevent.par1=control;//???????????? ma uit la Sequencer::recordnote() din varianele vechi de zyn
+     me->tmpevent.par2=value;
+     me->tmpevent.channel=chan;
+-    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
++    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
+     
+ };
+ 
+@@ -304,7 +304,7 @@
+     me->tmpevent.par1=0;
+     me->tmpevent.par2=0;
+     me->tmpevent.channel=0;
+-    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
++    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
+ };
+ 
+ 
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/Sequencer.C ZynAddSubFX-2.1.1/src/Seq/Sequencer.C
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/Sequencer.C	2004-07-20 15:17:56.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/Seq/Sequencer.C	2004-10-13 02:03:54.829973000 -0500
+@@ -101,30 +101,30 @@
+     //test
+ //    if (ntrack!=0) return(-1);
+ 
+-    updatecounter(&playtime[ntrack]);
++    updatecounter(&playtime[(int)ntrack]);
+ 
+-//    printf("%g %g\n",nextevent[ntrack].time,playtime[ntrack].abs);
++//    printf("%g %g\n",nextevent[(int)ntrack].time,playtime[(int)ntrack].abs);
+ 
+-    if (nextevent[ntrack].time<playtime[ntrack].abs) readevent(&miditrack[ntrack].track,&nextevent[ntrack].ev);
++    if (nextevent[(int)ntrack].time<playtime[(int)ntrack].abs) readevent(&miditrack[(int)ntrack].track,&nextevent[(int)ntrack].ev);
+ 	else return(-1);
+-    if (nextevent[ntrack].ev.type==-1) return(-1);
++    if (nextevent[(int)ntrack].ev.type==-1) return(-1);
+ //    printf("********************************\n");    
+ 
+     //sa pun aici o protectie. a.i. daca distanta dintre timpul curent si eveliment e prea mare (>1sec) sa elimin nota
+ 
+-    if (ntrack==1) printf("_ %f %.2f  (%d)\n",nextevent[ntrack].time,playtime[ntrack].abs,nextevent[ntrack].ev.par2);
++    if (ntrack==1) printf("_ %f %.2f  (%d)\n",nextevent[(int)ntrack].time,playtime[(int)ntrack].abs,nextevent[(int)ntrack].ev.par2);
+ 
+-    *type=nextevent[ntrack].ev.type;
+-    *par1=nextevent[ntrack].ev.par1;
+-    *par2=nextevent[ntrack].ev.par2;
+-    *midich=nextevent[ntrack].ev.channel;
++    *type=nextevent[(int)ntrack].ev.type;
++    *par1=nextevent[(int)ntrack].ev.par1;
++    *par2=nextevent[(int)ntrack].ev.par2;
++    *midich=nextevent[(int)ntrack].ev.channel;
+ 
+     
+-    double dt=nextevent[ntrack].ev.deltatime*0.0001*realplayspeed;
+-    printf("zzzzzzzzzzzzzz[%d] %d\n",ntrack,nextevent[ntrack].ev.deltatime);
+-    nextevent[ntrack].time+=dt;
++    double dt=nextevent[(int)ntrack].ev.deltatime*0.0001*realplayspeed;
++    printf("zzzzzzzzzzzzzz[%d] %d\n",ntrack,nextevent[(int)ntrack].ev.deltatime);
++    nextevent[(int)ntrack].time+=dt;
+ 
+-//    printf("%f   -  %d %d \n",nextevent[ntrack].time,par1,par2);
++//    printf("%f   -  %d %d \n",nextevent[(int)ntrack].time,par1,par2);
+     return(0);//?? sau 1
+ };
+ 
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-sanitize_makefile.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-sanitize_makefile.patch
new file mode 100644
index 000000000000..829cb5cf3383
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-sanitize_makefile.patch
@@ -0,0 +1,11 @@
+diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Makefile ZynAddSubFX-2.1.1/src/Makefile
+--- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Makefile	2004-09-30 15:57:48.000000000 -0500
++++ ZynAddSubFX-2.1.1/src/Makefile	2004-10-13 02:50:11.923823045 -0500
+@@ -63,7 +63,6 @@
+ .PHONY: subdirs $(SUBDIRS)
+ 
+ all:
+-	yes " " | head
+ 	$(MAKE) -C UI $@
+ #	@sh -c "cd UI ; $(CXX) -MM -MG -w *.cc >> ../Make.deps ; cd .."
+ 	@for name in $(SUBDIRS); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.C >> ../Make.deps ; cd .."; done
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.ebuild
new file mode 100644
index 000000000000..01f408e02d2b
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.1.1.ebuild,v 1.1 2004/10/18 05:15:15 chriswhite Exp $
+
+inherit eutils
+
+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="~x86 ~amd64"
+
+#IUSE="oss alsa jack mmx"
+IUSE="oss alsa jack"
+
+DEPEND=">=x11-libs/fltk-1.1.2
+	=dev-libs/fftw-2*
+	media-sound/jack-audio-connection-kit
+	>=dev-libs/mini-xml-2.0"
+#	portaudio? ( media-libs/portaudio )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2 || die
+	epatch ${FILESDIR}/${P}-*.patch
+}
+
+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} \
+		|| 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/"*
+}