New revision, this time using ALSA_CARDS to enable or disable the tools that are specific to some cards (with specific ALSA driver).

Package-Manager: portage-2.1.2-r9

5 files changed, 181 insertions, 16 deletions

diff --git a/media-sound/alsa-firmware/Manifest b/media-sound/alsa-firmware/Manifest
index 00d3141332fc..ffd10fb57796 100644
--- a/media-sound/alsa-firmware/Manifest
+++ b/media-sound/alsa-firmware/Manifest
@@ -21,18 +21,18 @@ EBUILD alsa-firmware-1.0.14_rc1.ebuild 739 RMD160 63bbe79a63ece29cc2288579b93a82
 MD5 fa8bb064cb35f9ceabc89d31ddd546d5 alsa-firmware-1.0.14_rc1.ebuild 739
 RMD160 63bbe79a63ece29cc2288579b93a822838c774db alsa-firmware-1.0.14_rc1.ebuild 739
 SHA256 c97721e5b16c08e96d4a02b6b4904c90892b90aca91d2d69395697072d14f928 alsa-firmware-1.0.14_rc1.ebuild 739
-EBUILD alsa-firmware-1.0.14_rc2-r1.ebuild 2035 RMD160 8f15c3f215c0ddc9abcff713c37373ff94e35a43 SHA1 21bb4124c9078a2f49a440da938fb06482301480 SHA256 3514f49188cd994041d42b6724e49f8242bd231ce911dfef4eb449a4386bb409
-MD5 157c573eea6bc2d4ffcfa25631804005 alsa-firmware-1.0.14_rc2-r1.ebuild 2035
-RMD160 8f15c3f215c0ddc9abcff713c37373ff94e35a43 alsa-firmware-1.0.14_rc2-r1.ebuild 2035
-SHA256 3514f49188cd994041d42b6724e49f8242bd231ce911dfef4eb449a4386bb409 alsa-firmware-1.0.14_rc2-r1.ebuild 2035
+EBUILD alsa-firmware-1.0.14_rc2-r1.ebuild 2490 RMD160 267500e6344074946371d703ab9205476882ba70 SHA1 5d5ca860ae082ccebd7c1ee04108a561eabc4983 SHA256 fd8a6f218d69be049d105eccb41542d02eecd1298deae4239fa16b198c2d3ce5
+MD5 6c33271096f9855a6e8f7042cf1f89b8 alsa-firmware-1.0.14_rc2-r1.ebuild 2490
+RMD160 267500e6344074946371d703ab9205476882ba70 alsa-firmware-1.0.14_rc2-r1.ebuild 2490
+SHA256 fd8a6f218d69be049d105eccb41542d02eecd1298deae4239fa16b198c2d3ce5 alsa-firmware-1.0.14_rc2-r1.ebuild 2490
 EBUILD alsa-firmware-1.0.14_rc2.ebuild 748 RMD160 a89d358065a26aaa398217748c3a92b7d632cc02 SHA1 4f8d12a4f4b361ae0a42cf2749705b19738a14b6 SHA256 091fd842820bde96aa0d50e86c991f7b4488d6352d0ea69a03620017596f8c5d
 MD5 856e93b24f8bafdd735d58a636c90a03 alsa-firmware-1.0.14_rc2.ebuild 748
 RMD160 a89d358065a26aaa398217748c3a92b7d632cc02 alsa-firmware-1.0.14_rc2.ebuild 748
 SHA256 091fd842820bde96aa0d50e86c991f7b4488d6352d0ea69a03620017596f8c5d alsa-firmware-1.0.14_rc2.ebuild 748
