gentoo resync : 13.10.2019

50 files changed, 47 insertions, 869 deletions

diff --git a/profiles/arch/alpha/package.use.stable.mask b/profiles/arch/alpha/package.use.stable.mask
index 3ced383a69d5..4bbf72348d4c 100644
--- a/profiles/arch/alpha/package.use.stable.mask
+++ b/profiles/arch/alpha/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (2019-10-13)
+# Depends on php which is stable.mask'd
+net-analyzer/nagios-core web
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-12-02)
 # gnome-base/nautilus is not stable
 media-sound/easytag nautilus
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index d14c33e57e4f..4ed29713ab45 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -87,6 +87,7 @@ valgrind
 vaapi
 librtmp
 rtmp
+v4l
 vpx
 kde
 quvi
@@ -174,7 +175,7 @@ curl_ssl_axtls
 # media-libs/xine-lib is not keyworded
 xine
 
-template_haskell
+template-haskell
 
 # nvidia cg toolkit for binary drivers
 cg
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index d566f941602a..e384e174cd97 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Matt Turner <mattst88@gentoo.org> (2019‑10-13)
+# dev-lang/php is unstable-only on alpha
+php
+
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependency not yet stable (dev-libs/libappindicator).
 ayatana
diff --git a/profiles/arch/amd64-fbsd/clang/eapi b/profiles/arch/amd64-fbsd/clang/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/amd64-fbsd/clang/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/amd64-fbsd/clang/make.defaults b/profiles/arch/amd64-fbsd/clang/make.defaults
deleted file mode 100644
index 746ac289456c..000000000000
--- a/profiles/arch/amd64-fbsd/clang/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/amd64-fbsd/clang/package.use.force b/profiles/arch/amd64-fbsd/clang/package.use.force
deleted file mode 100644
index 36c6e4aadf94..000000000000
--- a/profiles/arch/amd64-fbsd/clang/package.use.force
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Force building libc++ over libcxxrt.
-sys-libs/libcxx libcxxrt
-
-# Force static libs and multilib on the C++ stack.
-sys-libs/libcxxrt static-libs abi_x86_32
-sys-libs/libcxx static-libs abi_x86_32
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl ssl curl_ssl_openssl
-
-# o-flag-munging is required to compile dev-libs/libgcrypt with clang.
-# https://bugs.gentoo.org/629410
-dev-libs/libgcrypt o-flag-munging
diff --git a/profiles/arch/amd64-fbsd/clang/package.use.mask b/profiles/arch/amd64-fbsd/clang/package.use.mask
deleted file mode 100644
index 666f4a7f80d0..000000000000
--- a/profiles/arch/amd64-fbsd/clang/package.use.mask
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Disable libcxxabi since it collides with forced libcxxrt
-# Build libcxxrt over libgcc_s since that is what clang defaults to.
-sys-libs/libcxx libcxxabi libunwind
-sys-libs/libcxxrt libunwind
-
-# Needs to be fixed: cxx useflag enables plugins and gold.
-# gold fails to build with clang:
-# https://bugs.gentoo.org/show_bug.cgi?id=427344
-# http://llvm.org/bugs/show_bug.cgi?id=12299
-sys-devel/binutils cxx
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_gnutls curl_ssl_nss
-
-# Needs to be fixed: build fails with clang++
-# https://bugs.gentoo.org/show_bug.cgi?id=578506
-sys-libs/db cxx
diff --git a/profiles/arch/amd64-fbsd/clang/packages b/profiles/arch/amd64-fbsd/clang/packages
deleted file mode 100644
index f60852f668d1..000000000000
--- a/profiles/arch/amd64-fbsd/clang/packages
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Don't remove gcc from here: clang uses it for crt{begin,end}*.o and its c++
-# stack.
-
-*sys-devel/llvm
-*sys-devel/clang
-*sys-libs/libcxx
diff --git a/profiles/arch/amd64-fbsd/clang/packages.build b/profiles/arch/amd64-fbsd/clang/packages.build
deleted file mode 100644
index 0cf609150f0c..000000000000
--- a/profiles/arch/amd64-fbsd/clang/packages.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file describes the packages needed to build a stage 1 based on this
-# profile.  Packages in this file are built in order.
-
-sys-devel/llvm
-sys-devel/clang
-sys-libs/libcxx
diff --git a/profiles/arch/amd64-fbsd/clang/parent b/profiles/arch/amd64-fbsd/clang/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/amd64-fbsd/clang/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/amd64-fbsd/clang/profile.bashrc b/profiles/arch/amd64-fbsd/clang/profile.bashrc
deleted file mode 100644
index 496d41b3853d..000000000000
--- a/profiles/arch/amd64-fbsd/clang/profile.bashrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-
-# Check if clang/clang++ exist before setting them so that we can more easily
-# switch to this profile and build stages.
-# Some packages will require BUILD_{CC,CXX} variables, bug 595878.
-type -P clang > /dev/null && export CC=clang && export BUILD_CC=clang
-type -P clang++ > /dev/null && [ -f /usr/lib/libc++.so ] && export CXX=clang++ && export BUILD_CXX=clang++
diff --git a/profiles/arch/amd64-fbsd/eapi b/profiles/arch/amd64-fbsd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/amd64-fbsd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults
deleted file mode 100644
index be0830e56871..000000000000
--- a/profiles/arch/amd64-fbsd/make.defaults
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# System-wide defaults for the G/FBSD Portage system
-
-ARCH="amd64-fbsd"
-ACCEPT_KEYWORDS="amd64-fbsd ~amd64-fbsd"
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-MULTILIB_ABIS="amd64_fbsd x86_fbsd"
-DEFAULT_ABI="amd64_fbsd"
-# Do not remove this one, or all kinds of hell breaks loose.
-ABI="amd64_fbsd"
-
-# 32bit specific settings.
-CFLAGS_x86_fbsd="-m32"
-LDFLAGS_x86_fbsd="-m elf_i386_fbsd -L/usr/lib32"
-
-CPU_FLAGS_X86="mmx mmxext sse sse2"
-
-VIDEO_CARDS="dummy intel mga nv r128 radeon siliconmotion via vmware"
-
-# Vanilla FreeBSD has: lib for native 64 bits libs, lib32 for 32-bits emulation.
-# Let's do this too as this also happens to be more standard among other linux
-# distros.
-# Adjust multilib dirs for multilib-strict.
-LIBDIR_amd64_fbsd="lib"
-LIBDIR_x86_fbsd="lib32"
-MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X11R6/lib32"
-SYMLINK_LIB="no"
-
-# Unhide the x86-specific USE_EXPANDs.
-USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
-
-# Michał Górny <mgorny@gentoo.org> (2014-07-01)
-# Default to abi_x86_64 for packages that don't have it forced.
-ABI_X86="64"
-
-# Michał Górny <mgorny@gentoo.org> (2014-07-01)
-# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
-# by non-multilib ebuilds when non-native ABIs are disabled.
-IUSE_IMPLICIT="abi_x86_64"
diff --git a/profiles/arch/amd64-fbsd/package.use.force b/profiles/arch/amd64-fbsd/package.use.force
deleted file mode 100644
index 03f9be01631c..000000000000
--- a/profiles/arch/amd64-fbsd/package.use.force
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-09)
-# Using stdlibc++ is broken on FreeBSD, so just force libcxx.
-sys-devel/clang default-libcxx
-
-# Michał Górny <mgorny@gentoo.org> (2017-04-08)
-# Require sandbox to be multilib-capable to avoid failures when building
-# multilib packages, #611292.
-sys-apps/sandbox abi_x86_32
-
-# Michał Górny <mgorny@gentoo.org> (2016-09-24)
-# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
-
-# Multilib flag for the system is forced
-sys-freebsd/freebsd-lib abi_x86_32
-sys-freebsd/freebsd-ubin abi_x86_32
-sys-freebsd/freebsd-libexec abi_x86_32
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
deleted file mode 100644
index 40a090f42d34..000000000000
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
-# dev-python/m2crypto is not keyworded here, bugs #597744, 687526
-dev-python/soappy ssl
-
-# Thomas Deutschmann <whissi@gentoo.org> (2019-04-18)
-# app-arch/zstd is not keyworded.
-media-libs/tiff zstd
-
-# Lars Wendler <polynomial-c@gentoo.org> (2019-04-15)
-# dev-vcs/subversion lacks amd64-fbsd keyword
-app-portage/layman subversion test
-dev-vcs/git subversion
-
-# David Seifert <soap@gentoo.org> (2019-04-15)
-# app-arch/zstd is not keyworded.
-dev-libs/boost zstd
-
-# Hans de Graaff <graaff@gentoo.org> (2019-04-08)
-# Obsolete ruby version, no newer versions keyworded or stable.
-dev-vcs/subversion ruby
-
-# Michał Górny <mgorny@gentoo.org> (2019-03-20)
-# Z3 fails to link on FreeBSD but linker produces no error messages.
-sys-devel/clang z3
-
-# Michał Górny <mgorny@gentoo.org> (2019-01-22)
-# Missing keywords on dependencies.
-app-arch/libarchive zstd
-
-# Mikle Kolyada <zlogene@gentoo.org> (2018-10-05)
-# Not keyworded
-app-admin/sudo sssd
-
-# Ulrich Müller <ulm@gentoo.org> (2018-05-01)
-# Missing keyword on virtual/gsasl dependency, bug #635216.
-net-mail/mailutils sasl
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-13)
-# Missing keywords on dependencies.
-dev-qt/designer webkit
-dev-qt/qtgui eglfs evdev ibus libinput
-dev-qt/qtnetwork connman libproxy
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-02)
-# Someone needs to test the driver.
-x11-base/xorg-drivers video_cards_amdgpu
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-02)
-# Requires sys-fs/fuse. Maybe it could work with fuse4bsd?
-net-fs/openafs fuse
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-01)
-# Requires separate libacl while FreeBSD has it in libc.
-dev-lang/php acl
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-01)
-# Unkeyworded dependencies.
-dev-libs/cyrus-sasl authdaemond
-gnome-base/gvfs cdda google nfs
-sys-auth/consolekit evdev pm-utils
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-28)
-# Requires masked USE flags.
-gnome-base/gvfs mtp
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-22)
-# USE=libcxxrt is use.forced.
-sys-libs/libcxx libcxxabi
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-22)
-# Even more unkeyworded dependencies.
-dev-libs/libpeas lua
-dev-util/cmocka doc
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-21)
-# Requires net-misc/curl[kerberos] which is masked here.
-dev-python/pycurl test
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-21)
-# More unkeyworded dependencies.
-media-video/ffmpeg frei0r sofalizer
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-19)
-# Unkeyworded dependencies.
-app-doc/doxygen clang
-dev-perl/GD fcgi
-media-libs/libcanberra gnome
-media-libs/mesa vaapi
-media-libs/openal sdl
-media-sound/pulseaudio equalizer qt5 realtime
-media-video/ffmpeg ebur128 kvazaar libilbc openh264
-media-video/ffmpeg rubberband sdl ssh x265 zeromq zimg
-net-libs/gnutls idn
-net-print/cups-filters pdf
-sys-devel/gcc objc-gc
-x11-drivers/nvidia-drivers static-libs tools
-x11-libs/pango test
-x11-wm/fluxbox vim-syntax
-virtual/ffmpeg sdl
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-17)
-# Claims to require dev-libs/elfutils which doesn't support FreeBSD.
-# We can umask if it works with virtual/libelf though.
-media-libs/gstreamer unwind
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-17)
-# Unkeyworded deps.
-media-libs/phonon vlc
-virtual/notification-daemon kde
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-15)
-# Requires USE=seccomp that is masked in this profile.
-net-libs/gnutls test-full
-
-# Ulrich Müller <ulm@gentoo.org> (2017-10-23)
-# Needs net-mail/mailutils which is not keyworded, bug #635216.
-app-editors/emacs mailutils
-app-editors/emacs-vcs mailutils
-
-# Johannes Huber <johu@gentoo.org> (2015-01-28)
-# Missing keyword on dev-libs/botan and dev-libs/pkcs11-helper
-app-crypt/qca botan pkcs11
-
-# Michael Palimaka <kensington@gentoo.org> (2014-12-26)
-# Unkeyworded media-libs/opencv
-media-plugins/frei0r-plugins facedetect
-media-video/vlc opencv
-
-# Patrick Lauer <patrick@gentoo.org> (2014-11-17)
-# Lars Wendler <polynomial-c@gentoo.org> (2015-01-23)
-# Missing keywords
-dev-libs/openssl sctp
-dev-libs/openssl-compat sctp
-net-misc/openssh sctp
-
-# Pacho Ramos <pacho@gentoo.org> (2014-06-01)
-# Missing keywords
->=app-misc/geoclue-2.1 modemmanager
->=x11-libs/gtk+-3.12 cloudprint
->=app-crypt/libsecret-0.16 test
-media-plugins/gst-plugins-meta modplug vaapi
-
-# Lars Wendler <polynomial-c@gentoo.org> (2014-05-09)
-# Masked kde USE flag until bug #509892 is fixed
-dev-vcs/subversion kwallet
-
-# Pacho Ramos <pacho@gentoo.org> (2013-12-02)
-# Missing keywords, bug #493156
-media-libs/libgphoto2 serial
-
-# nvidia-driver uses acpid
-x11-drivers/nvidia-drivers acpi
-
-# Needs emul libs and the package isnt multilib at all for FreeBSD x86_64
-x11-drivers/nvidia-drivers multilib
-
-# requires nvidia-cg-toolkit which is not available on bsd
-# see http://developer.nvidia.com/cg-toolkit-download
-media-libs/libprojectm video_cards_nvidia
-
-# x11-drivers/xf86-video-vmware works fine without KMS- and 3D support.
-# Other packages will not work. keep video_cards_vmware in use.mask.
-x11-base/xorg-drivers -video_cards_vmware
diff --git a/profiles/arch/amd64-fbsd/parent b/profiles/arch/amd64-fbsd/parent
deleted file mode 100644
index 014611b2535c..000000000000
--- a/profiles/arch/amd64-fbsd/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../base
-../../features/multilib
-todo
diff --git a/profiles/arch/amd64-fbsd/todo/eapi b/profiles/arch/amd64-fbsd/todo/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/amd64-fbsd/todo/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.force b/profiles/arch/amd64-fbsd/todo/package.use.force
deleted file mode 100644
index b7e1ec208cae..000000000000
--- a/profiles/arch/amd64-fbsd/todo/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-sys-libs/libcxx libcxxrt
-
-# bug 562412
-www-client/firefox pulseaudio
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
deleted file mode 100644
index 493d7286044f..000000000000
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Mask useflags that require deps with missing keywords.
-# Anyone is allowed and _very welcome_ to add masks there.
-# We will pick them up and keyword as time permits and prefer having a sane
-# deptree with missing features than a broken one.
-# Do *NOT* add a ChangeLog entry when modifying this file: it is intended as
-# temporary and cvs log is more than enough for getting its history.
-# 
-# Syntax is: # mising dep(s)
-#            mask
-# Keep it simple, we do not really care about the date or who masked it, we want
-# to be easily able to determine what we need to keyword.
-
-# net-dns/libidn2
-net-misc/wget idn
-
-# net-libs/gnome-online-accounts
-gnome-base/gvfs gnome-online-accounts
-
-# media-libs/gavl (missing clock_nanosleep on fbsd)
-media-plugins/frei0r-plugins scale0tilt
-
-# net-fs/openafs
-app-crypt/heimdal afs
-
-# app-accessibility/flite (fails at install)
-media-video/ffmpeg flite
-
-# dev-vcs/darcs
-app-portage/layman darcs
-
-# dev-python/mysql-python
-dev-vcs/mercurial bugzilla
-
-# media-libs/libmetalink -> undefined references on TEMP_FAILURE_RETRY (macro
-# provided by glibc)
-net-misc/curl metalink
-
-# sys-process/numactl
-sys-apps/hwloc numa
-
-# dev-lang/mono
-net-dns/libidn mono
-media-libs/libcaca mono
-
-# dev-lang/mono
-# >=dev-dotnet/gtk-sharp-2
-net-dns/avahi mono
-
-# net-misc/netkit-rsh
-x11-apps/xsm rsh
-
-# net-libs/libtirpc
-sys-apps/xinetd rpc
-
-# sci-libs/cfitsio
-media-gfx/ufraw fits
-
-# >=media-gfx/gimp-2
-media-gfx/ufraw gimp
-
-# net-libs/libproxy
-net-libs/neon libproxy
-net-libs/glib-networking libproxy
-
-# dev-libs/pakchois
-net-libs/neon pkcs11
-
-# app-text/texlive[extra]
-app-doc/doxygen latex doc
-
-# x11-misc/colord
-x11-libs/gtk+ colord
-
-# sys-auth/polkit
-sys-auth/consolekit policykit
-gnome-base/gconf policykit
-
-# media-sound/pulseaudio
-media-libs/libsdl pulseaudio
-media-libs/openal pulseaudio
-media-video/ffmpeg pulseaudio
-media-libs/libcanberra pulseaudio
-media-libs/phonon pulseaudio
-media-video/vlc pulseaudio
-media-sound/mpg123 pulseaudio
-media-video/mplayer pulseaudio
-media-libs/xine-lib pulseaudio
-
-# >=media-plugins/gst-plugins-pulse-0.10
-media-plugins/gst-plugins-meta pulseaudio
-
-# >=app-pda/libimobiledevice-1.1.0
-gnome-base/gvfs ios
-
-# >=sys-fs/fuse-2.8.0
-gnome-base/gvfs fuse
-
-# >=x11-libs/libva-0.32
-media-video/ffmpeg vaapi
-virtual/ffmpeg vaapi
-media-video/vlc vaapi
-media-libs/xine-lib vaapi
-
-# media-libs/nas
-media-libs/libsdl nas
-app-editors/xemacs nas
-media-sound/mpg123 nas
-media-video/mplayer nas
-
-# net-misc/openntpd
-net-misc/ntp openntpd
-
-# fails to build, need to investigate why
-net-libs/webkit-gtk geolocation introspection
-
-# virtual/mysql
-sci-mathematics/glpk mysql
-dev-libs/apr-util mysql
-dev-qt/qtsql mysql
-dev-libs/redland mysql
-dev-libs/cyrus-sasl mysql
-dev-lang/php mysql mysqli
-net-libs/courier-authlib mysql
-
-# does not build
-media-libs/mesa video_cards_vmware
-
-# media-libs/libepoxy
-x11-base/xorg-server glamor wayland
-x11-drivers/xf86-video-ati glamor
-
-# >=sys-devel/binutils-2.22
-sys-devel/llvm gold
-
-# media-libs/liboggz
-media-libs/libkate wxwidgets
-
-# media-sound/fluidsynth
-media-video/vlc fluidsynth
-
-# sys-cluster/knem
-sys-cluster/openmpi openmpi_fabrics_knem
-
-# sys-fabric/dapl
-sys-cluster/openmpi openmpi_fabrics_dapl
-
-# sys-fabric/ofed
-sys-cluster/openmpi openmpi_fabrics_ofed openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
-
-# sys-fabric/infinipath-psm
-sys-cluster/openmpi openmpi_fabrics_psm
-
-# sys-fabric/librdmacm
-sys-cluster/openmpi openmpi_ofed_features_rdmacm
-
-# sys-cluster/slurm
-sys-cluster/openmpi openmpi_rm_slurm
-
-# x11-libs/dnd
-app-editors/xemacs dnd
-
-# app-i18n/canna
-app-editors/xemacs canna
-
-# app-i18n/freewnn
-app-editors/xemacs freewnn
-
-# media-libs/devil[png,jpeg]
-media-gfx/graphviz devil
-
-# sys-apps/util-linux (libuuid)
-net-misc/wget uuid
-
-# net-misc/freerdp (doesnt build)
-media-video/vlc rdp
-
-# net-wireless/bluez
-media-sound/pulseaudio native-headset ofono-headset
diff --git a/profiles/arch/amd64-fbsd/use.force b/profiles/arch/amd64-fbsd/use.force
deleted file mode 100644
index 9dc35a08b0f3..000000000000
--- a/profiles/arch/amd64-fbsd/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Force the flag which corresponds to ARCH.
-amd64-fbsd
-
-# Multilib flag for default ABI
-abi_x86_64
diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
deleted file mode 100644
index 3dfab0817e61..000000000000
--- a/profiles/arch/amd64-fbsd/use.mask
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to ARCH.
--amd64-fbsd
-
--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
-
-# nvidia drivers works on x86
--xvmc
--nvidia
--video_cards_nvidia
-
-# Unmask vmware drivers
-#-video_cards_vmware
--input_devices_vmmouse
-
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-ayatana
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
-# sys-auth/elogind is not keyworded here.
-elogind
-
-# Ulrich Müller <ulm@gentoo.org> (2018-05-01)
-# virtual/mysql is not keyworded.
-mysql
-
-# Michał Górny <mgorny@gentoo.org> (2018-04-21)
-# net-wireless/bluez.
-bluetooth
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-02)
-# Requires dev-libs/libressl (not yet tested).
-curl_ssl_libressl
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-02)
-# Someone needs to test them.
-input_devices_libinput
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-01)
-# virtual/mpi not keyworded at the moment.
-mpi
-
-# Michał Górny <mgorny@gentoo.org> (2018-03-01)
-# sys-process/audit seems pretty Linux-specific.
-audit
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-25)
-# google-perftools does not work on FreeBSD.
-tcmalloc
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-17)
-# libraw is not keyworded here.
-raw
-
-# Michał Górny <mgorny@gentoo.org> (2018-02-17)
-# libav is not keyworded here.
-libav
-
-# Mart Raudsepp <leio@gentoo.org> (2018-02-11)
-# dev-util/valgrind is not keyworded here.
-valgrind
-
-# Michał Górny <mgorny@gentoo.org> (2018-01-23)
-# sys-libs/libseccomp is not keyworded here.
-seccomp
-
-# Michał Górny <mgorny@gentoo.org> (2018-01-23)
-# net-fs/samba is not keyworded here.
-samba
-
-# James Le Cuirot <chewi@gentoo.org> (2015-05-19)
-# icedtea needs testing and gcj isn't supported
-java
-
-# Other
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-09)
-# Orc optimisations work fine on amd64 and x86
--orc
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-21)
-# IPMI is only implemented for x86, amd64 and ia64
--ipmi
-
-# Multilib ABIs
--abi_x86_32
--abi_x86_64
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-08-22)
-# virtual/opencl is not keyworded
-opencl
-
-# Hans de Graaff <graaff@gentoo.org> (2014-12-27)
-# dev-libs/jemalloc is not keyworded
-jemalloc
-
-# Benda Xu <heroxbd@gentoo.org> (2019-06-26)
-# Not tested
-eselect-ldso
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index f15eb9ff2858..acd6cae65a8f 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -37,6 +37,7 @@ dev-util/biew
 games-action/badland
 games-action/beathazardultra
 games-action/brutal-legend
+games-action/crimsonland
 games-action/cs2d
 games-action/descent3
 games-action/descent3-demo
@@ -46,13 +47,11 @@ games-action/heretic2-demo
 games-action/hotline-miami
 games-action/intrusion2
 games-action/lugaru
-games-action/mutantstorm-demo
 games-action/phobiaii
 games-action/rune
 games-action/shadowgrounds-bin
 games-action/shadowgrounds-survivor-bin
 games-action/solar2
-games-action/spacetripper-demo
 games-action/swordandsworcery
 games-action/trine-enchanted-edition
 games-action/trine2
@@ -100,7 +99,6 @@ games-fps/rtcw
 games-fps/rtcwmp-demo
 games-fps/rtcwsp-demo
 games-fps/sauerbraten
-games-fps/serious-sam-tfe
 games-fps/serious-sam-tse
 games-fps/soldieroffortune
 games-fps/unreal-tournament
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 82280b43d705..0e8f34e6b6b8 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -73,7 +73,6 @@ media-gfx/imagemagick -heif
 
 # Ben Kohler <bkohler@gentoo.org> (2018-08-23)
 # Unmask iwd support where net-wireless/iwd is keyworded
-net-misc/connman -iwd
 net-misc/networkmanager -iwd
 
 # Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
@@ -200,7 +199,7 @@ 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
+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
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index c763944dd298..20224b09502d 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -38,10 +38,6 @@ dev-qt/qtsql oci8
 # Mask experimental contrib repo
 media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
 
-# Brian Evans <grknight@gentoo.org> (2018-12-06)
-# Unmask argon2 for php
-dev-lang/php -argon2
-
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # unmask sssd for sudo
 app-admin/sudo -sssd
@@ -49,8 +45,6 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (2018-11-01)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
-# Ben Kohler <bkohler@gentoo.org> (2019-05-22)
-net-misc/connman iwd
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-09-15)
 # the dependency is unstable
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 3a3a5d0d7113..3e2766145185 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -124,7 +124,6 @@ media-libs/opencv contrib_dnn
 
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # Moved from use.mask since they are flags local to one package.
-dev-cpp/xsd ace
 media-tv/tvheadend hdhomerun
 
 # Michał Górny <mgorny@gentoo.org> (2017-11-29)
@@ -516,10 +515,6 @@ dev-qt/qtwebkit -jit
 # unkeyworded deps for bug 379657 and bug 379651
 app-admin/packagekit-base entropy
 
-# Robin H. Johnson <robbat2@gentoo.org> (2011-09-03)
-# Remove this for your arch after you keyword dev-utils/google-perftools and virtual/gsasl (bug #381737)
-dev-libs/libmemcached sasl
-
 # Sebastian Pipping <sping@gentoo.org> (2011-02-22)
 # No media-sound/lilypond here, yet (bug #356069)
 app-text/asciidoc test
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 2f3ff24cd5eb..f140c5fde0fa 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -65,7 +65,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (2017-05-29)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-13 frei0r
-<=media-video/ffmpeg-4.1.3 frei0r sofalizer
+<=media-video/ffmpeg-4.1.3 frei0r
 
 # Michael Weber <xmw@gentoo.org> (2017-04-01)
 # no stable jdk
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 92213a34744d..901d17e9c137 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,17 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-<<<<<<< HEAD
-=======
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-09-27)
 # some testsuite deps are not keyworded
 sys-fs/zfs test-suite
 
->>>>>>> next
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is keyworded ~arm64
 sys-firmware/seabios -debug
 
+# Eugene Bright <eugene@bright.gdn> (2019-09-09)
+# Missing keyword on dev-embedded/libjaylink
+sys-apps/flashrom jlink-spi
+
 # Aaron Bauman <bman@gentoo.org> (2019-08-05)
 # dep not keyworded here
 media-gfx/gnome-photos upnp-av
@@ -197,10 +198,6 @@ dev-python/networkx scipy
 sys-libs/libblockdev dmraid
 
 # Mart Raudsepp <leio@gentoo.org> (2018-02-13)
-# USE=sofalizer requires sci-libs/netcdf that is not keyworded yet.
-media-video/ffmpeg sofalizer
-
-# Mart Raudsepp <leio@gentoo.org> (2018-02-13)
 # USE=upnp-av requires net-misc/dleyna-server that is not keyworded yet.
 >=media-plugins/grilo-plugins-0.3.5 upnp-av
 
@@ -260,7 +257,7 @@ media-gfx/pstoedit emf
 
 # Alexis Ballier <aballier@gentoo.org> (2017-07-14)
 # Appends -mfpu=neon and asm seems arm32
-net-misc/freerdp neon
+net-misc/freerdp cpu_flags_arm_neon
 
 # Alexis Ballier <aballier@gentoo.org> (2017-07-14)
 # zfs does not build on arm64 (yet?)
diff --git a/profiles/arch/arm64/package.use.stable.force b/profiles/arch/arm64/package.use.stable.force
index cee7fbaa8091..62ec6f0c05fe 100644
--- a/profiles/arch/arm64/package.use.stable.force
+++ b/profiles/arch/arm64/package.use.stable.force
@@ -1,6 +1,6 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (19 Nov 2018)
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2018-11-19)
 # iasl is keyworded ~arm64
 sys-firmware/seabios binary
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index a4b1a650640a..429fb27f23b6 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -66,10 +66,6 @@ app-doc/doxygen clang doxysearch doc
 # virtual/opengl and media-libs/freeglut not stable yet
 media-libs/libwebp opengl
 
-# Mart Raudsepp <leio@gentoo.org> (2018-05-06)
-# No media-libs/freeglut and co stable yet
-media-libs/jasper opengl
-
 # Mart Raudsepp <leio@gentoo.org> (2018-05-04)
 # sci-libs/mpir fails tests, bug 640424
 dev-python/gmpy mpir
diff --git a/profiles/arch/base/package.use.force b/profiles/arch/base/package.use.force
index c60d96841663..3c5b906b05f3 100644
--- a/profiles/arch/base/package.use.force
+++ b/profiles/arch/base/package.use.force
@@ -1,6 +1,6 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (19 Nov 2018)
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2018-11-19)
 # iasl is not keyworded on many platforms yet
 sys-firmware/seabios binary
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index faa9ca3ffc0d..6056662f4002 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -51,7 +51,6 @@ media-gfx/imagemagick heif
 
 # Ben Kohler <bkohler@gentoo.org> (2018-08-23)
 # Mask iwd support until net-wireless/iwd is keyworded
-net-misc/connman iwd
 net-misc/networkmanager iwd
 
 # Rick Farina <zerochaos@gentoo.org> (2018-06-27)
@@ -180,7 +179,7 @@ games-board/stockfish armv7
 
 # 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
+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
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 3fee37659d26..6347b32ab73b 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -85,8 +85,7 @@ app-shells/bash-completion test
 # Jeroen Roovers <jer@gentoo.org> (2017-02-04)
 # media-libs/libilbc has not been ported to HPPA
 # media-libs/zimg triggers a toolchain issue (bug #597152)
-# sofalizer needs sci-libs/netcdf and sci-libs/hdf5 (bug #615510)
-media-video/ffmpeg libilbc sofalizer zimg
+media-video/ffmpeg libilbc zimg
 
 # Jeroen Roovers <jer@gentoo.org> (2017-02-03)
 # net-mail/notmuch is not keyworded
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index d80d41906d52..6a9a1450fd3e 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -178,7 +178,7 @@ connman
 # media-libs/xine-lib is not keyworded
 xine
 
-template_haskell
+template-haskell
 
 # toolkit for nvidia binary drivers
 cg
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 7811cc8e24b3..d2273928c6f0 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -5,6 +5,10 @@
 # iasl is stable on ppc
 sys-firmware/seabios -debug
 
+# Eugene Bright <eugene@bright.gdn> (2019-09-09)
+# Missing keyword on dev-embedded/libjaylink
+sys-apps/flashrom jlink-spi
+
 # Conrad Kostecki <ck+gentoo@bl4ckb0x.de> (2019-08-17)
 # app-misc/graphlcd-base won't work on PowerPC/PowerPC64
 app-misc/lcdproc freetype lcd_devices_glcd png
diff --git a/profiles/arch/powerpc/ppc64/32ul/package.use.mask b/profiles/arch/powerpc/ppc64/32ul/package.use.mask
index 7c9959a5eeb1..1f591d730c7b 100644
--- a/profiles/arch/powerpc/ppc64/32ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/32ul/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index 3de03b9f1dc9..fd0e7c524c26 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Brian Evans <grknight@gentoo.org> (2015-11-23)
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 70b2f2d64466..314f6b7fba6a 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -65,7 +65,7 @@ audit
 
 # unregisterised ghc arch for now.
 # no ghci - no TH
-template_haskell
+template-haskell
 
 # Chris Gianelloni <wolf31o2@gentoo.org> (2008-02-13)
 # Mask multilib, since we cannot use it.
diff --git a/profiles/arch/powerpc/ppc64/package.use.force b/profiles/arch/powerpc/ppc64/package.use.force
index 2ccbbdd645cc..97210c0bb94e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.force
+++ b/profiles/arch/powerpc/ppc64/package.use.force
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Samuli Suominen <ssuominen@gentoo.org> (30 Oct 2012)
+# Samuli Suominen <ssuominen@gentoo.org> (2012-10-30)
 # Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm gets
 # stable keyword, this line can be removed.
 x11-misc/xscreensaver gdm
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index c7bd1726296e..cbfe8822ba6c 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Eugene Bright <eugene@bright.gdn> (2019-09-09)
+# Missing keyword on dev-embedded/libjaylink
+sys-apps/flashrom jlink-spi
+
 # Matthew Thode <prometheanfire@gentoo.org> (2019-08-22)
 # context works with newer versions of boost
 # https://github.com/boostorg/context/commit/d4608a4e8ba2e8a0bdd45613243e6c53a23d23dc
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index cdac340949c4..a16d07ecc347 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -36,6 +36,7 @@ dev-libs/iniparser doc
 dev-libs/libgcrypt doc
 dev-libs/libnl python
 dev-libs/libtasn1 valgrind
+dev-libs/libusb doc
 dev-libs/libxslt python
 dev-libs/libyaml doc
 dev-python/cython doc test
@@ -46,7 +47,9 @@ dev-python/snakeoil test
 dev-util/catalyst iso
 dev-util/meson test
 dev-util/ninja doc test
+dev-util/patchutils test
 dev-util/pkgconf test
+dev-util/strace unwind
 dev-vcs/git cvs highlight gnome-keyring subversion tk xinetd
 media-libs/freetype harfbuzz png
 media-libs/tiff jbig jpeg test webp zstd
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 3909985198b1..f639f53b04ca 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Eugene Bright <eugene@bright.gdn> (2019-09-09)
+# Missing keyword on dev-embedded/libjaylink
+sys-apps/flashrom jlink-spi
+
 # Mart Raudsepp <leio@gentoo.org> (2019-08-18)
 # media-video/pipewire is not keyworded yet
 x11-wm/mutter screencast
@@ -317,7 +321,7 @@ x11-misc/xscreensaver new-login
 
 # Pacho Ramos <pacho@gentoo.org> (2012-05-07)
 # libhid is not keyworded
-app-misc/lcdproc hid lcd_devices_mdm166a
+app-misc/lcdproc lcd_devices_mdm166a
 
 # Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
 # Mask the vde flag on tinc because net-misc/vde is not
diff --git a/profiles/arch/x86-fbsd/eapi b/profiles/arch/x86-fbsd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/x86-fbsd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/x86-fbsd/make.defaults b/profiles/arch/x86-fbsd/make.defaults
deleted file mode 100644
index e801595ce688..000000000000
--- a/profiles/arch/x86-fbsd/make.defaults
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# System-wide defaults for the G/FBSD Portage system
-
-ARCH="x86-fbsd"
-CFLAGS="-march=i686 -O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-ACCEPT_KEYWORDS="x86-fbsd ~x86-fbsd"
-
-# Michał Górny <mgorny@gentoo.org> (2014-06-20)
-# Provide values for ABI-related variables that are compatible with
-# multilib amd64, to make consistent ebuild writing easier.
-MULTILIB_ABIS="x86_fbsd"
-DEFAULT_ABI="x86_fbsd"
-ABI="x86_fbsd"
-LIBDIR_x86_fbsd="lib"
-
-VIDEO_CARDS="dummy intel mga nv r128 radeon siliconmotion via vmware"
-
-# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
-
-# Michał Górny <mgorny@gentoo.org> (2014-07-01)
-# Default to abi_x86_32 for packages that don't have it forced.
-ABI_X86="32"
-
-# Michał Górny <mgorny@gentoo.org> (2014-07-01)
-# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
-# by non-multilib ebuilds when non-native ABIs are disabled.
-IUSE_IMPLICIT="abi_x86_32"
diff --git a/profiles/arch/x86-fbsd/package.use.force b/profiles/arch/x86-fbsd/package.use.force
deleted file mode 100644
index 1c803f758dbf..000000000000
--- a/profiles/arch/x86-fbsd/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (2016-09-24)
-# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
deleted file mode 100644
index aafa97aea26e..000000000000
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-09-01)
-# media-libs/libaom not yet keyworded
-# media-libs/aribb24 not yet keyworded, bug #665048
-# media-libs/dav1d is not yet keyworded
-# skins requires USE=qt5 that is masked in this profile.
-media-video/vlc aom aribsub dav1d skins
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-10-26)
-# idn: Needs net-dns/libidn2 which is not keyworded
-# uuid: Needs sys-apps/util-linux which is not keyworded
-net-misc/wget idn uuid
-
-# Ulrich Müller <ulm@gentoo.org> (2017-10-23)
-# Needs net-mail/mailutils which is not keyworded, bug #635216.
-app-editors/emacs mailutils
-app-editors/emacs-vcs mailutils
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-06-09)
-# sys-process/audit not keyworded
-sys-process/fcron audit
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-02-14)
-# net-misc/curl dropped keywords in ffe8d873b8110d4434fc89423ea668450cab1d96
-www-servers/nginx nginx_modules_http_security
-
-# Alexis Ballier <aballier@gentoo.org> (2017-01-31)
-# nvidia drivers are unmasked here
-media-video/ffmpeg -nvenc
-
-# Michael Palimaka <kensington@gentoo.org> (2016-06-21)
-# Requires unkeyworded media-sound/jack-audio-connection-kit & media-video/movit
-media-libs/mlt jack opengl
-
-# Davide Pesavento <pesa@gentoo.org> (2015-10-26)
-# Tests require non-keyworded qt5
-dev-qt/qtchooser test
-
-# Johannes Huber <johu@gentoo.org> (2015-01-28)
-# Missing keyword on dev-libs/botan
-app-crypt/qca botan
-
-# Pacho Ramos <pacho@gentoo> (2011-03-18)
-# Missing keywords on deps (GNOME related packages)
-dev-libs/totem-pl-parser quvi
-media-plugins/gst-plugins-meta dv dvd vcd vpx wavpack
-
-# Justin Lecher <jlec@gentoo.org> (2010-09-19)
-# kde-apps/konqueror not keyworded
-app-arch/p7zip kde
-
-# Justin Lecher <jlec@gentoo.org> (2010-09-12)
-# net-libs/farsight2 not keyworded
-net-im/gajim jingle
-
-# Justin Lecher <jlec@gentoo.org> (2010-08-13)
-# MKL not available on this arch
-media-gfx/povray mkl
-
-# Java currently uses generation 1
-dev-libs/cyrus-sasl java
-
-# nvidia-driver uses acpid
-x11-drivers/nvidia-drivers acpi
-
-# gavl and opencv do not build
-media-plugins/frei0r-plugins scale0tilt facedetect
-
-# Dependencies not keyworded, bug #424571
-net-nds/openldap smbkrb5passwd
diff --git a/profiles/arch/x86-fbsd/parent b/profiles/arch/x86-fbsd/parent
deleted file mode 100644
index eb001c6e8ab8..000000000000
--- a/profiles/arch/x86-fbsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-../base
diff --git a/profiles/arch/x86-fbsd/use.force b/profiles/arch/x86-fbsd/use.force
deleted file mode 100644
index 98c1a17086cf..000000000000
--- a/profiles/arch/x86-fbsd/use.force
+++ /dev/null
@@ -1,3 +0,0 @@
-# Force the flag which corresponds to ARCH.
-x86-fbsd
-abi_x86_32
diff --git a/profiles/arch/x86-fbsd/use.mask b/profiles/arch/x86-fbsd/use.mask
deleted file mode 100644
index 385830faf29d..000000000000
--- a/profiles/arch/x86-fbsd/use.mask
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to ARCH.
--x86-fbsd
--abi_x86_32
-
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-ayatana
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
-# sys-auth/elogind is not keyworded here.
-elogind
-
-# Michael Palimaka <kensington@gentoo.org> (2016-06-21)
-# Unkeyworded
-qt5
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-21)
-# IPMI is only implemented for x86, amd64 and ia64
--ipmi
-
--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
-
-# nvidia drivers works on x86
--xvmc
--nvidia
--video_cards_nvidia
-
-# Unmask vmware drivers
--video_cards_vmware
--input_devices_vmmouse
-
-# James Le Cuirot <chewi@gentoo.org> (2015-05-19)
-# icedtea needs testing and gcj isn't supported
-java
-
-# No pulseaudio version is keyworded; unmask when it works
-pulseaudio
-# No portaudio version is keyworded; unmask when it works
-portaudio
-
-# valgrind hasn't been ported to fbsd yet
-valgrind
-
-# libva doesnt build on fbsd for now
-vaapi
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-08-22)
-# virtual/opencl is not keyworded
-opencl
-
-# Benda Xu <heroxbd@gentoo.org> (2019-06-26)
-# Not tested
-eselect-ldso
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index ce51c3317fa1..f307f7630537 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -68,7 +68,6 @@ media-video/orion qtav
 
 # Ben Kohler <bkohler@gentoo.org> (2018-08-23)
 # Unmask iwd support where net-wireless/iwd is keyworded
-net-misc/connman -iwd
 net-misc/networkmanager -iwd
 
 # Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
@@ -198,7 +197,7 @@ 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
+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
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index d7492438d65a..54afccee49ab 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -38,10 +38,6 @@ dev-qt/qtsql oci8
 # Mask experimental contrib repo
 media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
 
-# Brian Evans <grknight@gentoo.org> (2018-12-06)
-# Unmask argon2 for php
-dev-lang/php -argon2
-
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # unmask sssd for sudo
 app-admin/sudo -sssd
@@ -49,8 +45,6 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (2018-11-01)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
-# Ben Kohler <bkohler@gentoo.org> (2019-05-22)
-net-misc/connman iwd
 
 # Thomas Deutschmann <whissi@gentoo.org> (2018-09-27)
 # sys-devel/lld is unstable