Version bump, bug 239559

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 145 insertions, 12 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index e1850211ea05..04d6a423a138 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.162 2008/09/01 18:03:47 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.163 2008/11/11 18:17:39 beandog Exp $
+
+*alsa-tools-1.0.18 (11 Nov 2008)
+
+  11 Nov 2008; Steve Dibb <beandog@gentoo.org> +alsa-tools-1.0.18.ebuild:
+  Version bump, bug 239559
 
   01 Sep 2008; Petteri Räty <betelgeuse@gentoo.org>
   -alsa-tools-1.0.14.ebuild, -alsa-tools-1.0.16_rc1.ebuild:
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 9ee55d4fdc1f..a74218536b62 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.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.17.tar.bz2 1546105 RMD160 0ec3f6a27ba085beb183e416bbcfc4658f0710e7 SHA1 a127fcc1ee5d4757b259a50b289db252f2951d7a SHA256 464bfa1a25de822367f95e9050413753601da36cd79302e20eb566cbef834c40
+DIST alsa-tools-1.0.18.tar.bz2 1556113 RMD160 d24648724e3795bf47ec10ac38a2443f6eb395fa SHA1 937e7ccad45b5e1f3f07f7c52f226bbf600690f7 SHA256 6639c73e5a181202d63dc05d8eb7a1c92b52753faccf7e5e856019da638a71ae
 EBUILD alsa-tools-1.0.15.ebuild 3652 RMD160 8b07f5a486f2f19366cb52a724c23c780a999482 SHA1 08f5872163396d26ea125903a60b368fbdad5b2b SHA256 c5cb15e43d438f0336a2ebcadfe19a1f7897b2216e0f7f508d76878ab3faf707
 EBUILD alsa-tools-1.0.16.ebuild 3714 RMD160 add2eb6f7d7a1054c69553c9a6093915bf05f9bf SHA1 a7112584bc83aecb20c88de06fad22afa9ea3bbe SHA256 4cf880ce0f9279e15e77d4b36e2f624d28e3adedc091c04e6ffa5ae41748c370
 EBUILD alsa-tools-1.0.17.ebuild 3741 RMD160 de4013449c9e88b262e6c30258110cf455e8cc75 SHA1 50b1f753588694dc98c7bf3a31fc3def2b3fe515 SHA256 bac568de8e698fcdc99a6acdf8bcf4a5b1d34feb91507269743bb37db071c606
-MISC ChangeLog 23253 RMD160 55795eaf855d7fd64f853196d03fda1862d07b7e SHA1 bddc14233e3327f2e4fbfa0fac382e29543dbe54 SHA256 96cf31414076c49ef98af5b4cd6684bbfb3ff896f9500db45ebe9f1ce272394f
+EBUILD alsa-tools-1.0.18.ebuild 3688 RMD160 570e12f8fe2c7078cbf4546bbe34e5f8f99a16b0 SHA1 7db6c609dccb8ca054f400910ce566b905c6d2f7 SHA256 fc7d6f25718f214bceb5c367af036428578fe6d30616affdafe60455662002e1
+MISC ChangeLog 23386 RMD160 41075a39ed225c7a73487c78b18d93d8fcfb9ae6 SHA1 d5fa7c6e93b9178729f887ea75b4ac9406098e9c SHA256 97203383b8c5ca97b0ddc6645ba1c90accd428f6efdc803206dd8ea03f505766
 MISC metadata.xml 313 RMD160 268cddbeb91eb55d326ff5736fe51e704b22db82 SHA1 2a144ccf9aa1c3789e7b25cd0e9083c5ce345b67 SHA256 4777a7e011441b62b0e6db0b35035fa99d36a0657aac31f406c7cbeaef906801
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki8LosACgkQcxLzpIGCsLS/lgCghZqu+oVxO8nKYdAFIgXHJf0V
-JiUAn2ClkhNMAmRLjzut9DroetdWpCgY
-=mtm/
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.18.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.18.ebuild
new file mode 100644
index 000000000000..36ab6c5b4ce8
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.18.ebuild
@@ -0,0 +1,136 @@
+# 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.18.ebuild,v 1.1 2008/11/11 18:17:39 beandog 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.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})" || die
+				dodoc "${doc}.$(basename ${f})" || die
+			fi
+		done
+	done
+}