x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly

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

5 files changed, 26 insertions, 19 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index ca0ac2db7f60..cc97aeb3f541 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2011/02/26 20:46:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.37 2011/03/20 20:06:18 jlec Exp $
+
+  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,
+  zynaddsubfx-2.4.1.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
 *zynaddsubfx-2.4.1 (26 Feb 2011)
 
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild
index e712d1e3be00..6cc64ce7209c 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-2009 Gentoo Foundation
+# Copyright 1999-2011 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.9 2009/08/01 06:41:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild,v 1.10 2011/03/20 20:06:18 jlec Exp $
 
 EAPI=1
 inherit eutils
@@ -18,8 +18,9 @@ KEYWORDS="amd64 ~ppc x86"
 #IUSE="oss alsa jack mmx"
 IUSE="oss alsa jack"
 
-RDEPEND=">=x11-libs/fltk-1.1.2:1.1
-	=sci-libs/fftw-3*
+RDEPEND="
+	x11-libs/fltk:1
+	sci-libs/fftw:3.0
 	jack? ( media-sound/jack-audio-connection-kit )
 	>=dev-libs/mini-xml-2.2.1"
 #	portaudio? ( media-libs/portaudio )"
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild
index 3a5c4f8b7131..d7a4151534b6 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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-r4.ebuild,v 1.5 2009/08/01 06:41:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild,v 1.6 2011/03/20 20:06:18 jlec Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -18,8 +18,9 @@ KEYWORDS="~amd64 ~ppc ~x86"
 #IUSE="oss alsa jack mmx"
 IUSE="oss alsa jack"
 
-RDEPEND=">=x11-libs/fltk-1.1.2:1.1
-	=sci-libs/fftw-3*
+RDEPEND="
+	x11-libs/fltk:1
+	sci-libs/fftw:3.0
 	jack? ( media-sound/jack-audio-connection-kit )
 	alsa? ( media-libs/alsa-lib )
 	>=dev-libs/mini-xml-2.2.1"
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
index e2c24c5fc65a..8ce9b9c12d7f 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild,v 1.2 2009/09/04 07:56:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild,v 1.3 2011/03/20 20:06:18 jlec Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -17,8 +17,9 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="oss alsa jack lash +fltk"
 
-RDEPEND="fltk? ( >=x11-libs/fltk-1.1.2:1.1 )
-	=sci-libs/fftw-3*
+RDEPEND="
+	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 )
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
index 6ed3586b4fa2..0ef8532082f7 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
 # 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.1 2011/02/26 20:46:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild,v 1.2 2011/03/20 20:06:18 jlec Exp $
 
 EAPI=4
 inherit eutils cmake-utils
@@ -19,12 +19,11 @@ IUSE="alsa +fltk jack lash"
 
 RDEPEND="
 	sci-libs/fftw:3.0
-	sys-libs/zlib
-	>=dev-libs/mini-xml-2.2.1
-	alsa? ( media-libs/alsa-lib )
+	fltk? ( x11-libs/fltk:1 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	fltk? ( >=x11-libs/fltk-1.1.2:1.1 )
-	lash? ( media-sound/lash )"
+	alsa? ( media-libs/alsa-lib )
+	lash? ( media-sound/lash )
+	>=dev-libs/mini-xml-2.2.1"
 #	portaudio? ( media-libs/portaudio )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"