public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-sound/alsa-tools: alsa-tools-1.0.21-r1.ebuild alsa-tools-1.0.23.ebuild alsa-tools-1.0.20-r1.ebuild alsa-tools-1.0.21.ebuild alsa-tools-1.0.20-r2.ebuild alsa-tools-1.0.22.ebuild ChangeLog alsa-tools-1.0.24.1.ebuild
@ 2011-03-20 20:13 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2011-03-20 20:13 UTC (permalink / raw
  To: gentoo-commits

jlec        11/03/20 20:13:17

  Modified:             alsa-tools-1.0.21-r1.ebuild
                        alsa-tools-1.0.23.ebuild
                        alsa-tools-1.0.20-r1.ebuild
                        alsa-tools-1.0.21.ebuild
                        alsa-tools-1.0.20-r2.ebuild
                        alsa-tools-1.0.22.ebuild ChangeLog
                        alsa-tools-1.0.24.1.ebuild
  Log:
  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild?r1=1.1&r2=1.2

Index: alsa-tools-1.0.21-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-tools-1.0.21-r1.ebuild	8 Jan 2010 02:48:26 -0000	1.1
+++ alsa-tools-1.0.21-r1.ebuild	20 Mar 2011 20:13:16 -0000	1.2
@@ -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 @@
 ${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_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



1.9                  media-sound/alsa-tools/alsa-tools-1.0.23.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild?r1=1.8&r2=1.9

Index: alsa-tools-1.0.23.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsa-tools-1.0.23.ebuild	22 Jan 2011 22:56:27 -0000	1.8
+++ alsa-tools-1.0.23.ebuild	20 Mar 2011 20:13:16 -0000	1.9
@@ -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 @@
 
 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_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



1.8                  media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild?r1=1.7&r2=1.8

Index: alsa-tools-1.0.20-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alsa-tools-1.0.20-r1.ebuild	13 Oct 2009 17:52:22 -0000	1.7
+++ alsa-tools-1.0.20-r1.ebuild	20 Mar 2011 20:13:16 -0000	1.8
@@ -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 @@
 ${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_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



1.7                  media-sound/alsa-tools/alsa-tools-1.0.21.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild?r1=1.6&r2=1.7

Index: alsa-tools-1.0.21.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alsa-tools-1.0.21.ebuild	10 Feb 2010 03:39:01 -0000	1.6
+++ alsa-tools-1.0.21.ebuild	20 Mar 2011 20:13:16 -0000	1.7
@@ -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 @@
 ${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_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



1.2                  media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild?r1=1.1&r2=1.2

Index: alsa-tools-1.0.20-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-tools-1.0.20-r2.ebuild	8 Jan 2010 02:48:26 -0000	1.1
+++ alsa-tools-1.0.20-r2.ebuild	20 Mar 2011 20:13:16 -0000	1.2
@@ -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 @@
 ${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_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



1.3                  media-sound/alsa-tools/alsa-tools-1.0.22.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild?r1=1.2&r2=1.3

Index: alsa-tools-1.0.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-tools-1.0.22.ebuild	8 Jan 2010 02:48:26 -0000	1.2
+++ alsa-tools-1.0.22.ebuild	20 Mar 2011 20:13:16 -0000	1.3
@@ -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 @@
 ${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_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



1.200                media-sound/alsa-tools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/ChangeLog?rev=1.200&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/ChangeLog?rev=1.200&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/ChangeLog?r1=1.199&r2=1.200

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- ChangeLog	6 Feb 2011 00:32:39 -0000	1.199
+++ ChangeLog	20 Mar 2011 20:13:16 -0000	1.200
@@ -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)
 



1.2                  media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild?r1=1.1&r2=1.2

Index: alsa-tools-1.0.24.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-tools-1.0.24.1.ebuild	6 Feb 2011 00:32:39 -0000	1.1
+++ alsa-tools-1.0.24.1.ebuild	20 Mar 2011 20:13:16 -0000	1.2
@@ -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 @@
 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 @@
 
 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_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






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-sound/alsa-tools: alsa-tools-1.0.21-r1.ebuild alsa-tools-1.0.23.ebuild alsa-tools-1.0.20-r1.ebuild alsa-tools-1.0.21.ebuild alsa-tools-1.0.20-r2.ebuild alsa-tools-1.0.22.ebuild ChangeLog alsa-tools-1.0.24.1.ebuild
@ 2011-03-22  9:59 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2011-03-22  9:59 UTC (permalink / raw
  To: gentoo-commits

jlec        11/03/22 09:59:03

  Modified:             alsa-tools-1.0.21-r1.ebuild
                        alsa-tools-1.0.23.ebuild
                        alsa-tools-1.0.20-r1.ebuild
                        alsa-tools-1.0.21.ebuild
                        alsa-tools-1.0.20-r2.ebuild
                        alsa-tools-1.0.22.ebuild ChangeLog
                        alsa-tools-1.0.24.1.ebuild
  Log:
  Restrict fltk version being able to return includedir or hardcode includedir
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild?r1=1.2&r2=1.3

Index: alsa-tools-1.0.21-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-tools-1.0.21-r1.ebuild	20 Mar 2011 20:13:16 -0000	1.2
+++ alsa-tools-1.0.21-r1.ebuild	22 Mar 2011 09:59:02 -0000	1.3
@@ -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.21-r1.ebuild,v 1.2 2011/03/20 20:13:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild,v 1.3 2011/03/22 09:59:02 jlec Exp $
 
 EAPI="1"
 
@@ -28,7 +28,7 @@
 ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.20-r1
-	fltk? ( x11-libs/fltk:1 )
+	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
@@ -110,7 +110,7 @@
 	for f in ${ALSA_TOOLS}
 	do
 		cd "${S}/${f}"
-		econf --with-gtk2 || die "econf ${f} failed"
+		econf --with-gtk2
 		emake || die "emake ${f} failed"
 	done
 }



1.10                 media-sound/alsa-tools/alsa-tools-1.0.23.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild?r1=1.9&r2=1.10

Index: alsa-tools-1.0.23.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alsa-tools-1.0.23.ebuild	20 Mar 2011 20:13:16 -0000	1.9
+++ alsa-tools-1.0.23.ebuild	22 Mar 2011 09:59:02 -0000	1.10
@@ -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.23.ebuild,v 1.9 2011/03/20 20:13:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild,v 1.10 2011/03/22 09:59:02 jlec Exp $
 
 EAPI=1
 inherit eutils flag-o-matic autotools
@@ -104,14 +104,14 @@
 	if use fltk; then
 		# hdspmixer requires fltk
 		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
+		append-flags "-I/usr/include/fltk-1"
 	fi
 
 	local f
 	for f in ${ALSA_TOOLS}
 	do
 		cd "${S}/${f}"
-		econf --with-gtk2 || die "econf ${f} failed"
+		econf --with-gtk2
 		emake || die "emake ${f} failed"
 	done
 }



1.9                  media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild?r1=1.8&r2=1.9

Index: alsa-tools-1.0.20-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsa-tools-1.0.20-r1.ebuild	20 Mar 2011 20:13:16 -0000	1.8
+++ alsa-tools-1.0.20-r1.ebuild	22 Mar 2011 09:59:02 -0000	1.9
@@ -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.20-r1.ebuild,v 1.8 2011/03/20 20:13:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild,v 1.9 2011/03/22 09:59:02 jlec Exp $
 
 EAPI=1
 
@@ -104,14 +104,14 @@
 	if use fltk; then
 		# hdspmixer requires fltk
 		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
+		append-flags "-I/usr/include/fltk-1"
 	fi
 
 	local f
 	for f in ${ALSA_TOOLS}
 	do
 		cd "${S}/${f}"
-		econf --with-gtk2 || die "econf ${f} failed"
+		econf --with-gtk2
 		emake || die "emake ${f} failed"
 	done
 }



1.8                  media-sound/alsa-tools/alsa-tools-1.0.21.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild?r1=1.7&r2=1.8

Index: alsa-tools-1.0.21.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alsa-tools-1.0.21.ebuild	20 Mar 2011 20:13:16 -0000	1.7
+++ alsa-tools-1.0.21.ebuild	22 Mar 2011 09:59:02 -0000	1.8
@@ -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.21.ebuild,v 1.7 2011/03/20 20:13:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild,v 1.8 2011/03/22 09:59:02 jlec Exp $
 
 EAPI=1
 
@@ -101,14 +101,14 @@
 	if use fltk; then
 		# hdspmixer requires fltk
 		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
+		append-flags "-I/usr/include/fltk-1"
 	fi
 
 	local f
 	for f in ${ALSA_TOOLS}
 	do
 		cd "${S}/${f}"
-		econf --with-gtk2 || die "econf ${f} failed"
+		econf --with-gtk2
 		emake || die "emake ${f} failed"
 	done
 }



1.3                  media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild?r1=1.2&r2=1.3

Index: alsa-tools-1.0.20-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-tools-1.0.20-r2.ebuild	20 Mar 2011 20:13:16 -0000	1.2
+++ alsa-tools-1.0.20-r2.ebuild	22 Mar 2011 09:59:02 -0000	1.3
@@ -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.20-r2.ebuild,v 1.2 2011/03/20 20:13:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild,v 1.3 2011/03/22 09:59:02 jlec Exp $
 
 EAPI=1
 
@@ -28,7 +28,7 @@
 ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.20-r1
-	fltk? ( x11-libs/fltk:1 )
+	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
@@ -112,7 +112,7 @@
 	for f in ${ALSA_TOOLS}
 	do
 		cd "${S}/${f}"
-		econf --with-gtk2 || die "econf ${f} failed"
+		econf --with-gtk2
 		emake || die "emake ${f} failed"
 	done
 }



1.4                  media-sound/alsa-tools/alsa-tools-1.0.22.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild?r1=1.3&r2=1.4

Index: alsa-tools-1.0.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa-tools-1.0.22.ebuild	20 Mar 2011 20:13:16 -0000	1.3
+++ alsa-tools-1.0.22.ebuild	22 Mar 2011 09:59:02 -0000	1.4
@@ -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.22.ebuild,v 1.3 2011/03/20 20:13:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild,v 1.4 2011/03/22 09:59:02 jlec Exp $
 
 EAPI="1"
 
@@ -28,7 +28,7 @@
 ${ECHOAUDIO_CARDS}"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.20-r1
-	fltk? ( x11-libs/fltk:1 )
+	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
@@ -111,7 +111,7 @@
 	for f in ${ALSA_TOOLS}
 	do
 		cd "${S}/${f}"
-		econf --with-gtk2 || die "econf ${f} failed"
+		econf --with-gtk2
 		emake || die "emake ${f} failed"
 	done
 }



