Use virtual/udev instead of sys-fs/udev wrt #444398

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

2 files changed, 36 insertions, 38 deletions

diff --git a/media-sound/alsa-firmware/ChangeLog b/media-sound/alsa-firmware/ChangeLog
index cf3cd9f850b2..558878eb4479 100644
--- a/media-sound/alsa-firmware/ChangeLog
+++ b/media-sound/alsa-firmware/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-firmware
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.106 2012/12/03 15:56:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.107 2012/12/03 16:10:21 ssuominen Exp $
+
+  03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  alsa-firmware-1.0.24.1.ebuild:
+  Use virtual/udev instead of sys-fs/udev wrt #444398
 
   03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   -alsa-firmware-1.0.23.ebuild:
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.24.1.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
index 7f8e0c5311dd..f950941f5da7 100644
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
+++ b/media-sound/alsa-firmware/alsa-firmware-1.0.24.1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/alsa-firmware-1.0.24.1.ebuild,v 1.5 2011/12/29 21:34:09 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/alsa-firmware-1.0.24.1.ebuild,v 1.6 2012/12/03 16:10:21 ssuominen Exp $
 
-MY_P="${P/_rc/rc}"
+EAPI=5
+inherit udev
 
 DESCRIPTION="Advanced Linux Sound Architecture firmware"
 HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/firmware/${MY_P}.tar.bz2"
+SRC_URI="mirror://alsaproject/firmware/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,41 +27,37 @@ alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_emi26
 alsa_cards_ymfpci alsa_cards_wavefront alsa_cards_msnd-pinnacle
 alsa_cards_aica ${ECHOAUDIO_CARDS} ${EMU_CARDS}"
 
-S="${WORKDIR}/${MY_P}"
-
 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? ( || ( >=sys-fs/udev-096 media-sound/alsa-tools ) )
-	alsa_cards_vx222? ( || ( >=sys-fs/udev-096 media-sound/alsa-tools ) )
-	alsa_cards_pcxhr? ( || ( >=sys-fs/udev-096 >=media-sound/alsa-tools-1.0.14_rc1-r1 ) )"
+	alsa_cards_mixart? ( || ( virtual/udev media-sound/alsa-tools ) )
+	alsa_cards_vx222? ( || ( virtual/udev media-sound/alsa-tools ) )
+	alsa_cards_pcxhr? ( || ( virtual/udev media-sound/alsa-tools ) )"
 
-src_compile() {
-	econf \
-		--with-hotplug-dir=/lib/firmware \
-		|| die "configure failed"
+DOCS="README"
 
-	emake || die "make failed"
+src_configure() {
+	econf --with-hotplug-dir=/lib/firmware
 }
 
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	use alsa_cards_pcxhr || rm -rf "${D}/usr/share/alsa/firmware/pcxhrloader" "${D}/lib/firmware/pcxhr"
-	use alsa_cards_vx222 || rm -rf "${D}/usr/share/alsa/firmware/vxloader" "${D}/lib/firmware/vx"
-	use alsa_cards_usb-usx2y || rm -rf "${D}/usr/share/alsa/firmware/usx2yloader" "${D}/lib/firmware/vx"
-	use alsa_cards_mixart || rm -rf "${D}/usr/share/alsa/firmware/mixartloader" "${D}/lib/firmware/mixart"
-	use alsa_cards_hdsp || use alsa_cards_hdspm || rm -rf "${D}/usr/share/alsa/firmware/hdsploader"
-	use alsa_cards_asihpi || rm -rf "${D}/lib/firmware/asihpi"
-	use alsa_cards_sb16 || rm -rf "${D}/lib/firmware/sb16"
-	use alsa_cards_korg1212 || rm -rf "${D}/lib/firmware/korg"
-	use alsa_cards_maestro3 || rm -rf "${D}/lib/firmware/ess"
-	use alsa_cards_emi26 || rm -rf "${D}lib/firmware/emagic"
-	use alsa_cards_ymfpci || rm -rf "${D}lib/firmware/yamaha"
-	use alsa_cards_wavefront || rm -rf "${D}/lib/firmware/wavefront"
-	use alsa_cards_msnd-pinnacle || rm -rf "${D}/lib/firmware/turtlebeach"
-	use alsa_cards_aica || rm -rf "${D}/lib/firmware/aica_firmware.bin"
+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_emi26 || rm -rf "${ED}"/lib/firmware/emagic
+	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
 
 	local ea="no"
 	for card in ${ECHOAUDIO_CARDS}; do
@@ -72,11 +69,8 @@ src_install () {
 		use ${card} && emu="yes" && break
 	done
 
-	[[ ${ea} == "no" ]] && rm -rf "${D}/lib/firmware/ea"
-	[[ ${emu} == "no" ]] && rm -rf "${D}/lib/firmware/emu"
-
-	insinto /lib/udev/rules.d
-	use alsa_cards_usb-usx2y && doins "${FILESDIR}/52-usx2yaudio.rules"
+	[[ ${ea} == "no" ]] && rm -rf "${ED}"/lib/firmware/ea
+	[[ ${emu} == "no" ]] && rm -rf "${ED}"/lib/firmware/emu
 
-	dodoc README || die
+	use alsa_cards_usb-usx2y && udev_dorules "${FILESDIR}"/52-usx2yaudio.rules
 }