Synchronize with ipw2100-firmware ebuild.

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

3 files changed, 23 insertions, 27 deletions

diff --git a/net-wireless/prism54-firmware/ChangeLog b/net-wireless/prism54-firmware/ChangeLog
index df40825d5142..dd33f4d67037 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54-firmware/ChangeLog,v 1.21 2013/02/10 08:44:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54-firmware/ChangeLog,v 1.22 2013/02/10 08:49:55 ssuominen Exp $
+
+  10 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  prism54-firmware-2.13.ebuild:
+  Synchronize with ipw2100-firmware ebuild.
 
   10 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
   -prism54-firmware-1.0.4.3.ebuild:
diff --git a/net-wireless/prism54-firmware/Manifest b/net-wireless/prism54-firmware/Manifest
index cda2c8b88efe..9caa1cae01cc 100644
--- a/net-wireless/prism54-firmware/Manifest
+++ b/net-wireless/prism54-firmware/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST 2.13.1.0.lm86.arm 29500 SHA256 40c4a2bc94b0af65d81cf6467b2e22fe029d55827ba100ff17c4974a2a377d0e
-DIST 2.13.12.0.a.5.2.arm 26300 SHA256 e73a6b14403b955b4462ab249a9c80f80c8280c773845f9465f3876ef1b5f362
-DIST 2.13.12.0.arm 29036 SHA256 3e62fe0c55fe4138dd10ef8fe8b4841908609d2cb2386ef71d3d0508b627170b
-DIST 2.13.24.0.lm87.arm 29736 SHA256 b59793e00a042b2bd5e883a15847778db90f49a9a4bdd1368a6b4021e6c93979
-EBUILD prism54-firmware-2.13.ebuild 1336 SHA256 a9d6825522da945ececa944063b4f44c22bb2fce45be0829f09a3c3b789edbc3 SHA512 cae8d187fb99448f42007a2778c89faa35530be72f2b0f57dbd762bf5f9ef538b517012019fd3916ea0318354140794864dd4c58dcba1c2ed3146386622dbcaa WHIRLPOOL 6d855ab765e7de0b70dc3153ae203bb72e2f7a8921ec293a5b2be52caea42f4070d579d1d9d9e369912b31ba4f9f7fde73cd1a65bc64cbbf5f22ab2cdaf2dbb7
-MISC ChangeLog 3166 SHA256 62f43381ab33788375f1c5f8d254d01c94b80ee3397a669b9c0a0a58bec0c4df SHA512 14b4ec3306774fd1f49c734ed228fba6420ca9ba5258ca2e069d33c5747d930ae25d9ff3791162507ed0d109430657f867c1e178582f028977ec93fb06f9ed72 WHIRLPOOL 5fe6da4d60a70097dcb85e74ffa3f8f401ea3e5ee85372ae9e5e7f66c0d6810851580df700ee938e234cfeb492045327d493ba14f1a52d624d2a519d85daf25b
+DIST 2.13.1.0.lm86.arm 29500 SHA256 40c4a2bc94b0af65d81cf6467b2e22fe029d55827ba100ff17c4974a2a377d0e SHA512 678cbe00c4818b4865e71ae7441026ccd14d14841d276421fbbb3b6e048f7664773776f9d4192f46c2e0221d9cfda5da3f10f7ac447c0560aae4fd446fc05f2a WHIRLPOOL 36848bcd96a5e609e77f4fe193292b6a1b5af719bc4c547c42bd135dfc5fa77225aad8ee48f968333977f8e2b43e452b675eb14f3a1fe2db1139ddd6a9e9163d
+DIST 2.13.12.0.a.5.2.arm 26300 SHA256 e73a6b14403b955b4462ab249a9c80f80c8280c773845f9465f3876ef1b5f362 SHA512 b0d29e29b121d4e13cc7965f34e6a4f5fdcecaa64447a671ea348e1dbc839b101181c6f0283de89edd58e0448220200c4f5dc6f721843b77330aaf270aefb13e WHIRLPOOL 4de6be25bb5eb10c6d873c0d2a8e4c96e2619eccb9d86c899cf92cc05f84fd0170ec55e6fcdb83b023e9e9d90e79e41722bb487ff1bdf3364061a473285858bf
+DIST 2.13.12.0.arm 29036 SHA256 3e62fe0c55fe4138dd10ef8fe8b4841908609d2cb2386ef71d3d0508b627170b SHA512 601168f08e9801381037234f1394bc8e80265ee5b0b668fb2b5fdfc236bafeab560a6b4a95e94938c0a2c383b5365065673363bb6e529b1a766d816627bbf6e5 WHIRLPOOL fd941ebf4cdb16b856061da1d94a0d5972dc80acc3473ebecfea75cf504b5fb85cfbe894b8ad703f89ff27ab8bdb38464caa1c6898a72876833c1c667f1f8244
+DIST 2.13.24.0.lm87.arm 29736 SHA256 b59793e00a042b2bd5e883a15847778db90f49a9a4bdd1368a6b4021e6c93979 SHA512 cc82d1463c625a898f9dbc08645c045cbb61279b10e2ec557d3d87c4e87a91a6ef16c9ebaaedcb3564b843d9d63c370944ac25e290cb0568af1fe460c5ac8f0d WHIRLPOOL 43cf032beb1898440f0fd33942c2b877b04a0255ad68215a02a32fe4f0315c12c485a31601102f208e80f689050dba409981c846aabe9278682744caa2710f74
+EBUILD prism54-firmware-2.13.ebuild 1116 SHA256 380c7d8b24a521b4c1b9c096ede2b3838ac6d2204549dd56b70309942b353728 SHA512 a52f7d63652033a8a250f7ff1f1a16bb94862605026d32f388c6b965b7ce4af81ecf17e2ba05709dd7f1f6ee373c86137d7fcff8a2f902b3b4274526286d69e9 WHIRLPOOL 9d2056c8e15b2d33ba8943665c47ae41272b9d29d49cbb2a6ee35709d98cf2248e7c0e46e347ae93f364ef09d4b1843c67c905eb1d93f548ccfaea799cbd9aaa
+MISC ChangeLog 3297 SHA256 f07238cab44a1e18794fde2f8f36d53ad46f171ac6ea1f1adac8f43bc83f294d SHA512 c8013512d9c1365920d7ad1cda1d507c903cafdb455e90f2de56b1d37b3abf889bae85fc606c8a0357b1cddc6c882f715fd227000d7f3edb1b07fba9ecfbb92b WHIRLPOOL 55ba5b9a7187e9a24f3cc4c0eab9243aaf3ea4e28626614a5d0cd309de8016b56d015bb378e6d9cb95e18cf370a6b1e94093851e3f697ca35f351fb65b7b6213
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRF123AAoJEEdUh39IaPFNwqkH/i6C+rGgjigkhyP2n6qNsex+
-H3kGOepAVUvYUhdPMoRv56V7XQ+zC0x679aN21d4m0MGu4zF7KV75PtXUUhguWpB
-twjjUPRxJZw5+zZi0R77LX9TalQHgmOQqpseuEGWmpPu5fizMKxKpnPlo48qpNN9
-4Xhyh2kv2MJR8ApvhK/ky6R3pYx5iYvA13WPL3rdPEDygobDS/ecmcL7578HtlaM
-8smP02wZadioY3oS1Yv3N7OUHtkKMI3FQNul4a0X1wp55XFSwR6C3tjXQh1OhRcJ
-2VgOc+hl8rka5vdPMkkGHkG5fcBnQi2WW4paKCiSi0VFKwgwykp9XMEOk2S6jXA=
-=KtEe
+iQEcBAEBCAAGBQJRF173AAoJEEdUh39IaPFNwE8IAKNbOtlkUXmM6o9Xn+i7lFPp
+i81luJ6b/vZfqBkCPRIWzIsS4vaVFHJdkBxZEc8B+kiE5vIEvKyq9PU9NeLxjb4n
+8vwCeswZ5SICd0jw5D7rVfu0QbUl9LJ6d7gfhilNaCfekk9g6dXwN3PutkqvPOlJ
+LjNRD4XpujJ+4Qya1Yku2rbGWboJnzIsAoNuidEOQhm7IZrwoXvic+6YvzSTTZUI
+byJ603X45+hv/e+h5z9sfjv9cSRN6aHYHKoibdnqkJfrik0U47rITox0mEKchC5J
+aFHH6zc1LmhGxiwYpklokJ9EdUIcgub1ivT6Fzfn73hpE2+5ZL7MkBUMqqAqUR0=
+=x3pu
 -----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 53f7e472b727..6bb3a5a7f3f5 100644
