Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

125 files changed, 2740 insertions, 492 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8d2380090afc..ee68ac42b0d5 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch.list b/profiles/arch.list
index b9a9c022c007..53911cfb7246 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -1,5 +1,6 @@
 alpha
 amd64
+amd64-fbsd
 arm
 arm64
 hppa
@@ -13,6 +14,7 @@ s390
 sh
 sparc
 x86
+x86-fbsd
 
 # Prefix keywords
 ppc-aix
diff --git a/profiles/arch/alpha/package.use.stable.mask b/profiles/arch/alpha/package.use.stable.mask
index 961484d57b36..3ced383a69d5 100644
--- a/profiles/arch/alpha/package.use.stable.mask
+++ b/profiles/arch/alpha/package.use.stable.mask
@@ -17,10 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Matt Turner <mattst88@gentoo.org> (2019-10-13)
-# Depends on www-servers/lighttpd[php], and php is use.stable.mask'd
-net-analyzer/nagios-core lighttpd
-
 # 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 4ed29713ab45..d14c33e57e4f 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -87,7 +87,6 @@ valgrind
 vaapi
 librtmp
 rtmp
-v4l
 vpx
 kde
 quvi
@@ -175,7 +174,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 e384e174cd97..d566f941602a 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -4,10 +4,6 @@
 # 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
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/amd64-fbsd/clang/make.defaults b/profiles/arch/amd64-fbsd/clang/make.defaults
new file mode 100644
index 000000000000..746ac289456c
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/make.defaults
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 000000000000..36c6e4aadf94
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/package.use.force
@@ -0,0 +1,17 @@
+# 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
new file mode 100644
index 000000000000..666f4a7f80d0
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/package.use.mask
@@ -0,0 +1,21 @@
+# 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
new file mode 100644
index 000000000000..f60852f668d1
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/packages
@@ -0,0 +1,9 @@
+# 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
new file mode 100644
index 000000000000..0cf609150f0c
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/packages.build
@@ -0,0 +1,9 @@
+# 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
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/amd64-fbsd/clang/profile.bashrc b/profiles/arch/amd64-fbsd/clang/profile.bashrc
new file mode 100644
index 000000000000..496d41b3853d
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/clang/profile.bashrc
@@ -0,0 +1,8 @@
+#!/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
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults
new file mode 100644
index 000000000000..be0830e56871
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/make.defaults
@@ -0,0 +1,45 @@
+# 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
new file mode 100644
index 000000000000..03f9be01631c
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/package.use.force
@@ -0,0 +1,22 @@
+# 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
new file mode 100644
index 000000000000..40a090f42d34
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -0,0 +1,166 @@
+# 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
new file mode 100644
index 000000000000..014611b2535c
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/parent
@@ -0,0 +1,3 @@
+../base
+../../features/multilib
+todo
diff --git a/profiles/arch/amd64-fbsd/todo/eapi b/profiles/arch/amd64-fbsd/todo/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/todo/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.force b/profiles/arch/amd64-fbsd/todo/package.use.force
new file mode 100644
index 000000000000..b7e1ec208cae
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/todo/package.use.force
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 000000000000..493d7286044f
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -0,0 +1,181 @@
+# 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
new file mode 100644
index 000000000000..9dc35a08b0f3
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/use.force
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 000000000000..3dfab0817e61
--- /dev/null
+++ b/profiles/arch/amd64-fbsd/use.mask
@@ -0,0 +1,120 @@
+# 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 acd6cae65a8f..f15eb9ff2858 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -37,7 +37,6 @@ 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
@@ -47,11 +46,13 @@ 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
@@ -99,6 +100,7 @@ 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 0e8f34e6b6b8..82280b43d705 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -73,6 +73,7 @@ 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)
@@ -199,7 +200,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 20224b09502d..c763944dd298 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -38,6 +38,10 @@ 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
@@ -45,6 +49,8 @@ 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 3e2766145185..3a3a5d0d7113 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -124,6 +124,7 @@ 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)
@@ -515,6 +516,10 @@ 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 f140c5fde0fa..2f3ff24cd5eb 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
+<=media-video/ffmpeg-4.1.3 frei0r sofalizer
 
 # 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 901d17e9c137..342f099dbd1d 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -9,10 +9,6 @@ sys-fs/zfs test-suite
 # 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
@@ -198,6 +194,10 @@ 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
 
@@ -257,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 cpu_flags_arm_neon
+net-misc/freerdp 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 62ec6f0c05fe..cee7fbaa8091 100644
--- a/profiles/arch/arm64/package.use.stable.force
+++ b/profiles/arch/arm64/package.use.stable.force
@@ -1,6 +1,6 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2018-11-19)
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (19 Nov 2018)
 # 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 429fb27f23b6..a4b1a650640a 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -66,6 +66,10 @@ 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 3c5b906b05f3..c60d96841663 100644
--- a/profiles/arch/base/package.use.force
+++ b/profiles/arch/base/package.use.force
@@ -1,6 +1,6 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2018-11-19)
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (19 Nov 2018)
 # 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 6056662f4002..faa9ca3ffc0d 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -51,6 +51,7 @@ 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)
@@ -179,7 +180,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 6347b32ab73b..3fee37659d26 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -85,7 +85,8 @@ 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)
-media-video/ffmpeg libilbc zimg
+# sofalizer needs sci-libs/netcdf and sci-libs/hdf5 (bug #615510)
+media-video/ffmpeg libilbc sofalizer 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 6a9a1450fd3e..d80d41906d52 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 d2273928c6f0..7811cc8e24b3 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -5,10 +5,6 @@
 # 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 1f591d730c7b..7c9959a5eeb1 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 Authors
+# Copyright 1999-2019 Gentoo Foundation
 # 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 fd0e7c524c26..3de03b9f1dc9 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 Authors
+# Copyright 1999-2019 Gentoo Foundation
 # 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 314f6b7fba6a..70b2f2d64466 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 97210c0bb94e..2ccbbdd645cc 100644
--- a/profiles/arch/powerpc/ppc64/package.use.force
+++ b/profiles/arch/powerpc/ppc64/package.use.force
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Samuli Suominen <ssuominen@gentoo.org> (2012-10-30)
+# Samuli Suominen <ssuominen@gentoo.org> (30 Oct 2012)
 # 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 cbfe8822ba6c..c7bd1726296e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,10 +1,6 @@
 # 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 a16d07ecc347..cdac340949c4 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -36,7 +36,6 @@ 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
@@ -47,9 +46,7 @@ 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 f639f53b04ca..3909985198b1 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,10 +1,6 @@
 # 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
@@ -321,7 +317,7 @@ x11-misc/xscreensaver new-login
 
 # Pacho Ramos <pacho@gentoo.org> (2012-05-07)
 # libhid is not keyworded
-app-misc/lcdproc lcd_devices_mdm166a
+app-misc/lcdproc hid 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
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/x86-fbsd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/x86-fbsd/make.defaults b/profiles/arch/x86-fbsd/make.defaults
new file mode 100644
index 000000000000..e801595ce688
--- /dev/null
+++ b/profiles/arch/x86-fbsd/make.defaults
@@ -0,0 +1,33 @@
+# 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
new file mode 100644
index 000000000000..1c803f758dbf
--- /dev/null
+++ b/profiles/arch/x86-fbsd/package.use.force
@@ -0,0 +1,8 @@
+# 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
new file mode 100644
index 000000000000..aafa97aea26e
--- /dev/null
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -0,0 +1,72 @@
+# 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
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/x86-fbsd/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/x86-fbsd/use.force b/profiles/arch/x86-fbsd/use.force
new file mode 100644
index 000000000000..98c1a17086cf
--- /dev/null
+++ b/profiles/arch/x86-fbsd/use.force
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 000000000000..385830faf29d
--- /dev/null
+++ b/profiles/arch/x86-fbsd/use.mask
@@ -0,0 +1,74 @@
+# 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 f307f7630537..ce51c3317fa1 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -68,6 +68,7 @@ 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)
@@ -197,7 +198,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 54afccee49ab..d7492438d65a 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -38,6 +38,10 @@ 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
@@ -45,6 +49,8 @@ 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
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b4b872168f11..2eeffdf3ff59 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -80,7 +80,7 @@ COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog"
 
 # Tomáš Chvátal <scarabeus@gentoo.org> (2010-10-26)
 # By default enable all protocols for average GPS user
-GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx"
+GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx"
 
 # Benedikt Böhm <hollow@gentoo.org> (2007-11-27)
 # Sane defaults for built-in apache modules
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index e64b86353b9d..d8f5108cb0fb 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -16,14 +16,13 @@ sys-devel/gcc cxx
 # them is an experimental feature and needs testing.
 sys-libs/glibc static-libs
 
-# Michał Górny <mgorny@gentoo.org> (2019-03-22)
+# Michał Górny <mgorny@gentoo.org> (22 Mar 2019)
 # Force building separate tinfo to maintain stable library API.  This
 # is backwards-compatible with packages linked to -lncurses, so neither
 # installed packages nor pre-built software should be negatively
 # affected.  On the other hand, disabling USE=tinfo is capable of
 # breaking installed packages.
 sys-libs/ncurses tinfo
-sys-libs/ncurses-compat tinfo
 
 # Mart Raudsepp <leio@gentoo.org> (2018-12-14)
 # Security is not optional if available for the architecture/kernel.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 040b6ea8fd55..14940369710f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,29 +7,6 @@
 # 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> (2019-10-05)
-# net-libs/openslp is being removed.
-net-nds/openldap slp
-sys-block/open-iscsi slp
-sys-block/open-isns slp
-
-# Ben Kohler <bkohler@gentoo.org> (2019-10-03)
-# iwd backend for connman hasn't kept up with iwd releases/API, mask 
-# until it catches up.
-net-misc/connman iwd
-
-# Brian Evans <grknight@gentoo.org> (2019-10-01)
-# PHP support is broken with current version
-# Mask USE until they are fixed
-=dev-libs/xapian-bindings-1.2.25 php
-media-gfx/exact-image php
-sci-geosciences/mapserver php
-www-servers/nginx-unit php5-6
-
-# Michał Górny <mgorny@gentoo.org> (2019-09-28)
-# media-fonts/hkscs-ming is slated for removal.
-app-i18n/xcin unicode
-
 # Craig Andrews <candrews@gentoo.org> (2019-09-12)
 # OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support
 # see https://github.com/openssl/openssl/pull/8797
@@ -78,6 +55,27 @@ sys-kernel/linux-firmware initramfs
 # Requires dev-libs/gumbo which is only keyworded for amd64 and x86
 mail-client/claws-mail litehtml
 
+# David Seifert <soap@gentoo.org> (2019-07-14)
+# media-libs/jasper will be removed in 30 days, bug #689784
+dev-games/openscenegraph jpeg2k
+dev-python/weasyprint jpeg2k
+dev-qt/qtimageformats jpeg2k
+media-gfx/dcraw jpeg2k
+media-gfx/digikam jpeg2k
+media-gfx/exact-image jpeg2k
+media-gfx/fim jpeg2k
+<media-gfx/gimp-2.10 jpeg2k
+media-gfx/graphicsmagick jpeg2k
+media-gfx/ufraw jpeg2k
+media-libs/devil jpeg2k
+media-libs/gegl jpeg2k
+media-libs/libraw jpeg2k
+media-libs/netpbm jpeg2k
+media-libs/opencv jpeg2k
+media-libs/simage jpeg2k
+net-proxy/ziproxy jpeg2k
+x11-libs/gdk-pixbuf jpeg2k
+
 # James Le Cuirot <chewi@gentoo.org> (2019-05-21)
 # Doesn't support ffmpeg-4. Portage takes a long time to report the
 # conflict and the feature is half broken anyway. See
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 2ce5b0ecd480..0a00fc800bb7 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -21,6 +21,7 @@ dev-python/aiohttp-socks test
 # Kent Fredric <kentnl@gentoo.org> (2019-07-30)
 # These features require dev-perl/GD, which currently can't be
 # considered stable due to serious defects upstream. Bug #661634
+app-admin/yaala gd
 app-misc/gcstar stats
 app-misc/g15daemon perl
 dev-lang/php coverage
@@ -65,6 +66,10 @@ media-plugins/grilo-plugins chromaprint
 kde-apps/kipi-plugins mediawiki vkontakte
 media-gfx/digikam dnn vkontakte
 
+# Brian Evans <grknight@gentoo.org> (2018-12-06)
+# Mask USE flag since argon2 dependency is not stable on most arches
+dev-lang/php argon2
+
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # sssd is only stable for amd64 and x86
 app-admin/sudo sssd
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 6e981e94a6e9..fe8254ba5b7c 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,10 +4,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Brian Evans <grknight@gentoo.org> (2019-10-01)
-# Mask PHP 5.6 target for EOL
-php_targets_php5-6
-
 # Matt Turner <mattst88@gentoo.org> (2019-03-03)
 # Mask for testing. Bug 606924
 libglvnd
@@ -32,6 +28,10 @@ php_targets_php7-0
 # d3d9 only works on amd64/x86.
 d3d9
 
+# Aaron W. Swenson <titanofold@gentoo.org> (2018-09-09)
+# Mask PostgreSQL 12 while in (pre-)alpha.
+postgres_targets_postgres12
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2017-11-04)
 # Unkeyworded on most arches, unmasked in supported arch profiles.
 audacious
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 9ddc19ed3b00..645eae301301 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Patrick Lauer <patrick@gentoo.org> (2019-10-04)
-# No postgres-12 stable yet
-postgres_targets_postgres12
-
 # Zac Medico <zmedico@gentoo.org> (2016-09-01)
 # Needs virtual/pypy* stable
 python_targets_pypy
diff --git a/profiles/categories b/profiles/categories
index 238e64d905df..0f45f8cd1732 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -143,6 +143,7 @@ sys-cluster
 sys-devel
 sys-fabric
 sys-firmware
+sys-freebsd
 sys-fs
 sys-kernel
 sys-libs
