Add blockers against iwl3160-ucode, iwl3160-7260-bt-ucode.

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

5 files changed, 21 insertions, 11 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index f8ed8136fe86..677944d0f39b 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.91 2014/01/23 04:00:14 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.92 2014/01/25 03:31:13 gienah Exp $
+
+  25 Jan 2014; Mark Wright <gienah@gentoo.org> linux-firmware-20130728.ebuild,
+  linux-firmware-20131230.ebuild, linux-firmware-99999999.ebuild:
+  Add blockers against iwl3160-ucode, iwl3160-7260-bt-ucode.
 
   23 Jan 2014; Mark Wright <gienah@gentoo.org> linux-firmware-20130728.ebuild,
   linux-firmware-20131230.ebuild, linux-firmware-99999999.ebuild:
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index fa84b63629ff..ec9d7cb6c6ae 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -3,15 +3,15 @@ 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 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
+EBUILD linux-firmware-20130728.ebuild 3104 SHA256 1fd44631a268e5217f1d5bfbb464b737d69f72a583f5f4fe93c7358e2df180f5 SHA512 77b9c74f5a8b797cb0c921fd736ff6dca86eee7d8f52864830477875372f66ba6e371966f2948f5ffdf841a0adee306e6ac810ff52f70d0b51ee54af5777a70a WHIRLPOOL 66683cc363727bf6733b0f2e2ecaacb16db15942e148a6fdcb2506be6cf301be6f95f28be9ddb5eeb75b0bd7520f0c5dbe658305b4eae2eea7e33c8908057ca9
+EBUILD linux-firmware-20131230.ebuild 3112 SHA256 783a5a878eea5e343672e480249a1cfb8a71f249962d97552bc16e9c63ffdfd9 SHA512 43ada272c4aa4a24eb3fa8cae0f8cb764a15aeb8f9049a224ec6a31e8f28db733fc93703e86cbe82205f1994a99d0811c0710dc45fa041fb75f79b7d78195af6 WHIRLPOOL a22c08e5534aff2903e8c90b470f7602610d33f52aeafa5da56039d31a6c2e20ad811af3d3b9bffedaafbfca36e1c4166e0e52b075f38410bc09cea913bba4b4
+EBUILD linux-firmware-99999999.ebuild 3113 SHA256 cb5f567df4a4d97bd3031f2027f80944c128cade5e0d78e73e22ed54673f6bbb SHA512 4e539f3d64c3c7e544c9a4c72d8f04ec12122fd1fcce788dc5e8df16b405297421b5ac42da0445b8f937d28812297aaacdacd53c6c0dcfd9e2252fbb3fdda0de WHIRLPOOL 652e856ebcc7d987496f305450470ac468dd4cee2f2f1924c99cf228fb10938f8fe4b6952c22064b409951964f2aa532164ffe1f8eb543879c8f3dde71ba1a90
+MISC ChangeLog 16628 SHA256 a92844df52633195c9fd60e0d2e6d3b5867bb11439835aed7e11a296ddc5ffad SHA512 20b09db751a914ebd480f0d0036944490bcf44a8cfd29d204366cc15dd6eae3be656ca97688ad2ff7d3d189c44e1988732d7304ecbfd4e8be7ffb6e3159b268e WHIRLPOOL 40063413c6cdc487a038fa9de700ce14fe19d60d6a02069fa85182a7a6027cd6b615461a3f6e3e6aa51a8a46dbebcec078c6ec086655fa2a27748bfb32a365e6
 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
+iF4EAREIAAYFAlLjMBgACgkQoBEVQmGOlx9gcwD+IaWFzp8BFQlh5MzJoCuq1LLI
+Ornf+NyZw1UFltx1c1wA/itpf1MRmUFNZvJQ5YMzU56PytSO4IyZP5UU5K5Ukep2
+=0Dyc
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild b/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild
index 9655bd790a5e..2d47b8ed7d18 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.12 2014/01/23 04:00:14 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130728.ebuild,v 1.13 2014/01/25 03:31:13 gienah Exp $
 
 EAPI=5
 inherit savedconfig
@@ -56,7 +56,9 @@ RDEPEND="!savedconfig? (
 		!sys-firmware/iwl6005-ucode
 		!sys-firmware/iwl6030-ucode
 		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl3160-ucode
 		!sys-firmware/iwl7260-ucode
+		!sys-firmware/iwl3160-7260-bt-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 6046d98ae140..84bf363c52e2 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.2 2014/01/23 04:00:14 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild,v 1.3 2014/01/25 03:31:13 gienah Exp $
 
 EAPI=5
 inherit savedconfig
@@ -56,7 +56,9 @@ RDEPEND="!savedconfig? (
 		!sys-firmware/iwl6005-ucode
 		!sys-firmware/iwl6030-ucode
 		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl3160-ucode
 		!sys-firmware/iwl7260-ucode
+		!sys-firmware/iwl3160-7260-bt-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 4c8aaba9e6c8..1c228b7265f8 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-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.31 2014/01/23 04:00:14 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.32 2014/01/25 03:31:13 gienah Exp $
 
 EAPI=5
 inherit savedconfig
@@ -56,7 +56,9 @@ RDEPEND="!savedconfig? (
 		!sys-firmware/iwl6005-ucode
 		!sys-firmware/iwl6030-ucode
 		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl3160-ucode
 		!sys-firmware/iwl7260-ucode
+		!sys-firmware/iwl3160-7260-bt-ucode
 		!x11-drivers/radeon-ucode
 	)"
 #add anything else that collides to this