[patch] Diff against alsa-tools-1.0.9-r1.ebuild

alsa-tools-1.0.9-r1.ebuild.diff (text/plain), 3.22 KB, created by Henrik Brix Andersen on 2005-10-31 08:00:53 UTC

--- /usr/portage/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild	2005-10-30 23:52:09.000000000 +0100
+++ /usr/local/portage/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild	2005-10-31 16:56:40.000000000 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.9-r1.ebuild,v 1.1 2005/10/30 22:52:09 flameeyes Exp $
+# $Header: $
 
 inherit gnuconfig eutils
 
@@ -11,40 +11,44 @@
 LICENSE="GPL-2"
 SLOT="0.9"
 KEYWORDS="~amd64 ~mips ~ppc ppc64 ~sparc ~x86"
-IUSE="X"
+IUSE="fltk gtk"
 
 DEPEND=">=media-libs/alsa-lib-1.0.0
 	virtual/alsa
-	X? ( =x11-libs/fltk-1.1*
-	     =x11-libs/gtk+-1.2* )"
+	fltk? ( =x11-libs/fltk-1.1* )
+	gtk? ( =x11-libs/gtk+-1.2* )"
 
-# This is a list of the tools in the package.
-# Some of the tools don't make proper use of CFLAGS, even though
-# all of them seem to use autoconf.  This needs to be fixed.
-#
-# By default, all the supported tools will be compiled.
-# If you want to only compile for specific tool(s), set ALSA_TOOLS
-# environment to a space-separated list of tools that you want to build.
-# For example:
-#
-#   env ALSA_TOOLS='as10k1 ac3dec' emerge alsa-tools
-#
-if [ -z "${ALSA_TOOLS}" ]; then
-	if use X; then
-		ALSA_TOOLS="ac3dec as10k1 envy24control hdspconf hdsploader hdspmixer \
-		            mixartloader rmedigicontrol seq/sbiload sscape_ctl \
-		            us428control usx2yloader vxloader echomixer"
-	else
+pkg_setup() {
+	# This is a list of the tools in the package.
+	# Some of the tools don't make proper use of CFLAGS, even though
+	# all of them seem to use autoconf.  This needs to be fixed.
+	#
+	# By default, all the supported tools will be compiled.
+	# If you want to only compile for specific tool(s), set ALSA_TOOLS
+	# environment to a space-separated list of tools that you want to build.
+	# For example:
+	#
+	#   env ALSA_TOOLS='as10k1 ac3dec' emerge alsa-tools
+	#
+	if [ -z "${ALSA_TOOLS}" ]; then
 		ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader seq/sbiload \
 					sscape_ctl us428control usx2yloader vxloader"
-	fi
 
-	# sb16_csp won't build on ppc64 _AND_ ppc (and is not needed)
-	if  use !ppc64 && use !ppc; then
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-	fi
+		if use fltk; then
+			ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+		fi
+
+		if use gtk; then
+			ALSA_TOOLS="${ALSA_TOOLS} echomixer envy24control rmedigicontrol"
+		fi
+
+		# sb16_csp won't build on ppc64 _AND_ ppc (and is not needed)
+		if  use !ppc64 && use !ppc; then
+			ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+		fi
 
-fi
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
@@ -53,9 +57,11 @@
 }
 
 src_compile() {
-	# hdspmixer requires fltk
-	export LDFLAGS="-L/usr/$(get_libdir)/fltk-1.1"
-	export CPPFLAGS="-I/usr/include/fltk-1.1"
+	if use fltk; then
+		# hdspmixer requires fltk
+		export LDFLAGS="-L/usr/$(get_libdir)/fltk-1.1"
+		export CPPFLAGS="-I/usr/include/fltk-1.1"
+	fi
 
 	# hdspmixer is missing depconf - copy from the hdsploader directory
 	cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
@@ -64,7 +70,7 @@
 	for f in ${ALSA_TOOLS}
 	do
 		cd "${S}/${f}"
-		econf --with-kernel="${KV}" || die "configure failed"
+		econf || die "econf failed"
 		make || die "make failed"
 	done
 }