Add echo3g support thanks to chriskoe in bug #168209

Package-Manager: portage-2.1.2.4

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 7c9f472d7d519748b60b07d954bfe4359680ae6b..b0821cf65b01d168db976b6e106630c4d3346efd 100644 (file)
--- 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.142 2007/04/22 17:53:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.143 2007/04/27 00:23:06 dsd Exp $
+
+*alsa-tools-1.0.14_rc3-r1 (27 Apr 2007)
+
+  27 Apr 2007; Daniel Drake <dsd@gentoo.org>
+  +alsa-tools-1.0.14_rc3-r1.ebuild:
+  Add echo3g support thanks to chriskoe in bug #168209
 
   22 Apr 2007; Raúl Porcel <armin76@gentoo.org>
   alsa-tools-1.0.14_rc1-r1.ebuild:

diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index bcef7f0fe39c72eafcbd6007196ab1fa8b921ecf..d452a3807ce579ba4be109e73ed78caa5e169107 100644 (file)
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -17,14 +17,18 @@ EBUILD alsa-tools-1.0.14_rc1.ebuild 2555 RMD160 d56a39c292603a35f99deb9e05e45d9e
 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
+EBUILD alsa-tools-1.0.14_rc3-r1.ebuild 3679 RMD160 7f73a0ca5e568d45f1c6b2ed1d46654670f5b0b6 SHA1 025e7b9c0e9c49f2ff0f7007d0af66ab38b2ba0c SHA256 541d999d037952bc3c07407e6670bed1934fc67700fbaa5927e8b3dd9981c05e
+MD5 b52141d61ec9f9df0780f86a3bc5fc0e alsa-tools-1.0.14_rc3-r1.ebuild 3679
+RMD160 7f73a0ca5e568d45f1c6b2ed1d46654670f5b0b6 alsa-tools-1.0.14_rc3-r1.ebuild 3679
+SHA256 541d999d037952bc3c07407e6670bed1934fc67700fbaa5927e8b3dd9981c05e alsa-tools-1.0.14_rc3-r1.ebuild 3679
 EBUILD alsa-tools-1.0.14_rc3.ebuild 3662 RMD160 dbd3ece58d692c12d85cc03df51e91ffb7ca88a6 SHA1 adedb79508c8735df77bbd23db6bef95fa5744dc SHA256 aab92bab42a7c5de3751532dd294af96fbcbb906c4e2a82220041ba01e6414ec
 MD5 1a15e0568898ec54c4263eb773fe72b7 alsa-tools-1.0.14_rc3.ebuild 3662
 RMD160 dbd3ece58d692c12d85cc03df51e91ffb7ca88a6 alsa-tools-1.0.14_rc3.ebuild 3662
 SHA256 aab92bab42a7c5de3751532dd294af96fbcbb906c4e2a82220041ba01e6414ec alsa-tools-1.0.14_rc3.ebuild 3662
-MISC ChangeLog 20151 RMD160 f944c06a82fba7a2840a77da2cd5761932ce5011 SHA1 7bba40c929efa217f14f37aca3ff4fe9e042b1b3 SHA256 dea8baf46020be437bd9caec158167bc355f95dde275353e49c16a4eccb15e36
-MD5 909d3c146ff20ddba53cd6b8d3d4e4b5 ChangeLog 20151
-RMD160 f944c06a82fba7a2840a77da2cd5761932ce5011 ChangeLog 20151
-SHA256 dea8baf46020be437bd9caec158167bc355f95dde275353e49c16a4eccb15e36 ChangeLog 20151
+MISC ChangeLog 20325 RMD160 ea4c3e0ae07de92c5c8584b20b09392ee969fd59 SHA1 a7bbb0775e70100729fcad220c5e52c8fac0dc2a SHA256 de66bc69a5f236e6701257be3a908ec38243f0df56194fe9adb69d91c2de7ed7
+MD5 30aa686553ba3b82dbfea6e6ecb8eebe ChangeLog 20325
+RMD160 ea4c3e0ae07de92c5c8584b20b09392ee969fd59 ChangeLog 20325
+SHA256 de66bc69a5f236e6701257be3a908ec38243f0df56194fe9adb69d91c2de7ed7 ChangeLog 20325
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -41,3 +45,6 @@ SHA256 ed4e83c5e9dfb0acb7f9bed2ffcbe387ce74d04845da9b4b0d5636ce7d72560d files/di
 MD5 b35fb46a316db3026d1c4ad3d92d9bf3 files/digest-alsa-tools-1.0.14_rc3 268
 RMD160 40dcd0e2627433753cdfcce6f23686fe037be76d files/digest-alsa-tools-1.0.14_rc3 268
 SHA256 9d048641dd0fcdd4f7f9851eaa34fdb93495723171ead64b9419084ad879bd24 files/digest-alsa-tools-1.0.14_rc3 268
+MD5 b35fb46a316db3026d1c4ad3d92d9bf3 files/digest-alsa-tools-1.0.14_rc3-r1 268
+RMD160 40dcd0e2627433753cdfcce6f23686fe037be76d files/digest-alsa-tools-1.0.14_rc3-r1 268
+SHA256 9d048641dd0fcdd4f7f9851eaa34fdb93495723171ead64b9419084ad879bd24 files/digest-alsa-tools-1.0.14_rc3-r1 268

diff --git a/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-r1.ebuild
new file mode 100644 (file)
index 0000000..39c62f0
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.14_rc3-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_rc3-r1.ebuild,v 1.1 2007/04/27 00:23:06 dsd 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 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-1.0.14_rc3
+       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_rc3-r1 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.14_rc3-r1
new file mode 100644 (file)
index 0000000..64c0b73
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.14_rc3-r1
@@ -0,0 +1,3 @@
+MD5 298e242a5f62cde05a4dc043af2035d4 alsa-tools-1.0.14rc3.tar.bz2 1468172
+RMD160 f347d9caef402de79851129b8246b0dfe26e36b3 alsa-tools-1.0.14rc3.tar.bz2 1468172
+SHA256 b3bca8c0053c1b4225ea62e0ef88f2e93fe05914a4dcbed7578260f9edbb231f alsa-tools-1.0.14rc3.tar.bz2 1468172