Version bump; alsa_cards_ca0132 is in and alsa_cards_emi26 is out. Fix earlier commit too which went wrong with the || ( ) deps

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 91 insertions, 15 deletions

diff --git a/sys-firmware/alsa-firmware/ChangeLog b/sys-firmware/alsa-firmware/ChangeLog
index 0b9512aa857a..9d2c19770daa 100644
--- a/sys-firmware/alsa-firmware/ChangeLog
+++ b/sys-firmware/alsa-firmware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-firmware/alsa-firmware
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/ChangeLog,v 1.2 2013/04/23 09:56:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/ChangeLog,v 1.3 2013/04/23 10:26:50 ssuominen Exp $
+
+*alsa-firmware-1.0.27 (23 Apr 2013)
+
+  23 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +alsa-firmware-1.0.27.ebuild:
+  Version bump; alsa_cards_ca0132 is in and alsa_cards_emi26 is out.
 
   23 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
   alsa-firmware-1.0.24.1.ebuild:
diff --git a/sys-firmware/alsa-firmware/Manifest b/sys-firmware/alsa-firmware/Manifest
index 3049e34fee4b..d4a2343c744b 100644
--- a/sys-firmware/alsa-firmware/Manifest
+++ b/sys-firmware/alsa-firmware/Manifest
@@ -3,17 +3,19 @@ Hash: SHA256
 
 AUX 52-usx2yaudio.rules 971 SHA256 a25a327b2c491d0d1464bdf282d99cee29d6c687b3bbc60a06bb40219d7d7e71 SHA512 5c3ac0e03a496384ea58f6da479c932cb2d2f91f110703d71d0bea60329ebfba8a1a0e78eb951c9854b7fe0dcc9943d10f436fe9acd04848ea780e90ac274f17 WHIRLPOOL bede72d2effef3296213ab55cdc007b1126f5c2138ab041568524033a3b4ab1b96f55da294cb478d3ba9a8d5c249e42d6f366ee7d6675a9e05a0413d188f1d13
 DIST alsa-firmware-1.0.24.1.tar.bz2 3845175 SHA256 fe9d8b4c0ff57b882875b2fe0b5a985e0ba63534b6a3eb868619c90d6a04bf14 SHA512 e45d74e50c626fa4d09b62c2ca777710234d66fab58e51ed3f1c083fe41fb61b99fb4557be10da2ff0289b4c6fccc062e2d7f9c818fdd95072a77d699badf1f8 WHIRLPOOL 4ae2bc5eba36543df5fa59590b9bc19f0a32e5d38d835f176dc52100a8c6dcffb22b00d696a84869780de1ca4173d2e7db4aa74668bb03c9e44fd73ac44f4d58
