summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2014-01-23 04:00:14 +0000
committerMark Wright <gienah@gentoo.org>2014-01-23 04:00:14 +0000
commitc94892012e1d9f4346333cdf6c320fbd45269c06 (patch)
tree9cf97ed5b9e5ec7d6e2c29e5a7bf173f54f399e6 /sys-kernel/linux-firmware
parentFix ebuild syntax, add die to external commands (diff)
downloadgentoo-2-c94892012e1d9f4346333cdf6c320fbd45269c06.tar.gz
gentoo-2-c94892012e1d9f4346333cdf6c320fbd45269c06.tar.bz2
gentoo-2-c94892012e1d9f4346333cdf6c320fbd45269c06.zip
Add blockers against iwl7260, bug #489714.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'sys-kernel/linux-firmware')
-rw-r--r--sys-kernel/linux-firmware/ChangeLog6
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20130728.ebuild3
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20131230.ebuild3
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-99999999.ebuild5
4 files changed, 12 insertions, 5 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/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