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

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

8 files changed, 65 insertions, 48 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