Block only old revision of ivtv-firmware for the v4l-cx25840.fw file collision wrt #362361

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

9 files changed, 30 insertions, 22 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index 730b2685819d..90122eca7e09 100644
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/linux-firmware
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.60 2013/02/06 00:10:18 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.61 2013/02/11 20:16:17 ssuominen Exp $
+
+  11 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  linux-firmware-20120719.ebuild, linux-firmware-20120816.ebuild,
+  linux-firmware-20120909.ebuild, linux-firmware-20120924.ebuild,
+  linux-firmware-20121030.ebuild, linux-firmware-20121225.ebuild,
+  linux-firmware-20130113.ebuild, linux-firmware-99999999.ebuild:
+  Block only old revision of ivtv-firmware for the v4l-cx25840.fw file
+  collision wrt #362361
 
 *linux-firmware-20130113 (06 Feb 2013)
 
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild
index 03c4bd5fd9ba..f743575839e0 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
+# Copyright 1999-2013 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.7 2012/10/03 20:45:59 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild,v 1.8 2013/02/11 20:16:17 ssuominen Exp $
 
 EAPI=4
 inherit savedconfig
@@ -28,7 +28,7 @@ RDEPEND="!savedconfig? (
 		!media-sound/alsa-firmware[alsa_cards_sb16]
 		!media-sound/alsa-firmware[alsa_cards_ymfpci]
 		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild
index 08a99a751ba4..0064a66694da 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild,v 1.2 2012/10/03 20:45:59 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild,v 1.3 2013/02/11 20:16:17 ssuominen Exp $
 
 EAPI=4
 inherit savedconfig
@@ -28,7 +28,7 @@ RDEPEND="!savedconfig? (
 		!media-sound/alsa-firmware[alsa_cards_sb16]
 		!media-sound/alsa-firmware[alsa_cards_ymfpci]
 		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild
index 406dbf15bd20..d9a29abedbcd 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild,v 1.2 2012/10/03 20:45:59 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild,v 1.3 2013/02/11 20:16:17 ssuominen Exp $
 
 EAPI=4
 inherit savedconfig
@@ -28,7 +28,7 @@ RDEPEND="!savedconfig? (
 		!media-sound/alsa-firmware[alsa_cards_sb16]
 		!media-sound/alsa-firmware[alsa_cards_ymfpci]
 		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild
index 4d916568a5ad..84c57004378e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild,v 1.4 2012/12/04 11:31:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild,v 1.5 2013/02/11 20:16:17 ssuominen Exp $
 
 EAPI=4
 inherit savedconfig
@@ -28,7 +28,7 @@ RDEPEND="!savedconfig? (
 		!media-sound/alsa-firmware[alsa_cards_sb16]
 		!media-sound/alsa-firmware[alsa_cards_ymfpci]
 		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20121030.ebuild b/sys-kernel/linux-firmware/linux-firmware-20121030.ebuild
index f03e616eb1a5..b78a1f03ad00 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20121030.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20121030.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20121030.ebuild,v 1.1 2012/11/04 00:18:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20121030.ebuild,v 1.2 2013/02/11 20:16:17 ssuominen Exp $
 
 EAPI=4
 inherit savedconfig
@@ -28,7 +28,7 @@ RDEPEND="!savedconfig? (
 		!media-sound/alsa-firmware[alsa_cards_sb16]
 		!media-sound/alsa-firmware[alsa_cards_ymfpci]
 		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20121225.ebuild b/sys-kernel/linux-firmware/linux-firmware-20121225.ebuild
index 9ed324c0b89f..d8d0e3fc8373 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20121225.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20121225.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20121225.ebuild,v 1.1 2013/01/01 13:18:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20121225.ebuild,v 1.2 2013/02/11 20:16:17 ssuominen Exp $
 
 EAPI=4
 inherit savedconfig
@@ -28,7 +28,7 @@ RDEPEND="!savedconfig? (
 		!media-sound/alsa-firmware[alsa_cards_sb16]
 		!media-sound/alsa-firmware[alsa_cards_ymfpci]
 		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild b/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild
index e677d2b58a58..8a345a1e5d66 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild,v 1.1 2013/02/06 00:10:18 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild,v 1.2 2013/02/11 20:16:17 ssuominen Exp $
 
 EAPI=5
 inherit savedconfig
@@ -29,7 +29,7 @@ RDEPEND="!savedconfig? (
 		!media-sound/alsa-firmware[alsa_cards_sb16]
 		!media-sound/alsa-firmware[alsa_cards_ymfpci]
 		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 6dd5db6a3835..2839100d60d7 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
 # 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.21 2013/02/06 00:10:18 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.22 2013/02/11 20:16:17 ssuominen Exp $
 
 EAPI=5
 inherit savedconfig
@@ -29,7 +29,7 @@ RDEPEND="!savedconfig? (
 		!media-sound/alsa-firmware[alsa_cards_sb16]
 		!media-sound/alsa-firmware[alsa_cards_ymfpci]
 		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]