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.

Package-Manager: portage-2.1.2-r9

4 files changed, 40 insertions, 72 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/Manifest b/media-sound/alsa-tools/Manifest
index edc15bb0bcba..9df8a679e02b 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -7,18 +7,18 @@ RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 files/alsa-tools-1.0.11-asneeded
 SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c files/alsa-tools-1.0.11-asneeded.patch 1845
 DIST alsa-tools-1.0.13.tar.bz2 1464807 RMD160 1e55ab98dcc78dabbfec8f057bb164482d334c9a SHA1 43c32b3304140f31cce7f5f9fe4dcd57f01b0965 SHA256 1d82c6f64d035e20fb151b8791972cad47ef229bc365fd046ff64f74bec31eb3
 DIST alsa-tools-1.0.14rc1.tar.bz2 1466476 RMD160 7c0e0131bfa91b9b07705204ebacca2b5b87a19b SHA1 c170029c5a783abb122f0a93b4343e75a6d3fc84 SHA256 d29ebd324359263d98428213f4fc2f58a12b108f9fce9c3b8bde18e315f4ac36
-EBUILD alsa-tools-1.0.13.ebuild 2628 RMD160 fe958bb31c4b452436246f9adca18874e9685c2a SHA1 ac86e7745b5a7a450ceccaaa6a585e258ee20e52 SHA256 7c3fa20065e7dd01e7c545affa0c3de826d5f179209d8ed0573804a4861089a5
-MD5 0be4336a041da024396a3fbc01486046 alsa-tools-1.0.13.ebuild 2628
-RMD160 fe958bb31c4b452436246f9adca18874e9685c2a alsa-tools-1.0.13.ebuild 2628
-SHA256 7c3fa20065e7dd01e7c545affa0c3de826d5f179209d8ed0573804a4861089a5 alsa-tools-1.0.13.ebuild 2628
-EBUILD alsa-tools-1.0.14_rc1.ebuild 2687 RMD160 e5f97d25c83a196b87ef098800c783cd788fa6ba SHA1 d7a83e42cee7e48ec262c89a8183fd3cf77e189d SHA256 b3fee2ba69d88f263947397b2775ed487914ec2e3485e32dc44698eb6669e194
-MD5 15ec5c68c140d77d269679c5c0d874cc alsa-tools-1.0.14_rc1.ebuild 2687
-RMD160 e5f97d25c83a196b87ef098800c783cd788fa6ba alsa-tools-1.0.14_rc1.ebuild 2687
-SHA256 b3fee2ba69d88f263947397b2775ed487914ec2e3485e32dc44698eb6669e194 alsa-tools-1.0.14_rc1.ebuild 2687
-MISC ChangeLog 18578 RMD160 98cb2a3bd399b34cc64286d1c980a74a77c0bbb3 SHA1 6ead3f4f261939288aac03977b963ddf1d277626 SHA256 440da0e4ccfbe09c9780ff56cf8f9dc952540f3c35d1e782acd0aeaa52457dad
-MD5 018e93e52507d485fcdb177dc45b9691 ChangeLog 18578
-RMD160 98cb2a3bd399b34cc64286d1c980a74a77c0bbb3 ChangeLog 18578
-SHA256 440da0e4ccfbe09c9780ff56cf8f9dc952540f3c35d1e782acd0aeaa52457dad ChangeLog 18578
+EBUILD alsa-tools-1.0.13.ebuild 2101 RMD160 a2ab656d8d28038ff6a8ab45a49b7d6ea1957178 SHA1 f5ba25bf57f98a6bc0d701fd850b18923159553d SHA256 fe512b0942bd3825572197d4fe1e2cba8d0a19211c7b244926ec54617f4f6b02
+MD5 f25cd526260d3c488eacb6d0c2faa21b alsa-tools-1.0.13.ebuild 2101
+RMD160 a2ab656d8d28038ff6a8ab45a49b7d6ea1957178 alsa-tools-1.0.13.ebuild 2101
+SHA256 fe512b0942bd3825572197d4fe1e2cba8d0a19211c7b244926ec54617f4f6b02 alsa-tools-1.0.13.ebuild 2101
+EBUILD alsa-tools-1.0.14_rc1.ebuild 2159 RMD160 46626628beabf1b509ed5502689578cb96adc844 SHA1 28d6882dddd6e8aec2606b95ac464593491874f9 SHA256 93eccb8352544a48980d4e095913be6a9da3ab140ab5381fc12491fe0f9a5bbb
+MD5 e010a6f62962ca3a7b819ae939457809 alsa-tools-1.0.14_rc1.ebuild 2159
+RMD160 46626628beabf1b509ed5502689578cb96adc844 alsa-tools-1.0.14_rc1.ebuild 2159
+SHA256 93eccb8352544a48980d4e095913be6a9da3ab140ab5381fc12491fe0f9a5bbb alsa-tools-1.0.14_rc1.ebuild 2159
+MISC ChangeLog 18893 RMD160 30dfefbc52e527edb4cd6cd4a6a09896dfdf05c4 SHA1 1618b113e7acad8f1cf88a30ad50d33e6b0c1a30 SHA256 a7b366b27dc89b510ac708992da399a5f10f0136c833c4c4c50c493d4000b4a2
+MD5 b9fba63a109e5ad270a31b2cf91f205e ChangeLog 18893
+RMD160 30dfefbc52e527edb4cd6cd4a6a09896dfdf05c4 ChangeLog 18893
+SHA256 a7b366b27dc89b510ac708992da399a5f10f0136c833c4c4c50c493d4000b4a2 ChangeLog 18893
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -32,7 +32,7 @@ SHA256 ed4e83c5e9dfb0acb7f9bed2ffcbe387ce74d04845da9b4b0d5636ce7d72560d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFz1tXAiZjviIA2XgRAgjDAKCDoPU/qT1aCoWclvviT8LOjRK2AgCgiUht
-wmNymnDVm8DcZqU493LCWUY=
-=KCE3
+iD8DBQFFz2KLAiZjviIA2XgRAt7nAJwP+Dr5IoVQdct3FDmC1f3EP4hIsgCgyT8h
+YXl8g1IFeD6NvoDTOsaeBS8=
+=jcWE
 -----END PGP SIGNATURE-----
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
 }