10 files changed, 37 insertions, 18 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index aca9acb5ea67..3e376759fdc0 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.272 2014/07/30 11:55:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.273 2014/08/04 02:13:15 vapier Exp $
+
+  04 Aug 2014; Mike Frysinger <vapier@gentoo.org> package.use.mask:
+  Unmask x86-specific flashrom USE flags.
 
   30 Jul 2014; Sven Vermeulen <swift@gentoo.org> package.use.stable.mask:
   Adding use-stable-mask on libsemanage (multilib) as well
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 7046b4705e7b..80923ab8b810 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -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/profiles/arch/amd64/package.use.mask,v 1.183 2014/07/15 10:20:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.184 2014/08/04 02:13:15 vapier Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -18,6 +18,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Frysinger <vapier@gentoo.org> (04 Aug 2014)
+# Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024
+sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv
+
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (24 Apr 2014)
 # It's only supported on amd64
 dev-db/mariadb -tokudb
diff --git a/profiles/arch/arm/ChangeLog b/profiles/arch/arm/ChangeLog
index dd369ddf1fb1..f27762c489ab 100644
--- a/profiles/arch/arm/ChangeLog
+++ b/profiles/arch/arm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/ARM profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.312 2014/07/29 18:57:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.313 2014/08/04 02:13:15 vapier Exp $
+
+  04 Aug 2014; Mike Frysinger <vapier@gentoo.org> package.use.mask:
+  Drop flashrom masks that are in base now.
 
   29 Jul 2014; Markus Meier <maekke@gentoo.org> +armv5te/use.mask,
   +armv6j/use.mask, armv7a/use.mask:
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 65af13081c74..855282d202c9 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -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/profiles/arch/arm/package.use.mask,v 1.214 2014/07/27 21:40:59 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.215 2014/08/04 02:13:15 vapier Exp $
 
 # Rick Farina <zerochaos@gentoo.org> (27 Jul 2014)
 # net-misc/dahdi doesn't build
@@ -164,10 +164,6 @@ media-libs/mesa r600-llvm-compiler
 # Firmware loader not keyworded yet
 sci-libs/linux-gpib firmware
 
-# Christian Ruppert <idl0r@gentoo.org> (13 May 2013)
-# Mask nic3com re bug 454024
-sys-apps/flashrom nic3com
-
 # Markus Meier <maekke@gentoo.org> (11 May 2013)
 # unkeyworded deps for x11-wm/enlightenment
 x11-wm/enlightenment emotion
diff --git a/profiles/arch/arm64/ChangeLog b/profiles/arch/arm64/ChangeLog
index 61293bafab5c..6a929cdae0ca 100644
--- a/profiles/arch/arm64/ChangeLog
+++ b/profiles/arch/arm64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/ARM profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm64/ChangeLog,v 1.2 2014/07/01 14:34:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm64/ChangeLog,v 1.3 2014/08/04 02:13:15 vapier Exp $
+
+  04 Aug 2014; Mike Frysinger <vapier@gentoo.org> package.use.mask:
+  Drop flashrom masks that are in base now.
 
   01 Jul 2014; Michał Górny <mgorny@gentoo.org> big-endian/make.defaults,
   little-endian/make.defaults:
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index b8e4a17c3032..a645e6601208 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -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/profiles/arch/arm64/package.use.mask,v 1.3 2014/02/16 07:32:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm64/package.use.mask,v 1.4 2014/08/04 02:13:15 vapier Exp $
 
 # Needs testing.
 sys-devel/gcc gcj graphite regression-test
@@ -93,10 +93,6 @@ media-libs/mesa r600-llvm-compiler
 # Firmware loader not keyworded yet
 sci-libs/linux-gpib firmware
 
-# Christian Ruppert <idl0r@gentoo.org> (13 May 2013)
-# Mask nic3com re bug 454024
-sys-apps/flashrom nic3com
-
 # Markus Meier <maekke@gentoo.org> (11 May 2013)
 # unkeyworded deps for x11-wm/enlightenment
 x11-wm/enlightenment emotion
diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 687efae2a911..14b025551ed7 100644
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.172 2014/07/27 09:22:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.173 2014/08/04 02:13:16 vapier Exp $
+
+  04 Aug 2014; Mike Frysinger <vapier@gentoo.org> package.use.mask:
+  Unmask x86-specific flashrom USE flags.
 
   27 Jul 2014; Alexis Ballier <aballier@gentoo.org> use.mask:
   unmask xop useflag on x86
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 2e35233e1e1a..a19143f67690 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.136 2014/07/15 10:20:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.137 2014/08/04 02:13:16 vapier Exp $
 
 # This file requires >=portage-2.1.1
 
+# Mike Frysinger <vapier@gentoo.org> (04 Aug 2014)
+# Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024
+sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv
+
 # Yixun Lan <dlan@gentoo.org> (21 May 2014)
 # sys-fs/zfs not keyworded on x86
 sys-cluster/ceph zfs
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 95678b6c8d62..fb41223faf17 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.705 2014/08/01 19:50:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.706 2014/08/04 02:13:16 vapier Exp $
+
+  04 Aug 2014; Mike Frysinger <vapier@gentoo.org> package.use.mask:
+  Mask x86-specific flashrom USE flags in base.
 
   01 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> package.use.stable.mask:
   Mask USE="java mono" for media-libs/libcaca as unrequired and too fragile
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0d0e3100232e..e3604499a07f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,11 +1,15 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.587 2014/07/30 00:17:27 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.588 2014/08/04 02:13:16 vapier Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 #
 
+# Mike Frysinger <vapier@gentoo.org> (04 Aug 2014)
+# Mask flashrom drivers that only work on x86 due to in/out asm insns #454024
+sys-apps/flashrom atahpt nic3com nicnatsemi nicrealtek rayer_spi satamv
+
 # Brian Evans <grknight@gentoo.org> (30 Jul 2014)
 # Mask embedded due to upstream not supporting
 # https://bugs.launchpad.net/bugs/1236873