Version bump. Introduces new utility hwmixvolume which means a pyalsa dependency...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 011a70eb0e75a0b8817ba39761ff1ff9671d77d1..c2e18dc57c2d58545d632f70cdd3e8dea7a1cd40 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 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.190 2010/02/10 03:39:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.191 2010/04/16 22:34:04 chainsaw Exp $
+
+*alsa-tools-1.0.23 (16 Apr 2010)
+
+  16 Apr 2010; <chainsaw@gentoo.org> +alsa-tools-1.0.23.ebuild:
+  Version bump. Introduces new utility hwmixvolume which means a pyalsa
+  dependency, filed bug #315671 for lost PPC, PPC64 & Sparc keywords.
 
   10 Feb 2010; Joseph Jezak <josejx@gentoo.org> alsa-tools-1.0.21.ebuild:
   Marked ppc stable for bug #300064.

diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index a1ed9bc297bc91c0adc1ee28e3cfdd336954cc2f..305f7db1dcaa291a5580c74ca6f06ee3ed082b30 100644 (file)
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -7,17 +7,19 @@ AUX envy24control-config-dir.patch 593 RMD160 7db6a5e50e0d89a6a5baac7a6f25eb814e
 DIST alsa-tools-1.0.20.tar.bz2 1555723 RMD160 2d4a35726c012b2bb1f24cff68847452e1639702 SHA1 f066b2d8719536c29769db0f5274247f42036071 SHA256 2a05047363b20f16820f36198ed3b139d1c55f55464750ea11d350e00b09cb86
 DIST alsa-tools-1.0.21.tar.bz2 1556178 RMD160 639acff29e783dd36d4404f353eacbe99dbe53f5 SHA1 23e8090bc7c47e68564dfd005c57d65e37491a0e SHA256 b5299ef71d33172183776c98ebbdbfa061d918aa6963b60267608a529b069329
 DIST alsa-tools-1.0.22.tar.bz2 1555768 RMD160 2bfc7c047341cfdae25610db0fac6223a330a0e4 SHA1 7c4ad5cf600fb9943b43a557995dc7ef93c00e9d SHA256 4185a075287072f91df8eee5a37d99a688093cd231226909e3c8b57db775fb40
+DIST alsa-tools-1.0.23.tar.bz2 1603719 RMD160 140e5f19874c1f7d43f5b0bd26b8ef1fe0060370 SHA1 4683fa0bd151d4a17c45125aebd8eaec58cf6ca3 SHA256 5e048633f0324c11998cdbc283ced30d72887f9bed1f2aeb85b9ee5e9e907099
 EBUILD alsa-tools-1.0.20-r1.ebuild 3560 RMD160 36813dfb4f88823e6e13bb021e7d78566bb0c4aa SHA1 c4c8d49ad7a81b2dfe449befc74caf6b71457695 SHA256 f005cd9dac47c9ba816cfd56633a4bc3b7fc3886b93e43761f82343e5f6b1106
 EBUILD alsa-tools-1.0.20-r2.ebuild 3618 RMD160 bf8bd70d5084e91cbcee15ff9d15c955cacf213e SHA1 230879bf75af781be94a4b0bce37a5612977fe72 SHA256 1619eaf036ee2f482c50e154c98b96e6480d115a63556d44c0064bfadfabc2fc
 EBUILD alsa-tools-1.0.21-r1.ebuild 3523 RMD160 5c390e1aa77f63668f20a5ac183a26e6dcf488de SHA1 c12299fc960fb3715e3d584b014451172866296e SHA256 7686b8d5a8bbc72a5103b1868acd9ed8ea0fcc6454e66106a1c7b521fa04e371
 EBUILD alsa-tools-1.0.21.ebuild 3460 RMD160 dfe8671efddbb440ba3f441b6ab312b5ccf2f23f SHA1 a3a4816534b5eff294e86f6bfec4bf82831fbbf6 SHA256 f9fba410ea65f659c99f34e66b836c59867c91c0e9f2a29c85a942cf3ebbe1f3
 EBUILD alsa-tools-1.0.22.ebuild 3534 RMD160 6938f3fd3cb8b599ad090c912db2687822f9354d SHA1 f4ef54cb996bebc5b44cbc0df1db76b25b7780b7 SHA256 9f3e7a0842906ff5c7ba2d4dee4663d6d39d54be84e48f5e4b09af76b8c3eeaa
-MISC ChangeLog 27804 RMD160 aeaf913aff16f52e9e4264105cd7f5cb5316cbda SHA1 2585468ffba34349ddb30bd7cea5d158b1945a3a SHA256 6df7661cb0c6142c2c23333e276a334dcedd63434e0fc1b8fd964e24e8982698
+EBUILD alsa-tools-1.0.23.ebuild 3553 RMD160 a3ba516c187dc75e6e972559f6c395f74eca5a5d SHA1 13c5aa83898e84ecbf6c2cdb536d7f6c32175cc8 SHA256 4824848592c57a9bb9f8c1aad9bf5dbbb13076f7cb3f56681234fadc02f47c56
+MISC ChangeLog 28047 RMD160 1ff97c1ea10bdbd25aa42082f9837f4ee8471e89 SHA1 a75c3f4b48892a28f5e4030209d50ebf5494a164 SHA256 ec9dd7a2a9b3970eb0a6448f90362c309b30beeff7ee46fd644d056ec00878ab
 MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktyKikACgkQcsIHjyDViGRxOACgv18E3gr4buuMr734alEau1kZ
-+HAAoMGcjYxWUzawPEM+1nl9lRN7MmQf
-=S2dj
+iEYEARECAAYFAkvI5f8ACgkQp5vW4rUFj5oiPACfT8BR+JYT9A7LghR8o32lZDza
+XSQAoIshbLLsIhEjB3UGSWjS8tz80fcv
+=o5p9
 -----END PGP SIGNATURE-----

diff --git a/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild
new file mode 100644 (file)
index 0000000..b963ca7
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2010 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.23.ebuild,v 1.1 2010/04/16 22:34:04 chainsaw Exp $
+
+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 ~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 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.22
+       >=dev-python/pyalsa-1.0.22
+       fltk? ( =x11-libs/fltk-1.1* )
+       gtk? ( =x11-libs/gtk+-2* )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+
+       ALSA_TOOLS="ac3dec seq/sbiload us428control hwmixvolume"
+
+       if use gtk; then
+               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}"
+
+       # bug 273129
+       epatch "${FILESDIR}"/envy24control-config-dir.patch
+
+       # This block only deals with the tools that still use GTK and the
+       # AM_PATH_GTK macro.
+       for dir in echomixer envy24control rmedigicontrol; do
+               has "${dir}" "${ALSA_TOOLS}" || continue
+               pushd "${dir}" &> /dev/null
+               sed -i -e '/AM_PATH_GTK/d' configure.in
+               eautoreconf
+               popd &> /dev/null
+       done
+
+       # This block deals with the tools that are being patched
+       for dir in hdspconf; do
+               has "${dir}" "${ALSA_TOOLS}" || continue
+               pushd "${dir}" &> /dev/null
+               eautoreconf
+               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
+
+       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
+}