diff --git a/profiles/default/bsd/eapi b/profiles/default/bsd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/amd64/11.1/clang/eapi b/profiles/default/bsd/fbsd/amd64/11.1/clang/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/11.1/clang/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/amd64/11.1/clang/parent b/profiles/default/bsd/fbsd/amd64/11.1/clang/parent
new file mode 100644
index 000000000000..7dbda405f0ab
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/11.1/clang/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/amd64-fbsd/clang
diff --git a/profiles/default/bsd/fbsd/amd64/11.1/eapi b/profiles/default/bsd/fbsd/amd64/11.1/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/11.1/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/amd64/11.1/make.defaults b/profiles/default/bsd/fbsd/amd64/11.1/make.defaults
new file mode 100644
index 000000000000..eaafeb7a93f7
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/11.1/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+CHOST="x86_64-gentoo-freebsd11.1"
+CHOST_amd64_fbsd="x86_64-gentoo-freebsd11.1"
+CHOST_x86_fbsd="i686-gentoo-freebsd11.1"
diff --git a/profiles/default/bsd/fbsd/amd64/11.1/parent b/profiles/default/bsd/fbsd/amd64/11.1/parent
new file mode 100644
index 000000000000..317f8c857ad2
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/11.1/parent
@@ -0,0 +1,2 @@
+..
+../../../../../releases/freebsd-11.1
diff --git a/profiles/default/bsd/fbsd/amd64/eapi b/profiles/default/bsd/fbsd/amd64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/amd64/parent b/profiles/default/bsd/fbsd/amd64/parent
new file mode 100644
index 000000000000..5fbdc945bbcc
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/parent
@@ -0,0 +1,2 @@
+..
+../../../../arch/amd64-fbsd
diff --git a/profiles/default/bsd/fbsd/eapi b/profiles/default/bsd/fbsd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/make.defaults b/profiles/default/bsd/fbsd/make.defaults
new file mode 100644
index 000000000000..43e27554dfea
--- /dev/null
+++ b/profiles/default/bsd/fbsd/make.defaults
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Last building sandbox breaks gfind, bug #374425
+FEATURES="-sandbox -usersandbox"
+
+USERLAND="BSD"
+KERNEL="FreeBSD"
+ELIBC="FreeBSD"
+
+MAKE="gmake"
+
+USE="berkdb crypt iconv ipv6 ncurses nls oss pam pcre readline ssl tcpd zlib"
+
+# Donnie Berkholz <dberkholz@gentoo.org> (2006-03-07)
+# Modular X: Support direct rendering by default
+USE="${USE} dri"
+
+# Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
+# Defaults for video drivers
+VIDEO_CARDS="dummy fbdev vmware"
+
+# Let virtual/mta pick ssmtp[mta] for stage1 builds.
+# https://bugs.gentoo.org/show_bug.cgi?id=408587
+BOOTSTRAP_USE="${BOOTSTRAP_USE} mta"
diff --git a/profiles/default/bsd/fbsd/package.mask b/profiles/default/bsd/fbsd/package.mask
new file mode 100644
index 000000000000..973fa4f5bcef
--- /dev/null
+++ b/profiles/default/bsd/fbsd/package.mask
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Diego Pettenò <flameeyes@gentoo.org> (2005-05-27)
+# SGI's FAM is dead upstream, and requires mayor changes.
+# Gamin before 0.1.0 is not supported as missed the FreeBSD patches.
+# At the moment we rely on Gentopia's patched Gamin.
+app-admin/fam
+
+# Diego Pettenò <flameeyes@gentoo.org> (2005-05-23)
+# Strace doesn't support FreeBSD 5. When a better port will be
+# available, this can be unmasked.
+dev-util/strace
+
+# Don't use them, use the one in base system
+dev-util/yacc
+dev-util/byacc
diff --git a/profiles/default/bsd/fbsd/package.use b/profiles/default/bsd/fbsd/package.use
new file mode 100644
index 000000000000..5c91bf16e4b9
--- /dev/null
+++ b/profiles/default/bsd/fbsd/package.use
@@ -0,0 +1,12 @@
+# Default USE flags for specific packages
+
+# Diego Pettenò <flameeyes@gentoo.org> (2008-03-06)
+# pam_racklib requires sys-libs/pam, disable it by default (it is
+# masked anyway).
+# pam_passwdqc is used by default on FreeBSD, enable it by default
+# even on Gentoo/FreeBSD.
+sys-auth/pambase -cracklib passwdqc
+
+# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (2011-02-13)
+# Disable deprecated bsddb module of Python 2 by default.
+=dev-lang/python-2* -berkdb
diff --git a/profiles/default/bsd/fbsd/package.use.force b/profiles/default/bsd/fbsd/package.use.force
new file mode 100644
index 000000000000..323ffb50b596
--- /dev/null
+++ b/profiles/default/bsd/fbsd/package.use.force
@@ -0,0 +1,4 @@
+# app-arch/xz-utils[threads=] required by app-arch/libarchive
+# https://bugs.gentoo.org/show_bug.cgi?id=594980
+app-arch/libarchive threads
+app-arch/xz-utils threads
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
new file mode 100644
index 000000000000..5b413acf9576
--- /dev/null
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (2018-04-06)
+# We are building only minimal util-linux, so program flags
+# are irrelevant to us.
+sys-apps/util-linux build cramfs fdformat kill ncurses pam readline
+sys-apps/util-linux slang suid tty-helpers
+
+# Brian Evans <grknight@gentoo.org> (2018-03-02)
+# php incorrectly looks for libacl when it is built-in on FreeBSD
+dev-lang/php acl
+
+# Thomas Deutschmann <whissi@gentoo.org> (2017-10-26)
+# libressl: dev-libs/libressl is a base package on FreeBSD
+net-misc/wget libressl
+
+# Thomas Deutschmann <whissi@gentoo.org> (2017-01-20)
+# libressl: dev-libs/libressl is a base package on FreeBSD
+net-libs/libvncserver libressl
+
+# Felix Janda <felix.janda@posteo.de> (2016-09-24)
+# net-libs/libnetfilter_conntrack is not keyworded on FreeBSD
+net-dns/dnsmasq conntrack
+
+# Thomas Deutschmann <whissi@gentoo.org> (2016-08-26)
+# libressl:  dev-libs/libressl is a base package on FreeBSD
+# jemalloc:  dev-libs/jemalloc is not keyworded on FreeBSD
+# systemtap: dev-util/systemtap is not keyworded on FreeBSD and is also
+#            a linux specialized tool
+dev-db/percona-server jemalloc libressl systemtap
+
+# Thomas Deutschmann <whissi@gentoo.org> (2016-08-23)
+# libressl: dev-libs/libressl is a base package on FreeBSD
+# luajit:   dev-lang/luajit not keyworded on FreeBSD
+www-servers/nginx libressl luajit
+
+# As per UberLord's requests
+sys-apps/openrc pam
+
+# Jim Ramsay <lack@gentoo.org> (2007-09-07)
+# app-admin/gkrellm may pull in hddtemp, which is not yet available here
+app-admin/gkrellm hddtemp
+
+# PDA masked until we can do some testing on it
+mail-client/claws-mail pda
+
+# Original spell plugin uses ispell that requires
+# miscfiles.. that in turn does not work
+net-irc/rbot spell
+
+# Diego Pettenò <flameeyes@gentoo.org> (2007-01-18)
+# Vixie-Cron uses pam useflag for pam_limits.so that is provided
+# by Linux-PAM we don't use for now.
+sys-process/vixie-cron pam
+
+x11-misc/xscreensaver new-login
+
+# Gilles Dartiguelongue <eva@gentoo.org> (2007-10-22)
+# GNU attr isn't supported
+dev-libs/glib xattr
+gnome-base/gnome-vfs acl
+# https://bugs.gentoo.org/show_bug.cgi?id=435474
+sys-devel/patch xattr
+# https://bugs.gentoo.org/show_bug.cgi?id=432410
+app-arch/tar xattr
+
+# Diego Pettenò <flameeyes@gentoo.org> (2008-02-21)
+# pam_cracklib is only provided by Linux-PAM which is not usable on
+# Gentoo/FreeBSD.
+# Javier Villavicencio <the_paya@gentoo.org> (2008-07-31)
+# pam_ssh deps on Linux-PAM.
+# Diego Pettenò <flameeyes@gentoo.org> (2008-08-01)
+# sha512 is only supported by Linux-PAM's pam_unix for now
+sys-auth/pambase cracklib pam_ssh sha512
+
+# Naohiro Aota <naota@gentoo.org> (2011-08-04)
+# ads require krb5, which is maksed on FreeBSD
+# cluster require ctdb, which doesn't support FreeBSD
+net-fs/samba ads cluster
+
+# Naohiro Aota <naota@gentoo.org> (2011-11-24)
+# Masked because kerberos is masked
+net-dns/bind gssapi
+
+# Naohiro Aota <naota@gentoo.org> (2012-02-20)
+# Ian Stakenvicius <axs@gentoo.org> (2014-04-30)
+# Upstream does not support FreeBSD wifi nor crashreporter;
+# net-wireless/wireless-tools useless on fbsd, keep mozilla stuff
+# from bringing it in via mozconfig-3.eclass
+www-client/firefox wifi
+www-client/seamonkey wifi
+
+# Naohiro Aota <naota@gentoo.org> (2012-10-06)
+# Mask rpm, app-arch/rpm needs elfutils
+net-analyzer/net-snmp rpm
+
+# Naohiro Aota <naota@gentoo.org> (2012-10-09)
+# Mask dmpai, sys-apps/dmapi cannot build on BSD
+net-fs/samba dmapi
+
+# Naohiro Aota <naota@gentoo.org> (2012-10-15)
+# Mask numa on sys-apps/hwloc. numactl not available on FreeBSD
+sys-apps/hwloc numa
+
+# Naohiro Aota <naota@gentoo.org> (2014-07-07)
+# xattr support is not available on BSD #501534
+sys-apps/portage xattr
diff --git a/profiles/default/bsd/fbsd/packages b/profiles/default/bsd/fbsd/packages
new file mode 100644
index 000000000000..470e41dec3dc
--- /dev/null
+++ b/profiles/default/bsd/fbsd/packages
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# This files contains a small list of packages that define a 
+# minimal FreeBSD system. DO NOT change this without contacting
+# <bsd@gentoo.org>
+#
+*sys-freebsd/freebsd-mk-defs
+*sys-freebsd/freebsd-lib
+*sys-freebsd/freebsd-libexec
+*sys-freebsd/freebsd-bin
+*sys-freebsd/freebsd-sbin
+*sys-freebsd/freebsd-ubin
+*sys-freebsd/freebsd-usbin
+*sys-freebsd/freebsd-share
+
+*sys-devel/gettext
+*dev-libs/libiconv
+
+*app-arch/libarchive
+
+*sys-libs/timezone-data
+
+*sys-process/pidof-bsd
diff --git a/profiles/default/bsd/fbsd/packages.build b/profiles/default/bsd/fbsd/packages.build
new file mode 100644
index 000000000000..4d7682dad3f6
--- /dev/null
+++ b/profiles/default/bsd/fbsd/packages.build
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 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.
+
+# Please do not move perl before baselayout doing so will break lib -> lib64
+# symlinks on systems that use them.
+
+app-arch/bzip2
+app-arch/gzip
+dev-libs/openssl
+app-arch/libarchive
+app-shells/bash:0
+net-misc/rsync
+net-misc/wget
+sys-devel/autoconf
+sys-devel/automake
+sys-devel/libtool
+sys-apps/openrc
+sys-apps/baselayout
+sys-apps/diffutils
+sys-apps/file
+sys-apps/findutils
+sys-apps/gawk
+sys-apps/grep
+sys-apps/less
+sys-apps/sed
+sys-devel/binutils
+sys-devel/bison
+sys-devel/flex
+sys-devel/gcc
+dev-libs/libiconv
+sys-devel/gettext
+sys-devel/gnuconfig
+sys-devel/make
+sys-devel/patch
+virtual/editor
+virtual/libc
+virtual/os-headers
+virtual/package-manager
+virtual/pkgconfig
+sys-freebsd/freebsd-mk-defs
+sys-freebsd/freebsd-lib
+sys-freebsd/freebsd-libexec
+sys-freebsd/freebsd-bin
+sys-freebsd/freebsd-sbin
+sys-freebsd/freebsd-ubin
+sys-freebsd/freebsd-usbin
+sys-libs/timezone-data
diff --git a/profiles/default/bsd/fbsd/parent b/profiles/default/bsd/fbsd/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/bsd/fbsd/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/bsd/fbsd/profile.bashrc b/profiles/default/bsd/fbsd/profile.bashrc
new file mode 100644
index 000000000000..89e6c19f7a88
--- /dev/null
+++ b/profiles/default/bsd/fbsd/profile.bashrc
@@ -0,0 +1,91 @@
+#!/bin/bash
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+
+type -P gmake  > /dev/null && alias make=gmake
+type -P gpatch > /dev/null && alias patch=gpatch
+type -P gsed   > /dev/null && alias sed=gsed
+type -P gawk   > /dev/null && alias awk=gawk
+type -P gfind  > /dev/null && alias find=gfind
+type -P gxargs > /dev/null && alias xargs=gxargs
+
+# Attempt to point the default SHELL used by configure scripts to bash.
+# while most should work with BSD's bourne just fine, the extra scripts
+# used by some applications (specially test scripts) use way too many bashisms.
+# Alexis Ballier (2012-05-29): Disable this, we should rather fix bugs and it
+# seems to confuse libtool a couple of packages (dev-libs/libtar, net-dns/hesiod)
+# export CONFIG_SHELL="/bin/bash"
+
+# Hack to avoid every package that uses libiconv/gettext
+# install a charset.alias that will collide with libiconv's one
+# See bugs 169678, 195148 and 256129.
+# Also the discussion on
+# https://archives.gentoo.org/gentoo-dev/msg_8cb1805411f37b4eb168a3e680e531f3.xml
+bsd-post_src_install()
+{
+	if [ "${PN}" != "libiconv" -a -e "${D}"/usr/lib*/charset.alias ] ; then
+		rm -f "${D}"/usr/lib*/charset.alias
+	fi
+}
+
+# These are because of
+# https://archives.gentoo.org/gentoo-dev/msg_529a0806ed2cf841a467940a57e2d588.xml
+# The profile-* ones are meant to be used in etc/portage/profile.bashrc by user
+# until there is the registration mechanism.
+profile-post_src_install() { bsd-post_src_install ; }
+        post_src_install() { bsd-post_src_install ; }
+
+
+# Another hack to fix old versions of install-sh (automake) where a non-gnu
+# mkdir is not considered thread-safe (make install errors with -j > 1)
+bsd-patch_install-sh() {
+	# Do nothing if we don't have patch installed:
+	if [[ -z $(type -P gpatch) ]]; then
+		return 0
+	fi
+
+        # Do nothing if $S does not exist
+        [ -d "${S}" ] || return 0
+
+	local EPDIR="${EPREFIX}/usr/share/elt-patches/install-sh"
+	local EPATCHES="${EPDIR}/1.5.6 ${EPDIR}/1.5.4 ${EPDIR}/1.5"
+	local ret=0
+	cd "${S}"
+	for file in $(find . -name "install-sh" -print); do
+		if [[ -n $(egrep "scriptversion=2005|scriptversion=2004" ${file}) ]]; then
+			einfo "Automatically patching parallel-make unfriendly install-sh."
+			# Stolen from libtool.eclass
+			for mypatch in ${EPATCHES}; do
+				if gpatch -p0 --dry-run "${file}" "${mypatch}" &> "${T}/patch_install-sh.log"; then
+					gpatch -p0 -g0 --no-backup-if-mismatch "${file}" "${mypatch}" \
+						&> "${T}/patch_install-sh.log"
+					ret=$?
+					break
+				else
+					ret=1
+				fi
+			done
+			if [[ ret -eq 0 ]]; then
+				einfo "Patch applied successfully on \"${file}\"."
+			else
+				ewarn "Unable to apply install-sh patch. "
+				ewarn "If you experience errors during install phase, try with MAKEOPTS=\"-j1\""
+			fi
+		fi
+	done
+}
+
+# It should be run after everything has been unpacked/patched, some developers
+# do patch this little bastard from time to time.
+# So do it after unpack() for EAPI=0|1 and after prepare() for everything else.
+if [[ -n $EAPI ]] ; then
+	case "$EAPI" in
+		0|1)
+			profile-post_src_unpack() { bsd-patch_install-sh ; }
+			post_src_unpack() { bsd-patch_install-sh ; }
+			;;
+		*)
+			profile_post_src_prepare() { bsd-patch_install-sh ; }
+			post_src_prepare() { bsd-patch_install-sh ; }
+			;;
+	esac
+fi
diff --git a/profiles/default/bsd/fbsd/use.force b/profiles/default/bsd/fbsd/use.force
new file mode 100644
index 000000000000..c6a65ae2eb1e
--- /dev/null
+++ b/profiles/default/bsd/fbsd/use.force
@@ -0,0 +1,3 @@
+# Force freebsd-specific variables
+elibc_FreeBSD
+kernel_FreeBSD
diff --git a/profiles/default/bsd/fbsd/use.mask b/profiles/default/bsd/fbsd/use.mask
new file mode 100644
index 000000000000..0aef3c7ce9cb
--- /dev/null
+++ b/profiles/default/bsd/fbsd/use.mask
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Espeak does not run on bsd
+espeak
+
+# Someone who knows kerberos is needed to make sure that this works
+kerberos
+
+# fftw requires sinl and cosl function, not present in FreeBSD
+fftw
+
+# we have hardened.
+-hardened
+
+# Unmask freebsd-specific variables
+-elibc_FreeBSD
+-kernel_FreeBSD
+
+# This does not build on FreeBSD, unless anybody wants to fix it, use opie
+skey
+
+# To be tested
+snmp
+pcsc-lite
+
+# we don't have custom patched cdparanoia for fbsd anymore
+cdparanoia
+
+# wayland is not targetting BSDs
+wayland
+
+# Recent sys-auth/polkit cannot be built on FreeBSD
+policykit
diff --git a/profiles/default/bsd/fbsd/x86/11.1/eapi b/profiles/default/bsd/fbsd/x86/11.1/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/11.1/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/x86/11.1/make.defaults b/profiles/default/bsd/fbsd/x86/11.1/make.defaults
new file mode 100644
index 000000000000..df595c8a0183
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/11.1/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+CHOST="i686-gentoo-freebsd11.1"
+CHOST_x86_fbsd="${CHOST}"
diff --git a/profiles/default/bsd/fbsd/x86/11.1/parent b/profiles/default/bsd/fbsd/x86/11.1/parent
new file mode 100644
index 000000000000..317f8c857ad2
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/11.1/parent
@@ -0,0 +1,2 @@
+..
+../../../../../releases/freebsd-11.1
diff --git a/profiles/default/bsd/fbsd/x86/eapi b/profiles/default/bsd/fbsd/x86/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/x86/parent b/profiles/default/bsd/fbsd/x86/parent
new file mode 100644
index 000000000000..2b1ea633a872
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/parent
@@ -0,0 +1,2 @@
+..
+../../../../arch/x86-fbsd
diff --git a/profiles/default/bsd/make.defaults b/profiles/default/bsd/make.defaults
new file mode 100644
index 000000000000..db6541243641
--- /dev/null
+++ b/profiles/default/bsd/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2012 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Mask systemd files until upstream supports *BSD
+INSTALL_MASK="/usr/lib/systemd"
diff --git a/profiles/default/bsd/package.mask b/profiles/default/bsd/package.mask
new file mode 100644
index 000000000000..7acc12c39bc6
--- /dev/null
+++ b/profiles/default/bsd/package.mask
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask out the GNU versions of various packages.
+# We want BSD versions wherever possible
+# Also mask packages that are depending on Linux kernel
+sys-apps/apmd
+sys-apps/net-tools
+net-misc/iputils
+sys-apps/hardened-shadow
+sys-apps/shadow
+sys-apps/utempter
+sys-apps/which
+sys-libs/glibc
+sys-libs/libcap
+sys-libs/pam
+sys-power/acpid
+sys-process/procps
+sys-apps/iproute2
+sys-fs/eudev
+sys-fs/udev
+virtual/libgudev
+virtual/libudev
+virtual/udev
+sys-fs/sysfsutils
+sys-apps/attr
+sys-apps/acl
+net-misc/pump
+
+# Diego Pettenò <flameeyes@gentoo.org> (2005-06-05)
+# metamail isn't maintained anymore upstream, Debian patches doesn't
+# work on FreeBSD, and neither on Debian or on FreeBSD the package
+# has a maintainer to coordinate with. Isn't an hard-dep for anything.
+net-mail/metamail
+
+# Diego Pettenò <flameeyes@gentoo.org> (2005-08-20)
+# We obviously can't have linux-sources (mask this to allow the
+# virtual to be masked)
+sys-kernel/gentoo-sources
diff --git a/profiles/default/bsd/package.use b/profiles/default/bsd/package.use
new file mode 100644
index 000000000000..e572e7e61ca6
--- /dev/null
+++ b/profiles/default/bsd/package.use
@@ -0,0 +1,7 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Michał Górny <mgorny@gentoo.org> (2017-01-26)
+# Preserve the old defaults on *BSD systems.
+sys-libs/libcxx -libcxxabi libcxxrt -libunwind
+sys-libs/libcxxrt -libunwind
diff --git a/profiles/default/bsd/package.use.force b/profiles/default/bsd/package.use.force
new file mode 100644
index 000000000000..c7c7c02310cc
--- /dev/null
+++ b/profiles/default/bsd/package.use.force
@@ -0,0 +1,3 @@
+# Javier Villavicencio <the_paya@gentoo.org> (2009-01-22)
+# Otherwise useless tar.
+app-arch/libarchive bzip2 zlib lzma
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
new file mode 100644
index 000000000000..2842678d58e6
--- /dev/null
+++ b/profiles/default/bsd/package.use.mask
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (2018-09-20)
+# dev-libs/libpfm has broken install rules for FreeBSD. Bug #666649.
+sys-devel/llvm exegesis
+
+# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
+# unkeyworded notmuch dependency, bug #587560
+mail-client/mutt notmuch
+
+# Matthias Maier <tamiko@gentoo.org> (2014-12-24)
+# dev-libs/xapian is currently not keyworded for any *-bsd profile
+app-doc/doxygen doxysearch
+
+# Mikle Kolyada <zlogene@gentoo.org> (2014-12-07)
+# There are a lot of unkeyworded dev-perl/* packages
+dev-vcs/git mediawiki mediawiki-experimental
+
+# Robin H. Johnson <robbat2@gentoo.org> (2014-01-05)
+# Pending keywording of net-libs/miniupnpc per bug #497186
+net-proxy/dante upnp
+
+# Naohiro Aota <naota@gentoo.org> (2013-10-14)
+# libcap-ng is for Linux only
+net-analyzer/tcpdump drop-root
+
+# Sebastian Pipping <sping@gentoo.org> (2011-02-22)
+# No dev-util/source-highlight or media-sound/lilypond here, yet (bug #356069, bug #344289)
+app-text/asciidoc test highlight
+
+# iproute2 - linux only
+net-vpn/openvpn iproute2
+
+media-video/ffmpeg ieee1394 iec61883
+net-libs/c-client pam
+net-proxy/squid -ipf-transparent -pf-transparent
+sys-apps/coreutils acl
+sys-apps/help2man nls
+
+# NetworkManager is Linux-only, Zephyr requires kerberos
+net-im/pidgin networkmanager zephyr
+
+# Alexis Ballier <aballier@gentoo.org> (2008-07-18)
+# Requires a linux only library,  bug #226085
+dev-lang/erlang sctp
+
+# Alexis Ballier <aballier@gentoo.org> (2008-08-08)
+# Linux only useflags for vlc
+media-video/vlc dc1394 ieee1394
+
+# Alexis Ballier <aballier@gentoo.org> (2008-08-08)
+# Depends on torque which is a linux only thing
+# lksctp-tools is linux only too
+sys-cluster/openmpi openmpi_rm_pbs openmpi_fabrics_sctp
+
+# Alexis Ballier <aballier@gentoo.org> (2008-09-25)
+# elf -> dev-libs/elfutils is too tight to the gnu libc
+# rpm could be masked but we have rpm 5 keyworded even if it's still masked.
+net-analyzer/net-snmp elf
+
+# Alexis Ballier <aballier@gentoo.org> (2008-10-04)
+# clisp doesn't build out of the box but can be fixed, xindy's way of building
+# its clisp module is confused by gmake vs bsdmake, mask it until we can
+# properly keyword xindy.
+app-text/texlive xindy
+
+# Alexis Ballier <aballier@gentoo.org> (2008-11-28)
+# Requires bluez-libs which is linux only
+net-libs/libpcap bluetooth
+
+# Alexis Ballier <aballier@gentoo.org> (2009-01-22)
+# Requires gpm
+www-client/links livecd
+
+# needs udev
+media-libs/libsdl2 kms
+media-libs/mesa gbm dri3 d3d9 vulkan vulkan-overlay
+x11-base/xorg-drivers video_cards_radeonsi
+x11-drivers/xf86-video-ati glamor
+media-libs/gst-plugins-base gbm
+>=gnome-base/gvfs-1.38 cdda gphoto2 mtp udisks
+
+# udisks is linux only (for now?)
+gnome-base/gvfs udisks
+
+# joystick useflag is linux only #477750
+media-video/mplayer joystick
+
+# linux only
+media-libs/opencv ieee1394 cuda
diff --git a/profiles/default/bsd/packages b/profiles/default/bsd/packages
new file mode 100644
index 000000000000..b4fb8b6d0827
--- /dev/null
+++ b/profiles/default/bsd/packages
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+-*virtual/dev-manager
+-*sys-fs/e2fsprogs
+-*sys-process/procps
+-*sys-process/psmisc
+-*virtual/shadow
+-*sys-apps/which
+-*virtual/modutils
+-*sys-apps/kbd
+#-*sys-apps/findutils
+#-*sys-apps/debianutils
+-*sys-apps/coreutils
+-*net-misc/iputils
+-*app-arch/tar
diff --git a/profiles/default/bsd/parent b/profiles/default/bsd/parent
new file mode 100644
index 000000000000..985c694a07d5
--- /dev/null
+++ b/profiles/default/bsd/parent
@@ -0,0 +1 @@
+../../base
diff --git a/profiles/default/bsd/profile.bashrc b/profiles/default/bsd/profile.bashrc
new file mode 100644
index 000000000000..bd15c4699460
--- /dev/null
+++ b/profiles/default/bsd/profile.bashrc
@@ -0,0 +1,14 @@
+if [[ ${EBUILD_PHASE} == compile ]] && [ -d "${S}" ] ; then
+	if grep -q "Assume that mode_t is passed compatibly" ${S} -r --include openat.c; then
+		eerror "The source code contains a faulty openat.c unit from gnulib."
+		eerror "Please report this on Gentoo Bugzilla in Gentoo/Alt product for component FreeBSD."
+		eerror "https://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%2FAlt&component=FreeBSD&op_sys=FreeBSD"
+		die "Broken openat.c gnulib unit."
+	fi
+        if grep -q "\\<test .*==" "${S}" -r --include configure; then
+                eerror "Found a non POSIX test construction in a configure script"
+                eerror "The configure checks of this package may not function properly"
+                eerror "Please report this on Gentoo Bugzilla in Gentoo/Alt product for component FreeBSD."
+                eerror "https://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%2FAlt&component=FreeBSD&op_sys=FreeBSD"
+        fi
+fi
diff --git a/profiles/default/bsd/use.force b/profiles/default/bsd/use.force
new file mode 100644
index 000000000000..706719015f84
--- /dev/null
+++ b/profiles/default/bsd/use.force
@@ -0,0 +1,2 @@
+split-usr
+userland_BSD
diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask
new file mode 100644
index 000000000000..76347096232a
--- /dev/null
+++ b/profiles/default/bsd/use.mask
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mart Raudsepp <leio@gentoo.org>
+# net-misc/networkmanager not keyworded
+networkmanager
+
+# ulm told me to do it!
+m17n-lib
+
+# Linux-dependant flags
+selinux
+nptl
+alsa
+v4l
+libv4l
+fbcon
+gpm
+lirc
+multilib
+lm-sensors
+caps
+filecaps
+vidix
+3dfx
+nvidia
+xvmc
+xfs
+udev
+systemd
+inotify
+aio
+
+# This usually refers just to linux-dvb
+dvb
+
+# Hardened doesn't work on Gentoo/*BSD for now
+hardened
+pax_kernel
+
+# This requires a kernel module that's Linux specific right now
+ifp
+
+# This requires a usb-eject command
+ipod
+
+# Mask extraneous elibc/kernel combinations
+-userland_BSD
+elibc_glibc
+kernel_linux
+userland_GNU
+
+# mask linux touch screen access lib.
+tslib
+
+# Mask Xorg-modular drivers that are Linux-specific
+input_devices_evdev
+input_devices_synaptics
+input_devices_vmmouse
+video_cards_vmware
+video_cards_nvidia
+video_cards_nouveau
+
+# Linux only sane backends
+sane_backends_qcam
+
+# Diego E. Pettenò <flameeyes@gentoo.org> (2010-10-19)
+# unmasking flags that only apply to FreeBSD
+-kqueue
diff --git a/profiles/default/linux/arm64/17.0/musl/use.mask b/profiles/default/linux/arm64/17.0/musl/use.mask
index a6ffd344214b..e6145791eeca 100644
--- a/profiles/default/linux/arm64/17.0/musl/use.mask
+++ b/profiles/default/linux/arm64/17.0/musl/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Mask multilib, since we cannot use it.
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index cde357d354a0..10c7b0d0affa 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -17,7 +17,6 @@ dev-games/gtkradiant
 dev-games/ps2-packer
 games-action/beathazardultra
 games-action/brutal-legend
