Update blockers after package move of iwl1000-*, bug 429868.

(Portage version: 2.1.11.10/cvs/Linux x86_64)

6 files changed, 61 insertions, 56 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index af717b42f338..03a81cc9da59 100644
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux-firmware
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.47 2012/08/06 15:39:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.48 2012/08/18 20:15:52 ulm Exp $
+
+  18 Aug 2012; Ulrich Müller <ulm@gentoo.org> linux-firmware-20120502.ebuild,
+  linux-firmware-20120615.ebuild, linux-firmware-20120708.ebuild,
+  linux-firmware-20120719.ebuild, linux-firmware-99999999.ebuild:
+  Update blockers after package move of iwl1000-*, bug 429868.
 
   06 Aug 2012; Ulrich Müller <ulm@gentoo.org> linux-firmware-20120502.ebuild,
   linux-firmware-20120615.ebuild, linux-firmware-20120708.ebuild,
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
index dddf7a9d9a12..914aea20a7be 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild,v 1.7 2012/08/06 15:39:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild,v 1.8 2012/08/18 20:15:52 ulm Exp $
 
 EAPI=4
 inherit savedconfig
@@ -36,22 +36,22 @@ RDEPEND="!savedconfig? (
 		!net-dialup/ueagle4-atm
 		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
-		!sys-firmware/iwl1000-ucode
-		!net-wireless/iwl2030-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
 		!net-wireless/libertas-firmware
 		!net-wireless/rt61-firmware
 		!net-wireless/rt73-firmware
 		!net-wireless/rt2860-firmware
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
 		!x11-drivers/radeon-ucode
 	)"
 #add anything else that collides to this
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild
index e123cc64bca3..492b1514d21e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild,v 1.2 2012/08/06 15:39:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild,v 1.3 2012/08/18 20:15:52 ulm Exp $
 
 EAPI=4
 inherit savedconfig
@@ -36,22 +36,22 @@ RDEPEND="!savedconfig? (
 		!net-dialup/ueagle4-atm
 		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
-		!sys-firmware/iwl1000-ucode
-		!net-wireless/iwl2030-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
 		!net-wireless/libertas-firmware
 		!net-wireless/rt61-firmware
 		!net-wireless/rt73-firmware
 		!net-wireless/rt2860-firmware
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
 		!x11-drivers/radeon-ucode
 	)"
 #add anything else that collides to this
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild
index 073a3b39d78f..b19c7c2a8568 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild,v 1.2 2012/08/06 15:39:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild,v 1.3 2012/08/18 20:15:52 ulm Exp $
 
 EAPI=4
 inherit savedconfig
@@ -36,22 +36,22 @@ RDEPEND="!savedconfig? (
 		!net-dialup/ueagle4-atm
 		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
-		!sys-firmware/iwl1000-ucode
-		!net-wireless/iwl2030-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
 		!net-wireless/libertas-firmware
 		!net-wireless/rt61-firmware
 		!net-wireless/rt73-firmware
 		!net-wireless/rt2860-firmware
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
 		!x11-drivers/radeon-ucode
 	)"
 #add anything else that collides to this
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild
index 50c96bf2761e..59f7072d9dce 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild,v 1.2 2012/08/06 15:39:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild,v 1.3 2012/08/18 20:15:52 ulm Exp $
 
 EAPI=4
 inherit savedconfig
@@ -36,22 +36,22 @@ RDEPEND="!savedconfig? (
 		!net-dialup/ueagle4-atm
 		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
-		!sys-firmware/iwl1000-ucode
-		!net-wireless/iwl2030-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
 		!net-wireless/libertas-firmware
 		!net-wireless/rt61-firmware
 		!net-wireless/rt73-firmware
 		!net-wireless/rt2860-firmware
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-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 8c62800ad278..8ee844afaeb2 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-2012 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.18 2012/08/06 15:39:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.19 2012/08/18 20:15:52 ulm Exp $
 
 EAPI=4
 inherit savedconfig
@@ -36,22 +36,22 @@ RDEPEND="!savedconfig? (
 		!net-dialup/ueagle4-atm
 		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
-		!sys-firmware/iwl1000-ucode
-		!net-wireless/iwl2030-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
 		!net-wireless/libertas-firmware
 		!net-wireless/rt61-firmware
 		!net-wireless/rt73-firmware
 		!net-wireless/rt2860-firmware
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
 		!x11-drivers/radeon-ucode
 	)"
 #add anything else that collides to this