Remove the ability of setting ALSA_TOOLS externally, and treat it as an internal variable. Users will have to get all the tools depending on the useflags, it's far from being a big package anyway.

(Portage version: 2.1.2-r9)

3 files changed, 25 insertions, 57 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index f0ca606e229f..939d7dc2522b 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.134 2007/02/11 18:07:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.135 2007/02/11 18:37:56 flameeyes Exp $
+
+  11 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-tools-1.0.13.ebuild, alsa-tools-1.0.14_rc1.ebuild:
+  Remove the ability of setting ALSA_TOOLS externally, and treat it as an
+  internal variable. Users will have to get all the tools depending on the
+  useflags, it's far from being a big package anyway.
 
   11 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   alsa-tools-1.0.13.ebuild, alsa-tools-1.0.14_rc1.ebuild:
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild
index 638603053565..98de16eddc0e 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.13.ebuild,v 1.10 2007/02/11 18:07:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild,v 1.11 2007/02/11 18:37:56 flameeyes Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -26,34 +26,15 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 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"
-
-		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
+	ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader seq/sbiloadx
+				sscape_ctl us428control usx2yloader vxloader"
 
+	use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+
+	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer envy24control rmedigicontrol"
+	# 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
 }
 
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild
index 1527a462687d..4a8bc9eb8e51 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.14_rc1.ebuild,v 1.7 2007/02/11 18:07:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild,v 1.8 2007/02/11 18:37:56 flameeyes Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -26,34 +26,15 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 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"
-
-		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
+	ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader seq/sbiload
+				sscape_ctl us428control usx2yloader vxloader"
 
+	use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+
+	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer envy24control rmedigicontrol"
+	# 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
 }