-games-action/crimsonland
 games-action/descent3
 games-action/descent3-demo
 games-action/guacamelee
@@ -28,6 +27,7 @@ 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
 games-action/trine-enchanted-edition
@@ -81,7 +81,6 @@ games-misc/papers-please
 games-puzzle/world-of-goo
 games-puzzle/world-of-goo-demo
 games-roguelike/adom
-games-roguelike/neon-chrome
 games-rpg/costume-quest
 games-rpg/dear-esther
 games-rpg/dungeon-defenders
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 5dbcaf761f6b..2e8ea3fca55f 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -6,6 +6,10 @@
 # One example: https://tracker.ceph.com/issues/41523
 >=sys-cluster/ceph-14.2 dpdk
 
+# Aaron Bauman <bman@gentoo.org> (2019-04-14)
+# Masked due to vulnerability in dev-libs/ace
+dev-cpp/xsd ace
+
 # Jason Zaman <perfinion@gentoo.org> (2015-09-06)
 # This is masked in base/package.use.mask as Linux only.
 sys-auth/consolekit -cgroups
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index 6cb7ffaaaadd..f8fa6ac1b00e 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -17,7 +17,6 @@ dev-libs/elfutils
 app-arch/rar
 dev-games/gtkradiant
 dev-games/ps2-packer
-games-action/crimsonland
 games-action/descent3
 games-action/descent3-demo
 games-action/guacamelee
@@ -57,7 +56,6 @@ games-fps/ut2004-troopers
 games-fps/ut2004-unwheel
 games-puzzle/world-of-goo
 games-puzzle/world-of-goo-demo
-games-roguelike/neon-chrome
 games-rpg/costume-quest
 games-rpg/wasteland2
 games-server/etqw-ded
diff --git a/profiles/desc/gpsd_protocols.desc b/profiles/desc/gpsd_protocols.desc
index 30e805418afe..d85396bb827c 100644
--- a/profiles/desc/gpsd_protocols.desc
+++ b/profiles/desc/gpsd_protocols.desc
@@ -14,7 +14,6 @@ garmin - Garmin protocol support
 garmintxt - Garmin Simple Text protocol support
 geostar - Geostar Protocol support
 gpsclock - GPSclock protocol support
-greis - Javad GREIS protocol support
 isync - Isync protocol support
 itrax - iTrax protocol support
 mtk3301 - MTK-3301 protocol support
diff --git a/profiles/desc/llvm_targets.desc b/profiles/desc/llvm_targets.desc
index 38e123de7968..1c65ccad350a 100644
--- a/profiles/desc/llvm_targets.desc
+++ b/profiles/desc/llvm_targets.desc
@@ -1,9 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors.
+# Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 AArch64 - AArch64 CPU target (arm64 in Gentoo)
 AMDGPU - AMDGPU target (supports R600 and GCN GPUs)
-ARC - ARC (Argonaut RISC Core) embedded CPU target [EXPERIMENTAL]
 ARM - ARM CPU target
 AVR - 8-bit Atmel AVR microcontroller target [EXPERIMENTAL]
 BPF - Berkeley Packet Filter target
@@ -11,11 +10,12 @@ Hexagon - Qualcomm Hexagon DSP target
 Lanai - Lanai CPU target
 Mips - MIPS CPU target (includes MIPS64)
 MSP430 - MSP430 CPU target (experimental)
+Nios2 - Nios2 CPU target [EXPERIMENTAL]
 NVPTX - NVIDIA PTX (GPU) target (32-bit and 64-bit)
 PowerPC - PowerPC CPU target (PPC32 and PPC64)
-RISCV - RISC-V CPU target
+RISCV - RISC-V CPU target [EXPERIMENTAL]
 Sparc - Sparc CPU target
 SystemZ - SystemZ (s390x) CPU target
-WebAssembly - WebAssembly backend
+WebAssembly - WebAssembly backend [EXPERIMENTAL]
 X86 - X86 CPU target (includes amd64)
 XCore - XCore CPU target
diff --git a/profiles/features/hardened/make.defaults b/profiles/features/hardened/make.defaults
index 0646f4850056..8435f024ae44 100644
--- a/profiles/features/hardened/make.defaults
+++ b/profiles/features/hardened/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors.
+# Copyright 1999-2019 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2011-11-16)
diff --git a/profiles/features/hardened/package.use.mask b/profiles/features/hardened/package.use.mask
index c903d0bed882..e02b6fa64f67 100644
--- a/profiles/features/hardened/package.use.mask
+++ b/profiles/features/hardened/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 sys-apps/hwloc gl
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
index 049bbfe48ee6..c08217181df4 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
@@ -11,6 +11,16 @@ elif [[ ${CATEGORY}/${PN} == dev-qt/qtcore && ${EBUILD_PHASE} == configure ]]; t
 elif [[ ${CATEGORY}/${PN} == dev-lang/ocaml && ${EBUILD_PHASE} == configure ]]; then
     einfo "Removing dup3 and pipe2 definitions..."
     sed -e '/hasgot dup3/,/^fi/d;/hasgot pipe2/,/^fi/d' -i "${S}"/configure || die
+elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == compile ]]; then
+    einfo "Removing F_DUPFD_CLOEXEC definitions..."
+    sed -e '/define.*F_DUPFD_CLOEXEC/,/*\//d' -i "${S}"/sysdeps/unix/sysv/linux/bits/fcntl-linux.h || die
+    einfo "Removing pipe2 definitions..."
+    sed -e '/^extern int pipe2/d' -i "${S}"/posix/unistd.h || die
+    einfo "Removing epoll_create1 definitions..."
+    sed -e '/^extern int epoll_create1/d' -i "${S}"/sysdeps/unix/sysv/linux/sys/epoll.h || die
+    einfo "Removing lutimes and utimensat definitions..."
+    sed -e '/^extern int lutimes/,/__THROW/d' -i "${S}"/time/sys/time.h || die
+    sed -e '/^extern int utimensat/,/__THROW/d' -i "${S}"/io/sys/stat.h || die
 fi
 
 # Local Variables:
diff --git a/profiles/features/prefix/standalone/package.use.mask b/profiles/features/prefix/standalone/package.use.mask
index d875d29e2a2e..7653e7fd7c1d 100644
--- a/profiles/features/prefix/standalone/package.use.mask
+++ b/profiles/features/prefix/standalone/package.use.mask
@@ -1,12 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Benda Xu <heroxbd@gentoo.org> (2019-10-09)
-# Do not draw pam from @system. Bug 695966.
-# runuser is not necessary for Prefix.
-sys-apps/util-linux pam
-net-misc/openssh pam
-
 # Benda Xu <heroxbd@gentoo.org> (2019-01-26)
 # native-extensions requires >=linux=4.6 for __NR_copy_file_range
 sys-apps/portage native-extensions
diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index fc75b02ca9a9..b90b3c601152 100644
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -10,6 +10,7 @@ sys-libs/glibc
 sys-libs/musl
 sys-libs/uclibc
 sys-libs/uclibc-ng
+sys-freebsd/freebsd-lib
 sys-devel/binutils
 sys-devel/libtool
 sys-devel/make
diff --git a/profiles/package.mask b/profiles/package.mask
index 9854b324dfbf..2ebdaee903ad 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,309 +29,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Michał Górny <mgorny@gentoo.org> (2019-10-13)
-# Last release in 2008.  Declared dead upstream, apparently broken
-# on newer systems.  EAPI 0.
-# Removal in 30 days.  Bug #697384.
-app-office/eqe
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-12)
-# Utility library that is used only by net-analyzer/bsnmp
-# (to be removed).
-# Removal in 30 days.  Bug #683284.
-dev-libs/libbegemot
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-12)
-# Bad quality package.  Last commit in 2016 (unpackaged in Gentoo).
-# GTK+2 only.  Most of the settings provided are also found in xfwm4
-# settings dialog.
-# Removal in 30 days.  Bug #697546.
-xfce-extra/xfce4-composite-editor
-
-# David Seifert <soap@gentoo.org> (2019-10-12)
-# Last release over 6.5 years ago, no code activity.
-# Scons build system very brittle, python 3 impl bumps
-# painful, no python 3.7, No reverse dependencies.
-# Removal in 30 days.  Bug #683140, #690800.
-dev-python/cgkit
-
-# Mike Gilbert <floppym@gentoo.org> (2019-10-11)
-# Inactive upstream for many years.
-# Several open bugs.
-# Please migrate to sys-apps/man-db.
-sys-apps/man
-
-# Mike Pagano <mpagano@gentoo.org> (2019-10-11)
-# kenel incorrectly specifics a version
-# not included in enpatches tarball 
-# This can be removed in 2019-11-11
-=sys-kernel/gentoo-sources-5.3.6
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-11)
-# FreeBSD-only packages.  The project has been discontinued,
-# and the core FreeBSD packages are already gone.
-# Removal in 14 days.  Bug #683284.
-dev-libs/libexecinfo
-net-analyzer/bsnmp
-net-firewall/pftop
-sys-apps/flock
-sys-auth/openpam
-virtual/pam
-sys-block/eject-bsd
-sys-fs/fuse4bsd
-sys-process/pidof-bsd
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-10)
-# Upstream gone.  Last bumped in 2006.  EAPI 0.  net-misc/sipcalc seems
-# like a good replacement.
-# Removal in 30 days.  Bug #697236.
-net-misc/ipsc
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-10)
-# Unmaintained.  Does not build.  EAPI 0.
-# Removal in 30 days.  Bug #696294.
-mail-mta/qmail-ldap
-
-# Matt Turner <mattst88@gentoo.org> (2019-10-09)
-# Needs unreleased xorgproto. Bug #697098.
-=x11-libs/libX11-1.6.9
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-07)
-# Unmaintained.  A few versions behind upstream.  Forces an old version
-# of dev-java/ant-contrib.
-# Removal in 30 days.  Bug #696916.
-net-im/openfire
-
-# Stefan Strogin <steils@gentoo.org> (2019-10-05)
-# Masked for testing
->=dev-libs/libressl-3.0.1
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-05)
-# Apparently included in apache-2.4, rendering split package obsolete.
-# Removal in 30 days.  Bug #680768.
-www-apache/mod_xml2enc
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-05)
-# Does not support kernels >3.11 (oldest gentoo-sources is 4.4 atm).
-# Not bumped since 2013.  Bump request waiting since 2014.
-# Removal in 30 days.  Bug #696376.
-sys-block/iscsitarget
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-05)
-# Open vulnerability for two years.  No maintainer activity since 2017.
-# Upstream is not making any new releases, and patches are accumulating.
-# Removal in 30 days.  Bug #662878.
-net-libs/openslp
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-04)
-# Unmaintained, EAPI 0 packages.  No reverse dependencies.  If you want
-# them to stay, please port them to EAPI 7, and preferably become
-# the maintainer.
-# Removal in 30 days.  Bug #696252.
-app-benchmarks/volanomark
-app-cdr/mode2cdmaker
-app-cdr/xdvdfs-tools
-app-mobilephone/cobex
-app-office/tedia2sql
-app-text/mht-rip
-dev-embedded/gnap
-dev-libs/xplc
-dev-vcs/cvsd
-dev-vcs/cvsq
-dev-vcs/svn2cl
-mail-client/biabam
-mail-client/pinepgp
-mail-filter/clamassassin
-mail-filter/clamsmtp
-mail-filter/disspam
-mail-filter/sqlgrey
-media-gfx/cthumb
-media-gfx/fblogo
-net-dialup/globespan-adsl
-net-dns/bind-dns-keygen
-net-firewall/fwanalog
-net-firewall/fwipsec
-net-firewall/quicktables
-net-firewall/shapecfg
-net-irc/dircproxy
-net-irc/jircii
-net-irc/miau
-net-mail/hotwayd
-net-mail/popick
-net-mail/poppassd_ceti
-net-mail/qmail-notify
-net-mail/spamcup
-net-mail/vacation
-net-mail/yosucker
-net-misc/cgterm
-net-misc/clockspeed-conf
-net-misc/fmirror
-net-misc/ng-utils
-net-misc/sendfile
-net-news/yencode
-net-nntp/slrnconf
-net-nntp/ubh
-net-p2p/createtorrent
-net-p2p/ctcs
-net-proxy/ratproxy
-net-wireless/airsnort
-sys-apps/hwdata-redhat
-sys-auth/pam-afs-session
-sys-auth/pam_chroot
-sys-auth/pam_require
-sys-block/dellmgr
-sys-fs/gt5
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-04)
-# Unmaintained, EAPI 0 packages.  No reverse dependencies.  If you want
-# them to stay, please sacrifice the 30 minutes of your life needed
-# to port them to EAPI 7, recheck license, update URIs, etc.
-# Removal in 30 days.  Bug #696248.
-app-dicts/dictd-devils
-app-dicts/dictd-dicts
-app-dicts/dictd-elements
-app-dicts/dictd-foldoc
-app-dicts/dictd-gazetteer
-app-dicts/dictd-jargon
-app-dicts/dictd-misc
-app-dicts/dictd-web1913
-
-# Michał Górny <mgorny@gentoo.org> (2019-10-04)
-# Unmaintained.  EAPI 0.  Last release in 2009.  No reverse
-# dependencies.
-# Removal in 30 days.  Bug #696176.
-mail-filter/procmail-lib
-
-# Patrice Clement <monsieurp@gentoo.org> (2019-10-02)
-# OTR support is fully integrated within irssi since version 1.2.0. Type /help otr
-# at the command prompt to find out more. The OTR module is therefore obsolete
-# and can be tree-cleaned.
-# Masked for removal in 30 days. Bug #696074.
-net-irc/irssi-otr
-
-# Ulrich Müller <ulm@gentoo.org> (2019-10-01)
-# Fails byte-compilation with recent Emacs versions.
-# Homepage and SRC_URI are gone. Upstream package
-# is unmaintained, according to EmacsWiki.
-# Masked for removal in 30 days. Bug #666836.
-app-emacs/mode-compile
-
-# Brian Evans <grknight@gentoo.org> (2019-10-01)
-# End of life.  Please upgrade.
-# Removal in 90 days. Bug 651784
-dev-lang/php:5.6
-virtual/httpd-php:5.6
-
-# Brian Evans <grknight@gentoo.org> (2019-10-01)
-# Requires end of life PHP 5.6.  Please upgrade.
-# Removal in 90 days. Bug 651784
-=www-apps/rutorrent-3.4-r1
-
-# Brian Evans <grknight@gentoo.org> (2019-10-01)
-# Old slots for support of PHP <7
-# Removal in 90 days. Bug 651784
-dev-php/pecl-apcu:0
-dev-php/pecl-dbase:0
-dev-php/pecl-http:2
-dev-php/pecl-mailparse:0
-dev-php/pecl-memcached:0
-dev-php/pecl-oauth:0
-dev-php/pecl-propro:0
-dev-php/pecl-ps:0
-dev-php/pecl-raphf:0
-dev-php/pecl-rrd:0
-dev-php/pecl-ssh2:0
-dev-php/pecl-stomp:0
-dev-php/pecl-xdiff:0
-dev-php/pecl-yaml:0
-
-# Brian Evans <grknight@gentoo.org> (2019-10-01)
-# Old extensions which only work with PHP <7
-# pecl-memcache is replaced by pecl-memcachd (with code changes)
-# pecl-mongo is replaced by pecl-monogodb
-# Removal in 90 days. Bug 651784
-dev-php/PEAR-MDB2_Driver_mysql
-dev-php/magickwand
-dev-php/pecl-bbcode
-dev-php/pecl-cairo
-dev-php/pecl-dbx
-dev-php/haru
-dev-php/pecl-htscanner
-dev-php/pecl-libevent
-dev-php/pecl-memcache
-dev-php/pecl-mongo
-dev-php/pecl-mysqlnd_ms
-dev-php/pecl-mysqlnd_qc
-dev-php/pecl-sphinx
-dev-php/pecl-spl_types
-dev-php/pecl-svn
-dev-php/pecl-xrange
-dev-php/suhosin
-dev-php/xcache
-dev-php/xhprof
-
-# Matt Turner <mattst88@gentoo.org> (2019-09-28)
-# Merged into Mesa. No reverse dependencies. Bug #654464
-# Removal in 30 days
-media-libs/libtxc_dxtn
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2019-09-28)
-# ppc64/ia64 binary-only package was needed to workaround
-# gcc-3.3 bugs. Should not be needed anymore. To be removed
-# in 30 days.
-sys-libs/libstdc++-v3-bin
-
-# Michał Górny <mgorny@gentoo.org> (2019-09-28)
-# All of the following packages are unfetchable and mirror-restricted.
-#
-# games-fps/enemy-territory-etpro: #638092
-# games-fps/ut2003-bonuspack-cm: #640552
-# games-rpg/runescape-launcher: #625884
-# games-server/bf1942-lnxded: #640576
-# games-server/nwn-ded: #640578
-# games-strategy/mindrover-demo: #640586
-# media-fonts/hkscs-ming: #640590
-# net-print/adobeps: #687000
-# sci-chemistry/xdsstat-bin: #673962
-# sci-libs/parmgridgen (+ revdep sci-libs/openfoam): #633888
-#
-# Removal in 30 days.
-games-fps/enemy-territory-etpro
-games-fps/ut2003-bonuspack-cm
-games-rpg/runescape-launcher
-games-server/bf1942-lnxded
-games-server/nwn-ded
-games-strategy/mindrover-demo
-media-fonts/hkscs-ming
-net-print/adobeps
-sci-chemistry/xdsstat-bin
-sci-libs/openfoam
-sci-libs/parmgridgen
-
-# Michał Górny <mgorny@gentoo.org> (2019-09-28)
-# games-fps/ut2004 is unfetchable for almost 3 years.  The remaining
-# packagse are its reverse dependencies, some of them unfetchable
-# as well.
-# Removal in 30 days.  Bug #601402.
-games-fps/ut2004
-games-fps/ut2004-action
-games-fps/ut2004-airbuccaneers
-games-fps/ut2004-bonuspack-cbp1
-games-fps/ut2004-bonuspack-cbp2
-games-fps/ut2004-bonuspack-ece
-games-fps/ut2004-bonuspack-mega
-games-fps/ut2004-cor
-games-fps/ut2004-crossfire
-games-fps/ut2004-data
-games-fps/ut2004-deathball
-games-fps/ut2004-fragops
-games-fps/ut2004-hamsterbash
-games-fps/ut2004-muralis
-games-fps/ut2004-strikeforce
-games-fps/ut2004-troopers
-games-fps/ut2004-unwheel
-games-server/ut2004-ded
-
 # Stefan Strogin <steils@gentoo.org> (2019-09-27)
 # Requires >=dev-lang/lua-5.3 which is masked
 >=dev-util/bam-0.5.0
@@ -381,6 +78,10 @@ sci-chemistry/azara
 app-admin/systemrescuecd-x86
 sys-boot/systemrescuecd-x86-grub
 
+# Matt Turner <mattst88@gentoo.org> (2019-09-03)
+# Broken. Bug #694774
+>=media-libs/freeglut-3.2.0
+
 # Michał Górny <mgorny@gentoo.org> (2019-09-17)
 # Unmaintained EAPI 0 Apache modules + mod_access_dnsbl as a revdep.
 # Removal in 30 days.  Bug #694608.
@@ -443,6 +144,11 @@ app-portage/hashgen
 # Removal in 30 days.  Bug #694390.
 dev-go/go-oauth2
 
+# Zac Medico <zmedico@gentoo.org> (2019-09-14)
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694392.
+dev-go/go-protobuf
+
 # Michał Górny <mgorny@gentoo.org> (2019-09-14)
 # Unmaintained.  All of them were not bumped since 2016.  No reverse
 # dependencies.
