Corrected firmware location for hotplug to be /lib/firmware. Closes bug #78780.

(Portage version: 2.0.51.19)

6 files changed, 17 insertions, 40 deletions

diff --git a/media-sound/alsa-firmware/ChangeLog b/media-sound/alsa-firmware/ChangeLog
index 55575c558482..b6c3c6a69194 100644
--- a/media-sound/alsa-firmware/ChangeLog
+++ b/media-sound/alsa-firmware/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsa-firmware
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.16 2005/03/16 11:58:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/ChangeLog,v 1.17 2005/04/22 11:15:04 eradicator Exp $
+
+*alsa-firmware-1.0.8-r1 (22 Apr 2005)
+
+  22 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-firmware-1.0.7.ebuild, -alsa-firmware-1.0.8.ebuild,
+  +alsa-firmware-1.0.8-r1.ebuild:
+  Corrected firmware location for hotplug to be /lib/firmware. Closes bug
+  #78780.
 
   16 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -alsa-firmware-1.0.4.ebuild:
diff --git a/media-sound/alsa-firmware/Manifest b/media-sound/alsa-firmware/Manifest
index 84507ed6cf2d..f5d79ff0f84b 100644
--- a/media-sound/alsa-firmware/Manifest
+++ b/media-sound/alsa-firmware/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 03f28666a673cbceaf4983350bdb06a3 ChangeLog 2343
-MD5 f01866350d19579244e01acabe5f7ac4 alsa-firmware-1.0.7.ebuild 573
+MD5 18c80105c66fb40927a6314d917caf5a alsa-firmware-1.0.8-r1.ebuild 653
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ba01af83e329e6613d816a35556bc349 alsa-firmware-1.0.8.ebuild 573
-MD5 b7601798d4996be9e37c08c457487fbc files/digest-alsa-firmware-1.0.7 73
-MD5 455a8b164a15d1dfd6a5784479456b7e files/digest-alsa-firmware-1.0.8 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCOB+IArHZZzCEUG0RAjFyAJ4pRLScOjJE82UrBSAJ5+NwKAuS5gCfd1wn
-B9oBjrXPJUZrYkzr4Bu0qRU=
-=jFwu
------END PGP SIGNATURE-----
+MD5 455a8b164a15d1dfd6a5784479456b7e files/digest-alsa-firmware-1.0.8-r1 73
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.7.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild
index 8a506c895905..ecbe34a05792 100644
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.7.ebuild
+++ b/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7.ebuild,v 1.4 2005/01/23 11:24:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild,v 1.1 2005/04/22 11:15:04 eradicator Exp $
 
 IUSE=""
 
@@ -17,6 +17,11 @@ LICENSE="GPL-2"
 
 DEPEND=""
 
+src_compile() {
+	econf --with-hotplug-dir=/lib/firmware
+	emake || die
+}
+
 src_install () {
 	make DESTDIR="${D}" install || die
 	dodoc README
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.8.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.8.ebuild
deleted file mode 100644
index f66792bda87d..000000000000
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 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.8.ebuild,v 1.2 2005/03/09 01:41:59 eradicator Exp $
-
-IUSE=""
-
-MY_P=${P/_rc/rc}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Advanced Linux Sound Architecture firmware"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/firmware/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-LICENSE="GPL-2"
-
-DEPEND=""
-
-src_install () {
-	make DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.7 b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.7
deleted file mode 100644
index e3c4b0955b82..000000000000
--- a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91b29697c758406d3b969006556fa606 alsa-firmware-1.0.7.tar.bz2 1042010
diff --git a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.8 b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.8-r1
index e8c25112002f..e8c25112002f 100644
--- a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.8
+++ b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.8-r1