Upgrade iwl3160-7260-bt-ucode from 37.7.10 to 37.8.10. Delete the old 37.10.10-r1 - 37.10.10 was an incorrect version number, it actually was 37.7.10, and the 37.7.10 ucode files are included in 37.8.10.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 26 insertions, 13 deletions

diff --git a/sys-firmware/iwl3160-7260-bt-ucode/ChangeLog b/sys-firmware/iwl3160-7260-bt-ucode/ChangeLog
index 15b0e6fca557..3eaf0fe4a76b 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/ChangeLog
+++ b/sys-firmware/iwl3160-7260-bt-ucode/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-firmware/iwl3160-7260-bt-ucode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-7260-bt-ucode/ChangeLog,v 1.4 2014/06/22 14:09:36 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-7260-bt-ucode/ChangeLog,v 1.5 2014/07/01 05:12:42 gienah Exp $
+
+*iwl3160-7260-bt-ucode-37.8.10 (01 Jul 2014)
+
+  01 Jul 2014; Mark Wright <gienah@gentoo.org>
+  +iwl3160-7260-bt-ucode-37.8.10.ebuild,
+  -iwl3160-7260-bt-ucode-37.10.10-r1.ebuild, metadata.xml:
+  Upgrade iwl3160-7260-bt-ucode from 37.7.10 to 37.8.10. Delete the old
+  37.10.10-r1 - 37.10.10 was an incorrect version number, it actually was
+  37.7.10, and the 37.7.10 ucode files are included in 37.8.10.
 
   22 Jun 2014; Mark Wright <gienah@gentoo.org>
   iwl3160-7260-bt-ucode-37.10.10-r1.ebuild:
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/Manifest b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
index d4d272c912fd..ba30ab1b422d 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/Manifest
+++ b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST iwl3160-7260-bt-ucode-37.10.10.tgz 13417 SHA256 df5f9dcf61b6fa4244347c6b54eb9811aa3d8c075c042d515e67b5a5624d07e0 SHA512 cbd6975dfd1939ea543e68dcb11863d45472b0450edf980f3de0911fc034833d0ccdb85500a460dfe20c6641ef5d3be695e7d910dc6739bf9b56c306c2f2978e WHIRLPOOL 961d9ee3b136136df1d71ae2d7872be61f0e9bf7f2121fa30d050ce0d5bb4fd99e39b52747fb880510f3b9b41def419d2b0ab6633fa959759f8675ea6870b162
-EBUILD iwl3160-7260-bt-ucode-37.10.10-r1.ebuild 1126 SHA256 9011cee525e12125a78b30ec87cf9ad254b4ed82714bec3de37b07fa369ed2fd SHA512 cffe72553a85ec343e8e36d82b1d9d1579223d049035772c73ccf785013d26376ea02b81d04c4e2ff66e7fcc59d17b4390b7ab86e0554a8f8ee7c34e9518606d WHIRLPOOL 77ac6cbfcb0c3ba86af8e9fb4a176d1af073eeb36b6dd78785b6db7ceae84a19939ce6f72d9d810a57da3db8382d2ba831f08a4ab86dda3e8d09bffbc6bc72f9
-MISC ChangeLog 1248 SHA256 a8dcb8855e2e6fc9beb864dea5dfc73535f91d355a27909d404d56a81c7ecaa5 SHA512 a184de5175af0e27b65649ab07dfd1588554faf6fd8796e61a2eec61ac00b458c7c3e0239c2718d77bac715cc461fb4509b4091b60ddb480725bd33d177c4795 WHIRLPOOL 42b29883562cd200c4739b7b0990aa372ff0d8ec3c629dfb2c9b4c64a9616a4bec6db4090d4bad64c3c15f2fb94dcc951443f517953c9c1720cb5b9e0c9599e4
-MISC metadata.xml 397 SHA256 ee206317c47f0dcdc914a0c4b5ee94caa8f92ed30ecfd0b8465037a05c5cbbd4 SHA512 fe3aa80f4c066fcb9fe58c57bd9690b596b2280c3cf1a247423157eedf8a107ce9b16e327a0feacd4e764d26a93559cd5e4790837b4cce9c5b38677a63d84c8b WHIRLPOOL b6ee6d87faf225ce6130b0e83348f74e7289a6f70d697da6e6643ab3392d6691732496cfe72d245ca22971a47761f39f402fae5cf0736258c952de26fe96f193
+DIST iwl3160-7260-bt-ucode-37.8.10.tgz 21750 SHA256 74be75b38f2280aefcbafb8d5fc1cb6732e47bc7d380a30eb063e690ba9dfa59 SHA512 a0f81382cd7ce9077e8efd75566220a3b2ab0077897ce2d292091f6942b12832819335fe53d007a06797d0f79ef18463282b714e8a148dcc57898313e8f627ba WHIRLPOOL 4e9b2a8fd350eec89f6f32fdf47e95b7faeaea62292a6e3b7b7f73e25bcf6832db81b17259409b37d436faf100184d9881dc6f58633a95eb9a112e3fefba5745
+EBUILD iwl3160-7260-bt-ucode-37.8.10.ebuild 1263 SHA256 7c2fbc0f64616aee5f55717588056bad5a42d8e56c17502dc6af42e136fa267f SHA512 d6c0e48f0149dd7e1b3534309d5cf07839224083d097c011c28440fa724ce62f19c7facc585b929e2da961e83717d80a088c9818d99037c34fbf89910d0c5479 WHIRLPOOL 8f164f3074e268425e13b1f1ef1200f52227b42fe5ef89ed0422fd007b5af25cf876d046fbe372fe9471854ff611f00947b9731e4eecd60aadb107aca4d53866
+MISC ChangeLog 1652 SHA256 f06e1a4f80bb7a12b2d8d908a102cd2d26d7dac75078f8a5fe71e905cbc5ce80 SHA512 848056b8ad3b9466cbbd716ae0d1b6e122ec63d5ddeb05daa7e47b2d20616c70e1f9ea736e0687b0f50a42ba621f17fa6065cc085255405f8088f0ebb346e1d2 WHIRLPOOL 19b1ec5d3c4ba8332b75adcd08d2a0cb9edc322a04a215a1269c5133e0af0c996cf7fb2ea9a9b6b751e2606f54f8e65bd83ec0033fc50036a33366ac5594b77f
+MISC metadata.xml 504 SHA256 741b3a405ed837d24e67af787b37184876cdd741ff25733bf3145e37420635e7 SHA512 fe01c5ef076d7fd086b8f33d4165babbb3945c8d46d76119bcf2fc761369842c11064e8d43a1ac1dbbcb16a551607c77c858cd5d3703a34b79bc232959dbdf84 WHIRLPOOL 905d6ab17ada5d2d1663e167b4a60eed002902697e70a62fb3b9d0f529659cc171cfe58977cab5e408b464ca255dfe249800b33adce8404de5ca47ab5efe778d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOm46kACgkQoBEVQmGOlx/X3AEAo8jGZJgFG4+7y2vJRY4iSEyx
-OmNBu0bcWES6PmVXXIsBAISFrpZs0q0nIu9XsddTizQGBSeVZ4FJ+urBIA2sHWJu
-=MN5Q
+iF4EAREIAAYFAlOyQ1gACgkQoBEVQmGOlx+oHAEAvxZ5Z9Fg778oslYVtLuGLQ7F
+7i1ytvsysBu/1KVZnGYBAIPxLHzHz2sqdyTWWqCDSlA+It0F/u2vJCywav8Kw5f/
+=H+wH
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.10.10-r1.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild
index 7a68db8c4387..3aafb9137715 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.10.10-r1.ebuild
+++ b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.10.10-r1.ebuild,v 1.2 2014/06/22 14:09:36 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild,v 1.1 2014/07/01 05:12:42 gienah Exp $
 
 EAPI=5
 inherit linux-info
 
-MY_PN="iwlwifi-7260-ucode"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC 7260"
+DESCRIPTION="Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
 SRC_URI="mirror://gentoo/${P}.tgz"
 
@@ -22,7 +20,7 @@ RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
 S="${WORKDIR}"
 
 CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the 7260 firmware"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the Intel (R) Wireless 3160, 7260, 7265 firmware"
 
 pkg_pretend() {
 	if kernel_is lt 3 10 0; then
@@ -34,6 +32,9 @@ pkg_pretend() {
 src_install() {
 	insinto /lib/firmware/intel
 	doins "${S}/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq"
+	doins "${S}/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq"
 	doins "${S}/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq"
 	doins "${S}/ibt-hw-37.7.bseq"
+	doins "${S}/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq"
+	doins "${S}/ibt-hw-37.8.bseq"
 }
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml b/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
index 03df02aea9ad..ebddf58bc786 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
+++ b/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
@@ -7,4 +7,7 @@
     please consider bumping sys-firmware/iwl3160-ucode and 
     sys-firmware/iwl7260-ucode as well.</description>
   </maintainer>
+<longdescription lang='en'>
+Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth.
+</longdescription>
 </pkgmetadata>