Fix SRC_URI and migrate to EAPI 4. Fixes bug #371015.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux i686

3 files changed, 26 insertions, 10 deletions

diff --git a/net-wireless/prism54-firmware/ChangeLog b/net-wireless/prism54-firmware/ChangeLog
index 5c9c075d0058..08fb5d961e55 100644
--- a/net-wireless/prism54-firmware/ChangeLog
+++ b/net-wireless/prism54-firmware/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/prism54-firmware
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54-firmware/ChangeLog,v 1.12 2010/03/04 14:14:44 lxnay Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54-firmware/ChangeLog,v 1.13 2011/07/02 19:26:04 betelgeuse Exp $
+
+  02 Jul 2011; Petteri Räty <betelgeuse@gentoo.org>
+  prism54-firmware-2.13.ebuild:
+  Fix SRC_URI and migrate to EAPI 4. Fixes bug #371015.
 
   04 Mar 2010; Fabio Erculiani <lxnay@gentoo.org>
   prism54-firmware-2.13.ebuild:
diff --git a/net-wireless/prism54-firmware/Manifest b/net-wireless/prism54-firmware/Manifest
index 353d1a2016c3..1a3a33e572ea 100644
--- a/net-wireless/prism54-firmware/Manifest
+++ b/net-wireless/prism54-firmware/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST 1.0.4.3.arm 93996 RMD160 2cfb84dffedcc0615a5545c87423e213f5b0876e SHA1 d0b5260b64e624c933ad506f85730ce07598431c SHA256 dce24156c57234dba131429fbe8cd1de8ba818c9481ddc33cf7e5af9d57a737c
-DIST 2.13.1.0.arm.0 29500 RMD160 bcc26cce89a49dc5ee7754f1d1faf1200e2020b1 SHA1 62a8640848277d2516128a1b95d0a150706b14d3 SHA256 40c4a2bc94b0af65d81cf6467b2e22fe029d55827ba100ff17c4974a2a377d0e
+DIST 2.13.1.0.lm86.arm 29500 RMD160 bcc26cce89a49dc5ee7754f1d1faf1200e2020b1 SHA1 62a8640848277d2516128a1b95d0a150706b14d3 SHA256 40c4a2bc94b0af65d81cf6467b2e22fe029d55827ba100ff17c4974a2a377d0e
 DIST 2.13.12.0.a.5.2.arm 26300 RMD160 8d18a98c6c183eaceffb81809b23332a1143ece4 SHA1 e1ac645632f2a669c54a75c7aaaecd6dd7004d30 SHA256 e73a6b14403b955b4462ab249a9c80f80c8280c773845f9465f3876ef1b5f362
 DIST 2.13.12.0.arm 29036 RMD160 a5ad53d395fc4ca0c126ab03e5b6d74235879507 SHA1 a96e2f1135483128268cc6355121f05c8a212876 SHA256 3e62fe0c55fe4138dd10ef8fe8b4841908609d2cb2386ef71d3d0508b627170b
 DIST 2.13.24.0.lm87.arm 29736 RMD160 57180c4c267203972aeea87858992b5c8a43680c SHA1 0f16cd96c5ad0f10da7d23e07a4e020947f2861f SHA256 b59793e00a042b2bd5e883a15847778db90f49a9a4bdd1368a6b4021e6c93979
 EBUILD prism54-firmware-1.0.4.3.ebuild 698 RMD160 b7d7f4711b4567e7f9afca94d544179e699979b6 SHA1 06da6115340f0ec7ae620e262140597b2285794a SHA256 898f64655f1da6c32cdbaefc95098eee496a82370729e8a98012c51d97314ed3
-EBUILD prism54-firmware-2.13.ebuild 1379 RMD160 431096e4cf66552e6da31d903d0f24d5c28adcfe SHA1 fd48e4e12a8d4c31f312220bccf575762d5dce1a SHA256 d497d901d9f5ca658b16d1fdbac81e134913ee77c93f1f38096059bd924de63a
-MISC ChangeLog 1972 RMD160 28b2282e34315994141fab22cf990e340c7f5546 SHA1 118ec7b623be97ebaa92304a54b1786f25fc29bb SHA256 e7995e4cc7f0d3c75399d1bd71efa9185ac99818cdca0a6f5ddfd0b7fd25461b
+EBUILD prism54-firmware-2.13.ebuild 1406 RMD160 1c15a1f1d9ec8bad0152e4d6088b5816e5c3a98a SHA1 71737455b1b4092edf30a37294ff97ccdafa70a6 SHA256 c12e135f4451e79cba5daaa01b3724f587f2602a9dd9e3ef9542d500ddb8c11f
+MISC ChangeLog 2119 RMD160 5a36672579e5decc56c783d7186832f5e5e3b2e3 SHA1 3c6dbdc5434d19e5e44c6d4d71e950d148124f84 SHA256 197eb1fcc923d255cbf9c961b9a0a2d3fd7d96a8fa803863cdc5d036e6eb8c42
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4PcK8ACgkQcxLzpIGCsLRrjQCcDPEoMl6psTckdxJaDKuaSqdA
+g9EAoI1O0l2T1Eox2Ig5Km9STYyjj3yu
+=d3Bj
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild b/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild
index ba29d38b3941..341415d18252 100644
--- a/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild
+++ b/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild,v 1.2 2010/03/04 14:14:44 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild,v 1.3 2011/07/02 19:26:04 betelgeuse Exp $
 
-EAPI="1"
+EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="firmware for Intersil Prism GT / Prism Duette (including USB) wireless chipsets"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/p54"
 SRC_URI="http://daemonizer.de/prism54/prism54-fw/fw-softmac/2.13.12.0.arm
-	http://daemonizer.de/prism54/prism54-fw/fw-usb/2.13.1.0.arm.0
+	http://daemonizer.de/prism54/prism54-fw/fw-usb/2.13.1.0.lm86.arm
 	http://daemonizer.de/prism54/prism54-fw/fw-usb/2.13.24.0.lm87.arm
 	http://daemonizer.de/prism54/prism54-fw/stlc4560/2.13.12.0.a.5.2.arm"
 
@@ -21,6 +21,8 @@ RESTRICT="mirror"
 
 RDEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )"
 
+S="${WORKDIR}"
+
 src_unpack() { :; }
 
 src_install() {
@@ -28,7 +30,7 @@ src_install() {
 	insinto /lib/firmware
 	newins "${DISTDIR}"/2.13.12.0.a.5.2.arm 3826.arm
 	newins "${DISTDIR}"/2.13.24.0.lm87.arm isl3887usb
-	newins "${DISTDIR}"/2.13.1.0.arm.0 isl3886usb
+	newins "${DISTDIR}"/2.13.1.0.lm86.arm isl3886usb
 	newins "${DISTDIR}"/2.13.12.0.arm isl3886pci
 }