Add bluetooth use flag to pull in sys-firmware/iwl3160-7260-bt-ucode for the Intel Wireless Bluetooth 3160 and Intel Wireless Bluetooth 7260 devices. Part of bug #489714, thanks to Thomas Kear for reporting, testing and initial ebuilds.

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

5 files changed, 103 insertions, 6 deletions

diff --git a/sys-firmware/iwl7260-ucode/ChangeLog b/sys-firmware/iwl7260-ucode/ChangeLog
index 0e69ae02164c..a6742b9c6b03 100644
--- a/sys-firmware/iwl7260-ucode/ChangeLog
+++ b/sys-firmware/iwl7260-ucode/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-firmware/iwl7260-ucode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/ChangeLog,v 1.3 2014/01/23 22:43:40 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/ChangeLog,v 1.4 2014/01/25 04:48:53 gienah Exp $
+
+*iwl7260-ucode-22.15.8.0-r1 (25 Jan 2014)
+*iwl7260-ucode-22.1.7.0-r1 (25 Jan 2014)
+
+  25 Jan 2014; Mark Wright <gienah@gentoo.org>
+  +iwl7260-ucode-22.1.7.0-r1.ebuild, +iwl7260-ucode-22.15.8.0-r1.ebuild,
+  metadata.xml:
+  Add bluetooth use flag to pull in sys-firmware/iwl3160-7260-bt-ucode for the
+  Intel Wireless Bluetooth 3160 and Intel Wireless Bluetooth 7260 devices. Part
+  of bug #489714, thanks to Thomas Kear for reporting, testing and initial
+  ebuilds.
 
   23 Jan 2014; Mark Wright <gienah@gentoo.org> iwl7260-ucode-22.15.8.0.ebuild:
   Thanks to Thomas Kear for testing and this fix (for my copy-paste bug): sys-
diff --git a/sys-firmware/iwl7260-ucode/Manifest b/sys-firmware/iwl7260-ucode/Manifest
index 0f2112e38b6a..6af9ae4be77f 100644
--- a/sys-firmware/iwl7260-ucode/Manifest
+++ b/sys-firmware/iwl7260-ucode/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST iwl7260-ucode-22.1.7.0.tgz 341956 SHA256 1ecc335e2a81a4f6d19422a5e707a93ef56351030a4e95d698e064fe51ba6154 SHA512 c6ae43ec84e5d0df85b6fc1962c5d6052be9352e453b53807a3c45eebc334892dae51c84a053fd197afa66a77bac5b5c349de8d566c071f15f2e76c370a36880 WHIRLPOOL 91ed3469604377462701ac921f06bd0269e032f04a1523ecc9e550d94cfd0fc1fee5caa484f0d46cd5d41ad25bc041fe953a7cd6c2dc0b8e3cbd39705b08119d
 DIST iwl7260-ucode-22.15.8.0.tgz 342953 SHA256 7ef7010705b26ab182c45f3810243cc814c0bec7a0c3dad21f0cdd22019ee7ec SHA512 7f6105c547dde559280444e1d729928c33d55ca4f5df1036d40ced735d7863277f2291a27c36ac544bb0c4278883b345be087268124d22af85155b0b4a57bb96 WHIRLPOOL 2ceea1c21749af78748652c8ce12df520621e0f54eff3c80307f0e038b23f730c9eccbadd1a4152276b8e99a447e7f1e38641d161334c197a5e86c5ce9e9e37e
+EBUILD iwl7260-ucode-22.1.7.0-r1.ebuild 1226 SHA256 9e7eb9b1b87a877903db20f2b732f1622f222f9529b929ae247a2aaacf7bfdf3 SHA512 134fbdeb7e4fa2c1850ab3d0b9701349c1af1427ed59a7f7bbb6a0f6f4db25ac430957ec57174702fc60400fd78917419434429b77b6e7295618aeebadb3d3a5 WHIRLPOOL ed5a7c97f754f57da18a2f061433e666e7db7a30b01f3780227c12f87a19eeca16feab98abe7dcf091389befd00556214be16b0c27a3ec4e98dffbe9b6485daf
 EBUILD iwl7260-ucode-22.1.7.0.ebuild 1129 SHA256 934f50cc000b0575b350cd845ab4b3a314aa04f3cc58e8391b23b1fd0d6820b0 SHA512 21336cc9e84fe0323739de62587eec749ef1c15ee635625fe943f8d2e73c7f1c3cf698839c21ca01d78435fc107805544abd5e7bf1b5d1dd116e399f524a5e0e WHIRLPOOL dd00a2549a280003289bb76a703d8672bb15ddbd360bb5de7a2f665febde1bba3498e4edc8215425497197d62c26f6f83e86b5bd4807ade31c9ea931b4c62035
