profiles: update USE-flag masks for sys-apps/flashrom

On the one hand, the recently-added driver 'atapromise' requires
PCI-port I/O support and as such only works on amd64 and x86. On the
other, the fact the internal programmer is only supported on amd64/x86
(and mipsel, flashrom isn't keyworded for mips though) is now enforced
at the Makefile level instead of letting the users enable it but
aborting at run time on unsupported arches.

Closes: https://bugs.gentoo.org/728092
Signed-off-by: Marek Szuba <marecki@gentoo.org>

3 files changed, 14 insertions, 12 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 5fb6fde75e42..5ffde3c307c5 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2020-06-15)
+# Unmask globally-masked flashrom drivers which do work on amd64
+sys-apps/flashrom -atahpt -atapromise -internal -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
 # clisp is keyworded on amd64
 app-text/texlive-core -xindy
@@ -222,10 +226,6 @@ media-libs/libbluray -bdplus
 # pidgin-opensteamworks is only available for amd64, ppc32 and x86
 net-im/telepathy-connection-managers -steam
 
-# Mike Frysinger <vapier@gentoo.org> (2014-08-04)
-# 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> (2014-04-24)
 # It's only supported on amd64
 dev-db/mariadb -tokudb
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index e807056d39a4..e1ce8f90077d 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2020-06-15)
+# Mask flashrom drivers which only work on few architectures:
+#  - internal is presently only supported on amd64/x86 and mipsel,
+#  - the others only work on x86 due to lack of PCI-port I/O support
+sys-apps/flashrom atahpt atapromise internal nic3com nicnatsemi nicrealtek rayer-spi satamv
+
 # Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
 # Dependency is only keyworded on amd64 and x86
 app-metrics/collectd collectd_plugins_slurm
@@ -193,10 +199,6 @@ media-libs/libbluray bdplus
 # pidgin-opensteamworks is only available for amd64, ppc32 and x86
 net-im/telepathy-connection-managers steam
 
-# Mike Frysinger <vapier@gentoo.org> (2014-08-04)
-# 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
-
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2014-04-24)
 # It's only supported on amd64
 dev-db/mariadb tokudb
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index bb07f13d64d4..cf7cc7c27626 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2020-06-15)
+# Unmask globally-masked flashrom drivers which do work on x86
+sys-apps/flashrom -atahpt -atapromise -internal -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv
+
 # Christopher Head <chead@chead.ca> (2020-06-10)
 # Requires dev-db/influxdb which is amd64-only
 dev-python/influxdb test
@@ -233,10 +237,6 @@ net-im/telepathy-connection-managers -steam
 # >x11-drivers/nvidia-drivers-346 on x86 has no UVM support (bug #534156)
 >x11-drivers/nvidia-drivers-346 uvm
 
-# Mike Frysinger <vapier@gentoo.org> (2014-08-04)
-# 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> (2014-05-21)
 # sys-fs/zfs not keyworded on x86
 sys-cluster/ceph zfs