-MISC ChangeLog 8327 RMD160 ddc74bc84f1a350bee30b543e123fa284bafbb73 SHA1 dcf996e11f920da15d700462ad92bb81b9482433 SHA256 b7a1ab8ef86aa31f1efa800caff2a7151570f44c0dbefa34c46fae08319268d2
-MD5 6649797b58c44d36f51b527558eae331 ChangeLog 8327
-RMD160 ddc74bc84f1a350bee30b543e123fa284bafbb73 ChangeLog 8327
-SHA256 b7a1ab8ef86aa31f1efa800caff2a7151570f44c0dbefa34c46fae08319268d2 ChangeLog 8327
+MISC ChangeLog 8626 RMD160 41e36d14514d3c3006176a1b0143ddd4baeac77c SHA1 37f8b0a9f2598c81336dae2bf44eb1786bb0a773 SHA256 6d702589f04d232365aa89327f75b8b991104d988f552c62bd0909ef58b1bfc6
+MD5 d82d5d8e9c82908f33d5821d6847c33a ChangeLog 8626
+RMD160 41e36d14514d3c3006176a1b0143ddd4baeac77c ChangeLog 8626
+SHA256 6d702589f04d232365aa89327f75b8b991104d988f552c62bd0909ef58b1bfc6 ChangeLog 8626
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -55,7 +55,7 @@ SHA256 28a0de262a871b5195ba3bd8ad6f2c7ae0b5b517a545d0810f20727461adcdd5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF1yDoAiZjviIA2XgRAgcdAKCi/dbjKSxVptqEysxjFzOr1UiDPQCfWO3k
-USv1htiN6IcX2hSc0roevEc=
-=fDjC
+iD8DBQFF1zMoAiZjviIA2XgRAgTiAJ9LqgsWU98LEhkPHP3UQ1xt2ICguwCgwrWz
+o7hESgKYnZwju433xIGpkyw=
+=2nMM
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index ffcb537cac72..e634490e0651 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.137 2007/02/11 23:34:58 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.138 2007/02/17 16:50:42 flameeyes Exp $
+
+*alsa-tools-1.0.14_rc1-r1 (17 Feb 2007)
+
+  17 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-tools-1.0.14_rc1-r1.ebuild:
+  New revision, this time using ALSA_CARDS to enable or disable the tools that
+  are specific to some cards (with specific ALSA driver).
 
   11 Feb 2007; Simon Stelling <blubb@gentoo.org>
   alsa-tools-1.0.14_rc1.ebuild:
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 762d91cc7b9d..f69b3b6ebd6b 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX alsa-tools-1.0.11-asneeded.patch 1845 RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 SHA1 63a368a5d0e435f085e8d84ff7968bb1ac6e78f3 SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c
 MD5 f49f91697e8927971c5b0c65338eac5c files/alsa-tools-1.0.11-asneeded.patch 1845
 RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 files/alsa-tools-1.0.11-asneeded.patch 1845
@@ -8,14 +11,18 @@ EBUILD alsa-tools-1.0.13.ebuild 2101 RMD160 a2ab656d8d28038ff6a8ab45a49b7d6ea195
 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-r1.ebuild 3662 RMD160 5ad9208c8510abda02fbac1870d171b006037b16 SHA1 b5576ec110ae40dd6d4c57d1ea5bda59877e40ab SHA256 85500ceb180b6b2eb3e2b07da7ca19c77e298f92dad58d32d89c97cdde36ddba
+MD5 ccc3c6b5a184880489e775c0689d0a58 alsa-tools-1.0.14_rc1-r1.ebuild 3662
+RMD160 5ad9208c8510abda02fbac1870d171b006037b16 alsa-tools-1.0.14_rc1-r1.ebuild 3662
+SHA256 85500ceb180b6b2eb3e2b07da7ca19c77e298f92dad58d32d89c97cdde36ddba alsa-tools-1.0.14_rc1-r1.ebuild 3662
 EBUILD alsa-tools-1.0.14_rc1.ebuild 2555 RMD160 d56a39c292603a35f99deb9e05e45d9e4268c10c SHA1 4315c365ab343c95feda2c104cc2d7c196a4c704 SHA256 49fb940036f707963ff6b60718f7489e6f170c2eb28ac3a0aafe211abff9eb01
 MD5 a5bd1febf7a6b2f3e73d139d773edb30 alsa-tools-1.0.14_rc1.ebuild 2555
 RMD160 d56a39c292603a35f99deb9e05e45d9e4268c10c alsa-tools-1.0.14_rc1.ebuild 2555
 SHA256 49fb940036f707963ff6b60718f7489e6f170c2eb28ac3a0aafe211abff9eb01 alsa-tools-1.0.14_rc1.ebuild 2555
-MISC ChangeLog 19258 RMD160 ebf05a8ad772257a8b1afded95d73dead76c638c SHA1 fb45883aa95e0b9a2fc0b994a9e5fca08c462ccd SHA256 d79c69e04a08298acc0a8bfd6a5826afe4e97c421a03db41c0962096b92bb573
-MD5 953fbdf0b072a275944f9bea37a95009 ChangeLog 19258
-RMD160 ebf05a8ad772257a8b1afded95d73dead76c638c ChangeLog 19258
-SHA256 d79c69e04a08298acc0a8bfd6a5826afe4e97c421a03db41c0962096b92bb573 ChangeLog 19258
+MISC ChangeLog 19530 RMD160 9b432639e669d86fa2253b8247bb8eafc393015d SHA1 125a4a690bb49831187809f85d90750d3136fdcf SHA256 6b73627f5ace15b261d43b03b123197488700130ed597b3988eb358bfbf3afbc
+MD5 1c55687e324f6eae52d66613921fe63d ChangeLog 19530
+RMD160 9b432639e669d86fa2253b8247bb8eafc393015d ChangeLog 19530
+SHA256 6b73627f5ace15b261d43b03b123197488700130ed597b3988eb358bfbf3afbc ChangeLog 19530
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -26,3 +33,13 @@ SHA256 15b7d6d6b39370866e31c2be2cc01be576f688ee49635a994cf90bcce8aff5d3 files/di
 MD5 5a258c285548ff21c60c1225f775d161 files/digest-alsa-tools-1.0.14_rc1 268
 RMD160 64d5fe5908475bc07623bee5c616718b148266ed files/digest-alsa-tools-1.0.14_rc1 268
 SHA256 ed4e83c5e9dfb0acb7f9bed2ffcbe387ce74d04845da9b4b0d5636ce7d72560d files/digest-alsa-tools-1.0.14_rc1 268