-EBUILD alsa-firmware-1.0.24.1.ebuild 2942 SHA256 46ffe7dae1aa88b8bc1199795186678c9611d67c15e28db60818b624af7c1b10 SHA512 c763220970195360346385b1660cf8ff3cd3d75c3e6ad49a801e3f735dcfa43bd68aec6270cb3710740dcd3168c2939dbffd8bf32ea6493592b985f90608b1e3 WHIRLPOOL 59956fe05584d4b9ab9db774d7314ba4f2014f7f59578c5987d77dc3c00d25f272c3f4816d65ec50f8d28d16c17cc89fb6e64e81fa756234b90216b15e5d924e
-MISC ChangeLog 16202 SHA256 abc589c948199667676cfdbc17e381e86cf6b885f4085902b841f06030b2915e SHA512 3c8a65a815aca7df63bb04ec2483f667d2f3d321ab60aa6d3bc9c9c19d9e1683999168d94f74416dfab588417b64ed322335c955430ef57a7aa5e68680e2e09b WHIRLPOOL aeb6e7245bdf181272f8653ac338daf1fa453e7fac5cbd02da093d613e575f003af65e67ab272fa05f7f1f72c73831140bf2030824fc878fce8bef70c479e579
+DIST alsa-firmware-1.0.27.tar.bz2 3935104 SHA256 34cde0e67fba1c86cbee5c219b91c0a245da01d268dfa7623b1a73430fd16e5b SHA512 4b1f722d75e7e74eb1eca767af491eca4a52807fad1d4fc28cbc1fce4c5a2a92b5e30a3b72d6ad01724902040be4176b8a786c6c55b617cf977f80f43477c6fb WHIRLPOOL d3af61b5256574c072179bb1b05b00b6fb81965456ec90c4b36386108f25017ee14066f24f10cd71bd01fb7d82786c8856c5be5777298b44529a9831912b743a
+EBUILD alsa-firmware-1.0.24.1.ebuild 2803 SHA256 9b93580101b79e33577e234aee322e0dd4f3c431d5d377cf1c9581250b3927a0 SHA512 dd995691f8134c524679fb3f62277843f43e56a4b411376863a5d251cb397a821b9d3883e1aec61a683e0a76db654692ffb51712d0caf991c101b7f9353a46ec WHIRLPOOL 3237841ba700f33f7e16f372dffa07e6ea35ffb96e9da8b3577bdfff7662f819e815b45813741b38961d8888c1a1baf3f364117aa04355cccc30824cf83caad8
+EBUILD alsa-firmware-1.0.27.ebuild 2808 SHA256 719f50827a2359fa82f5f387ae3380f49cd33b81a9920ebc55ec5c783b87adb4 SHA512 a61159fc04b4bac3bc0472a0bd4a31c1cbe779b5854fe5e2a354f90b6a4387b1785107f7bcc5977b055134d74231c9a0dca5522acbc888afaad3cf3c94136aba WHIRLPOOL b366d9a311c102bfff0c4a6dcca81a018eb0f596c9879ea12190157fb0ad7cfd2acc3df952b23b56852f42d63e96eba740289dedc555bd6c07bb4c0ab7072a05
+MISC ChangeLog 16395 SHA256 8c28ea8a8b4ce70760808cef8032f44d40786082a8d5cf3411fab99bba79cc07 SHA512 99452d800b05252050318c0776ddfe676c8658971b90b0347e48356584255774e3e1e11b56824fe646cdd4bea3e9f598bd4a632e4cdc1ff67126fc414dc2a9e7 WHIRLPOOL a9e800a9eed968b5e360a0121f2ce0bc142ec3983f7f43482ffaa110c5bd07dd14dc5b9650d6d7a4924c6b6ffe5e2adf9583356c7c956c87a1546f772d874b82
 MISC metadata.xml 220 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 SHA512 bfa2051cacad9c45a63629f41143d807230d2c6470275bcfc1e96a16dfaa885905054ab76eedbb11a6b2414fb0ca1996ba8222913a8c6fd7d8219e48adb90fac WHIRLPOOL 38c7fa4c2a63df86caebb43afa06ed95650a09dec9cd676738d8074fc699820ca66a9b8a7f00d64747ab2adf4e348efa1249aaab6f6778b045be7d2372e27b42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRdlqDAAoJEEdUh39IaPFN0hoH/3ETZxS2hFH4lUjmHjPg70Gh
-ScaS+Nw/A179G5zAXWFPVG5GBo9LCWWmO17Fvua2lOxQtMqrQHde2TCd1hrQ9AUN
-wiVw0WQf9QEct3+17khgfw5Bf9gG33At7vODgU4O/3pYlSSGOCpu3R8FnVSm9BTV
-KurocKrx64TPDA7zUBDQz2GY64kcsYpXmeYZf1Yt+4jxhCWU6qMxrxsIP9LARZXq
-bdwRetT9Lnnzu7EHiZ+see9Jh7QMIdL+GO4Iwk91nKnaW00zYQq6lc5jtF+Cgw4S
-+RRmmsagS5dXO3KATkdL/Tj0VlLNYelVsaDUeSG77n5d5k8EbOT+5p7zzSJgaI8=
-=cgdu
+iQEcBAEBCAAGBQJRdmGlAAoJEEdUh39IaPFNVqgH+wbXawKaIQSt3aGTee0of8hR
+F4swipUptbqED8GTTLvVrwph6xeIluGusm5wabuKuvGOLgCp+G0EDC7tNx1VfSYF
+z6mXNA+hwkeuKVD7EiZUkWqoOoZmjCjTCxw+RHWodFA3Z0F8J/YPnXad2zYdC1va
+ElsxNZ8IvF2j4hCDVvnsr54dUd8tBoOo11U+hAwJ0sb97+V+it/PizytU2Aw8ZOQ
+gg3h35n3C+R7AZG8/wiFbx57TlbWYvzAX4Ga8TJ2HdLj2NhAEwrNziCAJngW3TDR
+35gNigOYw80NJrmmmzCC3XlFSUsmlMwwlztOgXrZweh0ixw5DLL8dmNuERukFv8=
+=X372
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
index 7a57ae5e0805..ea6bb7fdd802 100644
--- a/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild,v 1.2 2013/04/23 09:56:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/alsa-firmware-1.0.24.1.ebuild,v 1.3 2013/04/23 10:26:50 ssuominen Exp $
 
 EAPI=5
 inherit udev
