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.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 19 insertions, 6 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/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>