Version bump. Drop the epatch as the Flameeyes-fix made it upstream.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 167 insertions, 11 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 7d550162493c..d7862e886c9d 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.168 2008/12/20 23:23:14 fmccor Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.169 2009/01/19 16:11:29 chainsaw Exp $
+
+*alsa-tools-1.0.19 (19 Jan 2009)
+
+  19 Jan 2009; <chainsaw@gentoo.org> +alsa-tools-1.0.19.ebuild:
+  Version bump. Drop the epatch as the Flameeyes-fix made it upstream.
 
   20 Dec 2008; Ferris McCormick <fmccor@gentoo.org>
   alsa-tools-1.0.17.ebuild:
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 83bd7ce7fabb..05600133fce5 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
 AUX alsa-tools-1.0.14-asneeded.patch 256 RMD160 db252d8994605036e5ab200af2d7a9dc633650b5 SHA1 94cd80b03fd5d58ef564e26711c60b95ece3b4d6 SHA256 d309bee615d0d22da845f7448e4be48d9838a006a4b53b745149410123a34ca8
 AUX alsa-tools-1.0.18-asneeded.patch 2898 RMD160 44f2ac59f5868b1bd8ecf6aef3c81a7c49075dc1 SHA1 1233b39b8df8a89581fc69ab24a6b387946f7af7 SHA256 b35d80c761f0994174147dd1ccf36b6d9d707f437246d5784db3fc73c4f850ae
@@ -5,9 +8,18 @@ DIST alsa-tools-1.0.15.tar.bz2 1546790 RMD160 cb6949dc34e3151459e3c81d613f85df30
 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
+DIST alsa-tools-1.0.19.tar.bz2 1555635 RMD160 3277883fcef3c743e39e5dc16185370255d854e5 SHA1 89347a329f7ac39bba33cc122f6c8e74c67254d3 SHA256 499105f968272cbaab4a115997f871eaf12c25f5f3b0c53325f6ad3fbdd5b328
+EBUILD alsa-tools-1.0.15.ebuild 3654 RMD160 5b8477bdab284b1efeae1326d5f26d491f80bb88 SHA1 f02740c29b5e184e268fd905c237c5d2086eaeba SHA256 2f7543b748515aa84662dd6dc89d8cdb6b7af0b7ff77ae22dd5fb11fdceffee3
+EBUILD alsa-tools-1.0.16.ebuild 3717 RMD160 9d5bb2eacf5e54d5d03a81cb4b4baafc57ae220c SHA1 099b8b0c3c511462a78a9ad0981c48c6b638f473 SHA256 bf88deeb444ff5b7e459594de25835b5b93bfcbc24829ae8dfa192e426463cc0
 EBUILD alsa-tools-1.0.17.ebuild 3734 RMD160 dc65bcb117124e81707c4bbfe7caa0457ae8899b SHA1 53612bfaea8ae53cde0afd0c5e20de5cccd7b191 SHA256 93a0a86cc973bf85c82a5696d9632cae5c9e0bfe6f34fd38a2421cbc75b089b9
 EBUILD alsa-tools-1.0.18.ebuild 3794 RMD160 0bccad07a7060c82062b759e1a6af4a992e6d9c7 SHA1 d9ef07516dc0a2be9de4aa2e5163396a355decf9 SHA256 c4da546a900cd808058990cb99bf9de65c91bd80537c982c830a9fddf7580e39
-MISC ChangeLog 24140 RMD160 22931376620e7693e7a76c88eb22c7bf8bb2614d SHA1 9eff76043969cf795904268d1ed7981f0fffeffd SHA256 b1858b08575a8decdd5d167ae8e673ea5d4ba3072c5ff5480ac0f47415a4e45d
+EBUILD alsa-tools-1.0.19.ebuild 3742 RMD160 be43f47a333be2e55976bcc38448a6b4247016c1 SHA1 1952f07def1473fc575c685d142e67c7a569f2f9 SHA256 9abc39047dc0d092ed6f850215f94eb49138c1debd8436aab17407f0e0da7c12
+MISC ChangeLog 24312 RMD160 41140ebe202a3d4a882e62f5778a4dc51b01cc38 SHA1 a0b8764d381879bb570b474abd29629e203619bb SHA256 fc07da2bd770baf892a671ad04c19a311e4e2650a8a9f102e6313688131cbab8
 MISC metadata.xml 313 RMD160 268cddbeb91eb55d326ff5736fe51e704b22db82 SHA1 2a144ccf9aa1c3789e7b25cd0e9083c5ce345b67 SHA256 4777a7e011441b62b0e6db0b35035fa99d36a0657aac31f406c7cbeaef906801
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkl0pbgACgkQp5vW4rUFj5rCYQCguOxVp2uyYxQIf/5RzR0ZM8B8
+NIkAn3mJk8Z0pKRC1rXRyzHXt5cyZKTN
+=/V86
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild
index a26845d4b8b9..c9a05e7bc4af 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.15.ebuild,v 1.3 2008/01/31 16:51:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild,v 1.4 2009/01/19 16:11:29 chainsaw Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -88,7 +88,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.0.11-asneeded.patch"
 
 	for dir in echomixer envy24control rmedigicontrol; do
-		pushd ${dir} &> /dev/null
+		pushd "${dir}" &> /dev/null
 		sed -i -e '/AM_PATH_GTK/d' configure.in
 		eautomake
 		popd &> /dev/null
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.16.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.16.ebuild
index fd9ca1274488..bfdd4bbc0a97 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.16.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.6 2008/05/13 14:53:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.16.ebuild,v 1.7 2009/01/19 16:11:29 chainsaw Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -89,7 +89,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.0.14-asneeded.patch"
 
 	for dir in echomixer envy24control rmedigicontrol; do
-		pushd ${dir} &> /dev/null
+		pushd "${dir}" &> /dev/null
 		sed -i -e '/AM_PATH_GTK/d' configure.in
 		eautomake
 		popd &> /dev/null
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.19.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.19.ebuild
new file mode 100644
index 000000000000..fa072cb24bf0
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.19.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2009 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.19.ebuild,v 1.1 2009/01/19 16:11:29 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}"
+
+	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
+
+	pushd hdspmixer &> /dev/null
+	sed -i -e '/AM_PATH_GTK/d' configure.in
+	eautoreconf
+	popd &> /dev/null
+
+	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
+}