--- a/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild
+++ b/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2013 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.9 2013/02/08 17:54:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54-firmware/prism54-firmware-2.13.ebuild,v 1.10 2013/02/10 08:49:55 ssuominen Exp $
 
-EAPI="4"
-
-inherit eutils
+EAPI=5
 
 DESCRIPTION="firmware for Intersil Prism GT / Prism Duette (including USB) wireless chipsets"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/p54"
@@ -13,11 +11,12 @@ 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.24.0.lm87.arm
 	http://daemonizer.de/prism54/prism54-fw/stlc4560/2.13.12.0.a.5.2.arm"
 
-LICENSE="as-is"
+RESTRICT="mirror"
+
+LICENSE="as-is" # as-is is bs here, google for "prism 54 firmware license"
 SLOT="1"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
-RESTRICT="mirror"
 
 S=${WORKDIR}
 
@@ -31,10 +30,3 @@ src_install() {
 	newins "${DISTDIR}"/2.13.1.0.lm86.arm isl3886usb
 	newins "${DISTDIR}"/2.13.12.0.arm isl3886pci
 }
-
-pkg_preinst() {
-	elog "Kernels older than 2.6.29 are not supported by these firmwares."
-	elog "If you are running 2.6.28 or older kernels, please emerge:"
-	elog "net-wireless/prism54-firmware:0"
-	elog "But please note, that firmware is officially deprecated."
-}