1.201                media-sound/alsa-tools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/ChangeLog?rev=1.201&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/ChangeLog?rev=1.201&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/ChangeLog?r1=1.200&r2=1.201

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- ChangeLog	20 Mar 2011 20:13:16 -0000	1.200
+++ ChangeLog	22 Mar 2011 09:59:02 -0000	1.201
@@ -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.200 2011/03/20 20:13:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.201 2011/03/22 09:59:02 jlec Exp $
+
+  22 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:
+  Restrict fltk version being able to return includedir or hardcode includedir
 
   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,



1.3                  media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild?r1=1.2&r2=1.3

Index: alsa-tools-1.0.24.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-tools-1.0.24.1.ebuild	20 Mar 2011 20:13:16 -0000	1.2
+++ alsa-tools-1.0.24.1.ebuild	22 Mar 2011 09:59:02 -0000	1.3
@@ -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.2 2011/03/20 20:13:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild,v 1.3 2011/03/22 09:59:02 jlec Exp $
 
 EAPI=3
 inherit base flag-o-matic autotools
@@ -28,7 +28,7 @@
 
 RDEPEND=">=media-libs/alsa-lib-${PV}
 	>=dev-python/pyalsa-1.0.24
-	fltk? ( x11-libs/fltk:1 )
+	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
@@ -110,10 +110,10 @@
 		cd "${S}/${f}"
 		case "${f}" in
 			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2 || die "econf ${f} failed"
+				econf --with-gtk2
 				;;
 			* )
-				econf || die "econf ${f} failed"
+				econf
 				;;
 		esac
 	done






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-03-22  9:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-20 20:13 [gentoo-commits] gentoo-x86 commit in media-sound/alsa-tools: alsa-tools-1.0.21-r1.ebuild alsa-tools-1.0.23.ebuild alsa-tools-1.0.20-r1.ebuild alsa-tools-1.0.21.ebuild alsa-tools-1.0.20-r2.ebuild alsa-tools-1.0.22.ebuild ChangeLog alsa-tools-1.0.24.1.ebuild Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2011-03-22  9:59 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox