[gentoo-dev] [PATCH] Profile cleanup, pt. 3: arch/base

[gentoo-dev] [PATCH] Profile cleanup, pt. 3: arch/base

[Michał Górny]

Hi,

Here's the third part of my profile cleanup series. This time it's
focused on moving arch-related stuff from base/ to arch/base/.

The main goal is to have a clear profile inheritance. Since all arch/*
profiles inherit arch/base (not top-level base!), it is reasonable to
do the 'mask on all arches, unmask on specific' things there.

I should note that I didn't touch the part focused on stable masking
that applies to all arches uniformly. I'm not sure whether it should
be moved to arch/base or kept in base since it applies to all arches.
I guess it doesn't really matter though. It might also be reasonable
to create a dedicated directory for this specific use in arch/base.

The change is almost NFC, except for:

- little flag changes on ppc64 64le profile (ibm flag is masked now,
  ppc64: please advise if it's desired or undesirable),

- flag masking changes on Prefix profiles (Fabian is already testing
  them),

- flag masking changes to the dead uclibc/ profiles.

Please review.

[gentoo-dev] [PATCH 1/4] profiles/prefix: Add arch/base to parent

[Michał Górny]

---
 profiles/prefix/parent | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/prefix/parent b/profiles/prefix/parent
index 8f0e9fd7471d..3eaf2c441360 100644
--- a/profiles/prefix/parent
+++ b/profiles/prefix/parent
@@ -1 +1,2 @@
+../arch/base
 ../features/prefix/rpath
-- 
2.11.1

[gentoo-dev] [PATCH 2/4] profiles: Move ARCH-specific defaults to arch/base

[Michał Górny]

---
 profiles/arch/base/make.defaults | 9 +++++++++
 profiles/base/make.defaults      | 8 +++-----
 2 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 profiles/arch/base/make.defaults

diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
new file mode 100644
index 000000000000..552931edaff1
--- /dev/null
+++ b/profiles/arch/base/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+USE_EXPAND_UNPREFIXED="ARCH"
+USE_EXPAND_IMPLICIT="ARCH"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+
+PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 3d634df97d10..e8c6f3d30355 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
@@ -7,9 +7,7 @@
 
 # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
 IUSE_IMPLICIT="prefix prefix-guest"
-USE_EXPAND_UNPREFIXED="ARCH"
-USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
@@ -27,7 +25,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
-PROFILE_ONLY_VARIABLES="ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
+PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
 
 # 'Sane' defaults
 ELIBC="glibc"
-- 
2.11.1

[gentoo-dev] [PATCH 3/4] profiles: Move arch-specific use.mask entries to arch/base

[Michał Górny]

Resulting effective changes:
- in ppc64 64le, the 'ibm' flag is masked,
- a lot of extra arch masks on Prefix profiles.
---
 profiles/arch/base/use.mask | 203 ++++++++++++++++++++++++++++++++++++++++++++
 profiles/base/use.mask      | 203 +-------------------------------------------
 2 files changed, 207 insertions(+), 199 deletions(-)

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 54a139ff449c..96eb933cd24f 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -1,3 +1,206 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Michael Orlitzky <mjo@gentoo.org> (7 Jan 2017)
+# The dev-db/firebird and dev-db/oracle-instantclient* packages
+# only support amd64 and x86.
+firebird
+oci8
+
+# cilk has been ported only to x86 systems
+cilk
+
+# cuda only works on amd64/x86
+cuda
+
+# masking here, and unmasking in arch/x86/use.mask
+vidix
+
+# Mask as long its not available everywhere
+zeitgeist
+
+# vdpau is currently only available with binary nvidia-drivers, thus amd64/x86*
+vdpau
+
+# Infiniband stuff should generaly work on all arches but keyworded only on amd64/x86
+infiniband
+
+# These need libieee1284 which is amd64/x86 only.
+sane_backends_canon_pp
+sane_backends_hpsj5s
+sane_backends_mustek_pp
+sane_backends_qcam
+
+# amd64/x86 arch specific USE flags
+lilo
+mpx
+svga
+nvram
+cpu_flags_x86_3dnow
+cpu_flags_x86_3dnowext
+cpu_flags_x86_aes
+cpu_flags_x86_avx
+cpu_flags_x86_avx2
+cpu_flags_x86_fma3
+cpu_flags_x86_fma4
+cpu_flags_x86_mmx
+cpu_flags_x86_mmxext
+cpu_flags_x86_padlock
+cpu_flags_x86_popcnt
+cpu_flags_x86_sse
+cpu_flags_x86_sse2
+cpu_flags_x86_sse3
+cpu_flags_x86_sse4_1
+cpu_flags_x86_sse4_2
+cpu_flags_x86_sse4a
+cpu_flags_x86_ssse3
+cpu_flags_x86_xop
+
+# ppc arch specific USE flags
+altivec
+ppcsha1
+
+# mips arch specific USE flags
+fixed-point
+loongson2f
+mipsdspr1
+mipsdspr2
+mipsfpu
+
+# ppc64 arch specific USE flags
+ibm
+ps3
+
+# sparc arch specific USE flags
+vis
+
+# arm arch specific USE flags
+armvfp
+armv5te
+armv6
+armv6t2
+iwmmxt
+neon
+
+# nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers
+nvidia
+
+# dev-db/oracle-instantclient-basic is only available on x86
+oci8-instant-client
+oracle
+
+# not keyworded on non-x86 systems
+video_cards_geode
+video_cards_voodoo
+
+# not needed on non-sparc systems
+video_cards_sunbw2
+video_cards_suncg14
+video_cards_suncg3
+video_cards_suncg6
+video_cards_sunffb
+video_cards_sunleo
+video_cards_suntcx
+
+# not needed on non-mips systems
+video_cards_newport
+
+# not needed on non-x86, non-amd64 systems
+input_devices_vmmouse
+video_cards_nvidia
+video_cards_fglrx
+video_cards_via
+video_cards_vmware
+video_cards_virtualbox
+
+# not needed on non-arm systems
+video_cards_exynos
+video_cards_freedreno
+video_cards_omap
+video_cards_omapfb
+video_cards_tegra
+video_cards_vc4
+video_cards_vivante
+
+# linux-only drivers
+video_cards_qxl
+
+# not needed on non-x86, non-amd64, non-ppc systems
+input_devices_synaptics
+input_devices_wacom
+
+# Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
+# Only works on x86 or amd64
+lcd_devices_svga
+lcd_devices_luise
+
+# Joseph Jezak <josejx@gentoo.org> (11 Mar 2007)
+# Only for x86 and amd64 (in pbbuttonsd)
+macbook
+
+# George Shapovalov <george@gentoo.org> (8 Apr 2007)
+# Ada is supported only on x86, amd64 and ppc at present
+ada
+
+# Alex Legler <a3li@gentoo.org> (7 Dec 2009)
+# Rubinius is whitelisted on supported arches
+ruby_targets_rbx
+
+# Samuli Suominen <ssuominen@gentoo.org> (03 Oct 2011)
+# RealMagic Hollywood+/Creative DXR3 support
+# Still using obsolete V4L1 wrt bug 350211
+# If fixed, should be unmasked in amd64/x86/ppc32 use.mask
+dxr3
+
+# Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012)
+# IPMI is only implemented for x86, amd64 and ia64
+ipmi
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Dec 2012)
+# dev-lang/orc is useful only for some specific arches (amd64/x86/arm/...)
+orc
+
+# Mike Gilbert <floppym@gentoo.org> (02 Jan 2013)
+# PyPy is unkeyworded on most arches. If you are running amd64 or x86,
+# please switch to one of the testing 13.0 profiles to get it.
+python_targets_pypy
+python_single_target_pypy
+python_targets_pypy3
+python_single_target_pypy3
+
+# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
+# Mask the multilib flags globally. Unmasked in specific arches.
+abi_x86_32
+abi_x86_64
+abi_x86_x32
+# Matt Turner <mattst88@gentoo.org> (29 Jul 2013)
+abi_mips_o32
+abi_mips_n32
+abi_mips_n64
+abi_ppc_32
+abi_ppc_64
+abi_s390_32
+abi_s390_64
+
+# Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
+# These lisps are available only on some arches
+clisp
+clozurecl
+cmucl
+ecls
+gcl
+sbcl
+
+# Michał Górny <mgorny@gentoo.org> (4 May 2013)
+# Mask systemd flag globally, unmasked on arches on which systemd
+# is keyworded.
+systemd
+
+# Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
+# sys-libs/libapparmor
+apparmor
+
 # Mask flags that correspond to all possible ARCH values.
 alpha
 amd64
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 480c8ee49ffd..370b9b6ba0d4 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -2,30 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# This file is only for generic masks. For arch-specific masks (i.e.
+# mask everywhere, unmask on arch/*) use arch/base.
+
 # Michał Górny <mgorny@gentoo.org> (25 Jan 2017)
 # Masked until dev-lang/python:3.6 is unmasked
 python_targets_python3_6
 python_single_target_python3_6
 
-# Michael Orlitzky <mjo@gentoo.org> (7 Jan 2017)
-# The dev-db/firebird and dev-db/oracle-instantclient* packages
-# only support amd64 and x86.
-firebird
-oci8
-
 # Michael Palimaka <kensington@gentoo.org> (29 Dec 2016)
 # elogind support is not yet fully implemented in all required packages
 elogind
 
-# cilk has been ported only to x86 systems
-cilk
-
 # CURL_SSL=winssl is for prefix/windows/winnt only
 curl_ssl_winssl
 
-# cuda only works on amd64/x86
-cuda
-
 # on the way out
 ruby_targets_jruby
 ruby_targets_ruby19
@@ -37,128 +28,13 @@ kmod
 # not ready for primetime
 packagekit
 
-# masking here, and unmasking in arch/x86/use.mask
-vidix
-
-# Mask as long its not available everywhere
-zeitgeist
-
-# vdpau is currently only available with binary nvidia-drivers, thus amd64/x86*
-vdpau
-
-# Infiniband stuff should generaly work on all arches but keyworded only on amd64/x86
-infiniband
-
-# These need libieee1284 which is amd64/x86 only.
-sane_backends_canon_pp
-sane_backends_hpsj5s
-sane_backends_mustek_pp
-sane_backends_qcam
-
 # profile specific USE flags
 # Don't put hardened in here.
+# TODO: move multilib into arch/base once inherit order is fixed
 selinux
 uclibc
 multilib
 
-# amd64/x86 arch specific USE flags
-lilo
-mpx
-svga
-nvram
-cpu_flags_x86_3dnow
-cpu_flags_x86_3dnowext
-cpu_flags_x86_aes
-cpu_flags_x86_avx
-cpu_flags_x86_avx2
-cpu_flags_x86_fma3
-cpu_flags_x86_fma4
-cpu_flags_x86_mmx
-cpu_flags_x86_mmxext
-cpu_flags_x86_padlock
-cpu_flags_x86_popcnt
-cpu_flags_x86_sse
-cpu_flags_x86_sse2
-cpu_flags_x86_sse3
-cpu_flags_x86_sse4_1
-cpu_flags_x86_sse4_2
-cpu_flags_x86_sse4a
-cpu_flags_x86_ssse3
-cpu_flags_x86_xop
-
-# ppc arch specific USE flags
-altivec
-ppcsha1
-
-# mips arch specific USE flags
-fixed-point
-loongson2f
-mipsdspr1
-mipsdspr2
-mipsfpu
-
-# ppc64 arch specific USE flags
-ibm
-ps3
-
-# sparc arch specific USE flags
-vis
-
-# arm arch specific USE flags
-armvfp
-armv5te
-armv6
-armv6t2
-iwmmxt
-neon
-
-# nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers
-nvidia
-
-# dev-db/oracle-instantclient-basic is only available on x86
-oci8-instant-client
-oracle
-
-# not keyworded on non-x86 systems
-video_cards_geode
-video_cards_voodoo
-
-# not needed on non-sparc systems
-video_cards_sunbw2
-video_cards_suncg14
-video_cards_suncg3
-video_cards_suncg6
-video_cards_sunffb
-video_cards_sunleo
-video_cards_suntcx
-
-# not needed on non-mips systems
-video_cards_newport
-
-# not needed on non-x86, non-amd64 systems
-input_devices_vmmouse
-video_cards_nvidia
-video_cards_fglrx
-video_cards_via
-video_cards_vmware
-video_cards_virtualbox
-
-# not needed on non-arm systems
-video_cards_exynos
-video_cards_freedreno
-video_cards_omap
-video_cards_omapfb
-video_cards_tegra
-video_cards_vc4
-video_cards_vivante
-
-# linux-only drivers
-video_cards_qxl
-
-# not needed on non-x86, non-amd64, non-ppc systems
-input_devices_synaptics
-input_devices_wacom
-
 # Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles.
 userland_BSD
 
@@ -193,38 +69,15 @@ kernel_Winnt
 aqua
 coreaudio
 
-# Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
-# Only works on x86 or amd64
-lcd_devices_svga
-lcd_devices_luise
-
-# Joseph Jezak <josejx@gentoo.org> (11 Mar 2007)
-# Only for x86 and amd64 (in pbbuttonsd)
-macbook
-
-# George Shapovalov <george@gentoo.org> (8 Apr 2007)
-# Ada is supported only on x86, amd64 and ppc at present
-ada
-
 # Jeremy Olexa <darkside@gentoo.org>
 # The prefix USE flags should never be used on non prefix profiles
 prefix
 prefix-guest
 
-# Alex Legler <a3li@gentoo.org> (7 Dec 2009)
-# Rubinius is whitelisted on supported arches
-ruby_targets_rbx
-
 # Diego E. Pettenò <flameeyes@gentoo.org> (19 Oct 2010)
 # masking flags that only apply to FreeBSD
 kqueue
 
-# Samuli Suominen <ssuominen@gentoo.org> (03 Oct 2011)
-# RealMagic Hollywood+/Creative DXR3 support
-# Still using obsolete V4L1 wrt bug 350211
-# If fixed, should be unmasked in amd64/x86/ppc32 use.mask
-dxr3
-
 # Ralph Sennhauser <sera@gentoo.org> (31 Jul 2012)
 # Unmask in arch specific profiles when jython implementaton is available.
 python_targets_jython2_7
@@ -234,54 +87,10 @@ python_single_target_jython2_7
 # Prelude is being masked for removal
 prelude
 
-# Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012)
-# IPMI is only implemented for x86, amd64 and ia64
-ipmi
-
 # Diego Elio Pettenò <flameeyes@gentoo.org> (27 Aug 2012)
 # netlink is a Linux-specific interface
 netlink
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Dec 2012)
-# dev-lang/orc is useful only for some specific arches (amd64/x86/arm/...)
-orc
-
-# Mike Gilbert <floppym@gentoo.org> (02 Jan 2013)
-# PyPy is unkeyworded on most arches. If you are running amd64 or x86,
-# please switch to one of the testing 13.0 profiles to get it.
-python_targets_pypy
-python_single_target_pypy
-python_targets_pypy3
-python_single_target_pypy3
-
-# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
-# Mask the multilib flags globally. Unmasked in specific arches.
-abi_x86_32
-abi_x86_64
-abi_x86_x32
-# Matt Turner <mattst88@gentoo.org> (29 Jul 2013)
-abi_mips_o32
-abi_mips_n32
-abi_mips_n64
-abi_ppc_32
-abi_ppc_64
-abi_s390_32
-abi_s390_64
-
-# Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
-# These lisps are available only on some arches
-clisp
-clozurecl
-cmucl
-ecls
-gcl
-sbcl
-
-# Michał Górny <mgorny@gentoo.org> (4 May 2013)
-# Mask systemd flag globally, unmasked on arches on which systemd
-# is keyworded.
-systemd
-
 # Pacho Ramos <pacho@gentoo.org> (28 Sep 2013)
 # This USE flag is available after long dicussion in
 # http://www.gossamer-threads.com/lists/gentoo/dev/276077
@@ -290,10 +99,6 @@ systemd
 # could suffer unexpected problem, don't expect support for it then.
 openrc-force
 
-# Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
-# sys-libs/libapparmor
-apparmor
-
 # Brian Evans <grknight@gentoo.org> (2 Dec 2015)
 # php 5.4 is end of life, masked for removal
 php_targets_php5-4
-- 
2.11.1

[gentoo-dev] [PATCH 4/4] profiles: Move arch-specific package.use.mask to arch/base

[Michał Górny]

---
 profiles/arch/base/package.use.mask | 251 ++++++++++++++++++++++++++++++++++++
 profiles/base/package.use.mask      | 251 +-----------------------------------
 2 files changed, 254 insertions(+), 248 deletions(-)
 create mode 100644 profiles/arch/base/package.use.mask

diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
new file mode 100644
index 000000000000..2aa971959c3a
--- /dev/null
+++ b/profiles/arch/base/package.use.mask
@@ -0,0 +1,251 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Alexis Ballier <aballier@gentoo.org> (31 Jan 2017)
+# nvenc requires nvidia drivers, apply same mask logic
+media-video/ffmpeg nvenc
+
+# Thomas Deutschmann <whissi@gentoo.org> (30 Jan 2017)
+# media-libs/raspberrypi-userland not keyworded
+media-video/motion mmal
+
+# Magnus Granberg <zorry@gentoo.org> (18 Jan 2017)
+# Mask it globally, unmask it on supported arch
+>=sys-devel/gcc-6.2.0 pie
+
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (04 Jan 2017)
+# Mask assembly optimisations that are platform-specific
+dev-libs/libsecp256k1 asm
+
+# Ettore Di Giacinto <mudler@gentoo.org> (18 Oct 2016)
+# Enable gambit and scm only on supported arches
+>=dev-scheme/slib-3.2.5 gambit scm
+
+# Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016)
+# Dependency is only keyworded on amd64 and x86
+app-admin/collectd collectd_plugins_mqtt
+
+# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
+# It's only supported on amd64, ia64, powerpc and x86
+dev-db/percona-server numa
+
+# Brian Evans <grknight@gentoo.org> (23 Aug 2016)
+# It's only supported on amd64
+dev-db/percona-server tokudb tokudb-backup-plugin
+
+# Brian Evans <grknight@gentoo.org> (18 Aug 2016)
+# Mask jdbc as most arches don't support java
+dev-db/mariadb jdbc
+
+# James Le Cuirot <chewi@gentoo.org> (26 Jul 2016)
+# Only available on amd64.
+dev-java/icedtea shenandoah
+
+# Mike Gilbert <floppym@gentoo.org> (23 Jun 2016)
+# This flag only has meaning on amd64
+sys-boot/grub:2 grub_platforms_xen-32
+
+# Ian Delaney <idella4@gentoo.org> (06 Apr 2016)
+# on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
+# Raspberry Pi support is only available on arm.
+# Mask raspberry-pi USE globally, unmask on arm.
+media-video/mpv raspberry-pi
+
+# Alexis Ballier <aballier@gentoo.org> (14 Nov 2015)
+# MMAL is only available on the Raspberry Pi:
+# Mask it globally, unmask it on arm.
+media-video/ffmpeg mmal
+
+# Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015)
+# git useflag requires dev-libs/libgit2 which few arches support
+dev-util/geany-plugins git
+
+# Brian Evans <grknight@gentoo.org (14 Sep 2015)
+# Mask new USE flags for mariadb which all arches do not yet have dependencies
+>=dev-db/mariadb-10.1.0 mroonga sst-xtrabackup galera
+
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd gnuefi
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# JavaFX and the browser plugin are not included on some platforms.
+dev-java/oracle-jdk-bin javafx nsplugin
+dev-java/oracle-jre-bin javafx nsplugin
+
+# Ben de Groot <yngwin@gentoo.org> (15 Mar 2015)
+# Mask bdplus support and unmask on arches where libbdplus is keyworded.
+media-libs/libbluray bdplus
+
+# Michał Górny <mgorny@gentoo.org> (01 Mar 2015)
+# pidgin-opensteamworks is only available for amd64, ppc32 and x86
+net-im/telepathy-connection-managers steam
+
+# Ben de Groot <yngwin@gentoo.org> (07 Feb 2015)
+# Mask for all arches, can be unmasked on arm once keyworded there
+games-board/stockfish armv7
+
+# Tim Harder <radhermit@gentoo.org> (10 Oct 2014)
+# Masked since skype isn't stable
+net-im/bitlbee skype
+
+# 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
+
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (24 Apr 2014)
+# It's only supported on amd64
+dev-db/mariadb tokudb
+
+# Lars Wendler <polynomial-c@gentoo.org> (23 Apr 2014)
+# Not working on 64bit systems
+media-sound/lmms vst
+
+# Alexey Shvetsov <alexxy@gentoo.org> (16 Apr 2014)
+# libehca only works on ppc*
+sys-fabric/ofed ofed_drivers_ehca
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (4 Jan 2014)
+# Mask until dependencies are keyworded (bug 497068)
+dev-vcs/git mediawiki
+
+# Sergey Popov <pinkbyte@gentoo.org> (27 Dec 2013)
+# Mask because Boost.Context library does not work on most of arches
+dev-libs/boost context
+
+# Jeff Horelick <jdhore@gentoo.org> (1 Sep 2013)
+# Dependency (media-libs/libsidplayfp) only keyworded
+# on x86 and amd64. Will unmask there.
+>=media-plugins/audacious-plugins-3.4 sid
+
+# Tim Harder <radhermit@gentoo.org> (13 Aug 2013)
+# Related deps dev-lang/luajit and dev-scheme/racket are not keyworded by most arches.
+app-editors/vim luajit racket
+app-editors/gvim luajit racket
+
+# Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013)
+# Doesn't work on most profiles. Easier to mask here and
+# unmask in particular profiles
+sys-apps/hwloc cuda gl opencl
+
+# Justin Lecher <jlec@gentoo.org> (21 Feb 2013)
+# cuda only works on x86 and amd64
+sci-libs/cholmod cuda
+sci-libs/flann cuda
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (30 Dec 2012)
+# chromium is keyworded only on a few arches
+gnome-extra/zeitgeist-datasources chromium
+
+# Christoph Junghans <junghans@gentoo.org> (26 Dec 2012)
+# cuda/mkl only works on x86/amd64
+sci-chemistry/gromacs cuda mkl
+
+# Diego Elio Pettenò <flameeyes@gentoo.org> (3 Nov 2012)
+# Requires net-dns/unbound which is not keyworded by most arches
+net-libs/gnutls dane
+
+# Ben de Groot <yngwin@gentoo.org> (30 Jul 2012)
+# fontconfig-infinality dependency not yet keyworded on most arches
+media-libs/freetype infinality
+
+# James Le Cuirot <chewi@gentoo.org> (20 May 2015)
+# Mask this in conjunction with the above.
+dev-java/icedtea infinality
+
+# Rick Farina <zerochaos@gentoo.org> (05 July 2012)
+# cuda is available on x86/amd64 only
+app-crypt/johntheripper cuda
+
+# Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
+# sys-fs/zfs is not available everywhere.
+sys-boot/grub libzfs
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012)
+# Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
+# gobject-introspection[doctool], bug #411761
+dev-libs/gobject-introspection doctool
+
+# Michał Górny <mgorny@gentoo.org> (11 Apr 2012)
+# JIT compilation in libzpaq generates code for x86/amd64.
+app-arch/zpaq jit
+
+# Arun Raghavan <ford_prefect@gentoo.org> (28 Mar 2012)
+# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
+# added.
+# Arun Raghavan <ford_prefect@gentoo.org> (24 May 2012)
+# Mask xen USE flag by default, unmask on x86/amd64 where it is supported.
+media-sound/pulseaudio webrtc-aec xen
+
+# Christoph Junghans <junghans@gentoo.org> (04 Feb 2012)
+# mips only use flags
+>=sci-libs/fftw-3 zbus
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
+# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
+# it's masked here and unmasked in individual profiles (bug #396313).
+net-libs/webkit-gtk jit
+www-client/midori jit
+
+# Samuli Suominen <ssuominen@gentoo.org> (06 Dec 2011)
+# NuppelVideo is available on x86 only
+media-video/transcode nuv pic
+
+# Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
+# The QML (V4) and JSC JITs are supported only on amd64/arm/x86, so
+# mask the flag here and unmask it in the appropriate arch profiles.
+dev-qt/qtdeclarative jit
+dev-qt/qtscript jit
+dev-qt/qtwebkit jit
+
+# Samuli Suominen <ssuominen@gentoo.org> (25 Nov 2011)
+# Expose USE="suid" for USE="svga" only for x86 users,
+# see arch/x86/package.use.mask
+www-client/links suid
+
+# Samuli Suominen <ssuominen@gentoo.org> (16 Oct 2011)
+# Mask libbluray support here, and enable it per arch instead
+gnome-base/gvfs bluray
+
+# Nirbheek Chauhan <nirbheek@gentoo.org> (17 Sep 2011)
+# Systemtap is not keyworded on anything except amd64/x86
+# Temporarily mask instead of dropping keywords, bug 384647
+dev-libs/glib systemtap
+
+# Robin H. Johnson <robbat2@gentoo.org> (10 Jul 2011)
+# PPS should work on all arches, but only keyworded on amd64/x86
+>=net-misc/ntp-4.2.6_p3-r1 parse-clocks
+
+# Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2010)
+# Masked because tools pulled in are not supported on most archs.
+sys-power/pm-utils video_cards_intel video_cards_radeon
+
+# Mounir Lamouri <volkmar@gentoo.org> (07 Nov 2009)
+# Mask cuda for k3d. Works only on amd64/x86. Bug 267264
+media-gfx/k3d cuda
+
+# Jean-Noël Rivasseau <elvanor@gentoo.org> (23 Sep 2009)
+# X use flag only for amd64/x86, bug 285951.
+media-gfx/iscan X
+
+# Tomas Chvatal <scarabeus@gentoo.org> (31 Jan 2009)
+# mask cuda for boinc. Works only on amd64 and x86
+sci-misc/boinc cuda
+
+# Robert Buchholz <rbu@gentoo.org> (16 Aug 2008)
+# TLS needs dev-libs/cryptlib, which is x86 only
+dev-python/kaa-base tls
+
+# Serkan Kaba <serkan@gentoo.org> (20 Jul 2008)
+# Java is not supported in most of the arches enchant is keyworded
+app-text/enchant zemberek
+
+# Raúl Porcel <armin76@gentoo.org> (09 Nov 2008)
+# CPU opts: This needs amd64, x86 and ppc on some of them
+# dvdnav: hard masked dependency
+media-video/mplayer cpudetection
+
+# Ian Whyman <thev00d00@gentoo.org> (22 May 2016)
+# Mask raspberry-pi except on arm.
+dev-libs/libcec raspberry-pi
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index e2a0752a7c84..8874a0bed8da 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,19 +5,14 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# This file is only for generic masks. For arch-specific masks (i.e.
+# mask everywhere, unmask on arch/*) use arch/base.
+
 # Ulrich Müller <ulm@gentoo.org> (4 Feb 2017)
 # Uses old and vulnerable net-libs/webkit-gtk:3, bug #584156.
 app-editors/emacs:25 xwidgets
 app-editors/emacs-vcs:25 xwidgets
 
-# Alexis Ballier <aballier@gentoo.org> (31 Jan 2017)
-# nvenc requires nvidia drivers, apply same mask logic
-media-video/ffmpeg nvenc
-
-# Thomas Deutschmann <whissi@gentoo.org> (30 Jan 2017)
-# media-libs/raspberrypi-userland not keyworded
-media-video/motion mmal
-
 # Matt Turner <mattst88@gentoo.org> (26 Jan 2017)
 # x11-drivers/ati-drivers is masked for removal.
 media-gfx/blender opencl
@@ -40,18 +35,10 @@ x11-base/xorg-drivers video_cards_v4l
 net-fs/samba system-heimdal
 
 # Magnus Granberg <zorry@gentoo.org> (18 Jan 2017)
-# Mask it globally, unmask it on supported arch
->=sys-devel/gcc-6.2.0 pie
-
-# Magnus Granberg <zorry@gentoo.org> (18 Jan 2017)
 # Adding the mask so that end users and devlopers are notified of the removal and have some
 # time to migrate. There is no support for gcj in gcc-7
 >=sys-devel/gcc-6.3.0 gcj
 
-# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (04 Jan 2017)
-# Mask assembly optimisations that are platform-specific
-dev-libs/libsecp256k1 asm
-
 # Robin H. Johnson <robbat2@gentoo.org> (04 Dec 2016)
 # Additional HAProxy functionality waiting for related stuff to land in the
 # tree.
@@ -78,20 +65,12 @@ net-libs/opal capi
 # and as for now we have only stable mate versions
 mate-base/mate bluetooth
 
-# Ettore Di Giacinto <mudler@gentoo.org> (18 Oct 2016)
-# Enable gambit and scm only on supported arches
->=dev-scheme/slib-3.2.5 gambit scm
-
 # Ulrich Müller <ulm@gentoo.org> (15 Oct 2016)
 # The --with-cairo option is considered as experimental by upstream
 # and causes problems with updating the X window, bug #592238
 app-editors/emacs cairo
 app-editors/emacs-vcs cairo
 
-# Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016)
-# Dependency is only keyworded on amd64 and x86
-app-admin/collectd collectd_plugins_mqtt
-
 # Michael Palimaka <kensington@gentoo.org> (15 Sep 2016)
 # Requires unreleased dependency dev-qt/qtspeech.
 kde-apps/konqueror speech
@@ -107,14 +86,6 @@ kde-frameworks/ktextwidgets speech
 # either unless somebody steps up to fix it.
 >=sys-devel/llvm-3.9.0_rc lldb
 
-# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
-# It's only supported on amd64, ia64, powerpc and x86
-dev-db/percona-server numa
-
-# Brian Evans <grknight@gentoo.org> (23 Aug 2016)
-# It's only supported on amd64
-dev-db/percona-server tokudb tokudb-backup-plugin
-
 # Brian Evans <grknight@gentoo.org> (22 Aug 2016)
 # Depends on masked, end-of-life php versions
 =dev-libs/ossp-uuid-1.6.2-r4 php
@@ -133,10 +104,6 @@ dev-ml/cairo-ocaml svg
 # gnutls is broken for years
 >=net-libs/gsoap-2.8.0 gnutls
 
-# Brian Evans <grknight@gentoo.org> (18 Aug 2016)
-# Mask jdbc as most arches don't support java
-dev-db/mariadb jdbc
-
 # Brian Dolbec <dolsen@gentoo.org> (9 Aug 2016)
 # Mask doc use flag due to needed sphinx pkg update
 ~dev-util/buildbot-0.9.0_p1 doc
@@ -144,10 +111,6 @@ dev-db/mariadb jdbc
 ~dev-util/buildbot-0.9.2 doc
 ~dev-util/buildbot-0.9.3 doc
 
-# James Le Cuirot <chewi@gentoo.org> (26 Jul 2016)
-# Only available on amd64.
-dev-java/icedtea shenandoah
-
 # Johannes Huber <johu@gentoo.org> (10 Jul 2016)
 # Unreleased dependencies.
 >=media-gfx/digikam-5.0.0 addressbook
@@ -157,10 +120,6 @@ dev-java/icedtea shenandoah
 # to security bug cleanup, #585102.
 dev-util/intel-ocl-sdk system-clang
 
-# Mike Gilbert <floppym@gentoo.org> (23 Jun 2016)
-# This flag only has meaning on amd64
-sys-boot/grub:2 grub_platforms_xen-32
-
 # Matthew Brewer <tomboy64@sina.cn> (02 June 2016)
 # Acked-by: Amy Winston <amynka@gentoo.org>
 # Currently broken upstream.
@@ -205,12 +164,6 @@ dev-cpp/eigen:2 doc
 # you're doing. This has upstream's approval.
 dev-java/icedtea cacao jamvm
 
-# Ian Delaney <idella4@gentoo.org> (06 Apr 2016)
-# on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
-# Raspberry Pi support is only available on arm.
-# Mask raspberry-pi USE globally, unmask on arm.
-media-video/mpv raspberry-pi
-
 # Maciej Mrozowski <reavertm@gmail.com> (23 Mar 2016)
 # Experimental cairo-qt backend (see bug #568000).
 app-text/poppler cairo-qt
@@ -234,19 +187,10 @@ kde-plasma/plasma-sdk plasmate
 # Unsastified dependencies are upsetting repoman. Needs investigation.
 app-arch/cfv bittorrent
 
-# Alexis Ballier <aballier@gentoo.org> (14 Nov 2015)
-# MMAL is only available on the Raspberry Pi:
-# Mask it globally, unmask it on arm.
-media-video/ffmpeg mmal
-
 # Rick Farina <zerochaos@gentoo.org> (06 Oct 2015)
 # forward porting this patch is non-trivial, mask for now
 >=net-wireless/wpa_supplicant-2.5 wimax
 
-# Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015)
-# git useflag requires dev-libs/libgit2 which few arches support
-dev-util/geany-plugins git
-
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (25 Sep 2015)
 # Upstream gtk3 support is experimental:
 # https://code.google.com/p/chromium/issues/detail?id=132847
@@ -257,10 +201,6 @@ www-client/chromium gtk3
 # https://bugs.gentoo.org/show_bug.cgi?id=533876
 >=sci-libs/vtk-6.1.0 examples
 
-# Brian Evans <grknight@gentoo.org (14 Sep 2015)
-# Mask new USE flags for mariadb which all arches do not yet have dependencies
->=dev-db/mariadb-10.1.0 mroonga sst-xtrabackup galera
-
 # Fabian Groffen <grobian@gentoo.org> (08 Sep 2015)
 # GnuTLS support is currently broken/causes hang, bug #559834
 # http://dev.mutt.org/trac/ticket/3772
@@ -271,10 +211,6 @@ www-client/chromium gtk3
 # Unmasked in default/linux/package.use.mask.
 sys-auth/consolekit cgroups
 
-# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
-# sys-boot/gnu-efi is not supported on all archs.
-sys-apps/systemd gnuefi
-
 # Manuel Rüger <mrueg@gentoo.org> (03 Sep 2015)
 # Mask USE=ruby for packages that solely rely on the soon to be deprecated
 # ruby 1.9
@@ -304,11 +240,6 @@ dev-java/gcj-jdk awt
 # Gentoo bug: 554484
 >=dev-lang/mono-3.12.1 doc
 
-# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
-# JavaFX and the browser plugin are not included on some platforms.
-dev-java/oracle-jdk-bin javafx nsplugin
-dev-java/oracle-jre-bin javafx nsplugin
-
 # Manuel Rüger <mrueg@gentoo.org> (05 Jul 2015)
 # app-text/migemo is masked because it fails for ruby20
 app-text/cmigemo emacs
@@ -337,23 +268,11 @@ games-strategy/freeciv system-lua
 dev-db/mariadb cluster
 dev-db/mysql cluster
 
-# Ben de Groot <yngwin@gentoo.org> (15 Mar 2015)
-# Mask bdplus support and unmask on arches where libbdplus is keyworded.
-media-libs/libbluray bdplus
-
-# Michał Górny <mgorny@gentoo.org> (01 Mar 2015)
-# pidgin-opensteamworks is only available for amd64, ppc32 and x86
-net-im/telepathy-connection-managers steam
-
 # Andrew Savchenko <bircoph@gentoo.org> (11 Feb 2015)
 # Cluster code is still under development, only base functionality
 # is implemented. Masking for testing and evaluation.
 app-admin/clsync cluster mhash
 
-# Ben de Groot <yngwin@gentoo.org> (07 Feb 2015)
-# Mask for all arches, can be unmasked on arm once keyworded there
-games-board/stockfish armv7
-
 # Michał Górny <mgorny@gentoo.org> (25 Dec 2014)
 # Requires non-keyworded >=libevent-2.1, bug #533540.
 www-servers/pshs ssl
@@ -380,10 +299,6 @@ sys-devel/gcc sanitize
 # swfdec is masked for removal, bug #525834
 dev-libs/DirectFB swfdec
 
-# Tim Harder <radhermit@gentoo.org> (10 Oct 2014)
-# Masked since skype isn't stable
-net-im/bitlbee skype
-
 # Rick Farina <zerochaos@gentoo.org> (26 Aug 2014)
 # mirisdr does not seem to like making releases
 <net-wireless/gr-osmosdr-9999 mirisdr
@@ -392,10 +307,6 @@ net-im/bitlbee skype
 # net-libs/tox is in mva overlay only ATM
 app-leechcraft/lc-azoth sarin
 
-# 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
@@ -427,22 +338,10 @@ net-analyzer/metasploit development test
 # Tracked in Gentoo bug #509602.
 dev-java/jboss-logging doc
 
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (24 Apr 2014)
-# It's only supported on amd64
-dev-db/mariadb tokudb
-
-# Lars Wendler <polynomial-c@gentoo.org> (23 Apr 2014)
-# Not working on 64bit systems
-media-sound/lmms vst
-
 # Markos Chandras <hwoarang@gentoo.org> (20 Apr 2014)
 # Fails to build with recent polarssl (>=1.3). Bug #503604
 media-video/rtmpdump polarssl
 
-# Alexey Shvetsov <alexxy@gentoo.org> (16 Apr 2014)
-# libehca only works on ppc*
-sys-fabric/ofed ofed_drivers_ehca
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (12 Apr 2014)
 # Upstream regularly forgets to update the bindings after changes in API,
 # leading to build failures. This is becoming more and more painful...
@@ -462,14 +361,6 @@ media-sound/podcatcher bittorrent
 # Upstream says to not use this for now.
 dev-libs/elfutils threads
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (4 Jan 2014)
-# Mask until dependencies are keyworded (bug 497068)
-dev-vcs/git mediawiki
-
-# Sergey Popov <pinkbyte@gentoo.org> (27 Dec 2013)
-# Mask because Boost.Context library does not work on most of arches
-dev-libs/boost context
-
 # Gilles Dartiguelongue <eva@gentoo.org> (23 Dec 2013)
 # Gstreamer support fails to build due to libtool shortcomings when using
 # an intermediate library as a dependency of another libtool target dependency.
@@ -494,11 +385,6 @@ dev-python/pypy3 sandbox
 # luajit is in ~arch, prepare for minetest stabilization
 games-action/minetest luajit
 
-# Jeff Horelick <jdhore@gentoo.org> (1 Sep 2013)
-# Dependency (media-libs/libsidplayfp) only keyworded
-# on x86 and amd64. Will unmask there.
->=media-plugins/audacious-plugins-3.4 sid
-
 # Julian Ospald <hasufell@gentoo.org> (31 Aug 2013)
 # Randomly breaks consumers at runtime. Do not report
 # gentoo bugs.
@@ -508,16 +394,6 @@ media-libs/libsdl2 custom-cflags
 # Causes build to fail, issue is being discussed with upstream
 >=www-plugins/gnash-0.8.10_p20130822 openvg
 
-# Tim Harder <radhermit@gentoo.org> (13 Aug 2013)
-# Related deps dev-lang/luajit and dev-scheme/racket are not keyworded by most arches.
-app-editors/vim luajit racket
-app-editors/gvim luajit racket
-
-# Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013)
-# Doesn't work on most profiles. Easier to mask here and
-# unmask in particular profiles
-sys-apps/hwloc cuda gl opencl
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
 # GL/GLES support in cairo is mutually exclusive, bug #428770.
 x11-libs/cairo gles2
@@ -554,11 +430,6 @@ media-sound/google-musicmanager log
 # Experimental, masked until it compiles and works.
 media-libs/avidemux-core system-ffmpeg
 
-# Justin Lecher <jlec@gentoo.org> (21 Feb 2013)
-# cuda only works on x86 and amd64
-sci-libs/cholmod cuda
-sci-libs/flann cuda
-
 # Julian Ospald <hasufell@gentoo.org> (20 Feb 2013)
 # Unsupported and experimental.
 # NP-Hardass <NP-Hardass@gentoo.org> (18 Jun 2015)
@@ -570,14 +441,6 @@ sci-libs/flann cuda
 # Mask it until upstream fixes it. Bug #417869
 <media-sound/audacity-2.1.0 ffmpeg
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (30 Dec 2012)
-# chromium is keyworded only on a few arches
-gnome-extra/zeitgeist-datasources chromium
-
-# Christoph Junghans <junghans@gentoo.org> (26 Dec 2012)
-# cuda/mkl only works on x86/amd64
-sci-chemistry/gromacs cuda mkl
-
 # Jory A. Pratt <anarchy@gentoo.org> (15 Dec 2012)
 # PGO is known to be busted with most configurations
 www-client/firefox pgo
@@ -586,10 +449,6 @@ www-client/firefox pgo
 # PDF docs building failed with sandbox violation
 media-libs/opencolorio pdf
 
-# Diego Elio Pettenò <flameeyes@gentoo.org> (3 Nov 2012)
-# Requires net-dns/unbound which is not keyworded by most arches
-net-libs/gnutls dane
-
 # Diego Elio Pettenò (27 Aug 2012)
 # The libpci access is only used for linux.
 net-analyzer/net-snmp pci
@@ -598,22 +457,6 @@ net-analyzer/net-snmp pci
 # The prevent-removal USE flag is only implemented for Linux.
 sys-auth/pam_mktemp prevent-removal
 
-# Ben de Groot <yngwin@gentoo.org> (30 Jul 2012)
-# fontconfig-infinality dependency not yet keyworded on most arches
-media-libs/freetype infinality
-
-# James Le Cuirot <chewi@gentoo.org> (20 May 2015)
-# Mask this in conjunction with the above.
-dev-java/icedtea infinality
-
-# Rick Farina <zerochaos@gentoo.org> (05 July 2012)
-# cuda is available on x86/amd64 only
-app-crypt/johntheripper cuda
-
-# Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
-# sys-fs/zfs is not available everywhere.
-sys-boot/grub libzfs
-
 # Michael Weber<xmw@gentoo.org>  (02 Jun 2012)
 # Not fit for production (bug 404403, comment #5)
 dev-db/firebird client
@@ -622,22 +465,6 @@ dev-db/firebird client
 # Requires icc which does not emerge (distfile unavailable)
 media-libs/opencv ipp
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012)
-# Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
-# gobject-introspection[doctool], bug #411761
-dev-libs/gobject-introspection doctool
-
-# Michał Górny <mgorny@gentoo.org> (11 Apr 2012)
-# JIT compilation in libzpaq generates code for x86/amd64.
-app-arch/zpaq jit
-
-# Arun Raghavan <ford_prefect@gentoo.org> (28 Mar 2012)
-# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
-# added.
-# Arun Raghavan <ford_prefect@gentoo.org> (24 May 2012)
-# Mask xen USE flag by default, unmask on x86/amd64 where it is supported.
-media-sound/pulseaudio webrtc-aec xen
-
 # Samuli Suominen <ssuominen@gentoo.org> (20 Mar 2012)
 # This is for udev-acl. Unmasked in default/linux/package.use.mask.
 sys-auth/consolekit acl
@@ -650,55 +477,16 @@ www-plugins/gnash directfb
 # libobjc2/clang experimental support
 >=gnustep-base/gnustep-make-2.6.2 libobjc2
 
-# Christoph Junghans <junghans@gentoo.org> (04 Feb 2012)
-# mips only use flags
->=sci-libs/fftw-3 zbus
-
 # Samuli Suominen <ssuominen@gentoo.org> (10 Jan 2012)
 # This is required only for Linux, so mask it here and unmask in
 # default/linux/package.use.mask. Bug 354923.
 app-arch/libarchive e2fsprogs
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked here and unmasked in individual profiles (bug #396313).
-net-libs/webkit-gtk jit
-www-client/midori jit
-
 # Mike Frysinger <vapier@gentoo.org> (06 Dec 2011)
 # No one should be mucking with libssp unless they really know what they're
 # doing.  Force extra work on the smart peeps to protect the not-so-smart.
 sys-devel/gcc libssp
 
-# Samuli Suominen <ssuominen@gentoo.org> (06 Dec 2011)
-# NuppelVideo is available on x86 only
-media-video/transcode nuv pic
-
-# Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
-# The QML (V4) and JSC JITs are supported only on amd64/arm/x86, so
-# mask the flag here and unmask it in the appropriate arch profiles.
-dev-qt/qtdeclarative jit
-dev-qt/qtscript jit
-dev-qt/qtwebkit jit
-
-# Samuli Suominen <ssuominen@gentoo.org> (25 Nov 2011)
-# Expose USE="suid" for USE="svga" only for x86 users,
-# see arch/x86/package.use.mask
-www-client/links suid
-
-# Samuli Suominen <ssuominen@gentoo.org> (16 Oct 2011)
-# Mask libbluray support here, and enable it per arch instead
-gnome-base/gvfs bluray
-
-# Nirbheek Chauhan <nirbheek@gentoo.org> (17 Sep 2011)
-# Systemtap is not keyworded on anything except amd64/x86
-# Temporarily mask instead of dropping keywords, bug 384647
-dev-libs/glib systemtap
-
-# Robin H. Johnson <robbat2@gentoo.org> (10 Jul 2011)
-# PPS should work on all arches, but only keyworded on amd64/x86
->=net-misc/ntp-4.2.6_p3-r1 parse-clocks
-
 # Andrey Grozin <grozin@gentoo.org> (29 Mar 2011)
 # dev-lang/swig-2.0.2 with -octave generated .cpp files
 # incompatible with >=sci-mathematics/octave-3.4.0
@@ -721,10 +509,6 @@ net-dns/pdnsd isdn urandom
 # Masked because libsvm module is broken with this release on every arch.
 dev-lisp/clisp svm
 
-# Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2010)
-# Masked because tools pulled in are not supported on most archs.
-sys-power/pm-utils video_cards_intel video_cards_radeon
-
 # Diego E. Pettenò <flameeyes@gmail.com> (18 Jan 2010)
 # Don't use system-wide mode unless you *really* know what you're doing.
 # Keep it masked here so that I don't need to manage two versions every time.
@@ -740,41 +524,12 @@ media-sound/pulseaudio system-wide
 # Mask very experimental mpi use flag dfor gamess
 sci-chemistry/gamess mpi
 
-# Mounir Lamouri <volkmar@gentoo.org> (07 Nov 2009)
-# Mask cuda for k3d. Works only on amd64/x86. Bug 267264
-media-gfx/k3d cuda
-
-# Jean-Noël Rivasseau <elvanor@gentoo.org> (23 Sep 2009)
-# X use flag only for amd64/x86, bug 285951.
-media-gfx/iscan X
-
-# Tomas Chvatal <scarabeus@gentoo.org> (31 Jan 2009)
-# mask cuda for boinc. Works only on amd64 and x86
-sci-misc/boinc cuda
-
-# Robert Buchholz <rbu@gentoo.org> (16 Aug 2008)
-# TLS needs dev-libs/cryptlib, which is x86 only
-dev-python/kaa-base tls
-
-# Serkan Kaba <serkan@gentoo.org> (20 Jul 2008)
-# Java is not supported in most of the arches enchant is keyworded
-app-text/enchant zemberek
-
 # These are for BSD only
 net-proxy/squid ipf-transparent pf-transparent
 app-admin/sshguard ipfilter
 
-# Raúl Porcel <armin76@gentoo.org> (09 Nov 2008)
-# CPU opts: This needs amd64, x86 and ppc on some of them
-# dvdnav: hard masked dependency
-media-video/mplayer cpudetection
-
 # Alexis Ballier <aballier@gentoo.org> <16 Feb 2011>
 # Win32 specific useflags for vlc. Can be used for cross-compiling.
 media-video/vlc directx dxva2
 # Mac OSX / iPhone OS specific useflags
 media-video/vlc audioqueue macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
-
-# Ian Whyman <thev00d00@gentoo.org> (22 May 2016)
-# Mask raspberry-pi except on arm.
-dev-libs/libcec raspberry-pi
-- 
2.11.1

Re: [gentoo-dev] [PATCH] Profile cleanup, pt. 3: arch/base

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]

W dniu 13.02.2017, pon o godzinie 15∶40 +0100, użytkownik Michał Górny
napisał:
> Hi,
> 
> Here's the third part of my profile cleanup series. This time it's
> focused on moving arch-related stuff from base/ to arch/base/.
> 
> The main goal is to have a clear profile inheritance. Since all arch/*
> profiles inherit arch/base (not top-level base!), it is reasonable to
> do the 'mask on all arches, unmask on specific' things there.
> 
> I should note that I didn't touch the part focused on stable masking
> that applies to all arches uniformly. I'm not sure whether it should
> be moved to arch/base or kept in base since it applies to all arches.
> I guess it doesn't really matter though. It might also be reasonable
> to create a dedicated directory for this specific use in arch/base.
> 
> The change is almost NFC, except for:
> 
> - little flag changes on ppc64 64le profile (ibm flag is masked now,
>   ppc64: please advise if it's desired or undesirable),
> 
> - flag masking changes on Prefix profiles (Fabian is already testing
>   them),
> 
> - flag masking changes to the dead uclibc/ profiles.
> 
> Please review.

Committed now. Please remember to commit arch-related masks to
profiles/arch/base instead of profiles/base from now on.

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 963 bytes --]

[gentoo-dev] Re: [PATCH 1/4] profiles/prefix: Add arch/base to parent

[Michael Haubenwallner]

On 02/13/2017 03:40 PM, Michał Górny wrote:
> ---
>  profiles/prefix/parent | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/profiles/prefix/parent b/profiles/prefix/parent
> index 8f0e9fd7471d..3eaf2c441360 100644
> --- a/profiles/prefix/parent
> +++ b/profiles/prefix/parent
> @@ -1 +1,2 @@
> +../arch/base
>  ../features/prefix/rpath
> 

This causes duplicate inheritance of arch/base for prefix/linux/* profiles,
as they get arch/base via default/linux/* anyway.

Fixed in
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf75385caac73e1ffb7035b37add91ef57583fe

/haubi/