+EBUILD iwl7260-ucode-22.15.8.0-r1.ebuild 1296 SHA256 83e8e55868fa0b6d217028c56be94bcb01f045a5fa89bd0f1097710f497ee6a1 SHA512 f59fe20c5c49413856eb9c13380950f5789051242bb9b4237ac6eef65cae99628015b663c32c30892d7d6431cd26bceade375d3ec2328092ffff352e5ac78940 WHIRLPOOL b832045dfa29b27bd28154b6bc3922c3e790f9e22b30b915841d8be4d7b94ea67d0b725453fe355dba039802d6582df9e06a6d3ea2ce1e88a2b9b1217c26c5f5
 EBUILD iwl7260-ucode-22.15.8.0.ebuild 1199 SHA256 03be76f4ca18cbc90eabbe66d261688d69745794ef318204ee3189e58f98d56f SHA512 411e2c88e5aa3592bffb0622a95e6ad8fdb7ecfc2595476fe607a566d8c90db3edae75022c4435a8a69f842a1145e22609d267434a5b3a96320ca2df004ec456 WHIRLPOOL 590f9bbb4d05ea52362aec574c4f4a26fd41cf044c90c5ac184c30d6b25a6c644042d0714f40d1d6623bf948a2464df7015d732752fe97486e70127f72e6634c
-MISC ChangeLog 1074 SHA256 a3017ccd5482bebcb5eb15bfa2a615f9f493deba94c06bdea0682176ff015c0e SHA512 fd85e2b007ae40ba4cb016c7b5052a139a18a9e71ade7335ea22628cb499d6d680d0cf0f49cd97ed5e7b94fe452bdd29f18cdcc1506861795de15ad25d12391d WHIRLPOOL 9b835853ce2b7eb7b88de2d980794cba27df92068fd3b99617bba0473c81d14026b03b659495901966796afb1b6dc965d768404a57475cf646d535f020a61cf1
-MISC metadata.xml 207 SHA256 a62c829cee70797120eae5e60b3d377e5a60e97e6b6bb3d73e49118eb112c5a6 SHA512 e247c62121802b65300755e600c16c0b6a390274e45e8f8dfc59b50909fa8ede2b8279bcdc66395e69f9341d68c5d8ca26b86488632d62a6bd39e7247590fe7e WHIRLPOOL a137cee3425fdd8fc4944bfa0ba806237278705e08047769e9921dc2017d5a59ecae7ceaee0b1ebc4e6f000f4dfb20a33d6fa267b3fe0b15c5fb92cc45cff7a0
+MISC ChangeLog 1540 SHA256 47899856c75407b679614622a8225c0cc94f08d7716059f3e55a66aeb0c1240e SHA512 225b20eae68139a892f7f9b1ccc8c9ebe4a21ab8d6d44cfd99e3a6243424679b4db65fca70da733845770e2dba1aa5706f6e11dd450ebf06f58dde12c78d5141 WHIRLPOOL b5331a262464d012aad0717343513b9573c015a07f314124f3b71e8c81205731771ce4b6e3c23e844a026cc216b2899f91265146e9932a859594aaaf2833bb9b
+MISC metadata.xml 398 SHA256 81a62e5e24503efa7492ceb936b873540ff5ffc3eb56ca64644adc3f6009ace2 SHA512 7fdd10f2f284b66d121a38fb9eec94e03c58816f90ba4633cc595e2098a3eb9e93062c80751bbc72d8bf4433e5f34b0aaee4b1efd1554a354153e973ebfadb22 WHIRLPOOL a205605aa7c313201f313b460449d6fac3c6da20e371cdad662bebd74267c23ba988211e52762980a1c24fa2a20047f9fc4062660534d84e11bb38a3f48ee380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLhmyIACgkQoBEVQmGOlx+PpgD5AZXQmLn2HzAsZeutfJZ5ZKmT
-UjqOzR6yNdP694kOz7UBAMWGih16ap/DcHVNXPohJr88m+qupwUtaoSUVYC7tfNK
-=QVSP
+iF4EAREIAAYFAlLjQjwACgkQoBEVQmGOlx9ZmwD8Dqb071ATpK9C+qA5GKesFfLr
+16X+o3AYzNmjcMq1qNwBAJMNvKxtX9DqE3pEVTy+zjxHfKP0hAM2BgZiC3m08Oqo
+=zh0Z
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0-r1.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0-r1.ebuild
new file mode 100644
index 000000000000..e5db5a2f202d
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0-r1.ebuild,v 1.1 2014/01/25 04:48:53 gienah Exp $
+
+EAPI=5
+inherit linux-info
+
+DEV_N="${PN:3:4}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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 ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt 3 10 0; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= 3.10.0."
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-7.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0-r1.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0-r1.ebuild
new file mode 100644
index 000000000000..73ad2a5f3d79
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0-r1.ebuild,v 1.1 2014/01/25 04:48:53 gienah Exp $
+
+EAPI=5
+inherit linux-info
+
+DEV_N="${PN:3:4}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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 ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt 3 13 0; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= 3.13.0."
+		ewarn "For kernel versions < 3.10.13, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-8.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/metadata.xml b/sys-firmware/iwl7260-ucode/metadata.xml
index 37e19dad162a..d4caf1eba71e 100644
--- a/sys-firmware/iwl7260-ucode/metadata.xml
+++ b/sys-firmware/iwl7260-ucode/metadata.xml
@@ -3,5 +3,8 @@
 <pkgmetadata>
   <maintainer>
     <email>gienah@gentoo.org</email>
+    <description>Feel free to bump and add yourself to the maintainer list,
+    please bump sys-firmware/iwl3160-ucode and maybe
+    sys-firmware/iwl3160-7260-bt-ucode as well.</description>
   </maintainer>
 </pkgmetadata>