Restrict fltk version being able to return includedir or hardcode includedir

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

8 files changed, 29 insertions, 23 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 84818ffa334e..01a1b840eab8 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.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,
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 7a202281e87d..52c2da88d84e 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,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 @@ src_compile() {
 	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
 }
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 f8dad91d9bf4..1606a7105550 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,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 @@ 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 )
+	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
@@ -112,7 +112,7 @@ src_compile() {
 	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
 }
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 105caaceac03..1bfc8e2a0af8 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,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 @@ 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 )
+	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
@@ -110,7 +110,7 @@ src_compile() {
 	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
 }
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 8b726a01246f..fad4f0e4d208 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.21.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.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 @@ src_compile() {
 	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
 }
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 8c89ae87ace8..5e8026476f26 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.22.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.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 @@ 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 )
+	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}"
 
@@ -111,7 +111,7 @@ src_compile() {
 	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
 }
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 e7e110fe0245..d9843e66a787 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.23.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.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 @@ src_compile() {
 	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
 }
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 0119301097fe..1f0b1dc5a211 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.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 @@ ${ECHOAUDIO_CARDS}"
 
 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 @@ src_configure() {
 		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