@@ -532,22 +238,864 @@ dev-python/txsocksx
 dev-python/wsgilog
 dev-python/xmpppy
 
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Last bumped in 2017.  Newer version fails to fetch.  Pending bump.
+# Unresolved license issues.
+# Removal in 30 days.  Bug #694264.
+dev-util/idea-ultimate
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  Last bumped in 2017.  Unresolved license issues.
+# Removal in 30 days.  Bug #694274.
+dev-util/webstorm
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  No reverse dependencies.
+# Removal in 30 days.  Bug #694260.
+sys-libs/libmath++
+sys-libs/rvm
+sys-libs/system-config-base
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  All look pretty dead.  No reverse dependencies.
+#
+# x11-libs/gtkhotkey: 2009
+# x11-libs/libaosd: 2010
+# x11-libs/libproplist: ancient?
+#
+# Removal in 30 days.  Bug #694258.
+x11-libs/gtkhotkey
+x11-libs/libaosd
+x11-libs/libproplist
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  Not bumped since 2011.  Fails to build due to broken
+# build system.  No reverse dependencies.
+# Removal in 30 days.  Bug #500616.
+net-libs/nacl
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  No reverse dependencies.
+# Removal in 30 days.  Bug #694256.
+net-libs/ccnet
+net-libs/ccrtp
+net-libs/dslib
+net-libs/libgmail
+net-libs/libs3
+net-libs/libyahoo2
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  No reverse dependencies.
+#
+# media-libs/libbmp: 2010, homepage gone.
+# media-libs/libmkv: 2011.
+# media-libs/sampleicc: 2014, last upstream 2016.
+#
+# Removal in 30 days.  Bug #694254.
+media-libs/libbmp
+media-libs/libmkv
+media-libs/sampleicc
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current version from 2016, needs bump.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694242.
+dev-libs/xmlwrapp
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2011.  No reverse dependencies.
+# Removal in 30 days.  Bug #694240.
+dev-libs/xmlrpc-epi
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  No reverse dependencies.
+# Removal in 30 days.  Bug #694238.
+dev-libs/xml-security-c
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 1998.  No reverse dependencies.
+# Removal in 30 days.  Bug #694236.
+dev-libs/syncdir
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current version from 2011, latest upstream 2015.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694234.
+dev-libs/stlsoft
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2005.  No reverse dependencies.
+# Removal in 30 days.  Bug #694228.
+dev-libs/socketstream
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2014.  No reverse dependencies.
+# Removal in 30 days.  Bug #694228.
+dev-libs/sblim-sfcc
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Development stalled in 2009.  No reverse dependencies.
+# dev-libs/libvterm is the upstream recommended replacement.
+# Removal in 30 days.  Bug #694226.
+dev-libs/rote
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Added in 2008.  Live ebuild only.  No reverse
+# dependencies.
+# Removal in 14 days.  Bug #694224.
+dev-libs/polylib
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in <=2004.  Reported to fail to build.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694222.
+dev-libs/pcre++
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Added in 2005 and not bumped since.  Homepage gone.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694218.
+dev-libs/mdsplib
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2009.  Homepage gone.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694216.
+dev-libs/mapm
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2011.  Homepage gone.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694214.
+dev-libs/ltxml
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  EOL-ed upstream.  No reverse dependencies.
+# Removal in 30 days.  Bug #694212.
+dev-libs/log4shib
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Old GNOME library, last release in 2000.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694208.
+dev-libs/libunicode
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current version is from 2015, and is pending bump.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694206.
+dev-libs/libucl
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Added in 2002 and not bumped since.  Homepage gone.
+# No amd64 keyword.  No reverse dependencies.
+# Removal in 30 days.  Bug #694204.
+dev-libs/libtrain
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2011.  Homepage gone.  No amd64 keyword.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694202.
+dev-libs/libsqlora8
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2009.  No reverse dependencies.
+# Removal in 30 days.  Bug #694200.
+dev-libs/libproccpuinfo
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current version from 2015, last release in 2016.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694198.
+dev-libs/libntru
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2014.  Declared obsolete upstream.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694196.
+dev-libs/libmongo-client
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2009.  No reverse dependencies.
+# Removal in 30 days.  Bug #694192.
+dev-libs/libmail
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2009.  No reverse dependencies.
+# Removal in 30 days.  Bug #694188.
+dev-libs/libidmef
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2005.  Homepage gone.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694186.
+dev-libs/libhtmlparse
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2009.  No reverse dependencies.
+# Removal in 30 days.  Bug #694184.
+dev-libs/libhome
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Both fail with modern versions of dev-util/waf
+# (#664762, #663712).  No reverse dependencies.
+# Removal in 30 days.  Bug #694182.
+dev-libs/libcxml
+dev-libs/locked_sstream
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  No reverse dependencies.  Its presence breaks
+# pulseaudio (#672468).
+# Removal in 30 days.  Bug #694180.
+dev-libs/libcli
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2010.  No reverse dependencies.
+# Removal in 30 days.  Bug #694178.
+dev-libs/libcaldav
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  The driver is now included in the kernel,
+# so the package installs only a header file.  However, according
+# to upstream this file violated Lego Mindstorms SDK license.
+# Removal in 30 days.  Bug #694176.
+dev-libs/legousbtower
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  No reverse dependencies.  Multiple alternatives exist,
+# most with less restrictive licenses (e.g. dev-libs/glib).
+# Removal in 30 days.  Bug #694174.
+dev-libs/hashit
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release from 2010.  No reverse dependencies.
+# Removal in 30 days.  Bug #694170.
+dev-libs/fampp2
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  The current release is from 2005, pending version bump
+# since 2012.  No reverse dependencies.
+# Removal in 30 days.  Bug #694168.
+dev-libs/elfio
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current release is from 2014, and needs version bump.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694166.
+dev-libs/cgicc
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Fails to build against current version of boost.
+# No reverse dependencies (last one removed in April).
+# Removal in 30 days.  Bug #691264.
+dev-libs/actor-framework
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Unmaintained.  Last bumped in 2016, many versions behind now.
+# Has test failures reported.  No reverse dependencies.
+# Removal in 30 days.  Bug #694056.
+dev-libs/gecode
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Ruby 2.4-only.  Requires old version of dev-libs/gecode.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694040.
+dev-ruby/dep_selector
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Both packages are unmaintained, and are many releases behind.
+# hadolint is reported to fail to build, and requires old version
+# of language-docker.  Newer versions of language-docker have
+# no revdeps.
+# Removal in 30 days.  Bug #674660.
+dev-haskell/language-docker
+dev-util/hadolint
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Gentoo/FreeBSD project is effectively dead.  The core packages are
+# outdated and vulnerable.  We do not have a fully working install,
+# and I have not been able to find anyone knowing how to create one.
+# Leaf packages are failing to build more and more frequently, some
+# simply because of our outdated base system.  The profiles were marked
+# exp two months ago not to stall other developers, core packages are
+# masked for at least two months, and nowadays they have unsatisfied
+# dependencies already.
+#
+# If anyone wishes to take the effort over, please consider it urgent.
+# If not, I will slowly start removing remaining parts of FreeBSD
+# after this batch, and checking which packages can be salvaged.
+#
+# Removal in 30 days.  Bug #683284.
+sys-freebsd/boot0
+sys-freebsd/freebsd-bin
+sys-freebsd/freebsd-cddl
+sys-freebsd/freebsd-lib
+sys-freebsd/freebsd-libexec
+sys-freebsd/freebsd-mk-defs
+sys-freebsd/freebsd-pam-modules
+sys-freebsd/freebsd-pf
+sys-freebsd/freebsd-rescue
+sys-freebsd/freebsd-sbin
+sys-freebsd/freebsd-share
+sys-freebsd/freebsd-sources
+sys-freebsd/freebsd-ubin
+sys-freebsd/freebsd-usbin
+sys-freebsd/ubin-wrappers
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Unmaintained.  Ancient.  Carries a lot of patches, and has even more
+# bugs reported.  Last rites were cancelled due to Gentoo/FreeBSD 1 year
+# ago but that project is dead nowadays.  Many alternatives exist,
+# sys-process/cronie is probably the closest one (it's a fork).
+# Removal in 30 days.  Bug #694036.
+sys-process/vixie-cron
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Unmaintained.  Last bumped in 2013.  No apparent advantage over
+# the two other implementations in Gentoo (dev-util/pkgconfig,
+# dev-util/pkgconf).
+# Removal in 30 days.  Bug #694034.
+dev-util/pkgconfig-openbsd
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2009, last upstream release in 2014.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693944.
+www-client/ck4up
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Last bumped in 2006.  Homepage gone (domain taken over).  EAPI 0.
+# No amd64 keyword.
+# Removal in 30 days.  Bug #693942.
+www-apps/metadot
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  EAPI 0.  No amd64 keyword.  Does not support most
+# of the modern browsers.  Obsoleted by x11-misc/xdg-utils
+# and desktop-specific tools.
+# Removal in 30 days.  Bug #693940.
+www-apps/browser-config
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2005.  Last upstream update in 2003.  EAPI 0.
+# No amd64 keyword.
+# Removal in 30 days.  Bug #693938.
+www-apache/mod_diagnostics
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Last release in 2005.  EAPI 0.  No amd64 keyword.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #693936.
+sys-libs/lrmi
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2006 and not updated since.  EAPI 0.  Keyworded only for dead
+# x86-fbsd.
+# Removal in 30 days.  Bug #693934.
+sys-fs/scan-ffs
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2005, not bumped since.  Last upstream release in 2007.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693932.
+sys-cluster/ocfs
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2005, no upstream releases since.  EAPI 0.  No amd64 keyword.
+# -master is reported to fail to build.
+# Removal in 30 days.  Bug #693930.
+sys-cluster/feedbackd-agent
+sys-cluster/feedbackd-master
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2009, last upstream release from 2005.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693908.
+sys-boot/raincoat
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2006, no new releases since.  EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693906.
+sys-auth/icmpdn
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Not touched since 2005.  EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693904.
+sys-apps/netboot-base
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2005 and not bumped since.  Homepage gone.  EAPI 0.  No amd64
+# keyword.
+# Removal in 30 days.  Bug #693902.
+sys-apps/fwcrv
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2004 and not bumped since.  Homepage is gone.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693900.
+sys-apps/checkservice
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2012, last release in 2007.  EAPI 0.
+# No amd64 keyword.
+# Removal in 30 days.  Bug #693888.
+net-wireless/orinoco-fwutils
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last release in 2004.  EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693886.
+net-p2p/xnap
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2004, last release in 2002.  EAPI 0.
+# QA issues.  No amd64 keyword.
+# Removal in 30 days.  Bug #693884.
+net-p2p/smet2html
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2004 and not bumped since.  Homepage dead.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693882.
+net-p2p/myster
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2008, last upstream activity in 2010.
+# EAPI 0.  QA issues.  No amd64 keyword.
+# Removal in 30 days.  Bug #693880.
+net-p2p/mktorrent-borg
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2002 and not bumped since.  EAPI 0.  No amd64 keyword.
+# Sources are no longer to be found on the homepage, and upstream
+# explicitly points to third-party applications.
+# Removal in 30 days.  Bug #693878.
+net-misc/shout
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2003.  Homepage gone.  EAPI 0.
+# No amd64 keyword.
+# Removal in 30 days.  Bug #693876.
+net-misc/hlfl
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2003, no new releases since.  EAPI 0.
+# No amd64 keywords.
+# Removal in 30 days.  Bug #693868.
+net-mail/gensig
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Both added in 2003, no new releases since.  Homepage dead.  EAPI 0.
+# No amd64 keywords.
+# Removal in 30 days.  Bug #693866.
+net-mail/qmail-lint
+net-mail/qmail-qsanity
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2001, no new releases since.  EAPI 0.
+# Multiple QA issues.  No amd64 keywords.
+# Removal in 30 days.  Bug #693864.
+net-mail/fastforward
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Suite of NIH libraries.  Only dev-libs/vanessa-logger has external
+# revdep of net-misc/aggregate-flim.  All others only revdep between
+# themselves.  Almost all packages are EAPI 0, and date back
+# to 2002-2010 (one is EAPI 5 / 2015 but has no revdeps).
+# Removal in 30 days.  Bug #693820.
+dev-libs/vanessa-adt
+dev-libs/vanessa-logger
+net-libs/vanessa-mcast
+net-libs/vanessa-socket
+net-misc/aggregate-flim
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Added in 2004.  Upstream is gone.  EAPI 0.  No amd64
+# keyword.  No reverse dependencies.
+# Removal in 30 days.  Bug #693812.
+net-libs/roadrunner
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Added in 2006, no newer releases.  EAPI 0.  No amd64
+# keywords.
+# Removal in 30 days.  Bug #693812.
+net-dns/tinystats
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2009, last release in 2010.  EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693808.
+net-dialup/dgcmodem
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2000 and not bumped since.  EAPI 0.  No amd64 keywords.
+# Homepage and SRC_URI dead.  Original xanim was removed in 2016.
+# Removal in 30 days.  Bug #693804.
+media-video/xanim-export
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2007.  EAPI 0.  Multiple QA issues.  x86-only.
+# Homepage is long gone.
+# Removal in 30 days.  Bug #693802.
+media-sound/imp3sh
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2007.  EAPI 0.  Known to be broken on amd64.
+# Homepage dead.
+# Removal in 30 days.  Bug #693800.
+media-sound/hearnet
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2004 and not updated since.  Incorrect license.  EAPI 0.
+# Proprietary 32-bit x86 executable.  Homepage and SRC_URI are dead,
+# and we shouldn't be mirroring distfiles in the first place.
+# Removal in 30 days.  Bug #693798.
+sys-boot/psoload
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2003 and not updated since.  Unclear license.  EAPI 0.
+# No amd64 keywords.  Homepage and SRC_URI are dead, and we probably
+# shouldn't be mirroring distfiles in the first place.
+# Removal in 30 days.  Bug #693796.
+net-misc/netprofiles-ims
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2004 and not updated since.  Unclear license.  EAPI 0.
+# Homepage and SRC_URI are dead, and we probably shouldn't be mirroring
+# them in the first place.
+# Removal in 30 days.  Bug #693794.
+media-video/maven-poke
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2009.  EAPI 0.  Keyworded only for the dead x86-bsd
+# port.  No reverse dependencies.
+# Removal in 30 days.  Bug #693768.
+dev-libs/libvolume_id
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Added in 2002 and not updated since.  EAPI 0.  No amd64
+# keywords.  Apparently the only revdep was Stratego which was removed
+# in the past.
+# Removal in 30 days.  Bug #693760.
+dev-libs/cpl-stratego
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Added in 2004 and not updated since.  Homepage dead.
+# EAPI 0.  No amd64 keywords.  No reverse dependencies.
+# Removal in 30 days.  Bug #693758.
+dev-libs/asyncresolv
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Last release in 2004.  EAPI 0, no amd64 keywords.
+# Removal in 30 days.  Bug #693756.
+dev-lang/gwydion-dylan-bin
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Both packages are unmaintained, EAPI 0, not keyworded on amd64.
+# Both were last bumped in 2010.  Tinycobol had one release afterwards,
+# after which it has been declared dead (in 2011).  It is the only
+# reverse dependency of vbisam, and it has no reverse dependencies
+# itself.
+# Removal in 30 days.  Bug #693752.
+dev-db/vbisam
+dev-lang/tinycobol
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  EAPI 0.  Added in 2003 and not updated since.
+# Apparently FreeBSD had a 1.4.4 but upstream homepage is already gone.
+# Not keyworded on amd64.
+# Removal in 30 days.  Bug #693750.
+app-text/freepwing
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2008 and not updated since.  EAPI 0.  Upstream homepage
+# disappeared.  Not keyworded on amd64.
+# Removal in 30 days.  Bug #693748.
+app-emulation/vov
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Does not start.  Last bumped in 2012, numerous releases behind
+# upstream.
+# Removal in 30 days.  Bug #609652.
+net-p2p/saku
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2008.  Needs porting out of games.eclass.  Apparently
+# does not work in testing mode, and requires rare hardware and media
+# for normal operation.
+# Removal in 30 days.  Bug #654290.
+games-emulation/daphne
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  EAPI 0.  Homepage gone.  Potential netqmail maintainer
+# indicates that it can be replaced by running one daemon from normal
+# qmail install.
+# Removal in 30 days.  Bug #693746.
+mail-mta/mini-qmail
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Unmaintained.  Beta version from 2012.  The ebuild is currently
+# broken, and since it relies on CD install, so it needs someone with
+# the CD to fix it.  The original maintainer suggests trying Serious Sam
+# Fusion in wine instead.
+# Removal in 30 days.  Bug #551174.
+games-fps/serious-sam-tfe
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Has a build failure repoted.  Last bumped in 2006.  Homepage is gone,
+# and (newer) sources are nowhere to be found.
+# Removal in 30 days.  Bug #617188.
+sys-cluster/lspbs
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# sci-mathematics/kodkod: reported to fail to build.  Last bumped
+# in 2012.  Homepage is gone, and sources are nowhere to be found.
+#
+# Removal in 30 days.  Bug #685802.
+sci-mathematics/kodkod
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Unmaintained.  Not bumped since 2011.
+# Removal in 30 days.  Bug #693232.
+net-mail/kuvert
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Both packages are (now) mirror-restricted and have non-working
+# SRC_URI.
+# Removal in 30 days.  Bug #601052.
+games-action/mutantstorm-demo
+games-action/spacetripper-demo
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Mirror-restricted, SRC_URI down and sources nowhere to be found.
+# Removal in 30 days.  Bug #692798.
+sys-apps/adjtime
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Unmaintained.  Installs world-writable directory.  Last release
+# in 2004.
+# Removal in 30 days.  Bug #692522.
+app-admin/yaala
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Last release in 2004.  EAPI 0.  x86-only.  Upstream recommends
+# switching to XML Forms.
+# Removal in 30 days.  Bug #693658.
+app-text/fdftk
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Proprietary, fetch-restricted package.  Last bumped in 2007.  EAPI 0.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #693656.
+dev-java/jdbc-informix
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Unmaintained.  EAPI 0.  Last (pre-alpha) release in 2001.  No reverse
+# dependencies.  Removal in 30 days.  Bug #693644.
+media-libs/sdlmm
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Has reported build and test failures.  Last release in 2013.  Current
+# stable is EAPI 0, and there is no point in stabilizing the newer
+# version.  No reverse dependencies.
+# Removal in 30 days.  Bug #622340.
+media-libs/sdif
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Unmaintained.  EAPI 0.  Last bumped in 2005.  Upstream homepage
+# and sources gone.  No reverse dependencies.
+# Removal in 30 days.  Bug #693642.
+media-libs/libopendaap
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Does not install correctly on multilib systems.  EAPI 0.  Multiple
+# other QA issues.  Obscure format with unlikely real use.  The domain
+# for homepage expired.  Last upstream commit in 2013.
+# Removal in 30 days.  Bug #313087.
+media-libs/libnut
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Has a build failure reported.  Project discontinued and homepage gone.
+# Last bumped in 2007.  No reverse dependencies.
+# Removal in 30 days.  Bug #664494.
+media-libs/libjackasyn
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Last (and only) release in 2005.  EAPI 0.  No reverse dependencies.
+# Removal in 30 days.  Bug #693640.
+media-libs/libipod
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-07)
+# Proprietary software with restricted download access.  Last bumped
+# in 2011.  Still at EAPI 0.  Of the two revdeps, both make FMOD
+# optional and support alternative sound systems.
+# Removal in 30 days.  Bug #453748.
+media-libs/fmod
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-06)
+# Unmaintained.  Tests fail to build.  Last release in 2014.  No reverse
+# dependencies.  Removal in 30 days.  Bug #640860.
+dev-cpp/xsd
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-09-04)
+# EAPI 2. Brutally outdated and untouched for ages. Removal in
+# 30 days, bug 688504
+sci-libs/openfoam-bin
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-04)
+# EAPI 0.  Keyworded only for x86-fbsd which is dead.  Practically untouched
+# since 2007.  Removal in 30 days.  Bug #693504.
+app-admin/consolehm
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-04)
+# Unmaintained.  EAPI 0.  Last touched in 2010.  No real homepage.
+# No clear advantage over app-text/tree.
+# Removal in 30 days.  Bug #693502.
+app-text/ddir
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-04)
+# A metapackage without a really clear purpose.  No reverse
+# dependencies.
+# Removal in 30 days.
+app-text/docbook-sgml
+
 # Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
 # Unofficial build. Superseded by official 2.49.5 release.
 # Masked for removal.
 =www-client/seamonkey-2.49.9.1_p0
 
+# Matthias Maier <tamiko@gentoo.org> (2019-09-03)
+# Duplicate package - use sci-libs/med instead, bug #693146
+# (Expedited) removal in 7 days
+sci-libs/libmed
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-03)
+# Not supported by the current browserpass extension.
+# Removal in 30 days
+<www-plugins/browserpass-3
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-02)
+# gnome-vfs was deprecated along with GNOME 2.22 in favor of gvfs.
+# gnome-vfsmm provides C++ bindings for it, with last release in 2009
+# and only one reverse dependency.
+#
+# assogiate is the last revdep of gnome-vfsmm.  It was last bumped
+# in 2007, and the homepage is long gone (last seen ~2009).
+#
+# Removal in 30 days.  Bug #649000.
+dev-cpp/gnome-vfsmm
+gnome-extra/assogiate
+
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # <dev-scheme/guile-2 is package.mask'd
 <media-sound/lilypond-2.19
 
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# dev-scheme/guile-gnome-platform depends on dev-scheme/guile:12. Its only
+# reverse dependency is sci-chemistry/burrow-owl, so include it. The others are
+# dependencies of sci-chemistry/burrow-owl as well, and it is their only
+# reverse dependency.
+# Bug #693290.
+dev-libs/g-wrap
+dev-scheme/guile-cairo
+dev-scheme/guile-gnome-platform
+dev-scheme/guile-lib
+sci-chemistry/burrow-owl
+sci-libs/starparse
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# Unmaintained, unpackaged versions from 2015. Incompatible with guile-2.2.
+# Removal in 30 days. # Bug #654654.
+games-strategy/liquidwar6
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # TeXmacs is the only remaining package in tree that requires guile-1.8, which
 # is unsupported upstream. A TeXmacs port to Guile-2 has been in progress for a
 # few years. Bug #436400
 app-office/texmacs
 <dev-scheme/guile-2
 
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Remnant of Half-Life server stuff that was removed back in 2005.
+# Removal in 30 days.  Bug #693260.
+dev-games/hlsdk
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Ancient, i386-only binary package.  Current version is a nightly
+# from 2006.  The package has had a release since, has found a new
+# upstream and has been forked multiple times as well.  Apparently
+# NetRadiant-custom is the most recently maintained fork (not packaged).
+# Removal in 30 days.  Bug #181372.
+dev-games/gtkradiant
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Never keyworded on amd64 (and probably does not work on 64-bit
+# systems).  Last release from 2001.  Requires rare hardware.
+# Removal in 30 days.  Bug #693258.
+dev-games/flinker
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Last bumped in 2007.  The current version is known to be broken
+# on amd64.  The game has been discontinued, and then revived/forked
+# multiple times.  It is pending a version bump since at least 2011.
+# See [1] for the 'revived' project and links to other forks.
+# [1] http://www.netpanzer.info/Download/
+# Removal in 30 days.  Bug #375237.
+games-strategy/netpanzer
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Discontinued upstream.  Last release in 2003.  Replaced
+# by dev-embedded/urjtag.
+# Removal in 30 days.  Bug #693256.
+dev-embedded/jtag
+
+# Joonas Niilola <juippis@gentoo.org> (2019-08-31)
+# No maintainer and no one stepped in to take it after a mailing 
+# list announcement. Has QA issues and continuous CI issues. Removal 
+# in 30 days.
+# Bugs: #690784, #691376, #693184
+app-misc/pip3line
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-31)
+# Unmaintained.  EAPI 0 ebuilds with multiple QA issues.  Last release
+# added in 2003.  Upstream removed all traces of it.
+# Removal in 30 days.  Bug #693186.
+www-apache/mod_pcgi2
+www-apps/pcgi
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-30)
+# All current releases are incompatible with the current version
+# of mail-mta/opensmtpd.  Not touched by maintainer since 2016.  Some
+# USE flag combinations fail to build with other errors.  Needs porting
+# to new Python eclasses.
+# Removal in 30 days.  Bug #693128.
+mail-filter/opensmtpd-extras
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-30)
+# Unmaintained.  EAPI=0.  HOMEPAGE and SRC_URI are gone.  Last release
+# in 2006.  Removal in 30 days.  Bug #680412.
+mail-filter/ask
+
+# David Seifert <soap@gentoo.org> (2019-08-29)
+# Dead upstream, last commit over 10 years ago, no revdeps, EAPI=0,
+# Removal in 30 days.
+sci-electronics/gplcver
+
+# David Seifert <soap@gentoo.org> (2019-08-29)
+# Dead upstream, last release in 2008, no revdeps, removal in 30 days.
+dev-cpp/threadpool
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-29)
+# Added in 2012 and not touched since.  Fails multilib-strict.  Pending
+# version bump.  No reverse dependencies.
+# Removal in 30 days.  Bug #667064.
+net-misc/libss7
+
+# Stefan Strogin <steils@gentoo.org> (2019-08-29)
+# Obsolete. No reverse dependencies (games-rpg/eternal-lands no longer
+# depends on them).
+# Removal in 30 days. Bug #549890.
+games-rpg/eternal-lands-bloodsucker
+games-rpg/eternal-lands-data
+
 # Miroslav Šulc <fordfrog@gentoo.org> (2019-08-19)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.24
@@ -556,6 +1104,12 @@ app-office/texmacs
 # Fails to dbus activate properly for me. Help welcome figuring it out.
 net-misc/gnome-remote-desktop
 
+# Mike Gilbert <floppym@gentoo.org> (2019-08-13)
+# Dev channel releases are only for people who
+# are developers or want more experimental features
+# and accept a more unstable release.
+>=www-client/chromium-78
+
 # Mart Raudsepp <leio@gentoo.org> (2019-07-28)
 # GNOME 3.33 development release packages
 >=dev-libs/vala-common-0.45
@@ -580,6 +1134,18 @@ dev-lang/php:7.4
 # Requires >=dev-lang/lua-5.2 which is masked
 >=app-admin/conky-1.11.4
 
+# Patrick Lauer <patrick@gentoo.org> (2019-05-23)
+# PostgreSQL beta and release candidate releases are pre-release testing
+# versions, not meant for production use. They are feature-frozen, and are
+# released to the public for testing before final release
+#
+# NOTE: Successive beta or candidate releases may not be backwards compatible,
+# so it is important that you review the release notes before upgrading.
+#
+# For more information about beta and release candidate versions, see:
+#     https://www.postgresql.org/developer/beta/
+dev-db/postgresql:12
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2019-05-11)
 # Perl 5.24 will be removed soon. Please upgrade.
 <dev-lang/perl-5.26.2
@@ -762,6 +1328,7 @@ x11-drivers/xf86-video-voodoo
 # users, so let's keep them masked until somebody figures out what's
 # wrong.  Bug #647964.
 ~app-portage/gemato-14.1m
+~app-portage/gemato-14.0m
 ~app-portage/gemato-9999m
 
 # Kent Fredric <kentnl@gentoo.org> (2018-05-27)
@@ -799,7 +1366,6 @@ sys-devel/automake:1.6
 sys-devel/automake:1.7
 sys-devel/automake:1.8
 sys-devel/automake:1.9
-sys-devel/automake:1.10
 
 # Kent Fredric <kentnl@gentoo.org> (2017-10-11)
 # This package should now be provided entirely by dev-lang/perl,
@@ -931,6 +1497,7 @@ app-admin/amazon-ec2-init
 # See bugs #515926 and #510960.
 sys-libs/lib-compat
 sys-libs/lib-compat-loki
+games-action/mutantstorm-demo
 games-action/phobiaii
 games-fps/rtcw
 games-fps/unreal
diff --git a/profiles/prefix/linux/package.mask b/profiles/prefix/linux/package.mask
index 34c6186b8bc1..4a1b653891cd 100644
--- a/profiles/prefix/linux/package.mask
+++ b/profiles/prefix/linux/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (2019-01-08)
diff --git a/profiles/prefix/linux/package.use.mask b/profiles/prefix/linux/package.use.mask
index 2893cbd9af7a..d578c64b9d89 100644
--- a/profiles/prefix/linux/package.use.mask
+++ b/profiles/prefix/linux/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (2019-05-02)
diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index ee0e3ad4aacc..e6c0467b90ae 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (2019-06-07)
diff --git a/profiles/prefix/windows/cygwin/package.unmask b/profiles/prefix/windows/cygwin/package.unmask
index 0037a47423bd..a6462b66876e 100644
--- a/profiles/prefix/windows/cygwin/package.unmask
+++ b/profiles/prefix/windows/cygwin/package.unmask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (2019-02-13)
diff --git a/profiles/prefix/windows/cygwin/packages b/profiles/prefix/windows/cygwin/packages
index f3e9e76142f4..0b7db49e865e 100644
--- a/profiles/prefix/windows/cygwin/packages
+++ b/profiles/prefix/windows/cygwin/packages
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 *app-admin/cygwin-rebase
diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
index 85a7eabccb1f..9694edc101df 100644
--- a/profiles/prefix/windows/cygwin/profile.bashrc
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ ${CATEGORY}/${PN} == app-arch/xz-utils
diff --git a/profiles/prefix/windows/package.use.mask b/profiles/prefix/windows/package.use.mask
index a7308f8b5f20..8aa55bffc312 100644
--- a/profiles/prefix/windows/package.use.mask
+++ b/profiles/prefix/windows/package.use.mask
@@ -1,7 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (2019-07-31)
 # KERNEL=Winnt needs term-driver, which conflicts with termlib
 sys-libs/ncurses tinfo
-sys-libs/ncurses-compat tinfo
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 9d14fc0487b9..79d81595933a 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -205,6 +205,12 @@ x86             default/linux/x86/17.0/desktop/plasma/systemd   stable
 x86             default/linux/x86/17.0/developer                stable
 x86		default/linux/x86/17.0/systemd			stable
 
+# Gentoo/FreeBSD Profiles
+# @MAINTAINER: bsd@gentoo.org
+amd64-fbsd	default/bsd/fbsd/amd64/11.1			exp
+amd64-fbsd	default/bsd/fbsd/amd64/11.1/clang		exp
+x86-fbsd	default/bsd/fbsd/x86/11.1			exp
+
 # musl profiles
 # @MAINTAINER: musl@gentoo.org
 amd64		default/linux/amd64/17.0/musl				exp
diff --git a/profiles/releases/freebsd-11.1/package.mask b/profiles/releases/freebsd-11.1/package.mask
new file mode 100644
index 000000000000..7a82ed6bfdfe
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/package.mask
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Make sure we don't get wrong versions
+<sys-freebsd/freebsd-pam-modules-11.1_alpha
+>sys-freebsd/freebsd-pam-modules-11.1.99
+<sys-freebsd/freebsd-rescue-11.1_alpha
+>sys-freebsd/freebsd-rescue-11.1.99
+<sys-freebsd/freebsd-pf-11.1_alpha
+>sys-freebsd/freebsd-pf-11.1.99
+<sys-freebsd/freebsd-mk-defs-11.1_alpha
+>sys-freebsd/freebsd-mk-defs-11.1.99
+<sys-freebsd/freebsd-lib-11.1_alpha
+>sys-freebsd/freebsd-lib-11.1.99
+<sys-freebsd/freebsd-libexec-11.1_alpha
+>sys-freebsd/freebsd-libexec-11.1.99
+<sys-freebsd/freebsd-bin-11.1_alpha
+>sys-freebsd/freebsd-bin-11.1.99
+<sys-freebsd/freebsd-sbin-11.1_alpha
+>sys-freebsd/freebsd-sbin-11.1.99
+<sys-freebsd/freebsd-ubin-11.1_alpha
+>sys-freebsd/freebsd-ubin-11.1.99
+<sys-freebsd/freebsd-usbin-11.1_alpha
+>sys-freebsd/freebsd-usbin-11.1.99
+<sys-freebsd/freebsd-share-11.1_alpha
+>sys-freebsd/freebsd-share-11.1.99
+<sys-freebsd/freebsd-cddl-11.1_alpha
+>sys-freebsd/freebsd-cddl-11.1.99
+<sys-freebsd/boot0-11.1_alpha
+>sys-freebsd/boot0-11.1.99
+<sys-freebsd/freebsd-sources-11.1_alpha
+>sys-freebsd/freebsd-sources-11.1.99
+
+# Alexis Ballier <aballier@gentoo.org> (2012-05-11)
+# freebsd-lib provides a utempter compatible interface starting from FreeBSD 9.0
+# via libulog.
+# this package does not build anymore as it requires utmp
+sys-libs/libutempter
diff --git a/profiles/releases/freebsd-11.1/package.use.mask b/profiles/releases/freebsd-11.1/package.use.mask
new file mode 100644
index 000000000000..5e68f049c93b
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/package.use.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Brian Evans <grknight@gentoo.org> (2018-01-15)
+# Mask innodb-snappy as app-arch/snappy is untested
+# Mask innodb-lz4 as app-arch/lz4 is untested
+# Mask oqgraph as dev-libs/judy is untested
+# Mask numa as sys-process-numactl is untested
+dev-db/mariadb innodb-snappy innodb-lz4 oqgraph numa
diff --git a/profiles/releases/freebsd-11.1/packages b/profiles/releases/freebsd-11.1/packages
new file mode 100644
index 000000000000..2f2822721a66
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/packages
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+*>=sys-apps/baselayout-2.0.0
+*>=sys-apps/openrc-0.2.5
+
+# dev-libs/libiconv isn't necessary in 10.0 and later.
+-*dev-libs/libiconv
+
+# sys-freebsd/freebsd-libexec was merged into freebsd-lib in 11.1 and later.
+-*sys-freebsd/freebsd-libexec
diff --git a/profiles/releases/freebsd-11.1/packages.build b/profiles/releases/freebsd-11.1/packages.build
new file mode 100644
index 000000000000..eb15f165044a
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/packages.build
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+-dev-libs/libiconv
+-sys-freebsd/freebsd-libexec
+sys-freebsd/freebsd-share
diff --git a/profiles/releases/freebsd-11.1/parent b/profiles/releases/freebsd-11.1/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/releases/freebsd-11.1/profile.bashrc b/profiles/releases/freebsd-11.1/profile.bashrc
new file mode 100644
index 000000000000..8987e6d324f7
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/profile.bashrc
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+bsd-fbsd10fix(){
+	# http://svnweb.freebsd.org/ports/head/Mk/bsd.port.mk
+
+	for f in `find ${WORKDIR} -type f \( -name config.libpath -o \
+		-name config.rpath -o -name configure -o -name libtool.m4 -o \
+		-name ltconfig -o -name libtool -o -name aclocal.m4 -o \
+		-name acinclude.m4 \)` ; do \
+			sed -i.fbsd10bak \
+				-e 's|freebsd1\*)|freebsd1.\*)|g' \
+				-e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \
+				-e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \
+				-e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \
+				-e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \
+					${f} ; \
+			touch -mr ${f}.fbsd10bak ${f} ; \
+			rm -f ${f}.fbsd10bak ; \
+			einfo "===>   FreeBSD 10 autotools fix applied to ${f}"; \
+	done
+}
+
+if [[ -n $EAPI ]] ; then
+	case "$EAPI" in
+		0|1)
+			post_src_unpack() { bsd-patch_install-sh ; bsd-fbsd10fix ; }
+			;;
+		*)
+			post_src_prepare() { bsd-patch_install-sh ; bsd-fbsd10fix ; }
+			;;
+	esac
+fi
diff --git a/profiles/releases/freebsd-11.1/use.mask b/profiles/releases/freebsd-11.1/use.mask
new file mode 100644
index 000000000000..57b5cd349faa
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/use.mask
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Brian Evans <grknight@gentoo.org> (2018-01-15)
+# Mask dev-util/systemtap is untested
+systemtap
+
+# Brian Evans <grknight@gentoo.org> (2018-01-15)
+# Mask dev-libs/jemalloc is untested
+jemalloc
+
+# Brian Evans <grknight@gentoo.org> (2018-01-15)
+# Mask dev-libs/libressl is untested
+libressl
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index b745538a606a..107ab38ec871 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -5,7 +5,7 @@
 dev-libs/efl sound
 
 # Needed by gnome-photos
-media-libs/gegl raw
+media-libs/gegl jpeg2k raw
 
 # Needed by a global USE=wayland right now; some REQUIRED_USE may be outdated and need review
 >=media-libs/cogl-1.18.2-r1 gles2
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 7674bc4eb442..e14d4c9e8153 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -28,5 +28,5 @@ media-libs/mesa egl wayland
 # Required by kde-apps/kdenlive
 media-libs/mlt ffmpeg frei0r kdenlive melt
 
-# Required by dev-qt/qtwebengine:5
+# Required by kde-frameworks/kactivities
 sys-libs/zlib minizip
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index aa60b4074370..ccff6341312e 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -1,30 +1,38 @@
-apache		http://apache.lauf-forum.at/ http://apache.mirror.digionline.de/ http://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://ftp.halifax.rwth-aachen.de/apache/ http://mirror.23media.de/apache/ http://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ https://apache.osuosl.org/
-cpan		https://cpan.metacpan.org https://www.cpan.org
-cran		https://cran.r-project.org https://cran.us.r-project.org
-debian		https://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
-gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles https://gentoo.ussg.indiana.edu/distfiles
-gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ https://artfiles.org/gimp.org/pub/gimp/ https://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ http://pirbot.com/mirrors/gimp/gimp/
-gmt		http://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
+alsaproject	ftp://ftp.alsa-project.org/pub
+apache		http://apache.lauf-forum.at/ http://apache.mirror.digionline.de/ http://apache.mirror.iphh.net/ http://artfiles.org/apache.org/ http://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ http://ftp.fau.de/apache/ http://ftp.halifax.rwth-aachen.de/apache/ http://ftp.heikorichter.name/apache/ http://mirror.23media.de/apache/ http://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ http://apache.osuosl.org/
+cpan		http://cpan.metacpan.org http://search.cpan.org/CPAN http://www.cpan.org
+cran		http://cran.r-project.org http://cran.us.r-project.org
+debian		http://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
+fedora-dev	http://archives.fedoraproject.org/pub/archive/fedora/linux/
+gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles http://gentoo.ussg.indiana.edu/distfiles
+gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ http://artfiles.org/gimp.org/pub/gimp/ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ http://pirbot.com/mirrors/gimp/gimp/
+gmt		ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
 gnome		https://download.gnome.org/
-gnu		https://ftp.gnu.org/gnu/ https://artfiles.org/gnu.org/ https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
-gnu-alpha	https://www.mirrorservice.org/sites/alpha.gnu.org/gnu/ https://gnualpha.uib.no/ https://mirrors.fe.up.pt/pub/gnu-alpha/ https://alpha.gnu.org/gnu/ https://www.nic.funet.fi/pub/gnu/alpha/gnu/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ ftp://alpha.gnu.org/gnu/
+gnu		https://ftp.gnu.org/gnu/ https://ftpmirror.gnu.org/ https://artfiles.org/gnu.org/ https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
+gnu-alpha	https://www.mirrorservice.org/sites/alpha.gnu.org/gnu/ https://gnualpha.uib.no/ https://mirrors.fe.up.pt/pub/gnu-alpha/ http://alpha.gnu.org/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ ftp://alpha.gnu.org/gnu/
 gnupg		https://artfiles.org/gnupg.org/ https://www.mirrorservice.org/sites/ftp.gnupg.org/ https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ https://mirrors.dotsrc.org/gcrypt/ ftp://ftp.gnupg.org/gcrypt/
 hackage		https://hackage.haskell.org/
-idsoftware	ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff ftp://ftp.gamers.org/pub/idgames/idstuff
+idsoftware	ftp://ftp.idsoftware.com/idstuff ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff ftp://ftp.gamers.org/pub/idgames/idstuff
 imagemagick	https://www.imagemagick.org/download/ https://mirror.checkdomain.de/imagemagick/ https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/ https://ftp.nluug.nl/ImageMagick/ ftp://ftp.fifi.org/pub/ImageMagick/
 kde		https://download.kde.org http://mirror.csclub.uwaterloo.ca/kde ftp://mirrors.dotsrc.org/kde ftp://kde.mirror.anlx.net
+kernel		https://www.kernel.org/pub
 lokigames	http://updates.lokigames.com
-mplayer		https://www1.mplayerhq.hu/MPlayer http://www2.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer ftp://ftp1.mplayerhq.hu/MPlayer/ ftp://ftp6.mplayerhq.hu/MPlayer/ ftp://ftp7.mplayerhq.hu/MPlayer/ ftp://ftp8.mplayerhq.hu/MPlayer/
+mplayer		http://www1.mplayerhq.hu/MPlayer http://www2.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer ftp://ftp1.mplayerhq.hu/MPlayer/ ftp://ftp6.mplayerhq.hu/MPlayer/ ftp://ftp7.mplayerhq.hu/MPlayer/ ftp://ftp8.mplayerhq.hu/MPlayer/
 mysql		https://artfiles.org/mysql/ https://www.mirrorservice.org/sites/ftp.mysql.com/ https://ftp.gwdg.de/pub/misc/mysql/ https://ftp.jaist.ac.jp/pub/mysql/ http://mysql.he.net/ http://mysql.mirrors.ovh.net/ftp.mysql.com/ http://mirror.switch.ch/ftp/mirror/mysql/ http://vesta.informatik.rwth-aachen.de/mysql/ http://ftp.ntua.gr/pub/databases/mysql/ http://mysql.linux.cz/ http://linorg.usp.br/mysql/
-nongnu		https://download.savannah.nongnu.org/releases/ https://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ https://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ https://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ https://nongnu.askapache.com/ https://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://ftp.twaren.net/Unix/NonGNU/
+nongnu		http://download.savannah.nongnu.org/releases/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://nongnu.askapache.com/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/
 openbsd		https://cdn.openbsd.org/pub/OpenBSD https://cloudflare.cdn.openbsd.org/pub/OpenBSD https://fastly.cdn.openbsd.org/pub/OpenBSD
 openssl		https://artfiles.org/openssl.org/ https://www.mirrorservice.org/sites/ftp.openssl.org/ ftp://ftp.openssl.org
-pypi		https://files.pythonhosted.org/packages/source
-qmail		https://qmail.geto.net/ https://qmail-mirror.jms1.net/ http://qmail.pandakc.com/ http://qmail.glasswings.com.au/ http://qmail.ii.net/ http://qmail.teraren.com/ http://qmail.mirror.cdnetworks.com/ https://qmail.yongbok.net/ https://qmail.mirror.choon.net/ http://qmail.cbox.biz/ http://qmail.cbox.biz/ http://qmail.mirrors.ovh.net/ftp.qmail.org/ http://qmail.rasjonell.net/ http://mirrors.ntua.gr/qmail/ http://qmail.cti.gr/ http://qmail.dnsbeans.com/ http://qmail.hypergrid.it/ http://qmail.omnis.ch/ http://qmail.linorg.usp.br/ http://qmail.cavsystems.net/ https://qmail.mivzakim.net/ http://qmail.mirror.rise.ph/
-samba		https://download.samba.org/pub/samba/ https://ftp.cc.uoc.gr/mirrors/samba
-sabayon		http://sabayon.c3sl.ufpr.br/distfiles https://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles https://ftp.rnl.tecnico.ulisboa.pt/pub/sabayon/distfiles https://ftp.fsn.hu/pub/linux/distributions/sabayon/distfiles http://cross-lfs.sabayonlinux.org/distfiles https://mirror.dkm.cz/sabayon/distfiles http://mirror.internode.on.net/pub/sabayon/distfiles https://na.mirror.garr.it/mirrors/sabayonlinux/distfiles http://distfiles.sabayon.org
+pypi		https://pypi.org/packages/source https://files.pythonhosted.org/packages/source
+qmail		http://www.qmail.org/ http://qmail.geto.net/ http://qmail-mirror.jms1.net/ http://qmail.pandakc.com/ http://qmail.mirrors.auchnet.org/ http://qmail.glasswings.com.au/ http://qmail.ii.net/ http://infobase.ibase.com.hk/qmail/ http://qmail.morva.net/ http://qmail.teraren.com/ http://qmail.mirror.cdnetworks.com/ http://qmail.yongbok.net/ http://qmail.mirror.choon.net/ http://qmail.cbox.biz/ http://qmail.cbox.biz/ http://qmail.mirrors.ovh.net/ftp.qmail.org/ http://qmail.rasjonell.net/ http://qmail.europnews.de/ http://qmail.kendzorra.org/ http://qmail.mirror.gsnw.org/ http://mirrors.ntua.gr/qmail/ http://qmail.cti.gr/ http://qmail.dnsbeans.com/ http://qmail.hypergrid.it/ http://qmail.omnis.ch/ http://qmail.linorg.usp.br/ http://qmail.cavsystems.net/ http://qmail.mivzakim.net/ http://qmail.mirror.rise.ph/
+quakeunity	http://www.mirrorservice.org/sites/quakeunity.com
+rubygems	https://rubygems.org/gems
+ruby		https://cache.ruby-lang.org/pub/ruby/ ftp://ftp.fu-berlin.de/unix/languages/ruby/
+samba		https://download.samba.org/pub/samba/ ftp://ftp.samba.gr.jp/pub/samba http://ftp.cc.uoc.gr/mirrors/samba
+sabayon         http://sabayon.c3sl.ufpr.br/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://ftp.rnl.ist.utl.pt/pub/sabayon/distfiles http://ftp.fsn.hu/pub/linux/distributions/sabayon/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://cross-lfs.sabayonlinux.org/distfiles http://sabayon.mirror.dkm.cz/pub/sabayon/distfiles http://mirror.internode.on.net/pub/sabayon/distfiles http://na.mirror.garr.it/mirrors/sabayonlinux/distfiles http://distfiles.sabayon.org
+snobol4		ftp://ftp.snobol4.org/snobol/old/
 sourceforge	https://download.sourceforge.net
-sourceforge.jp	http://iij.dl.sourceforge.jp https://osdn.dl.sourceforge.jp https://jaist.dl.sourceforge.jp
-ubuntu		http://mirror.internode.on.net/pub/ubuntu/ubuntu/ https://mirror.tcc.wa.edu.au/ubuntu/ http://ubuntu.uni-klu.ac.at/ubuntu/ http://mirror.dhakacom.com/ubuntu-archive/ http://ubuntu.c3sl.ufpr.br/ubuntu/ http://ubuntu.uni-sofia.bg/ubuntu/ http://hr.archive.ubuntu.com/ubuntu/ http://cz.archive.ubuntu.com/ubuntu/ https://mirror.dkm.cz/ubuntu http://ftp.cvut.cz/ubuntu/ http://ftp.stw-bonn.de/ubuntu/ https://ftp-stud.hs-esslingen.de/ubuntu/ https://mirror.netcologne.de/ubuntu/ https://mirror.unej.ac.id/ubuntu/ http://kr.archive.ubuntu.com/ubuntu/ https://mirror.nforce.com/pub/linux/ubuntu/ http://mirror.amsiohosting.net/archive.ubuntu.com/ http://nl3.archive.ubuntu.com/ubuntu/ https://mirror.timeweb.ru/ubuntu/ http://ubuntu.mirror.su.se/ubuntu/ https://ftp.yzu.edu.tw/ubuntu/ https://mirror.aptus.co.tz/pub/ubuntuarchive/ https://ubuntu.volia.net/ubuntu-archive/ https://mirror.sax.uk.as61049.net/ubuntu/ https://mirror.pnl.gov/ubuntu/ http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ https://mirrors.namecheap.com/ubuntu/
+sourceforge.jp	http://iij.dl.sourceforge.jp http://osdn.dl.sourceforge.jp http://globalbase.dl.sourceforge.jp http://jaist.dl.sourceforge.jp
+ubuntu		http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://mirror.tcc.wa.edu.au/ubuntu/ http://ubuntu.uni-klu.ac.at/ubuntu/ http://mirror.dhakacom.com/ubuntu-archive/ http://ubuntu.c3sl.ufpr.br/ubuntu/ http://ubuntu.uni-sofia.bg/ubuntu/ http://hr.archive.ubuntu.com/ubuntu/ http://cz.archive.ubuntu.com/ubuntu/ http://archive.ubuntu.mirror.dkm.cz/ http://ftp.cvut.cz/ubuntu/ http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ http://ftp.stw-bonn.de/ubuntu/ http://ftp-stud.hs-esslingen.de/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://mirror.unej.ac.id/ubuntu/ http://mirror.network32.net/ubuntu/ http://kr.archive.ubuntu.com/ubuntu/ http://mirror.nforce.com/pub/linux/ubuntu/ http://mirror.amsiohosting.net/archive.ubuntu.com/ http://nl3.archive.ubuntu.com/ubuntu/ http://mirror.timeweb.ru/ubuntu/ http://ubuntu.mirror.su.se/ubuntu/ http://free.nchc.org.tw/ubuntu/ http://ftp.yzu.edu.tw/ubuntu/ http://mirror.aptus.co.tz/pub/ubuntuarchive/ http://ubuntu.volia.net/ubuntu-archive/ http://mirror.sax.uk.as61049.net/ubuntu/ http://mirror.pnl.gov/ubuntu/ http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ http://mirrors.namecheap.com/ubuntu/
 vdr-developerorg http://projects.vdr-developer.org/attachments/download
 vdrfiles	http://gentoo.fh-luh.de/files
+xorg		https://www.x.org/releases/individual
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6b82020b9277..6712f5cb7372 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -128,7 +128,7 @@ app-admin/rsyslog:kerberos - Build the GSSAPI input and output module (requires
 app-admin/rsyslog:kubernetes - Build the kubernetes modify plugin (requires net-misc/curl)
 app-admin/rsyslog:libressl - Use dev-libs/libressl instead of dev-libs/openssl (you still need to enable functionality which requires OpenSSL)
 app-admin/rsyslog:mdblookup - Build the MaxMind DB lookup message modify plugin using dev-libs/libmaxminddb
-app-admin/rsyslog:mongodb - Build the MongoDB output module (requires dev-libs/mongo-c-driver)
+app-admin/rsyslog:mongodb - Build the MongoDB output module (requires dev-libs/libmongo-client)
 app-admin/rsyslog:mysql - Build the MySQL database output module (requires virtual/mysql)
 app-admin/rsyslog:normalize - Build the normalize modify module (requires dev-libs/libee and dev-libs/liblognorm)
 app-admin/rsyslog:omhttp - Build the http output module (requires net-misc/curl)
@@ -657,6 +657,7 @@ app-emulation/virtualbox-bin:sdk - Enable building of SDK
 app-emulation/virtualbox-bin:vboxwebsrv - Install the VirtualBox webservice
 app-emulation/virtualbox-modules:pax_kernel - Apply patch needed for pax enabled kernels
 app-emulation/vkd3d:spirv-tools - Enable SPIRV shader debugging support using dev-util/spirv-tools
+app-emulation/vov:gprof - build with profiling support
 app-emulation/wine-any:capi - Enable ISDN support via CAPI
 app-emulation/wine-any:custom-cflags - Bypass strip-flags; use at your own peril
 app-emulation/wine-any:d3d9 - Apply highly experimental patches for Gallium Nine support. This patch may break some applications.
@@ -965,7 +966,6 @@ app-misc/kryoflux-dtc:fast-firmware - Install fast firmware instead of slow firm
 app-misc/kryoflux-dtc:gui - Install the Kryoflux GUI
 app-misc/lcd4linux:apm - Enable the APM plugin.
 app-misc/lcd4linux:asterisk - Enable the Asterisk plugin.
-app-misc/lcd4linux:button-exec - Enable the Button plugin, to execute something on keypress.
 app-misc/lcd4linux:button_exec - Enable the Button plugin, to execute something on keypress.
 app-misc/lcd4linux:cpuinfo - Enable the cpuinfo plugin.
 app-misc/lcd4linux:dbus - Enable the dbus plugin.
@@ -979,7 +979,6 @@ app-misc/lcd4linux:file - Enable the file plugin, to read from input from files.
 app-misc/lcd4linux:gps - Enable the gps plugin, for reading gps coordinates.
 app-misc/lcd4linux:hddtemp - Enable the hddtemp plugin, to read from the hddtemp daemon.
 app-misc/lcd4linux:huawei - Enable the huawei plugin, to read from a huawei device.
-app-misc/lcd4linux:i2c-sensors - Enable the i2c_sensors plugin, to read sensor data.
 app-misc/lcd4linux:i2c_sensors - Enable the i2c_sensors plugin, to read sensor data.
 app-misc/lcd4linux:iconv - Enable the iconv plugin, to convert between encodings.
 app-misc/lcd4linux:isdn - Enable the isdn plugin, to get information about ISDN.
@@ -987,14 +986,12 @@ app-misc/lcd4linux:kvv - Enable the kvv plugin, to get realtime train schedule f
 app-misc/lcd4linux:loadavg - Enable the loadavg plugin, to get stats load
 app-misc/lcd4linux:meminfo - Enable the meminfo plugin, to get memory statistics.
 app-misc/lcd4linux:mpd - Enable the mpd plugin, to read from the Music Player Daemon.
-app-misc/lcd4linux:mpris-dbus - Enable the mpris plugin, to read data via dbus for mpris.
 app-misc/lcd4linux:mpris_dbus - Enable the mpris plugin, to read data via dbus for mpris.
 app-misc/lcd4linux:mysql - Enable the mysql plugin, to get mysql database information.
 app-misc/lcd4linux:netdev - Enable the netdev plugin, to get interface statistics.
 app-misc/lcd4linux:netinfo - Enable the netinfo plugin, to get more interface statistic.
 app-misc/lcd4linux:outb - Enable raw i/o access.
 app-misc/lcd4linux:pop3 - Enable the pop3 plugin, to get notified about new mails.
-app-misc/lcd4linux:proc-stat - Enable the proc_stat plugin, to read data from the proc file system.
 app-misc/lcd4linux:proc_stat - Enable the proc_stat plugin, to read data from the proc file system.
 app-misc/lcd4linux:python - Enable support for dev-lang/python and enable the python plugin, to execute own python scripts.
 app-misc/lcd4linux:qnaplog - Enable the qnaplog plugin, to read a log from a QNAP device.
@@ -1034,6 +1031,9 @@ app-misc/note:text - Add support for text backend
 app-misc/openastro:jpeg - Enable exporting Astrological Charts to jpeg
 app-misc/openastro:png - Enable exporting Astrological Charts to png
 app-misc/pax-utils:python - Install a more powerful/faster version of lddtree
+app-misc/pip3line:distorm - Compile the Distorm plugin
+app-misc/pip3line:qscintilla - Use QScintilla for more efficient text display
+app-misc/pip3line:ssl - Compile the plugin adding miscellaneous hashes from OpenSSL
 app-misc/recoll:camelcase - Enable indexing for camelCase sentences and words
 app-misc/recoll:chm - Enable CHM file support via dev-python/pychm
 app-misc/recoll:inotify - Use the Linux Kernel notification subsystem for monitoring file alterations in realtime
@@ -1403,6 +1403,7 @@ dev-cpp/libjson-rpc-cpp:redis-client - Build support for Redis client using dev-
 dev-cpp/libjson-rpc-cpp:redis-server - Build support for Redis server using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for development and when pregenerated headers are not bundled)
 dev-cpp/sourcetrail:examples - Install example projects.
+dev-cpp/xsd:ace - Enable support for serializing to/from an ACE CDR stream
 dev-db/aerospike-server-community:tools - Install extra tools
 dev-db/clickhouse:client - Build CLI client.
 dev-db/clickhouse:kafka - Enables support for kafka consumer.
@@ -1494,6 +1495,7 @@ dev-db/percona-server:yassl - Enable SSL connections and crypto functions using
 dev-db/pgbouncer:c-ares - Use c-ares as the DNS backend instead of evdns (libevent).
 dev-db/pgbouncer:udns - Use udns as the DNS backend instead of evdns (libevent). Supports IPv4 only.
 dev-db/pgpool2:memcached - Use memcached for query caching.
+dev-db/pgrouting:drivingdistance - Enable to calculate driving distance
 dev-db/pgrouting:html - Install HTML formatted documentation
 dev-db/phpmyadmin:setup - Installs the phpMyAdmin setup utility. Users who don't use the utility should disable this USE flag for security reasons as the setup tool was the target of various exploits in the past.
 dev-db/postgis:address-standardizer - Normalize US and CA postal addresses
@@ -1630,11 +1632,11 @@ dev-haskell/cgi:extensible-exceptions-in-base - Required to be enabled for >=dev
 dev-haskell/cgi:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/chell:color-output - use colors in program output
 dev-haskell/citeproc-hs:bibutils - use Chris Putnam's app-text/bibutils
-dev-haskell/citeproc-hs:embed-data-files - Embed locale files into the library (needed for windows packaging)
+dev-haskell/citeproc-hs:embed_data_files - Embed locale files into the library (needed for windows packaging)
 dev-haskell/citeproc-hs:hexpat - use dev-haskell/hexpat instead of dev-haskell/xml for XML parsing
 dev-haskell/citeproc-hs:network - use dev-haskell/network and dev-haskell/http to retrieve CSL file from URIs
-dev-haskell/citeproc-hs:small-base - Choose the new smaller, split-up base package.
-dev-haskell/citeproc-hs:unicode-collation - Use Haskell bindings to the dev-libs/icu
+dev-haskell/citeproc-hs:small_base - Choose the new smaller, split-up base package.
+dev-haskell/citeproc-hs:unicode_collation - Use Haskell bindings to the dev-libs/icu
 dev-haskell/cmark:system-cmark - use app-text/cmark instead of bundled copy
 dev-haskell/cmdargs:quotation - Build quote module
 dev-haskell/cmdargs:testprog - Build the test program
@@ -1652,8 +1654,12 @@ dev-haskell/cpu:executable - build 'cpuid' tool
 dev-haskell/crypto-api:all-cpolys - Build all the CMAC polynomes up to 10000 bits instead of just the usual ones
 dev-haskell/crypto-conduit:conduit11 - Use conduit >= 1.1.
 dev-haskell/cryptohash:cryptoapi - Defines crypto-api instances
-dev-haskell/cryptonite:cpu-flags-x86-rdrand - allow compilation with RDRAND on system and architecture that supports it
 dev-haskell/cryptonite:integer-gmp - Whether or not to use GMP for some functions
+dev-haskell/cryptonite:support_aesni - allow compilation with AESNI on system and architecture that supports it
+dev-haskell/cryptonite:support_blake2_sse - Use SSE optimized version of BLAKE2
+dev-haskell/cryptonite:support_deepseq - add deepseq instances for cryptographic types
+dev-haskell/cryptonite:support_pclmuldq - Allow compilation with pclmuldq on architecture that supports it
+dev-haskell/cryptonite:support_rdrand - allow compilation with AESNI on system and architecture that supports it
 dev-haskell/dav:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/distributive:lib-werror - Compile with the ghc -Werror option
 dev-haskell/encoding:systemencoding - Provide the getSystemEncoding action to query the locale.
@@ -1668,7 +1674,7 @@ dev-haskell/gtk3:fmode-binary - Set the default file translation mode for file I
 dev-haskell/gtk3:gio - Depend on GIO package, thereby enabling certain features.
 dev-haskell/hackage-security:use-network-uri - Get Network.URI from the network-uri package.
 dev-haskell/happstack-server:network-uri - Get Network.URI from the network-uri package
-dev-haskell/happstack-server:template-haskell - Description: Template Haskell is available on this system
+dev-haskell/happstack-server:template_haskell - Description: Template Haskell is available on this system
 dev-haskell/hashed-storage:diff - Provide the Storage.Hashed.Diff module.
 dev-haskell/hashed-storage:hpc - Compile with the profiling ghc flag -fhpc.
 dev-haskell/hashtables:bounds-checking - if on, use bounds-checking array accesses
@@ -1726,11 +1732,11 @@ dev-haskell/monad-par:chaselev - Use Chase-Lev Deques for higher-perf work-steal
 dev-haskell/nats:hashable - You can disable the use of the `hashable` package using USE=-hashable. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If set we will not supply an instance of `Hashable`.
 dev-haskell/network-data:small-base - Build the split-up base package.
 dev-haskell/pandoc-citeproc:bibutils - use Chris Putnam's app-text/bibutils
-dev-haskell/pandoc-citeproc:embed-data-files - Embed locale files into the library (needed for windows packaging)
+dev-haskell/pandoc-citeproc:embed_data_files - Embed locale files into the library (needed for windows packaging)
 dev-haskell/pandoc-citeproc:hexpat - use dev-haskell/hexpat instead of dev-haskell/xml for XML parsing
 dev-haskell/pandoc-citeproc:network - use dev-haskell/network and dev-haskell/http to retrieve CSL file from URIs
-dev-haskell/pandoc-citeproc:small-base - Choose the new smaller, split-up base package.
-dev-haskell/pandoc-citeproc:test-citeproc - Build the test-citeproc program
+dev-haskell/pandoc-citeproc:small_base - Choose the new smaller, split-up base package.
+dev-haskell/pandoc-citeproc:test_citeproc - Build the test-citeproc program
 dev-haskell/pandoc-citeproc:unicode_collation - Use Haskell bindings to the dev-libs/icu
 dev-haskell/persistent:nooverlap - Use OverlappingInstances only for String. Only developers should use this.
 dev-haskell/persistent-sqlite:build-sanity-exe - Build a sanity check test executable.
@@ -1745,7 +1751,7 @@ dev-haskell/pointed:transformers - optional instances
 dev-haskell/pointed:unordered-containers - optional instances
 dev-haskell/publicsuffixlist:create - export Network.PublicSuffixList.Create module
 dev-haskell/publicsuffixlist:runtimelist - read suffix list from dist at startup instead of embedding list into library
-dev-haskell/quickcheck:template-haskell - Enable additional test modules requiring Template Haskell support.
+dev-haskell/quickcheck:template_haskell - Enable additional test modules requiring Template Haskell support.
 dev-haskell/recaptcha:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/reflection:template-haskell - Enable template haskell.
 dev-haskell/rfc5051:mkunicodedata - build codes generator itself
@@ -1934,11 +1940,8 @@ dev-lang/gdl:hdf - Add support for the Hierarchical Data Format v.4
 dev-lang/gdl:proj - Add support for sci-libs/proj (geographic projections)
 dev-lang/gdl:udunits - Add support for manipulating units of physical quantities
 dev-lang/ghc:binary - Install the binary version directly, rather than using it to build the source version.
-dev-lang/ghc:elfutils - Enable DWARF-based baclktraces using dev-libs/elfutils.
 dev-lang/ghc:ghcbootstrap - Internal: Bootstrap GHC from an existing GHC installation.
 dev-lang/ghc:ghcmakebinary - Internal: Build binary friendly for redistribution.
-dev-lang/ghc:gmp - use dev-libs/gmp for integer operations (works faster, but an external depend).
-dev-lang/ghc:numa - Enable NUMA thread balancing policy using sys-process/numactl.
 dev-lang/gnat-gpl:awt - Useful only when building GCJ, this enables Abstract Window Toolkit (AWT) peer support on top of GTK+
 dev-lang/gnat-gpl:bootstrap - Used to bootstrap gnat-gpl
 dev-lang/gnat-gpl:cilk - Support the Cilk Plus language (C/C++ based languages for parallel programming)
@@ -2059,6 +2062,18 @@ dev-lang/swig:ccache - build ccache-swig(a fast compiler cache)
 dev-lang/vala:valadoc - Installs valadoc documentation generation tool
 dev-lang/yap:R - Enable support for connecting R to Prolog
 dev-lang/zig:experimental - Enable builds that do not support all of LLVM's target architectures
+dev-libs/actor-framework:benchmarks - Due to the number of out-of-tree deps, these only get installed as docs
+dev-libs/actor-framework:boost - Make use of Boost's ASIO functionality
+dev-libs/actor-framework:cash - Build the C Actor Shell for introspection and debugging
+dev-libs/actor-framework:debug - Raises log-level to DEBUG, enables runtime checks and address sanitizer
+dev-libs/actor-framework:doc - Compiles and installs the documentation as PDF and HTML
+dev-libs/actor-framework:examples - Installs the provided example source files
+dev-libs/actor-framework:mem_management - Enables built-in memory management
+dev-libs/actor-framework:nexus - Nexus is the central component for CAF's runtime inspection
+dev-libs/actor-framework:opencl - Compiles against the provided opencl implementation
+dev-libs/actor-framework:riac - Runtime inspection and configuration
+dev-libs/actor-framework:static - Provides a static build
+dev-libs/actor-framework:test - Builds the provided unit tests
 dev-libs/antlr-c:debugger - Compiles debug info into the library
 dev-libs/appstream:apt - Enables Debians APT support
 dev-libs/appstream-glib:fonts - Enable fonts support for appstream-builder.
@@ -2172,18 +2187,14 @@ dev-libs/efl:harfbuzz - Enable complex text shaping and layout support
 dev-libs/efl:hyphen - Enable text hyphenation support
 dev-libs/efl:ibus - Enable Intelligent Input Bus
 dev-libs/efl:ico - Enable Ico image loader
-dev-libs/efl:json - Enable lottie animation support
 dev-libs/efl:libuv - Enable dev-libs/libuv support
 dev-libs/efl:luajit - USE dev-lang/luajit instead of dev-lang/lua
-dev-libs/efl:mono - Enable mono bindings
 dev-libs/efl:physics - Enable Bullet physics effects and support
-dev-libs/efl:pmaps - Enable PMAPS image loader
 dev-libs/efl:ppm - Enable PMAPS image loader
 dev-libs/efl:psd - Enable PSD image loader
 dev-libs/efl:scim - Enable Smart Common Input Method
 dev-libs/efl:system-lz4 - Use system liblz4 instead of bundled one
 dev-libs/efl:tga - Enable Tga image loader
-dev-libs/efl:tgv - Enable Tgv image loader
 dev-libs/efl:tslib - Enable x11-libs/tslib for touchscreen events
 dev-libs/efl:unwind - Enable debug support via sys-libs/libunwind
 dev-libs/efl:valgrind - Enable usage of dev-util/valgrind in debug
@@ -2200,6 +2211,8 @@ dev-libs/folks:telepathy - Load contacts from the Telepathy framework
 dev-libs/folks:tracker - Load contacts from app-misc/tracker index
 dev-libs/folks:utils - Build the folks-inspect utility
 dev-libs/fstrm:utils - Build fstrm utility programs
+dev-libs/gecode:gist - Enable Gist, the Gecode Interactive Search Tool
+dev-libs/gecode:gmp - Enable trigonometric and transcendental float constraints
 dev-libs/gf2x:bindist - Disable automatic fine-tuning to local processor features like pclmul or sse2.
 dev-libs/gf2x:custom-tune - Extra long compile time for tuning hardware specific low-level routines
 dev-libs/gf2x:fft - Build an FFT API for multiplication of 2 polynomials over GF(2)
@@ -2241,7 +2254,6 @@ dev-libs/libdynd:cuda - Enable NVIDIA CUDA toolkit support
 dev-libs/libdynd:mkl - Enable a plugin for Intel Math Kernel Library sci-libs/mkl
 dev-libs/libevent:debug - Support runtime debug mode and malloc hooks (for programmers)
 dev-libs/libffi:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
-dev-libs/libffi-compat:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
 dev-libs/libgcrypt:o-flag-munging - Enable O-flag mangling during build
 dev-libs/libgdata:crypt - Use app-crypt/gcr for keeping tokens and passwords in non-pageable memory for improved security
@@ -2264,6 +2276,7 @@ dev-libs/libisoburn:launch-frontend-setuid - Enable the tcl gui for xorriso unde
 dev-libs/libisofs:verbose-debug - Enable verbose debug messages
 dev-libs/liblogging:rfc3195 - Enables RFC 3195 protocol (aka syslog-reliable) support. If you don't know what this is, you don't need it!
 dev-libs/liblogging:stdlog - Enables liblogging's core component (think of it as a the next version of the syslog(3) API).
+dev-libs/libmail:apop - Enables the APOP authentication method
 dev-libs/libmemcached:hsieh - Use Hsieh hash algorithm.
 dev-libs/libmemcached:libevent - Use the libevent event loop interface.
 dev-libs/libmemcached:sasl - Use sasl auth for communications.
@@ -2300,13 +2313,18 @@ dev-libs/libsecp256k1:endomorphism - Enable endomorphism
 dev-libs/libsecp256k1:experimental - Allow experimental USE flags
 dev-libs/libsecp256k1:recovery - Enable ECDSA pubkey recovery module
 dev-libs/libsecp256k1:schnorr - Enable Schnorr signature module
-dev-libs/libsecp256k1:test-openssl - Enable OpenSSL comparison tests
+dev-libs/libsecp256k1:test_openssl - Enable OpenSSL comparison tests
 dev-libs/libslz:tools - Install additional tools (zenc, zdec)
 dev-libs/libsodium:asm - Enables assembly implementations
 dev-libs/libsodium:urandom - Use /dev/urandom instead of /dev/random
 dev-libs/libspt:libtirpc - Build against net-libs/libtirpc for RPC support
+dev-libs/libsqlora8:orathreads - Use Oracle threads
 dev-libs/libtasn1:valgrind - Enable usage of dev-util/valgrind in debug
 dev-libs/libtermkey:demos - Install demos, which pulls in dev-libs/glib
+dev-libs/libucl:regex - Enable regex checking for schema
+dev-libs/libucl:signatures - Enable signatures check
+dev-libs/libucl:urlfetch - Enable URLs fetch
+dev-libs/libucl:utils - Install the chargen and objdump utilities
 dev-libs/libunibreak:doc - Install html API documentation.
 dev-libs/libunibreak:man - Generate man pages with doxygen.
 dev-libs/libverto:glib - Support event loops using dev-libs/glib
@@ -2416,6 +2434,8 @@ dev-libs/xapian:inmemory - Enabled inmemory backend db support
 dev-libs/xapian:remote - Enabled remote backend db support
 dev-libs/xerces-c:iconv - Use iconv (virtual/libiconv) as message loader and transcoder (in general it would be possible to use iconv only as message loader and something else like icu or the native method as transcoder and vice-versa, but this is a less common case and hard to handle)
 dev-libs/xerces-c:threads - Enable threading support through pthread (or other libraries on AIX, IRIX, HPUX, Solars). Highly recommended
+dev-libs/xml-security-c:nss - Use dev-libs/nss for certain crypto operations (configureable at runtime)
+dev-libs/xml-security-c:xalan - Enable support for XSLT and XPath parsing by dev-libs/xalan-c
 dev-libs/xmlrpc-c:abyss - Build the Abyss mini web-server.
 dev-libs/xmlrpc-c:libxml2 - Use dev-libs/libxml2 to parse XML instead of the internal expat library.
 dev-libs/xmlrpc-c:threads - Controls whether to build the Abyss web-server with pthreads or fork 'threading'.
@@ -2495,11 +2515,13 @@ dev-perl/Coro:event - Build support for using dev-perl/Event as an event-loop vi
 dev-perl/DBD-MariaDB:mariadb - Use dev-db/mariadb-connector-c as the client library
 dev-perl/DBD-MariaDB:mysql - Use dev-db/mysql-connector-c as the client library
 dev-perl/DBD-SQLite:system-sqlite - Use the system-wide dev-db/sqlite installation
+dev-perl/DBD-mysql:embedded - Support embedded server (libmysqld)
 dev-perl/DBD-mysql:mariadb - Use dev-db/mariadb-connector-c as the client library
 dev-perl/DBD-mysql:mysql - Use dev-db/mysql-connector-c as the client library
 dev-perl/DBD-mysql:ssl - Compile in support for SSL connections via libmysqlclient
 dev-perl/DBIx-Class:admin - Modules required for the DBIx::Class administrative library
 dev-perl/DBIx-Class:admin-script - Modules required for the CLI DBIx::Class interface dbicadmin
+dev-perl/DBIx-Class:admin_script - Modules required for the CLI DBIx::Class interface dbicadmin
 dev-perl/DBIx-Class:deploy - Modules required for "deploy" in DBIx::Class::Storage::DBI and "deploymen_statements" in DBIx::Class::Storage::DBI
 dev-perl/DBIx-Class:replicated - Modules required for DBIx::Class::Storage::DBI::Replicated
 dev-perl/File-HomeDir:xdg - Ensure XDG Semantics for returned paths via x11-misc/xdg-user-dirs
@@ -2540,17 +2562,16 @@ dev-php/PEAR-HTTP_Request2:zlib - Force dev-lang/php to be compiled with zlib ex
 dev-php/PEAR-PHP_Beautifier:cli - Require dev-lang/php to be built with the "cli" SAPI and install the php_beautifier script.
 dev-php/agavi:executable - Install the "agavi" executable used to manage projects. This requires dev-php/phing, and may be omitted if you are (for example) deploying an existing site to a production server.
 dev-php/maxmind-db-reader:extension - Build the C extension that uses dev-libs/libmaxminddb
-dev-php/pecl-apcu:lock-pthreadmutex - Enable pthread mutex locking
-dev-php/pecl-apcu:lock-pthreadrw - Enable pthread read/write locking
-dev-php/pecl-apcu:lock-semaphore - Enable semaphore locks instead of fcntl
-dev-php/pecl-apcu:lock-spinlock - Enable spin locks (EXPERIMENTAL)
+dev-php/pecl-apcu:lock_pthreadmutex - Enable pthread mutex locking
+dev-php/pecl-apcu:lock_pthreadrw - Enable pthread read/write locking
+dev-php/pecl-apcu:lock_semaphore - Enable semaphore locks instead of fcntl
+dev-php/pecl-apcu:lock_spinlock - Enable spin locks (EXPERIMENTAL)
 dev-php/pecl-event:extra - Add support of the Libevent extra API
 dev-php/pecl-memcached:igbinary - Enable support for the igbinary serializer
 dev-php/pecl-memcached:json - Enable support for json serialization
 dev-php/pecl-mysqlnd_qc:memcached - Use dev-libs/libmemcached as a storage handler
 dev-php/pecl-mysqlnd_qc:sqlite - Use dev-db/sqlite as a storage handler
 dev-php/pecl-redis:igbinary - Enables igbinary serialisation support
-dev-php/pecl-redis:json - Enables json serializer support
 dev-php/pecl-zmq:czmq - Use the czmq high level bindings
 dev-php/phing:zip - Support zip archives by requiring said support in dev-lang/php.
 dev-php/swoole:http2 - Add support for HTTP/2 protocol via net-libs/nghttp2
@@ -2678,7 +2699,6 @@ dev-python/pyzor:redis - Enables the redis back-end database engine for pyzord t
 dev-python/rarfile:compressed - Enables the module to support compressed v3 archives by calling the app-arch/unrar.
 dev-python/rdflib:redland - enable support for Redland triplestore
 dev-python/restkit:cli - Install the restcli command line interface/tool, based on dev-python/ipython
-dev-python/rfc3986:idna - enable support for the IDNA specification (RFC 5891)
 dev-python/setuptools_scm:mercurial - Enables mercurial backend
 dev-python/simplespectral:faster - Use sci-libs/scipy to speed up drawing
 dev-python/simplespectral:fastest - Use dev-python/pyFFTW to speed up drawing to the max
@@ -3017,7 +3037,6 @@ dev-util/geany-plugins:overview - Enable overview plugin
 dev-util/geany-plugins:pretty-printer - Enable pretty-printer plugin
 dev-util/geany-plugins:scope - Enable the scope plugin which is a graphical GDB front-end
 dev-util/geany-plugins:soup - Enable updatechecker and geniuspaste plugins which require net-libs/libsoup
-dev-util/geany-plugins:workbench - Enable workbench plugin
 dev-util/glade:webkit - Build catalog support for net-libs/webkit-gtk:4 widgets.
 dev-util/global:vim - Integrate the GNU GLOBAL source code tag system with Vim
 dev-util/gnome-builder:clang - Provide integration with sys-devel/clang for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support
@@ -3035,6 +3054,7 @@ dev-util/gtk-doc:vim - Enable source code highlighting through app-editors/vim
 dev-util/idea-community:custom-jdk - Install and use IntelliJ's custom JRE.
 dev-util/idea-community:jbr11 - Install and use the Java 11 based version of JetBrains Runtime.
 dev-util/idea-community:jbr8 - Install and use the Java 8 based version of JetBrains Runtime.
+dev-util/idea-ultimate:custom-jdk - Install and use IntelliJ's custom JRE.
 dev-util/intel-ocl-sdk:android - Install android related files
 dev-util/intel-ocl-sdk:system-boost - Use system boost (dev-libs/boost) instead of bundled one
 dev-util/intel-ocl-sdk:system-clang - Use system clang (sys-devel/clang) instead of bundled one
@@ -3075,6 +3095,7 @@ dev-util/perf:unwind - Use sys-libs/libunwind for frame unwinding support.
 dev-util/pkgcheck:network - Enable support for network checks using dev-python/requests
 dev-util/pkgconf:pkg-config - Install as a replacement for dev-util/pkgconfig
 dev-util/pkgconfig:internal-glib - Use internal copy of dev-libs/glib
+dev-util/pkgconfig-openbsd:pkg-config - Install as a replacement for dev-util/pkgconfig
 dev-util/scanmem:gui - Enable the GameConqueror GUI
 dev-util/sccache:azure - Enable Azure Blob Storage support
 dev-util/sccache:dist-client - Enables distributed support in the sccache client
@@ -3400,6 +3421,9 @@ games-rpg/daimonin-client:music - Install extra music
 games-rpg/drascula:sound - Install optional audio files
 games-rpg/dreamweb:doc - High-resolution scans of the written material in the original UK game box
 games-rpg/dungeon-defenders:bundled-libs - Use the upstream provided bundled libraries.
+games-rpg/eternal-lands-data:bloodsuckermaps - Will install Bloodsucker's Maps in place of the official map files
+games-rpg/eternal-lands-data:music - Enables in-game music
+games-rpg/eternal-lands-data:sound - Enables in-game sound effects
 games-rpg/hatoful-boyfriend:gui - Install the GUI for configuring screen resolution and input
 games-rpg/hatoful-boyfriend-holiday-star:gui - Install the GUI for configuring screen resolution and input
 games-rpg/kqlives:cheats - Enable cheating mode
@@ -3448,6 +3472,12 @@ games-strategy/heroes3:music - Installs optional music data
 games-strategy/heroes3:sounds - Installs optional sound data
 games-strategy/ja2-stracciatella:editor - Adds necessary file to run the editor
 games-strategy/ja2-stracciatella:ru-gold - Support for russian gold ja2 version
+games-strategy/liquidwar6:doc - Convert the info pages to html
+games-strategy/liquidwar6:gles2 - Enable OpenGL ES 2.0 support
+games-strategy/liquidwar6:gtk - Used to display error/critical messages
+games-strategy/liquidwar6:maps - Install extra maps
+games-strategy/liquidwar6:ogg - Enable mod-ogg via media-libs/sdl-mixer (currently the only sound provider)
+games-strategy/liquidwar6:readline - Enable interactive script shell for hacking
 games-strategy/megaglest:editor - Build map editor
 games-strategy/megaglest:fribidi - Enable FriBIDi support
 games-strategy/megaglest:model-viewer - Build model viewer
@@ -3944,6 +3974,7 @@ mail-filter/amavisd-new:rspamd - Add support for mail-filter/rspamd extension (H
 mail-filter/amavisd-new:rspamd-https - Add support for mail-filter/rspamd extension (both HTTP and HTTPS)
 mail-filter/amavisd-new:spamassassin - Add support for mail-filter/spamassassin
 mail-filter/amavisd-new:zmq - Add support for zeromq sockets
+mail-filter/ask:procmail - Adds support for mail-filter/procmail
 mail-filter/bogofilter:tokyocabinet - Enable Tokyo Cabinet database support
 mail-filter/clamassassin:clamd - Use the app-antivirus/clamav daemon for virus checking
 mail-filter/clamassassin:subject-rewrite - Adds support for subject rewriting
@@ -3968,13 +3999,41 @@ mail-filter/opendkim:lua - Enables control over signature verification, filterin
 mail-filter/opendkim:memcached - Add support for using dev-libs/libmemcached
 mail-filter/opendkim:opendbx - Use opendbx backend to facilitate dataset driven OpenDKIM configuration options like stats, bodylengthdb, etc. against a wide variety of database types
 mail-filter/opendkim:poll - Use poll() instead of select() for the provided asynchronous resolver library.
-mail-filter/opendkim:query_cache - Obsolete, use "querycache" instead. Flag will be removed after next stabilization.
-mail-filter/opendkim:querycache - Add support for query caching (requires 'berkdb' flag)
+mail-filter/opendkim:query_cache - Add support for query caching (requires 'berkdb' flag)
 mail-filter/opendkim:sasl - Used to authenticate to a LDAP server in various ways if required.
 mail-filter/opendkim:stats - Add support for statistics (requires 'opendbx' flag)
 mail-filter/opendkim:unbound - Use the unbound dnssec library to perform DKIM DNS queries.
 mail-filter/opendmarc:reports - Install the reports binaries: expire, import, reports, params
 mail-filter/opendmarc:spf - Use the mail-filter/libspf2 for Sender Policy Framework checking
+mail-filter/opensmtpd-extras:filter-clamav - filter for scanning with app-antivirus/clamav
+mail-filter/opensmtpd-extras:filter-dkim-signer - filter for adding DKIM signatures to outgoing messages
+mail-filter/opensmtpd-extras:filter-dnsbl - filter for checking hosts against the DNS black lists
+mail-filter/opensmtpd-extras:filter-lua - filter for interfacing with dev-lang/lua
+mail-filter/opensmtpd-extras:filter-monkey - filter for arbitrarily rejecting random emails
+mail-filter/opensmtpd-extras:filter-pause - filter to pause on new connections
+mail-filter/opensmtpd-extras:filter-perl - filter for interfacing with dev-lang/perl
+mail-filter/opensmtpd-extras:filter-python - filter for interfacing with dev-lang/python
+mail-filter/opensmtpd-extras:filter-regex - filter for regular expression matching
+mail-filter/opensmtpd-extras:filter-spamassassin - filter for scanning with mail-filter/spamassassin
+mail-filter/opensmtpd-extras:filter-stub - stub filter
+mail-filter/opensmtpd-extras:filter-trace - trace filter
+mail-filter/opensmtpd-extras:filter-void - void filter
+mail-filter/opensmtpd-extras:queue-null - null queue
+mail-filter/opensmtpd-extras:queue-python - queue for interfacing with dev-lang/python
+mail-filter/opensmtpd-extras:queue-ram - ram queue
+mail-filter/opensmtpd-extras:queue-stub - stub queue
+mail-filter/opensmtpd-extras:scheduler-python - schedulre for interfacing with python
+mail-filter/opensmtpd-extras:scheduler-ram - ram scheduler
+mail-filter/opensmtpd-extras:scheduler-stub - stub scheduler
+mail-filter/opensmtpd-extras:table-ldap - table for lookups with net-nds/openldap
+mail-filter/opensmtpd-extras:table-mysql - table for lookups with virtual/mysql
+mail-filter/opensmtpd-extras:table-passwd - table for lookups using /etc/passwd
+mail-filter/opensmtpd-extras:table-postgres - table for lookups with dev-db/postgresql
+mail-filter/opensmtpd-extras:table-python - table for interfacing with dev-lang/python
+mail-filter/opensmtpd-extras:table-redis - table for lookups with dev-db/redis
+mail-filter/opensmtpd-extras:table-socketmap - table for lookups using a socket map
+mail-filter/opensmtpd-extras:table-sqlite - table for lookups with dev-db/sqlite3
+mail-filter/opensmtpd-extras:table-stub - stub table
 mail-filter/postfwd:tools - Install additional tools for testing postfwd
 mail-filter/postgrey:targrey - Enables the targrey patch
 mail-filter/rmilter:dkim - Enable support for DomainKeys Identified Mail
@@ -4233,7 +4292,6 @@ media-gfx/povray:mkl - Enable support for Intel Vector Math Library, part of sci
 media-gfx/pqiv:archive - Enable support for images in archives and cbX comic book files
 media-gfx/pstoedit:emf - Enable media-libs/libemf support
 media-gfx/pstoedit:pptx - Enable support for generating PowerPoint pptx files
-media-gfx/qimgv:video - Add support for gif/webm playback via libmpv
 media-gfx/shotwell:opencv - Enable face detection via media-libs/opencv
 media-gfx/sigal:s3 - Enables support for the Amazon S3 service.
 media-gfx/slic3r:gui - Enable GUI
@@ -4471,6 +4529,7 @@ media-libs/qtav:gui - Build a video player gui
 media-libs/quvi:json - Enable support for JSON output
 media-libs/raptor:json - Enable support for JSON parsing
 media-libs/raspberrypi-userland-bin:hardfp - Use armv6 hardfp ABI
+media-libs/sdif:ftruncate - Enables usage of ftruncate v. truncate
 media-libs/sdl-mixer:fluidsynth - Use media-sound/fluidsynth for MIDI support
 media-libs/sdl-mixer:midi - basic support for MIDI files
 media-libs/sdl-mixer:mod - basic support for MOD files
@@ -4934,6 +4993,7 @@ media-tv/mythtv:autostart - Use a custom autostart configuration
 media-tv/mythtv:bluray - Use the system libbluray for BluRay support
 media-tv/mythtv:cec - Allows control of CEC enabled TVs via HDMI
 media-tv/mythtv:ceton - Ceton InfiniTV 4 a CableCARD-enabled tuner support
+media-tv/mythtv:crystalhd - Broadcom CrystalHD hardware support
 media-tv/mythtv:debug - Instructs Qt to use the 'debug' target
 media-tv/mythtv:egl - EGL video output support
 media-tv/mythtv:fftw - Support visualizations via sci-libs/fftw
@@ -4953,7 +5013,6 @@ media-tv/mythtv:vpx - Enable VP8/VP9 support for media-libs/libvpx
 media-tv/mythtv:wrapper - Use Ubuntu mythtfrontend wrapper
 media-tv/mythtv:x265 - Enable h265 encoding using x265
 media-tv/mythtv:xmltv - Support media-tv/xmltv TV listing - not used by Schedules Direct]