@@ -30,10 +30,7 @@ alsa_cards_aica ${ECHOAUDIO_CARDS} ${EMU_CARDS}"
 DEPEND=""
 RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
 	alsa_cards_hdsp? ( media-sound/alsa-tools )
-	alsa_cards_hdspm? ( media-sound/alsa-tools )
-	alsa_cards_mixart? ( media-sound/alsa-tools )
-	alsa_cards_vx222? ( media-sound/alsa-tools )
-	alsa_cards_pcxhr? ( media-sound/alsa-tools )"
+	alsa_cards_hdspm? ( media-sound/alsa-tools )"
 
 DOCS="README"
 
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.0.27.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.0.27.ebuild
new file mode 100644
index 000000000000..22caa9e8deab
--- /dev/null
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.0.27.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/alsa-firmware-1.0.27.ebuild,v 1.1 2013/04/23 10:26:50 ssuominen Exp $
+
+EAPI=5
+inherit udev
+
+DESCRIPTION="Advanced Linux Sound Architecture firmware"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/firmware/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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"
+
+EMU_CARDS="alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820
+alsa_cards_emu10k1"
+
+IUSE="alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp
+alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16
+alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront
+alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 ${ECHOAUDIO_CARDS}
+${EMU_CARDS}"
+
+RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
+	alsa_cards_hdsp? ( media-sound/alsa-tools )
+	alsa_cards_hdspm? ( media-sound/alsa-tools )"
+
+DOCS="README"
+
+src_configure() {
+	econf --with-hotplug-dir=/lib/firmware
+}
+
+src_install() {
+	default
+
+	use alsa_cards_pcxhr || rm -rf "${ED}"/usr/share/alsa/firmware/pcxhrloader "${ED}"/lib/firmware/pcxhr
+	use alsa_cards_vx222 || rm -rf "${ED}"/usr/share/alsa/firmware/vxloader "${ED}"/lib/firmware/vx
+	use alsa_cards_usb-usx2y || rm -rf "${ED}"/usr/share/alsa/firmware/usx2yloader "${ED}"/lib/firmware/vx
+	use alsa_cards_mixart || rm -rf "${ED}"/usr/share/alsa/firmware/mixartloader "${ED}"/lib/firmware/mixart
+	use alsa_cards_hdsp || use alsa_cards_hdspm || rm -rf "${ED}"/usr/share/alsa/firmware/hdsploader
+	use alsa_cards_asihpi || rm -rf "${ED}"/lib/firmware/asihpi
+	use alsa_cards_sb16 || rm -rf "${ED}"/lib/firmware/sb16
+	use alsa_cards_korg1212 || rm -rf "${ED}"/lib/firmware/korg
+	use alsa_cards_maestro3 || rm -rf "${ED}"/lib/firmware/ess
+	use alsa_cards_ymfpci || rm -rf "${ED}"/lib/firmware/yamaha
+	use alsa_cards_wavefront || rm -rf "${ED}"/lib/firmware/wavefront
+	use alsa_cards_msnd-pinnacle || rm -rf "${ED}"/lib/firmware/turtlebeach
+	use alsa_cards_aica || rm -rf "${ED}"/lib/firmware/aica_firmware.bin
+	use alsa_cards_ca0132 || rm -rf "${ED}"/lib/firmware/c{tefx,tspeq}.bin
+
+	local ea="no"
+	for card in ${ECHOAUDIO_CARDS}; do
+		use ${card} && ea="yes" && break
+	done
+
+	local emu="no"
+	for card in ${EMU_CARDS}; do
+		use ${card} && emu="yes" && break
+	done
+
+	[[ ${ea} == "no" ]] && rm -rf "${ED}"/lib/firmware/ea
+	[[ ${emu} == "no" ]] && rm -rf "${ED}"/lib/firmware/emu
+
+	use alsa_cards_usb-usx2y && udev_dorules "${FILESDIR}"/52-usx2yaudio.rules
+}