File collisions with rt2860-firmware and rt2870-firmware, thanks to Chí-Thanh Christopher Nguyễn for noticing.

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

6 files changed, 23 insertions, 6 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index 89db7759ad99..60678e21a1c2 100644
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2012/02/21 21:41:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.34 2012/02/29 17:37:07 tetromino Exp $
+
+  29 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  linux-firmware-20110731.ebuild, linux-firmware-20110818.ebuild,
+  linux-firmware-20120125.ebuild, linux-firmware-20120219.ebuild,
+  linux-firmware-99999999.ebuild:
+  File collisions with rt2860-firmware and rt2870-firmware, thanks to
+  Chí-Thanh Christopher Nguyễn for noticing.
 
 *linux-firmware-20120219 (21 Feb 2012)
 
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
index 04d61a4b15a4..6768a71f784a 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20110731.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-20110731.ebuild,v 1.7 2012/02/03 22:56:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild,v 1.8 2012/02/29 17:37:07 tetromino Exp $
 
 EAPI=3
 inherit savedconfig
@@ -48,6 +48,8 @@ RDEPEND="!savedconfig? (
 		!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
 		!x11-drivers/radeon-ucode
 	)"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
index 0354bf4dc5cc..9049690c22d4 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20110818.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-20110818.ebuild,v 1.4 2012/02/03 22:56:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild,v 1.5 2012/02/29 17:37:07 tetromino Exp $
 
 EAPI=3
 inherit savedconfig
@@ -48,6 +48,8 @@ RDEPEND="!savedconfig? (
 		!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
 		!x11-drivers/radeon-ucode
 	)"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild
index a0b7bafc0ba0..e78450370c2e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120125.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-20120125.ebuild,v 1.1 2012/02/03 22:56:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild,v 1.2 2012/02/29 17:37:07 tetromino Exp $
 
 EAPI=4
 inherit savedconfig
@@ -48,6 +48,8 @@ RDEPEND="!savedconfig? (
 		!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
 		!x11-drivers/radeon-ucode
 	)"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120219.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120219.ebuild
index 8d94d49a2bf3..860030fe84ad 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120219.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120219.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-20120219.ebuild,v 1.1 2012/02/21 21:41:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120219.ebuild,v 1.2 2012/02/29 17:37:07 tetromino Exp $
 
 EAPI=4
 inherit savedconfig
@@ -48,6 +48,8 @@ RDEPEND="!savedconfig? (
 		!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
 		!x11-drivers/radeon-ucode
 	)"
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 62b4a31a7a0e..4ef36ee17868 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.14 2012/02/03 22:56:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.15 2012/02/29 17:37:07 tetromino Exp $
 
 EAPI=4
 inherit savedconfig
@@ -48,6 +48,8 @@ RDEPEND="!savedconfig? (
 		!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
 		!x11-drivers/radeon-ucode
 	)"