+MD5 5a258c285548ff21c60c1225f775d161 files/digest-alsa-tools-1.0.14_rc1-r1 268
+RMD160 64d5fe5908475bc07623bee5c616718b148266ed files/digest-alsa-tools-1.0.14_rc1-r1 268
+SHA256 ed4e83c5e9dfb0acb7f9bed2ffcbe387ce74d04845da9b4b0d5636ce7d72560d files/digest-alsa-tools-1.0.14_rc1-r1 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF1zJpAiZjviIA2XgRApp2AJ4+qad8yXT2u+lAWLCNH9uL5+hzjQCdFJFV
+JMnMOHK5Ku6mgXRsJmWDqG8=
+=D1Ba
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.14_rc1-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.14_rc1-r1.ebuild
new file mode 100644
index 000000000000..ce00ae88f85e
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.14_rc1-r1.ebuild
@@ -0,0 +1,138 @@
+# 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-r1.ebuild,v 1.1 2007/02/17 16:50:42 flameeyes Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="2.5"
+
+inherit eutils flag-o-matic autotools
+
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org"
+SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20
+alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24
+alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo
+alsa_cards_indigoio"
+
+IUSE="fltk gtk midi alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
+${ECHOAUDIO_CARDS}"
+
+RDEPEND=">=media-libs/alsa-lib-1.0.0
+	fltk? ( =x11-libs/fltk-1.1* )
+	gtk? ( =x11-libs/gtk+-2* )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ${CATEGORY}/${PN} with midi support you"
+		eerror "need to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+
+	ALSA_TOOLS="ac3dec"
+
+	use midi && ALSA_TOOLS="${ALSA_TOOLS} seq/sbiload us428control"
+
+	if use gtk; then
+		use midi && use alsa_cards_ice1712 && \
+			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
+		use alsa_cards_rme32 && use alsa_cards_rme96 && \
+			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
+		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+	fi
+
+	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
+	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
+	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
+	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
+	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
+
+	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
+		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
+	fi
+
+	if use gtk; then
+		for card in ${ECHOAUDIO_CARDS}; do
+			if use ${card}; then
+				ALSA_TOOLS="${ALSA_TOOLS} echomixer"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.0.11-asneeded.patch"
+
+	for dir in echomixer envy24control rmedigicontrol; do
+		pushd ${dir} &> /dev/null
+		sed -i -e '/AM_PATH_GTK/d' configure.in
+		eautomake
+		popd &> /dev/null
+	done
+
+	elibtoolize
+}
+
+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"
+	fi
+
+	# hdspmixer is missing depconf - copy from the hdsploader directory
+	cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
+
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		econf --with-gtk2 || die "econf ${f} failed"
+		emake || die "emake ${f} failed"
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		# Install the main stuff
+		cd "${S}/${f}"
+		emake DESTDIR="${D}" install || die
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS
+		do
+			if [ -f "${doc}" ]
+			then
+			mv "${doc}" "${doc}.`basename ${f}`"
+			dodoc "${doc}.`basename ${f}`"
+			fi
+		done
+	done
+}
diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.14_rc1-r1 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.14_rc1-r1
new file mode 100644
index 000000000000..ea2770eabd4b
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.14_rc1-r1
@@ -0,0 +1,3 @@
+MD5 09f083d7fdc7647d883dcb1cf872fa90 alsa-tools-1.0.14rc1.tar.bz2 1466476
+RMD160 7c0e0131bfa91b9b07705204ebacca2b5b87a19b alsa-tools-1.0.14rc1.tar.bz2 1466476
+SHA256 d29ebd324359263d98428213f4fc2f58a12b108f9fce9c3b8bde18e315f4ac36 alsa-tools-1.0.14rc1.tar.bz2 1466476