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

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

39 files changed, 209 insertions, 151 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 6f0c5d79c6c7..84818ffa334e 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.199 2011/02/06 00:32:39 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.200 2011/03/20 20:13:16 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> alsa-tools-1.0.20-r1.ebuild,
+  alsa-tools-1.0.20-r2.ebuild, alsa-tools-1.0.21.ebuild,
+  alsa-tools-1.0.21-r1.ebuild, alsa-tools-1.0.22.ebuild,
+  alsa-tools-1.0.23.ebuild, alsa-tools-1.0.24.1.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
 *alsa-tools-1.0.24.1 (06 Feb 2011)
 
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild
index 054318923b9d..7a202281e87d 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild
@@ -1,13 +1,15 @@
-# 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/alsa-tools/alsa-tools-1.0.20-r1.ebuild,v 1.7 2009/10/13 17:52:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild,v 1.8 2011/03/20 20:13:16 jlec Exp $
+
+EAPI=1
 
 inherit eutils flag-o-matic autotools
 
 MY_P="${P/_rc/rc}"
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
+HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -26,8 +28,8 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
 ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.20-r1
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-2* )"
+	fltk? ( x11-libs/fltk:1 )
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -101,8 +103,8 @@ src_unpack() {
 src_compile() {
 	if use fltk; then
 		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
 	fi
 
 	local f
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild
index 7db2bc0e74f3..f8dad91d9bf4 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2010 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/alsa-tools/alsa-tools-1.0.20-r2.ebuild,v 1.1 2010/01/08 02:48:26 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild,v 1.2 2011/03/20 20:13:16 jlec Exp $
+
+EAPI=1
 
 inherit eutils flag-o-matic autotools
 
 MY_P="${P/_rc/rc}"
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
+HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -26,8 +28,8 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
 ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.20-r1
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-2* )"
+	fltk? ( x11-libs/fltk:1 )
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -102,8 +104,8 @@ src_unpack() {
 src_compile() {
 	if use fltk; then
 		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
 	fi
 
 	local f
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild
index 5497df24b2b3..105caaceac03 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2010 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/alsa-tools/alsa-tools-1.0.21-r1.ebuild,v 1.1 2010/01/08 02:48:26 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild,v 1.2 2011/03/20 20:13:16 jlec Exp $
+
+EAPI="1"
 
 inherit eutils flag-o-matic autotools
 
 MY_P="${P/_rc/rc}"
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
+HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -26,8 +28,8 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
 ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.20-r1
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-2* )"
+	fltk? ( x11-libs/fltk:1 )
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -100,8 +102,8 @@ src_unpack() {
 src_compile() {
 	if use fltk; then
 		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
 	fi
 
 	local f
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild
index 5abeb4935edd..8b726a01246f 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2010 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/alsa-tools/alsa-tools-1.0.21.ebuild,v 1.6 2010/02/10 03:39:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild,v 1.7 2011/03/20 20:13:16 jlec Exp $
+
+EAPI=1
 
 inherit eutils flag-o-matic autotools
 
 MY_P="${P/_rc/rc}"
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
+HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -26,8 +28,8 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
 ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.20-r1
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-2* )"
+	fltk? ( x11-libs/fltk:1 )
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -98,8 +100,8 @@ src_unpack() {
 src_compile() {
 	if use fltk; then
 		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
 	fi
 
 	local f
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild
index 62231786e9af..8c89ae87ace8 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2010 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/alsa-tools/alsa-tools-1.0.22.ebuild,v 1.2 2010/01/08 02:48:26 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild,v 1.3 2011/03/20 20:13:16 jlec Exp $
+
+EAPI="1"
 
 inherit eutils flag-o-matic autotools
 
 MY_P="${P/_rc/rc}"
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
+HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -26,8 +28,8 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
 ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.20-r1
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-2* )"
+	fltk? ( x11-libs/fltk:1 )
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -101,8 +103,8 @@ src_unpack() {
 src_compile() {
 	if use fltk; then
 		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
 	fi
 
 	local f
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild
index c73c71c9320d..e7e110fe0245 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild,v 1.8 2011/01/22 22:56:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild,v 1.9 2011/03/20 20:13:16 jlec Exp $
 
+EAPI=1
 inherit eutils flag-o-matic autotools
 
 MY_P="${P/_rc/rc}"
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
+HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -27,8 +28,8 @@ ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.22
 	>=dev-python/pyalsa-1.0.22
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-2* )"
+	fltk? ( x11-libs/fltk:1 )
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -102,8 +103,8 @@ src_unpack() {
 src_compile() {
 	if use fltk; then
 		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
 	fi
 
 	local f
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild
index 754265987c00..0119301097fe 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.24.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/alsa-tools/alsa-tools-1.0.24.1.ebuild,v 1.1 2011/02/06 00:32:39 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild,v 1.2 2011/03/20 20:13:16 jlec Exp $
 
 EAPI=3
 inherit base flag-o-matic autotools
@@ -8,7 +8,7 @@ inherit base flag-o-matic autotools
 MY_P="${P/_rc/rc}"
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
+HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -28,8 +28,8 @@ ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}
 	>=dev-python/pyalsa-1.0.24
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-2* )"
+	fltk? ( x11-libs/fltk:1 )
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -100,8 +100,8 @@ src_prepare() {
 src_configure() {
 	if use fltk; then
 		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
 	fi
 
 	local f
diff --git a/media-sound/alsamixergui/ChangeLog b/media-sound/alsamixergui/ChangeLog
index 63ca7337d783..e2537174e7f6 100644
--- a/media-sound/alsamixergui/ChangeLog
+++ b/media-sound/alsamixergui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsamixergui
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.30 2009/07/19 20:47:54 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.31 2011/03/20 20:11:12 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org>
+  alsamixergui-0.9.0.1.2-r4.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
   19 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   alsamixergui-0.9.0.1.2-r4.ebuild,
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
index 760d857e31b6..ec4a64b27e08 100644
--- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -1,12 +1,14 @@
-# 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/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.17 2009/07/19 20:47:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.18 2011/03/20 20:11:12 jlec Exp $
 
 EAPI=2
+
+inherit autotools eutils flag-o-matic
+
 MY_P=${PN}-0.9.0rc1-2
-inherit autotools eutils
 
-DESCRIPTION="AlsaMixerGui - a FLTK based amixer Frontend"
+DESCRIPTION="FLTK based amixer Frontend"
 HOMEPAGE="http://www.gentoo.org"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
@@ -15,9 +17,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="media-libs/alsa-lib
+RDEPEND="
+	media-libs/alsa-lib
 	media-sound/alsa-utils
-	x11-libs/fltk:1.1"
+	x11-libs/fltk:1"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -27,13 +30,8 @@ src_prepare() {
 		"${FILESDIR}"/segfault-on-exit.patch \
 		"${FILESDIR}"/${P}-fltk-1.1.patch
 	eautoreconf
-}
-
-src_configure() {
-	export LDFLAGS="-L/usr/$(get_libdir)/fltk-1.1 ${LDFLAGS}"
-	export CPPFLAGS="-I/usr/include/fltk-1.1 ${CPPFLAGS}"
-
-	econf
+	append-ldflags "-L$(dirname $(fltk-config --libs))"
+	append-flags "-I$(fltk-config --includedir)"
 }
 
 src_install() {
diff --git a/media-sound/gmorgan/ChangeLog b/media-sound/gmorgan/ChangeLog
index b15a327fea39..581a9b3907b3 100644
--- a/media-sound/gmorgan/ChangeLog
+++ b/media-sound/gmorgan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/gmorgan
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.26 2009/08/01 06:28:47 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.27 2011/03/20 20:10:40 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> gmorgan-0.25-r1.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
   01 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   gmorgan-0.25-r1.ebuild:
diff --git a/media-sound/gmorgan/gmorgan-0.25-r1.ebuild b/media-sound/gmorgan/gmorgan-0.25-r1.ebuild
index 45a03867461f..a8e8fbeb295d 100644
--- a/media-sound/gmorgan/gmorgan-0.25-r1.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.25-r1.ebuild
@@ -1,11 +1,11 @@
-# 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/gmorgan/gmorgan-0.25-r1.ebuild,v 1.8 2009/08/01 06:28:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.25-r1.ebuild,v 1.9 2011/03/20 20:10:40 jlec Exp $
 
 EAPI=2
 inherit eutils autotools
 
-DESCRIPTION="gmorgan is an opensource software rhythm station."
+DESCRIPTION="Opensource software rhythm station"
 HOMEPAGE="http://gmorgan.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
 
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 sparc x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/fltk-1.1.2:1.1
-	media-libs/alsa-lib"
+RDEPEND="
+	media-libs/alsa-lib
+	x11-libs/fltk:1"
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
diff --git a/media-sound/horgand/ChangeLog b/media-sound/horgand/ChangeLog
index 3463ec23599d..1e3cd198dc2f 100644
--- a/media-sound/horgand/ChangeLog
+++ b/media-sound/horgand/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/horgand
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/ChangeLog,v 1.24 2008/12/15 01:42:01 yngwin Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/ChangeLog,v 1.25 2011/03/20 20:09:59 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> horgand-1.14.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
   15 Dec 2008; Ben de Groot <yngwin@gentoo.org> horgand-1.14.ebuild:
   Pinning fltk dep on slot 1.1, bug 246445
diff --git a/media-sound/horgand/horgand-1.14.ebuild b/media-sound/horgand/horgand-1.14.ebuild
index c08d4a3c3c2d..7ec5384bcf44 100644
--- a/media-sound/horgand/horgand-1.14.ebuild
+++ b/media-sound/horgand/horgand-1.14.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 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/horgand/horgand-1.14.ebuild,v 1.5 2008/12/15 01:42:01 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/horgand-1.14.ebuild,v 1.6 2011/03/20 20:09:59 jlec Exp $
 
 EAPI="1"
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Horgand is an opensource software organ."
+DESCRIPTION="Opensource software organ"
 HOMEPAGE="http://horgand.berlios.de"
 SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
-RDEPEND="x11-libs/fltk:1.1
+RDEPEND="x11-libs/fltk:1
 	x11-libs/libXpm
 	media-libs/libsndfile
 	media-libs/alsa-lib
diff --git a/media-sound/lmms/ChangeLog b/media-sound/lmms/ChangeLog
index add040aeeb20..ce426cf7b679 100644
--- a/media-sound/lmms/ChangeLog
+++ b/media-sound/lmms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lmms
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.18 2011/02/27 10:43:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.19 2011/03/20 20:10:10 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> lmms-0.4.9.ebuild,
+  lmms-0.4.9-r1.ebuild, lmms-0.4.9-r2.ebuild, lmms-0.4.9-r3.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
 *lmms-0.4.9-r3 (27 Feb 2011)
 
diff --git a/media-sound/lmms/lmms-0.4.9-r1.ebuild b/media-sound/lmms/lmms-0.4.9-r1.ebuild
index d0f0f4660ef1..dc8308ef2917 100644
--- a/media-sound/lmms/lmms-0.4.9-r1.ebuild
+++ b/media-sound/lmms/lmms-0.4.9-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9-r1.ebuild,v 1.1 2011/02/26 14:46:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9-r1.ebuild,v 1.2 2011/03/20 20:10:10 jlec Exp $
 
 EAPI="2"
 
 inherit eutils cmake-utils
 
-DESCRIPTION="free alternative to popular programs such as Fruityloops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net"
+DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/qt-core:4
 	>=media-libs/libsamplerate-0.1.7
 	x11-libs/libXinerama
 	alsa? ( media-libs/alsa-lib )
-	fftw? ( =sci-libs/fftw-3* >=x11-libs/fltk-1.3.0_rc:1.1 )
+	fftw? ( sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
 	ogg? ( media-libs/libvorbis
 			media-libs/libogg )
diff --git a/media-sound/lmms/lmms-0.4.9-r2.ebuild b/media-sound/lmms/lmms-0.4.9-r2.ebuild
index 094d180b6604..6b00ec84ddc5 100644
--- a/media-sound/lmms/lmms-0.4.9-r2.ebuild
+++ b/media-sound/lmms/lmms-0.4.9-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9-r2.ebuild,v 1.1 2011/02/26 15:09:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9-r2.ebuild,v 1.2 2011/03/20 20:10:10 jlec Exp $
 
 EAPI="2"
 
 inherit eutils cmake-utils
 
-DESCRIPTION="free alternative to popular programs such as Fruityloops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net"
+DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/qt-core:4
 	>=media-libs/libsamplerate-0.1.7
 	x11-libs/libXinerama
 	alsa? ( media-libs/alsa-lib )
-	fftw? ( =sci-libs/fftw-3* >=x11-libs/fltk-1.3.0_rc:1.1 )
+	fftw? ( sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
 	ogg? ( media-libs/libvorbis
 			media-libs/libogg )
diff --git a/media-sound/lmms/lmms-0.4.9-r3.ebuild b/media-sound/lmms/lmms-0.4.9-r3.ebuild
index 25a32cd9ff07..bd99c98310ed 100644
--- a/media-sound/lmms/lmms-0.4.9-r3.ebuild
+++ b/media-sound/lmms/lmms-0.4.9-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9-r3.ebuild,v 1.1 2011/02/27 10:43:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9-r3.ebuild,v 1.2 2011/03/20 20:10:10 jlec Exp $
 
 EAPI="2"
 
 inherit eutils cmake-utils
 
-DESCRIPTION="free alternative to popular programs such as Fruityloops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net"
+DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/qt-core:4
 	>=media-libs/libsamplerate-0.1.7
 	x11-libs/libXinerama
 	alsa? ( media-libs/alsa-lib )
-	fftw? ( =sci-libs/fftw-3* >=x11-libs/fltk-1.3.0_rc:1.1 )
+	fftw? ( sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
 	ogg? ( media-libs/libvorbis
 			media-libs/libogg )
diff --git a/media-sound/lmms/lmms-0.4.9.ebuild b/media-sound/lmms/lmms-0.4.9.ebuild
index 0713a92b5a79..456c17cc62f2 100644
--- a/media-sound/lmms/lmms-0.4.9.ebuild
+++ b/media-sound/lmms/lmms-0.4.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9.ebuild,v 1.1 2011/01/02 12:55:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.9.ebuild,v 1.2 2011/03/20 20:10:10 jlec Exp $
 
 EAPI="2"
 
 inherit eutils cmake-utils
 
-DESCRIPTION="free alternative to popular programs such as Fruityloops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net"
+DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/qt-core:4
 	>=media-libs/libsamplerate-0.1.7
 	x11-libs/libXinerama
 	alsa? ( media-libs/alsa-lib )
-	fftw? ( =sci-libs/fftw-3* )
+	fftw? ( sci-libs/fftw:3.0 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
 	ogg? ( media-libs/libvorbis
 			media-libs/libogg )
diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog
index aca0e3b97691..385d60680b21 100644
--- a/media-sound/mup/ChangeLog
+++ b/media-sound/mup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.35 2011/03/10 09:24:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.36 2011/03/20 20:07:55 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> mup-5.4.ebuild,
+  files/mup-5.4-Makefile.patch, mup-5.6.ebuild, files/mup-5.6-Makefile.patch,
+  mup-5.7.ebuild, files/mup-5.7-Makefile.patch:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
 *mup-5.7 (10 Mar 2011)
 
diff --git a/media-sound/mup/files/mup-5.4-Makefile.patch b/media-sound/mup/files/mup-5.4-Makefile.patch
index 99dc34f6ee61..3aff321d0719 100644
--- a/media-sound/mup/files/mup-5.4-Makefile.patch
+++ b/media-sound/mup/files/mup-5.4-Makefile.patch
@@ -360,8 +360,8 @@ diff -urN mup-5.4.orig/Makefile mup-5.4/Makefile
 +
 +mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
-+	-I/usr/include/fltk-1.1 -Imup -L$(X_LOCATION)/lib \
-+	-L/usr/lib/fltk-1.1 -lfltk -lfltk_images -lXext -lX11 -lXpm \
++	-I/usr/include/fltk-1 -Imup -L$(X_LOCATION)/lib \
++	-L/usr/lib/fltk-1 -lfltk -lfltk_images -lXext -lX11 -lXpm \
 +	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
 +
 +install: all
diff --git a/media-sound/mup/files/mup-5.6-Makefile.patch b/media-sound/mup/files/mup-5.6-Makefile.patch
index 36aed70d83fb..e44ffa215efd 100644
--- a/media-sound/mup/files/mup-5.6-Makefile.patch
+++ b/media-sound/mup/files/mup-5.6-Makefile.patch
@@ -10,9 +10,9 @@ diff -urN mup-5.6.orig/Makefile mup-5.6/Makefile
 +CFLAGS = -O2 -pipe
 +CXXFLAGS = -O2 -pipe
 +X_LOCATION = /usr
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1.1
++FLTK_LIB_LOCATION = -L/usr/lib/fltk-1
 +X_LIBS = -lXext -lX11 -lXpm
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1.1
++FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1
 +JPEGLIB = jpeg
 +PNGLIB = png
 +ZLIB = z
diff --git a/media-sound/mup/files/mup-5.7-Makefile.patch b/media-sound/mup/files/mup-5.7-Makefile.patch
index 402e2f34de95..a36a0042ca24 100644
--- a/media-sound/mup/files/mup-5.7-Makefile.patch
+++ b/media-sound/mup/files/mup-5.7-Makefile.patch
@@ -264,9 +264,9 @@
 +CFLAGS = -O2 -pipe
 +CXXFLAGS = -O2 -pipe
 +X_LOCATION = /usr
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1.1
++FLTK_LIB_LOCATION = -L/usr/lib/fltk-1
 +X_LIBS = -lXext -lX11 -lXpm
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1.1
++FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1
 +JPEGLIB = jpeg
 +PNGLIB = png
 +ZLIB = z
diff --git a/media-sound/mup/mup-5.4.ebuild b/media-sound/mup/mup-5.4.ebuild
index b0028f00c75d..524d4e96ccff 100644
--- a/media-sound/mup/mup-5.4.ebuild
+++ b/media-sound/mup/mup-5.4.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/mup/mup-5.4.ebuild,v 1.8 2011/02/28 18:07:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.4.ebuild,v 1.9 2011/03/20 20:07:56 jlec Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/fltk:1.1
+	x11-libs/fltk:1
 	x11-libs/libXpm
 	virtual/jpeg
 	media-libs/libpng"
diff --git a/media-sound/mup/mup-5.6.ebuild b/media-sound/mup/mup-5.6.ebuild
index 4106c175e5b9..b7e08a2fb089 100644
--- a/media-sound/mup/mup-5.6.ebuild
+++ b/media-sound/mup/mup-5.6.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/mup/mup-5.6.ebuild,v 1.3 2011/03/10 09:21:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.6.ebuild,v 1.4 2011/03/20 20:07:55 jlec Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/fltk:1.1
+	x11-libs/fltk:1
 	x11-libs/libXpm
 	virtual/jpeg
 	media-libs/libpng"
diff --git a/media-sound/mup/mup-5.7.ebuild b/media-sound/mup/mup-5.7.ebuild
index 70deb0629a0d..391dc331bbed 100644
--- a/media-sound/mup/mup-5.7.ebuild
+++ b/media-sound/mup/mup-5.7.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/mup/mup-5.7.ebuild,v 1.1 2011/03/10 09:24:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.7.ebuild,v 1.2 2011/03/20 20:07:55 jlec Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/fltk:1.1
+	x11-libs/fltk:1
 	x11-libs/libXpm
 	virtual/jpeg
 	media-libs/libpng"
diff --git a/media-sound/sfc/ChangeLog b/media-sound/sfc/ChangeLog
index f390a9779287..e0a2e9107a44 100644
--- a/media-sound/sfc/ChangeLog
+++ b/media-sound/sfc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/sfc
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sfc/ChangeLog,v 1.15 2008/12/15 01:47:28 yngwin Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sfc/ChangeLog,v 1.16 2011/03/20 20:07:34 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> sfc-0.016.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
   15 Dec 2008; Ben de Groot <yngwin@gentoo.org> sfc-0.016.ebuild:
   Pinning fltk dep on slot 1.1, bug 246445
diff --git a/media-sound/sfc/sfc-0.016.ebuild b/media-sound/sfc/sfc-0.016.ebuild
index 9cc2cf63d928..5f658fe79b38 100644
--- a/media-sound/sfc/sfc-0.016.ebuild
+++ b/media-sound/sfc/sfc-0.016.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/sfc/sfc-0.016.ebuild,v 1.5 2008/12/15 01:47:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sfc/sfc-0.016.ebuild,v 1.6 2011/03/20 20:07:34 jlec Exp $
 
 EAPI="1"
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="x11-libs/fltk:1.1
-	media-libs/alsa-lib"
+DEPEND="
+	media-libs/alsa-lib
+	x11-libs/fltk:1"
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
diff --git a/media-sound/spiralmodular/ChangeLog b/media-sound/spiralmodular/ChangeLog
index d786ecb32396..e38a30c35a5e 100644
--- a/media-sound/spiralmodular/ChangeLog
+++ b/media-sound/spiralmodular/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/spiralmodular
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.23 2010/10/24 16:40:29 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.24 2011/03/20 20:07:07 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> spiralmodular-0.2.2a-r1.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
   24 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   spiralmodular-0.2.2a-r1.ebuild:
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild
index 83316647530f..fb4a0d11ae00 100644
--- a/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild
+++ b/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 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/spiralmodular/spiralmodular-0.2.2a-r1.ebuild,v 1.8 2010/10/24 16:40:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild,v 1.9 2011/03/20 20:07:07 jlec Exp $
 
 EAPI="1"
 inherit eutils multilib
 
-DESCRIPTION="SSM is a object oriented modular softsynth/ sequencer/ sampler."
+DESCRIPTION="Object oriented modular softsynth/ sequencer/ sampler"
 HOMEPAGE="http://www.pawfal.org/Software/SSM/"
 SRC_URI="mirror://sourceforge/spiralmodular/${P}.tar.bz2"
 
@@ -14,12 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="alsa jack"
 
-DEPEND="x11-libs/fltk:1.1
+DEPEND="
+	media-libs/ladspa-sdk
 	media-libs/libsndfile
 	media-libs/liblrdf
+	x11-libs/fltk:1
 	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	media-libs/ladspa-sdk"
+	jack? ( media-sound/jack-audio-connection-kit )"
 
 S=${WORKDIR}/${PN}-0.2.2
 
diff --git a/media-sound/tapiir/ChangeLog b/media-sound/tapiir/ChangeLog
index b9944d176669..3c7e83e01593 100644
--- a/media-sound/tapiir/ChangeLog
+++ b/media-sound/tapiir/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/tapiir
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.20 2009/06/03 20:10:27 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/ChangeLog,v 1.21 2011/03/20 20:06:58 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> tapiir-0.7.2.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
   03 Jun 2009; Markus Meier <maekke@gentoo.org> tapiir-0.7.2.ebuild:
   amd64/x86 stable, bug #272134
diff --git a/media-sound/tapiir/tapiir-0.7.2.ebuild b/media-sound/tapiir/tapiir-0.7.2.ebuild
index 646bc139a65f..9ca73d378bbd 100644
--- a/media-sound/tapiir/tapiir-0.7.2.ebuild
+++ b/media-sound/tapiir/tapiir-0.7.2.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/tapiir/tapiir-0.7.2.ebuild,v 1.8 2009/06/03 20:10:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapiir/tapiir-0.7.2.ebuild,v 1.9 2011/03/20 20:06:58 jlec Exp $
 
 EAPI=2
 inherit eutils
@@ -14,9 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="media-sound/jack-audio-connection-kit
+RDEPEND="
+	media-sound/jack-audio-connection-kit
 	media-libs/alsa-lib
-	x11-libs/fltk:1.1"
+	x11-libs/fltk:1"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-sound/yoshimi/ChangeLog b/media-sound/yoshimi/ChangeLog
index cfeac12a4af4..bbbc1b71e3ad 100644
--- a/media-sound/yoshimi/ChangeLog
+++ b/media-sound/yoshimi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/yoshimi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yoshimi/ChangeLog,v 1.3 2010/04/22 09:36:50 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yoshimi/ChangeLog,v 1.4 2011/03/20 20:06:19 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> yoshimi-0.056.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
   22 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> yoshimi-0.056.ebuild:
   We can't be sure if SSE is available on x86 systems wrt #316627 by Diego
diff --git a/media-sound/yoshimi/yoshimi-0.056.ebuild b/media-sound/yoshimi/yoshimi-0.056.ebuild
index 86a0237c89a2..1d8506d0afe4 100644
--- a/media-sound/yoshimi/yoshimi-0.056.ebuild
+++ b/media-sound/yoshimi/yoshimi-0.056.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/yoshimi/yoshimi-0.056.ebuild,v 1.2 2010/04/22 09:36:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yoshimi/yoshimi-0.056.ebuild,v 1.3 2011/03/20 20:06:19 jlec Exp $
 
 EAPI=2
 inherit cmake-utils
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 -x86"
 IUSE=""
 
-RDEPEND="sys-libs/zlib
+RDEPEND="
+	sys-libs/zlib
 	media-libs/fontconfig
-	x11-libs/fltk:1.1
+	x11-libs/fltk:1
 	=sci-libs/fftw-3*
 	>=dev-libs/mini-xml-2.5
 	>=media-libs/alsa-lib-1.0.17
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"