Add blockers against iwl7260, bug #489714.

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

5 files changed, 26 insertions, 9 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index 2d3d73f6c70c..f8ed8136fe86 100644
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/linux-firmware
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.90 2014/01/18 16:33:56 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.91 2014/01/23 04:00:14 gienah Exp $
+
+  23 Jan 2014; Mark Wright <gienah@gentoo.org> linux-firmware-20130728.ebuild,
+  linux-firmware-20131230.ebuild, linux-firmware-99999999.ebuild:
+  Add blockers against iwl7260, bug #489714.
 
 *linux-firmware-20131230 (18 Jan 2014)
 
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 97987b9e41fc..fa84b63629ff 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST linux-firmware-20130728.tar.xz 19243912 SHA256 dff71cb96eb286e4cacc0d0fb0337481c285f091b23372a77c147e7125f46a9a SHA512 c86e003177988e58b6eae632d1e7f8022c5e2c848e83b925c1852dc87bce3eb9b94bccf8d33c67f73dc355cf4b02c231dadc53300b6a26ee0e8ca75878059609 WHIRLPOOL a8de4a07d1a48ba2b45d1a9143a015ead11d85498836c3c946fa0386099e66d0f71b05e70a6f230832d19401884f21a4b818b75a873e8b9caf5a19eec5067389
 DIST linux-firmware-20131230.tar.xz 21214036 SHA256 7189fd4cf954086a349286ca79d9275f6a2d79a7c0fd5c7cf6d41d25a863cc77 SHA512 4fe92db99cfd5bc0806ef5863fa6709501dc2c761b9af92689ff15fa8f9a97ca6086bbb3a79fa97e6bde15f8f67c0ae06eb38323fe5182f5406cf9601c4e6b57 WHIRLPOOL aaac2efb4a205bba80c3bad9c6b7eb38ec4fcde5b0233952eb1f58b6cc6afcf5059fc3738ea8a6f9e02de937bcaaf866ddf8021614ccc2cb067b665466ce2ea5
