Version bump, for bug #210249. Patch from Santiago M. Mola <coldwind@gentoo.org> closes bug #193885. Missing echo3g card flag readded, closes bug #168209.

Package-Manager: portage-2.1.4.4

4 files changed, 163 insertions, 5 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 495648b14d96..0a48567a7b2a 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.154 2008/01/31 16:51:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.155 2008/03/12 16:20:54 chainsaw Exp $
+
+*alsa-tools-1.0.16 (12 Mar 2008)
+
+  12 Mar 2008; Tony Vroon <chainsaw@gentoo.org>
+  +files/alsa-tools-1.0.14-asneeded.patch, +alsa-tools-1.0.16.ebuild:
+  Version bump, for bug #210249. Patch from Santiago M. Mola
+  <coldwind@gentoo.org> closes bug #193885. Missing echo3g card flag readded,
+  closes bug #168209.
 
 *alsa-tools-1.0.16_rc1 (31 Jan 2008)
 
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 3ae19d46842e..642a7c360758 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 AUX alsa-tools-1.0.11-asneeded.patch 1845 RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 SHA1 63a368a5d0e435f085e8d84ff7968bb1ac6e78f3 SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c
+AUX alsa-tools-1.0.14-asneeded.patch 256 RMD160 db252d8994605036e5ab200af2d7a9dc633650b5 SHA1 94cd80b03fd5d58ef564e26711c60b95ece3b4d6 SHA256 d309bee615d0d22da845f7448e4be48d9838a006a4b53b745149410123a34ca8
 DIST alsa-tools-1.0.14.tar.bz2 1547516 RMD160 f070e076cef8106c91744d6d369e8698d37e4029 SHA1 dfb92336592183c7cff53e207ea893de92c82d1f SHA256 f0ba0c1cf3194ac48616b46727e3261e2dc5041f3ac6b0dbd92b3367be9d2ccb
 DIST alsa-tools-1.0.15.tar.bz2 1546790 RMD160 cb6949dc34e3151459e3c81d613f85df30090fed SHA1 202de1344881dd2f1616a697992741ef469adb21 SHA256 5e37ebaf28c75dbd80a10acf5c8ab36646c841646b0787085885e1e124c32b45
+DIST alsa-tools-1.0.16.tar.bz2 1545984 RMD160 f855e72f76efc6c07edd23ffd868f40900d63126 SHA1 8fbd576986e3bc44e6bcdc4f028febe12839140d SHA256 2e62b6a0c04547148539e9c3fb074aa5beb389e0ae2cb6cabb59f67b11cb6565
 DIST alsa-tools-1.0.16rc1.tar.bz2 1545434 RMD160 8f78d55fdd75e7faac9310f50648d5c9cb5e4e7e SHA1 5d595d1140b066d9e95d7b58fe9aaea1f4e08b19 SHA256 c72549df1b6ff66a0fbecdfe92b2dd370a3f82c2d2706060e7231a77d9cec910
 EBUILD alsa-tools-1.0.14.ebuild 3679 RMD160 abf645061917ff057a5d628dafb10f692ddfd7d9 SHA1 71a5248b044e163c99afd5d07ff0ecc92b2f8b16 SHA256 9e57e12e6777035decd6d8e6ccdc2d600d798400eb23a7e172dff035da943b43
 EBUILD alsa-tools-1.0.15.ebuild 3652 RMD160 8b07f5a486f2f19366cb52a724c23c780a999482 SHA1 08f5872163396d26ea125903a60b368fbdad5b2b SHA256 c5cb15e43d438f0336a2ebcadfe19a1f7897b2216e0f7f508d76878ab3faf707
+EBUILD alsa-tools-1.0.16.ebuild 3720 RMD160 3de1f8b7b0ffd6733878bf0907f9c939aba622c8 SHA1 a40a4b886924aa8e90821d5d08f90826e9c32cb4 SHA256 91925ff0689200ba43888295d4155965c7836891dd05e22f815d578c12cdfbb4
 EBUILD alsa-tools-1.0.16_rc1.ebuild 3656 RMD160 f10b8e228a1e596f8bde40f635437131cf0e5185 SHA1 d4a0327299a85c8e1f43f4b104e7b9e842169272 SHA256 326af6c0693f3b2f7858eb686d5ee716af83552939844eefd6328149afda74f4
-MISC ChangeLog 22100 RMD160 242da2c7c5cc40dbf78598a08fb08fdefe2ef2fe SHA1 b77578470a673cb701ce680d99ab3606a8031734 SHA256 2834e8856b268f6b504138cb1943e242897fa29395aaed515500967e50133fb7
+MISC ChangeLog 22414 RMD160 a7dff97311a6f4bc256f1215e06cc4b9e141f9b8 SHA1 ad17e9546e5337e9efe48c4fbb39d806bfa563c6 SHA256 fe7a873d3433a936461692d0855ca56fceabbb70e33a02e6f6f10b23c0231d0f
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHof2Pp5vW4rUFj5oRAniHAJ9x3umKaVSAqHnKU8VDsWm+TUZAVgCdEPBv
-GCPTEJPguUJO4y0o/3vtXzA=
-=AyW7
+iD8DBQFH2AK8p5vW4rUFj5oRAjvWAJkBYlu6O78pC113tSiwiWW65I5MEACgtf1C
+7LtqTUmtQlmkB1LpiROZOvQ=
+=Hd02
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.16.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.16.ebuild
new file mode 100644
index 000000000000..4f4230f08fd9
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.16.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2008 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.16.ebuild,v 1.1 2008/03/12 16:20:54 chainsaw 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 ~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 alsa_cards_echo3g"
+
+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-${PV}
+	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"
+	epatch "${FILESDIR}/${PN}-1.0.14-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/alsa-tools-1.0.14-asneeded.patch b/media-sound/alsa-tools/files/alsa-tools-1.0.14-asneeded.patch
new file mode 100644
index 000000000000..c7016664abe5
--- /dev/null
+++ b/media-sound/alsa-tools/files/alsa-tools-1.0.14-asneeded.patch
@@ -0,0 +1,8 @@
+--- alsa-tools-1.0.14/hdspmixer/src/Makefile.am	2007-09-26 19:26:45.000000000 +0200
++++ alsa-tools-1.0.14/hdspmixer/src/Makefile.am	2007-09-26 19:28:56.000000000 +0200
+@@ -56,3 +56,5 @@
+ 	pixmaps.cxx \
+ 	pixmaps.h \
+ 	defines.h
++
++hdspmixer_LDADD = -lfltk