-media-tv/mythtv:xnvctrl - External XNVCtrl support using Nvidia proprietary driver
 media-tv/tvheadend:capmt - Enable support for capmt (dvbapi) protocol
 media-tv/tvheadend:constcw - Enable support for the constcw protocol
 media-tv/tvheadend:cwc - Enable support for the cwc (newcamd) protocol
@@ -5045,7 +5104,6 @@ media-video/ffmpeg:libdrm - Enables x11-libs/libdrm support for better screen gr
 media-video/ffmpeg:libilbc - Enables iLBC de/encoding via media-libs/libilbc.
 media-video/ffmpeg:librtmp - Enables Real Time Messaging Protocol using librtmp (media-video/rtmpdump) in addition to FFmpeg's native implementation.
 media-video/ffmpeg:libsoxr - Enables audio resampling through media-libs/soxr.
-media-video/ffmpeg:libtesseract - Enables the OCR filter via app-text/tesseract.
 media-video/ffmpeg:libv4l - Uses media-libs/libv4l for video4linux instead of direct calls. Adds support for more devices via the userspace library.
 media-video/ffmpeg:libxml2 - Uses dev-libs/libxml2 to enable dash demuxing support.
 media-video/ffmpeg:lv2 - Enables lv2 audio filter wrapper.
@@ -5330,7 +5388,7 @@ net-analyzer/hexinject:tools - Install hex2raw and prettypacket tools
 net-analyzer/httping:tfo - Enable support for TCP Fast Open
 net-analyzer/hydra:gcrypt - Enable radmin2 support through dev-libs/libgcrypt
 net-analyzer/hydra:libssh - Enable SSH support through net-libs/libssh
-net-analyzer/hydra:mongodb - MongoDB support through dev-libs/mongo-c-driver
+net-analyzer/hydra:mongodb - MongoDB support through dev-libs/libmongo-client
 net-analyzer/hydra:ncp - NCP protocol (NetWare) support through net-fs/ncpfs
 net-analyzer/icinga:contrib - additional scripts
 net-analyzer/icinga:eventhandler - Adds support for running custom scripts whenever a host or service state change occurs
@@ -5531,14 +5589,14 @@ net-analyzer/wireshark:dftest - Install dftest, to display filter byte-code, for
 net-analyzer/wireshark:dpauxmon - Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers
 net-analyzer/wireshark:dumpcap - Install dumpcap, to dump network traffic from inside wireshark
 net-analyzer/wireshark:editcap - Install editcap, to edit and/or translate the format of capture files
-net-analyzer/wireshark:http2 - Use net-libs/nghttp2 for HTTP/2 support
 net-analyzer/wireshark:libxml2 - Use dev-libs/libxml2 for handling XML configuration in dissectors
 net-analyzer/wireshark:maxminddb - Use dev-libs/libmaxminddb for IP address geolocation
 net-analyzer/wireshark:mergecap - Install mergecap, to merge two or more capture files into one
 net-analyzer/wireshark:minizip - Build with zip file compression support
 net-analyzer/wireshark:netlink - Use dev-libs/libnl
+net-analyzer/wireshark:nghttp2 - Use net-libs/nghttp2 for HTTP/2 support
 net-analyzer/wireshark:pcap - Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark)
-net-analyzer/wireshark:plugin-ifdemo - Install plugin interface demo
+net-analyzer/wireshark:plugin_ifdemo - Install plugin interface demo
 net-analyzer/wireshark:plugins - Install plugins
 net-analyzer/wireshark:randpkt - Install randpkt, a utility for creating pcap trace files full of random packets
 net-analyzer/wireshark:randpktdump - Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)
@@ -5798,6 +5856,7 @@ net-fs/samba:quota - Enables support for user quotas
 net-fs/samba:system-heimdal - Use app-crypt/heimdal instead of bundled heimdal.
 net-fs/samba:system-mitkrb5 - Use app-crypt/mit-krb5 instead of app-crypt/heimdal.
 net-fs/samba:winbind - Enables support for the winbind auth daemon
+net-fs/smbnetfs:gnome - Use the gnome-base/gnome-keyring for password management.
 net-ftp/frox:transparent - Enable transparent proxying of data connections
 net-ftp/lftp:convert-mozilla-cookies - Install the convert-mozilla-cookies script and its run-time dependencies
 net-ftp/lftp:verify-file - Install the verify-file script and its run-time dependencies
@@ -7233,7 +7292,7 @@ sci-biology/yass:dmalloc - Enable debugging with the dmalloc library
 sci-biology/yass:lowmem - Build for environments with low amounts of memory
 sci-calculators/datamash:linux-crypto - Use Linux kernel cryptographic API
 sci-calculators/datamash:openssl - Use dev-libs/openssl for hash routines instead of internal gnulib
-sci-calculators/units:units--cur - Install the units_cur python script that updates currencies
+sci-calculators/units:units_cur - Install the units_cur python script that updates currencies
 sci-chemistry/apbs:fast - APBS fast mode (experimental)
 sci-chemistry/apbs:fetk - Include support for FeTK
 sci-chemistry/apbs:iapbs - C/C++/Fortran interface
@@ -7311,7 +7370,7 @@ sci-geosciences/gmt:mex - Enable compilation of mex supplement which requires Oc
 sci-geosciences/gmt:octave - Enable octave support
 sci-geosciences/gpsbabel:gui - Enable the graphical user interface (requires dev-qt/qtwebengine)
 sci-geosciences/gpsd:dbus - export gpsd data over dbus connections
-sci-geosciences/gpsd:latency-timing - support latency timing information
+sci-geosciences/gpsd:latency_timing - support latency timing information
 sci-geosciences/gpsd:ntp - Enable net-misc/ntp shared memory interface and PPS kernel support for GPS time
 sci-geosciences/gpsd:shm - export gpsd over shared memory
 sci-geosciences/gpsd:sockets - export gpsd over unix sockets
@@ -7836,37 +7895,39 @@ sys-apps/firejail-lts:whitelist - Enable file and directory whitelisting
 sys-apps/flashrom:atahpt - Highpoint (HPT) ATA/RAID controller support
 sys-apps/flashrom:atapromise - Support for Promise PDC2026x (FastTrak/Ultra)
 sys-apps/flashrom:atavia - Support for VIA VT6421A SATA controllers
-sys-apps/flashrom:buspirate-spi - Enable Bus Pirate SPI programmer
-sys-apps/flashrom:ch341a-spi - Enable WCH CH341A SPI programmer
+sys-apps/flashrom:bitbang_spi - Bitbanging SPI infrastructure
+sys-apps/flashrom:buspirate_spi - Enable Bus Pirate SPI programmer
+sys-apps/flashrom:ch341a_spi - Enable WCH CH341A SPI programmer
 sys-apps/flashrom:dediprog - Dediprog SF100 support
-sys-apps/flashrom:developerbox-spi - Enable Devloperbox SPI recovery support
-sys-apps/flashrom:digilent-spi - Enable support for Digilent iCEblink40 development board
+sys-apps/flashrom:developerbox_spi - Enable Devloperbox SPI recovery support
+sys-apps/flashrom:digilent_spi - Enable support for Digilent iCEblink40 development board
 sys-apps/flashrom:drkaiser - Enable Dr. Kaiser programmer
 sys-apps/flashrom:dummy - Enable dummy tracing
-sys-apps/flashrom:ft2232-spi - Enable ftdi programmer, flashing through FTDI/SPI USB interface
+sys-apps/flashrom:ft2232_spi - Enable ftdi programmer, flashing through FTDI/SPI USB interface
 sys-apps/flashrom:gfxnvidia - Enable NVIDIA programmer
 sys-apps/flashrom:internal - Enable internal/onboard support
-sys-apps/flashrom:internal-dmi - Enable internal DMI decoding rather than use sys-apps/dmidecode
+sys-apps/flashrom:internal_dmi - Enable internal DMI decoding rather than use sys-apps/dmidecode
 sys-apps/flashrom:it8212 - Support for ITE IT8212F ATA/RAID controllers
-sys-apps/flashrom:jlink-spi - Support for SEGGER J-Link and compatible devices
-sys-apps/flashrom:linux-mtd - Enable support for Linux mtd SPI flash devices
-sys-apps/flashrom:linux-spi - Enable support for Linux userspace spidev interface
-sys-apps/flashrom:mstarddc-spi - Support for SPI flash ROMs accessible through DDC in MSTAR-equipped displays
+sys-apps/flashrom:jlink_spi - Support for SEGGER J-Link and compatible devices
+sys-apps/flashrom:linux_mtd - Enable support for Linux mtd SPI flash devices
+sys-apps/flashrom:linux_spi - Enable support for Linux userspace spidev interface
+sys-apps/flashrom:mstarddc_spi - Support for SPI flash ROMs accessible through DDC in MSTAR-equipped displays
 sys-apps/flashrom:nic3com - Enable 3Com NIC programmer
 sys-apps/flashrom:nicintel - Support for Intel NICs
-sys-apps/flashrom:nicintel-eeprom - Support for EEPROMs on Intel Gigabit network cards
-sys-apps/flashrom:nicintel-spi - Support for SPI on Intel NICs
+sys-apps/flashrom:nicintel_eeprom - Support for EEPROMs on Intel Gigabit network cards
+sys-apps/flashrom:nicintel_spi - Support for SPI on Intel NICs
 sys-apps/flashrom:nicnatsemi - Support for National Semiconductor NICs
 sys-apps/flashrom:nicrealtek - Support for Realtek NICs
-sys-apps/flashrom:ogp-spi - Enable support for OGP (Open Graphics Project) SPI flashing
-sys-apps/flashrom:pickit2-spi - SUpport for SPI flash ROMs accessible via Microchip PICkit2
-sys-apps/flashrom:pony-spi - Enable support for SI-Prog like hardware by Lancos
-sys-apps/flashrom:rayer-spi - RayeR SPIPGM hardware support
+sys-apps/flashrom:ogp_spi - Enable support for OGP (Open Graphics Project) SPI flashing
+sys-apps/flashrom:pickit2_spi - SUpport for SPI flash ROMs accessible via Microchip PICkit2
+sys-apps/flashrom:pony_spi - Enable support for SI-Prog like hardware by Lancos
+sys-apps/flashrom:rayer_spi - RayeR SPIPGM hardware support
 sys-apps/flashrom:satamv - Enable programmer for Marvell SATA controllers
 sys-apps/flashrom:satasii - Enable programmer for SiI SATA controllers
 sys-apps/flashrom:serprog - Enable Serial Flasher programmer
 sys-apps/flashrom:tools - Install additional tools
-sys-apps/flashrom:usbblaster-spi - Enable support for Altera USB-Blaster dongles
+sys-apps/flashrom:usbblaster - Enable support for Altera USB-Blaster dongles
+sys-apps/flashrom:usbblaster_spi - Enable support for Altera USB-Blaster dongles
 sys-apps/flashrom:wiki - Enable wiki informations, like supported devices etc.
 sys-apps/fwupd:agent - Enable update notification agent
 sys-apps/fwupd:colorhug - Enable ColorHug support throughx11-misc/colord package
@@ -8208,6 +8269,7 @@ sys-cluster/nova:memcached - Installs the memcached server
 sys-cluster/nova:novncproxy - Installs the initscripts for the nova novncproxy service
 sys-cluster/nova:openvswitch - Installs openvswitch for the neutron openvswitch support
 sys-cluster/nova:rabbitmq - Installs the rabbitmq server
+sys-cluster/ocfs:aio - Add aio support
 sys-cluster/openmpi:cma - Enable the CMA (Cross Memory Attach) MCA
 sys-cluster/openmpi:cuda - Add GPU direct support
 sys-cluster/openmpi:heterogeneous - Enable features required for heterogeneous platform support
@@ -8372,6 +8434,28 @@ sys-firmware/seabios:seavgabios - Include SeaVGABIOS binaries (replacement for v
 sys-firmware/sgabios:binary - Use pre-built binaries
 sys-firmware/sigrok-firmware-fx2lafw:binary - Use official upstream pre-built binaries
 sys-firmware/vgabios:binary - Use official upstream pre-built binaries (only default and cirrus images)
+sys-freebsd/boot0:tftp - Enable PXE/TFTP boot support.
+sys-freebsd/boot0:zfs - Enable booting on ZFS filesystems.
+sys-freebsd/freebsd-lib:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
+sys-freebsd/freebsd-lib:zfs - Enable ZFS support.
+sys-freebsd/freebsd-rescue:netware - Build tools to work with NetWare protocols (IPX and NCP).
+sys-freebsd/freebsd-rescue:zfs - Enable ZFS support.
+sys-freebsd/freebsd-sbin:ipfilter - Build tools to administer the ipfilter firewall.
+sys-freebsd/freebsd-sbin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
+sys-freebsd/freebsd-sbin:pf - Build tools to administer the PF firewall.
+sys-freebsd/freebsd-sbin:zfs - Enable ZFS support.
+sys-freebsd/freebsd-share:zfs - Enable ZFS support.
+sys-freebsd/freebsd-sources:build-kernel - Build and install a kernel (recommended).
+sys-freebsd/freebsd-sources:dtrace - Enable DTrace support.
+sys-freebsd/freebsd-sources:zfs - Enable ZFS support.
+sys-freebsd/freebsd-ubin:ar - Build FreeBSD's ar and ranlib replacements based on libarchive. The toolchain will still use binutils' version but you can play with it. They have been renamed to freebsd-ar and freebsd-ranlib not to collide with binutils.
+sys-freebsd/freebsd-ubin:audit - Build auditing tools
+sys-freebsd/freebsd-ubin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP)
+sys-freebsd/freebsd-ubin:zfs - Enable ZFS support (for fstat actually).
+sys-freebsd/freebsd-usbin:audit - Build auditing tools.
+sys-freebsd/freebsd-usbin:floppy - Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).
+sys-freebsd/freebsd-usbin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
+sys-freebsd/freebsd-usbin:zfs - Enable ZFS support.
 sys-fs/android-file-transfer-linux:fuse - Add FUSE mount helper
 sys-fs/bees:tools - Build extra tools useful for debugging (fiemap, fiewalk)
 sys-fs/btrfs-progs:convert - Build ext2 conversion utility (btrfs-convert)
@@ -8440,7 +8524,6 @@ sys-fs/owfs:zeroconf - Enables support for zero-configuration networking via net
 sys-fs/quota:netlink - Compile daemon receiving quota messages via netlink
 sys-fs/quota:rpc - Enable quota interaction via RPC
 sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
-sys-fs/squashfs-tools-ng:tools - Build the gensquashfs, rdsquashfs, sqfs2tar, sqfsdiff, and tar2sqfs tools
 sys-fs/squashfs-tools-ng:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
 sys-fs/udev:kmod - Enable kernel module loading/unloading support using sys-apps/kmod
 sys-fs/udisks:elogind - Use sys-auth/elogind for session tracking
@@ -8538,7 +8621,6 @@ sys-libs/musl-nscd:minimal - Only installs the header files
 sys-libs/ncurses:ada - Add bindings for the ADA programming language
 sys-libs/ncurses:tinfo - Build curses library (libncurses) sep from the low-level terminfo library (libtinfo) -- usually needed only for binary packages -- but it is binary compatible in either mode
 sys-libs/ncurses:trace - Enable test trace() support in ncurses calls
-sys-libs/ncurses-compat:tinfo - Build curses library (libncurses) sep from the low-level terminfo library (libtinfo) -- usually needed only for binary packages -- but it is binary compatible in either mode
 sys-libs/newlib:nano - Build additional newlib-nano library
 sys-libs/pam:berkdb - Build the pam_userdb module, that allows to authenticate users against a Berkeley DB file. Please note that enabling this USE flag will create a PAM module that links to the Berkeley DB (as provided by sys-libs/db) installed in /usr/lib and will thus not work for boot-critical services authentication.
 sys-libs/pam:cracklib - Build the pam_cracklib module, that allows to verify the chosen passwords' strength through the use of sys-libs/cracklib. Please note that simply enabling the USE flag on this package will not make use of pam_cracklib by default, you should also enable it in sys-auth/pambase as well as update your configuration files.
@@ -8795,6 +8877,9 @@ www-client/weboob:secure-updates - Enable secure updates
 www-misc/litmus:libproxy - Support for automatic proxy configuratino management through net-libs/libproxy.
 www-misc/litmus:libxml2 - Use dev-libs/libxml2 to parse XML
 www-misc/litmus:pkcs11 - Support for PKCS #11 through PaKChoiS (dev-libs/pakchois).
+www-misc/monitorix:apcupsd - Make use of a daemon that controls APC UPSes with sys-power/apcupsd.
+www-misc/monitorix:httpd - Enables the CGI webserver with any package that satisfies virtual/httpd-cgi.
+www-misc/monitorix:postfix - Analyze postfix logs with net-mail/pflogsumm.
 www-misc/shellinabox:pam - Enable PAM support.
 www-misc/vdradmin-am:vdr - Support for media-video/vdr. Disable this if the VDR you want to control runs at a remote machine.
 www-misc/xxv:themes - Enable more themes via x11-themes/xxv-skins
@@ -8934,6 +9019,8 @@ x11-libs/libSM:uuid - Use UUID for session identification instead of IP address
 x11-libs/libXaw:deprecated - Install deprecated Xaw6 library.
 x11-libs/libXfont2:bzip2 - Support bzip2 compressed PCF fonts.
 x11-libs/libXfont2:truetype - Use media-libs/freetype for font rasterization.
+x11-libs/libaosd:pango - Enable the textual helpers (requires pangocairo).
+x11-libs/libaosd:tools - Install the aosd_cat tool (requires glib-2.0).
 x11-libs/libdlo:test-program - Build the program for testing Displaylink devices.
 x11-libs/libdrm:libkms - Enable building of libkms, a library for applications to interface with KMS
 x11-libs/libdrm:valgrind - Compile in valgrind memory hints
@@ -9015,11 +9102,11 @@ x11-misc/x11vnc:xrandr - Enable support for the X xrandr extension
 x11-misc/xkbset:tk - Install the dev-perl/Tk based xkbset-gui utility
 x11-misc/xlockmore:vtlock - Enables support for virtual terminal locking
 x11-misc/xlockmore:xlockrc - Enables xlockrc for people without PAM
-x11-misc/xmobar:conduit - Use conduit to fetch weather data.
 x11-misc/xmobar:mpd - Support mpd plugin
 x11-misc/xmobar:mpris - Enables MPRIS v1, v2 support
 x11-misc/xmobar:timezone - Enables localized date support
-x11-misc/xmobar:uvmeter - Plugin to show UV data for Australia.
+x11-misc/xmobar:with_conduit - Use conduit to fetch weather data.
+x11-misc/xmobar:with_uvmeter - Plugin to show UV data for Australia.
 x11-misc/xscreensaver:gdm - Use gdmflexiserver from gnome-base/gdm instead of x11-misc/lightdm
 x11-misc/xscreensaver:new-login - Enable user switching support using gdmflexiserver (x11-misc/lightdm)
 x11-misc/xsr:cursor - Capture mouse cursor using x11-misc/xdotool, and place them on the screenshots using media-gfx/imagemagick