-EBUILD linux-firmware-20130728.ebuild 3003 SHA256 f2aba7f04732f8ac4750b97e2deee2af7bf1b1e3fc0a6485f02517cb319d14ce SHA512 ed9106057031edb6b59623e4404049c450dfc06e8c188449a5f2bbb1d5c54a1e05bbdfa4dfbcc7196d0e4d8c1132494c859e92aeded9bcbd3dd881fc4fe65976 WHIRLPOOL 51e13849629b39edc8e97051556d5f13a7c651967d04eb193d6fb6c4bb860c7cf71deb0158bbed8aabbb0f093d343b3fe3371ba17547fb549072eb2310f5dbcf
-EBUILD linux-firmware-20131230.ebuild 3016 SHA256 5d166b02a304ec8fc20cbe1e3f371ef8268dc80189ae8de1828ea2505ea13059 SHA512 cae0b6ac496c8ca08a64876bf21a866aab06cd09c9be999c30f4deab92cf739e5e66dea51f1dd55091910f4515c95d5fa29cae2363c04fb27c18e4f9c8e8ff70 WHIRLPOOL e50feba1ff87e9f1d42e90dbafdd54620688909194eb01d16e88a26d49ba73fb684e47534f055896ac360c29535fbd3ecfd6ddaa60a9c0955c3d81dcf9d8a214
-EBUILD linux-firmware-99999999.ebuild 3015 SHA256 ed1967a57f3e89d4b5ad4a8cfe1a3d5b0897fb773e20bc4aa9d7a4edef85a7c3 SHA512 921147ce1f8f088db4ae521d87704a2b929b847469e8c71df971b12f642e46f9c76b7c18a6d1e6c21436437575a333334ed4dff24f108687f4c25fbad9bae393 WHIRLPOOL 18b6ba72243985c098534d0defc07afff99bf4e42576e596b3c260091c2c3b74d5f86a222b3361051f5acbcd64ad96e6f2d991bedffd95d9a2e5ca720fc24d13
-MISC ChangeLog 16232 SHA256 14d98e66a0d287466348ef713cd2b9b871349f8de6147e76a4b04db431ce1025 SHA512 d96dcf1a3fa6fb9ced5df5f0a83667dbbb03978903d5407eaef59fbcb037aa02280ea0211f98c63bc2d19c34ef8d5ac2fa5265b7f06d328fa331def5c53529a4 WHIRLPOOL 2defb5cbfe3db9e05daaebe2a10a2300aa46463237d7ef2987c0cf53a36fc8f67b454986cb7f78c6c42b38e63e9bc23dfa563f3fc869aeb577af2233114e8286
+EBUILD linux-firmware-20130728.ebuild 3036 SHA256 1f2e6ef2f963c65095238a5a0124dd5735cbef7ec50c9c2a5f1ac65dcdb8da03 SHA512 8ae8f0ce9f4b7df60b51899cd6993403e199993832fcfa525b8d697f69147e4ab03069ee8b58525b777ef70d593b41cdea5a8430aa00110718cefeb190d89338 WHIRLPOOL 436aa5f0cd3297e98dd8732cc9efd01fc527da1ebf243155a99085e32bf36cd46a73ee72edbbf2cfe280fa406ff0a3d423fa07d6929852e227f02bbf8a07fa83
+EBUILD linux-firmware-20131230.ebuild 3044 SHA256 603b0f313820449d1654f60908ce959b9790d463f3c4fc7115b03244146a4d85 SHA512 66c41cbca57ee2fa90fe9d21ae2ac4887a7cdf814711de86421bb85341d201ed5bfb16869d152087836571a7d9f3107da8cdafacc58415b85e23d8f6d23995b3 WHIRLPOOL f8beaf40cc8318d397343fcf5e14789ba4e51bc91c76ea87611f3e74782cadf9a9277e62519f9aa72174fa3b15bcbae4e407f051e0bd19e71d9c8bf0a8265600
+EBUILD linux-firmware-99999999.ebuild 3045 SHA256 7bcc0fe20994e6c82681bd06fabf3ecd9a749e7f340f049a4af35787114af00d SHA512 05c63a9d180a23467b20642a64472a4771c977d136956f156c7a4a8bc4f0b1e542c9d7e99735de8d6c48c3d177892553400c4d677d346bccaa6f2835286d6b08 WHIRLPOOL a490972f07ffd94d3e6f848198256c94f2eadda4e296bf86fb4bc8f92833fee9d9827beadac0cd6a1d8662559262ecb9aa96211616bf60c5b75e965c4d8ad0ab
+MISC ChangeLog 16421 SHA256 3c12d8d8a05d2738b42049e0ced63f1e4ee688bccd91ed750fba8778e86bfc9a SHA512 e02fe736c7a237cba58cb97d01decc056b0c4f378a0cfa2153b7d3b6359f5dd6e62973d51e6121af9cc6bfbc224a94eedd321607893bae1ef0d4e768937cd4db WHIRLPOOL 5dd0902f5d5f45680f9672229138f8124ab6da5276760a036bdf6a23e87252e422b5ec3078d8f778457932c9b3edcc66736b403e2657a85d0092831df93253e0
 MISC metadata.xml 544 SHA256 fff409ecefbc4cf4505e7f3f09b8ffe2b599a4c2456fe80835342638fb71a2de SHA512 8a9fc249065f998914a4f8ca92a0c3060aec81ead8e42ea11b08d1100c2e992e3a07077e57b7f8b26ee041d41fbfc127ee93cb00cebb4e7e875d968c86dcc2dd WHIRLPOOL b023523bcf71d0cc69351371ab1dd95a634d6980427b06e6450903115852ee7cebbfcae6f4a5365b42620c25ec6927e82777d26dff50aa719e1043f20d0746b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlLgk9gACgkQoBEVQmGOlx8GkwEAp7DpbzgboLVExNk17M5zesvj
+sXBL+ehz4vsEuGoee8IA/0CEr0V9IWBlAmevCbnXEqJ0hppEq5Xh5auYCEcfR3yi
+=q6sS
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild b/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild
index 19ba5ea0a80d..9655bd790a5e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild,v 1.11 2014/01/15 09:21:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild,v 1.12 2014/01/23 04:00:14 gienah Exp $
 
 EAPI=5
 inherit savedconfig
@@ -56,6 +56,7 @@ RDEPEND="!savedconfig? (
 		!sys-firmware/iwl6005-ucode
 		!sys-firmware/iwl6030-ucode
 		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl7260-ucode
 		!x11-drivers/radeon-ucode
 	)"
 #add anything else that collides to this
diff --git a/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild b/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild
index 29d330ce740b..6046d98ae140 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild,v 1.1 2014/01/18 16:33:56 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild,v 1.2 2014/01/23 04:00:14 gienah Exp $
 
 EAPI=5
 inherit savedconfig
@@ -56,6 +56,7 @@ RDEPEND="!savedconfig? (
 		!sys-firmware/iwl6005-ucode
 		!sys-firmware/iwl6030-ucode
 		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl7260-ucode
 		!x11-drivers/radeon-ucode
 	)"
 #add anything else that collides to this
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index ce1aae3a49e9..4c8aaba9e6c8 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.30 2013/09/05 05:46:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.31 2014/01/23 04:00:14 gienah Exp $
 
 EAPI=5
 inherit savedconfig
@@ -56,6 +56,7 @@ RDEPEND="!savedconfig? (
 		!sys-firmware/iwl6005-ucode
 		!sys-firmware/iwl6030-ucode
 		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl7260-ucode
 		!x11-drivers/radeon-ucode
 	)"
 #add anything else that collides to this