gentoo resync : 30.06.2019

64 files changed, 127 insertions, 521 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 05c9f5abbd2e..75c73be7b410 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
index 09bc13e678ab..d457d88580e1 100644
--- a/profiles/arch/amd64-fbsd/use.mask
+++ b/profiles/arch/amd64-fbsd/use.mask
@@ -110,3 +110,7 @@ opencl
 # Hans de Graaff <graaff@gentoo.org> (27 Dec 2014)
 # dev-libs/jemalloc is not keyworded
 jemalloc
+
+# Benda Xu <heroxbd@gentoo.org> (26 Jun 2019)
+# Not tested
+eselect-ldso
\ No newline at end of file
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 419b00ce6577..fc2443e9526f 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (22 Jun 2019)
+# openjfx is keyworded on amd64
+dev-java/openjdk:11 -javafx
+
 # Matt Turner <mattst88@gentoo.org> (20 Jun 2019)
 # dev-lang/spidermonkey:60[jit] fails to build on most platforms, but does
 # build on amd64.
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index 4cce0b3608ea..9b037623bcfb 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -9,3 +9,7 @@
 # James Le Cuirot <chewi@gentoo.org> (24 May 2015)
 # This is built for armv7a so unmask against the wider arm mask.
 -dev-java/icedtea-bin
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (22 June 2019)
+# This is built for armv7a so unmask here.
+-dev-java/openjdk-bin:11
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 0b49278404ae..c9e8766bf74c 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -9,3 +9,7 @@ dev-java/oracle-jre-bin
 # James Le Cuirot <chewi@gentoo.org> (24 May 2015)
 # This is built for armv7a and will not work on earlier generations.
 dev-java/icedtea-bin
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (22 June 2019)
+# This is built for armv7a and will not work on earlier generations.
+dev-java/openjdk-bin:11
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 569dba33ec19..4b4ee6982e9e 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (22 Jun 2019)
+# mask javafx until it's keyworded on other arches
+dev-java/openjdk:11 javafx
+
 # Matt Turner <mattst88@gentoo.org> (20 Jun 2019)
 # dev-lang/spidermonkey:60[jit] fails to build on most platforms
 >=dev-lang/spidermonkey-60 jit
diff --git a/profiles/arch/x86-fbsd/use.mask b/profiles/arch/x86-fbsd/use.mask
index a5de147c236f..6746ea43d4d0 100644
--- a/profiles/arch/x86-fbsd/use.mask
+++ b/profiles/arch/x86-fbsd/use.mask
@@ -64,3 +64,7 @@ vaapi
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
 # virtual/opencl is not keyworded
 opencl
+
+# Benda Xu <heroxbd@gentoo.org> (26 Jun 2019)
+# Not tested
+eselect-ldso
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index d1b033f55ac9..c103679ebe56 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,7 +1,2 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Andreas Sturmlechner <asturm@gentoo.org> (15 Jul 2018)
-# Old ICU is unsupported. ICU 58 only remains for 13.0 based profiles.
-<dev-libs/icu-59
-<dev-libs/icu-layoutex-59
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index e0a379fa4bf4..e2720afe97fc 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -247,11 +247,6 @@ dev-java/openjdk:11 gentoo-vm
 # Requires audacious, which is masked. Bug 632513
 media-libs/freeverb3 jack
 
-# Ian Stakenvicius <axs@gentoo.org> (27 Sep 2017)
-# Depends on >=icu-59, still masked.
->=www-client/firefox-56.0 system-icu
->=mail-client/thunderbird-60.0 system-icu
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (9 Sep 2017)
 # Potentially destructive. Use it only if you know what you're doing.
 sys-libs/glibc vanilla
@@ -466,10 +461,6 @@ sys-devel/gcc sanitize
 # net-libs/tox is in mva overlay only ATM
 app-leechcraft/lc-azoth sarin
 
-# Thomas Sachau <tommy@gentoo.org> (30 Jun 2014)
-# Mask pixman USE flag of dev-libs/efl for future removal, bug 501074
-dev-libs/efl pixman
-
 # Pacho Ramos <pacho@gentoo.org> (01 Jun 2014)
 # Needs hardmasked lua-5.2
 >=media-plugins/grilo-plugins-0.2.12 lua
diff --git a/profiles/categories b/profiles/categories
index 4ff0d5562001..0f45f8cd1732 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -1,3 +1,5 @@
+acct-group
+acct-user
 app-accessibility
 app-admin
 app-antivirus
diff --git a/profiles/features/prefix/rpath/use.mask b/profiles/features/prefix/rpath/use.mask
index 294cb12c1d19..bc446ee8012f 100644
--- a/profiles/features/prefix/rpath/use.mask
+++ b/profiles/features/prefix/rpath/use.mask
@@ -7,3 +7,6 @@
 # multilib is never going to work as expected in Prefix rpath
 multilib
 
+# Benda Xu <heroxbd@gentoo.org> (26 Jun 2019)
+# Not supported
+eselect-ldso
diff --git a/profiles/hardened/linux/amd64/deprecated b/profiles/hardened/linux/amd64/deprecated
deleted file mode 100644
index e6cea706fada..000000000000
--- a/profiles/hardened/linux/amd64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/hardened
diff --git a/profiles/hardened/linux/amd64/eapi b/profiles/hardened/linux/amd64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/amd64/make.defaults b/profiles/hardened/linux/amd64/make.defaults
deleted file mode 100644
index 730679308126..000000000000
--- a/profiles/hardened/linux/amd64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-USE="-pic"
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/amd64/no-multilib/deprecated b/profiles/hardened/linux/amd64/no-multilib/deprecated
deleted file mode 100644
index 41a61f1937b6..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/no-multilib/hardened
diff --git a/profiles/hardened/linux/amd64/no-multilib/eapi b/profiles/hardened/linux/amd64/no-multilib/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/amd64/no-multilib/make.defaults b/profiles/hardened/linux/amd64/no-multilib/make.defaults
deleted file mode 100644
index 58039871f368..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/make.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# We don't need to have pic on
-USE="-pic"
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-MULTILIB_ABIS="amd64"
-
-# Mirror profile/amd64/no-multilib/make.defaults
-USE_EXPAND_HIDDEN="ABI_X86"
-
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
deleted file mode 100644
index 82649fc8202e..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# These are broken as reported by Halcy0n, Aug, 23, 2011
-dev-lang/rebol-bin
-
-games-action/brutal-legend
-games-action/hotline-miami
-games-action/trine-enchanted-edition
-games-action/trine2
-games-action/swordandsworcery
-games-action/beathazardultra
-games-action/solar2
-games-arcade/dynamitejack
-games-misc/katawa-shoujo
-games-misc/papers-please
-games-rpg/dungeon-defenders
-games-rpg/bastion
-games-rpg/wasteland2
-
-# Mirror profile/amd64/no-multilib/package.mask
-app-accessibility/mbrola
-app-accessibility/perlbox-voice
-app-arch/stuffit
-app-benchmarks/cpuburn
-app-editors/emacs:18
-app-emulation/crossover-bin
-app-emulation/genymotion-bin
-app-emulation/playonlinux
-app-emulation/q4wine
->=app-i18n/atokx3-3.0.0
-app-office/ooextras
-app-emulation/winetricks
-dev-embedded/libftd2xx
-dev-embedded/openocd
-dev-util/android-sdk-update-manager
-dev-util/biew
-games-action/cs2d
-games-action/descent3
-games-action/descent3-demo
-games-action/guacamelee
-games-action/heretic2
-games-action/heretic2-demo
-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/spacetripper-demo
-games-arcade/aquaria
-games-arcade/barbarian-bin
-games-arcade/jardinains
-games-arcade/gish-demo
-games-arcade/thinktanks-demo
-games-emulation/caps
-games-emulation/nestra
-games-emulation/pcsx2
-games-emulation/zinc
-games-emulation/zsnes
-games-fps/avp
-games-fps/doom3-cdoom
-games-fps/doom3-chextrek
-games-fps/doom3-data
-games-fps/doom3-demo
-games-fps/doom3-ducttape
-games-fps/doom3-eventhorizon
-games-fps/doom3-hellcampaign
-games-fps/doom3-inhell
-games-fps/doom3-lms
-games-fps/doom3-mitm
-games-fps/doom3-roe
-games-fps/doom3
-games-fps/enemy-territory-etpro
-games-fps/enemy-territory-omnibot
-games-fps/enemy-territory-truecombat
-games-fps/enemy-territory
-games-fps/etqw-bin
-games-fps/etqw-data
-games-fps/etqw-demo
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/postal2
-games-fps/quake3-bin
-games-fps/quake3-demo
-games-fps/quake3-ra3
-games-fps/quake4-bin
-games-fps/quake4-data
-games-fps/quake4-demo
-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
-games-fps/ut2003
-games-fps/ut2003-demo
-games-fps/ut2004-demo
-games-misc/little-inferno
-games-roguelike/adom
-games-rpg/baldurs-gate-ee
-games-rpg/costume-quest
-games-rpg/dear-esther
-games-rpg/eschalon-book-1-demo
-games-server/etqw-ded
-games-server/nwn-ded
-games-simulation/bcs-demo
-games-strategy/darwinia
-games-strategy/darwinia-demo
-games-strategy/defcon-demo
-games-strategy/dominions2
-games-strategy/heroes3
-games-strategy/majesty-demo
-games-strategy/smac
-games-strategy/spaz
-media-sound/aucdtect
-media-sound/ventrilo-server-bin
-media-video/binkplayer
-media-video/tsmuxer
-net-misc/icaclient
-net-misc/ps3mediaserver
-net-print/cndrvcups-common-lb
-net-print/cndrvcups-lb
-sci-biology/foldingathome
-sci-electronics/eagle
-sci-chemistry/cara-bin
-sci-chemistry/mars
-sci-chemistry/xdsstat-bin
-sys-libs/lib-compat-loki
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.use.mask b/profiles/hardened/linux/amd64/no-multilib/package.use.mask
deleted file mode 100644
index 35d2b1b04a48..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/package.use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Mirror profile/amd64/no-multilib/package.use.mask
-
-# Yixun Lan <dlan@gentoo.org> (12 Jul 2017)
-# GLEP 73 Immutability, USE=ovmf requires hvm
-app-emulation/xen-tools ovmf
-
-
-# Mike Frysinger <vapier@gentoo.org> (12 Aug 2016)
-# Requires sys-boot/grub:0 which is masked here.
-sys-apps/memtest86+ floppy
diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent
deleted file mode 100644
index 9bf59c55e35a..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/amd64/no-multilib
diff --git a/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated b/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated
deleted file mode 100644
index d9f2abb8d832..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/no-multilib/hardened/selinux
diff --git a/profiles/hardened/linux/amd64/no-multilib/selinux/eapi b/profiles/hardened/linux/amd64/no-multilib/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/amd64/no-multilib/selinux/parent b/profiles/hardened/linux/amd64/no-multilib/selinux/parent
deleted file mode 100644
index 933e67923d1a..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/hardened/linux/amd64/no-multilib/use.mask b/profiles/hardened/linux/amd64/no-multilib/use.mask
deleted file mode 100644
index 8884ba565956..000000000000
--- a/profiles/hardened/linux/amd64/no-multilib/use.mask
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Mask the multilib flags back for non-multilib profile.
-abi_x86_32
-
-# Mirror profile/amd64/no-multilib/use.mask
-
-# 2007/08/29 Christoph Mende <angelos@gentoo.org>
-# app-accessibility/mbrola is x86 only
-mbrola
-
-# 2007/08/24 Michael Marineau <marineam@gentoo.org>
-# Xen HVM support requires building 32-bit binaries.
-hvm
-
-# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
-# Mask multilib, since we cannot use it.
-multilib
diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
deleted file mode 100644
index d4ef19634383..000000000000
--- a/profiles/hardened/linux/amd64/package.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Depends on x11-drivers/nvidia-drivers
-#dev-python/pyopencl
-
-# Cernlib has address space issues on amd64 and package is no
-# longer supported by upstream. Thus masking it and its reverse
-# dependencies.
-# See bug 426764.
-sci-physics/cernlib
-sci-physics/cernlib-montecarlo
-sci-physics/paw
diff --git a/profiles/hardened/linux/amd64/package.use b/profiles/hardened/linux/amd64/package.use
deleted file mode 100644
index 0cef7f8d1d92..000000000000
--- a/profiles/hardened/linux/amd64/package.use
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Magnus Granberg <zorry@gentoo.org> (14 Jan, 2015)
-# We need to have the pic flag on.
-# Bugs 490276, 513464, 523736 and 512208.
-media-libs/x264 pic
-media-video/ffmpeg pic
-media-video/libav pic
->=media-libs/mesa-10.1.6 pic
-media-libs/libpostproc pic
->=media-libs/xvid-1.3.3 pic
diff --git a/profiles/hardened/linux/amd64/package.use.mask b/profiles/hardened/linux/amd64/package.use.mask
deleted file mode 100644
index 6c676aebf214..000000000000
--- a/profiles/hardened/linux/amd64/package.use.mask
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# When you add an entry to the top of this file, add your name, the date, and
-# an explanation of why something is getting masked. Please be extremely
-# careful not to commit atoms that are not valid, as it can cause large-scale
-# breakage, especially if it ends up in the daily snapshot.
-#
-## Example:
-##
-## # Dev E. Loper <developer@gentoo.org> (28 Jun 2012)
-## # Masking foo USE flag until we can get the
-## # foo stuff to work properly again (bug 12345)
-## =media-video/mplayer-0.90_pre5 foo
-## =media-video/mplayer-0.90_pre5-r1 foo
-
-# Magnus Granberg <zorry@gentoo.org> (30 sep 2016)
-# This target support VTV #547040.
->=sys-devel/gcc-4.9 -vtv
-
-# Magnus Granberg <zorry@gentoo.org> (29 Nov 2012)
-# Bug #444786 disable nvidia on app-admin/conky
-app-admin/conky nvidia
diff --git a/profiles/hardened/linux/amd64/parent b/profiles/hardened/linux/amd64/parent
deleted file mode 100644
index 815cf82784f9..000000000000
--- a/profiles/hardened/linux/amd64/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../base
-../../../default/linux
-../../../arch/amd64/lib32
-..
diff --git a/profiles/hardened/linux/amd64/selinux/deprecated b/profiles/hardened/linux/amd64/selinux/deprecated
deleted file mode 100644
index 13191e6977a1..000000000000
--- a/profiles/hardened/linux/amd64/selinux/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/hardened/selinux
diff --git a/profiles/hardened/linux/amd64/selinux/eapi b/profiles/hardened/linux/amd64/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/amd64/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/amd64/selinux/parent b/profiles/hardened/linux/amd64/selinux/parent
deleted file mode 100644
index e5c7cefb6826..000000000000
--- a/profiles/hardened/linux/amd64/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/selinux
diff --git a/profiles/hardened/linux/amd64/use.mask b/profiles/hardened/linux/amd64/use.mask
deleted file mode 100644
index 6e65e1b3a96e..000000000000
--- a/profiles/hardened/linux/amd64/use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Rick Farina <zerochaos@gentoo.org> 26 Nov 2012
-video_cards_nvidia
-# removing mask on nvidia use flag as it is used by monitoring tools
-# which may be desireable for cuda users
-#nvidia
-# adjusting use flag mask as nvidia-drivers are usable for cuda at least
-#cuda
diff --git a/profiles/hardened/linux/amd64/x32/deprecated b/profiles/hardened/linux/amd64/x32/deprecated
deleted file mode 100644
index 5cbfaf5838b0..000000000000
--- a/profiles/hardened/linux/amd64/x32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-# no successor
diff --git a/profiles/hardened/linux/amd64/x32/eapi b/profiles/hardened/linux/amd64/x32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/amd64/x32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/amd64/x32/make.defaults b/profiles/hardened/linux/amd64/x32/make.defaults
deleted file mode 100644
index 607b6452b9bf..000000000000
--- a/profiles/hardened/linux/amd64/x32/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="x86_64-pc-linux-gnux32"
diff --git a/profiles/hardened/linux/amd64/x32/parent b/profiles/hardened/linux/amd64/x32/parent
deleted file mode 100644
index 6793db467fe7..000000000000
--- a/profiles/hardened/linux/amd64/x32/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../../features/multilib
-../../../../arch/amd64/x32
-..
diff --git a/profiles/hardened/linux/eapi b/profiles/hardened/linux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/ia64/deprecated b/profiles/hardened/linux/ia64/deprecated
deleted file mode 100644
index 3da6a26f484b..000000000000
--- a/profiles/hardened/linux/ia64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0
diff --git a/profiles/hardened/linux/ia64/eapi b/profiles/hardened/linux/ia64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/ia64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/ia64/make.defaults b/profiles/hardened/linux/ia64/make.defaults
deleted file mode 100644
index 70c5284ec7ae..000000000000
--- a/profiles/hardened/linux/ia64/make.defaults
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/hardened/linux/ia64/parent b/profiles/hardened/linux/ia64/parent
deleted file mode 100644
index 8683acb05b19..000000000000
--- a/profiles/hardened/linux/ia64/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../base
-../../../default/linux
-../../../arch/ia64
-..
diff --git a/profiles/hardened/linux/make.defaults b/profiles/hardened/linux/make.defaults
deleted file mode 100644
index d83d7eab8856..000000000000
--- a/profiles/hardened/linux/make.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic xtpax -jit -orc"
-
-USE="hardened pic urandom xtpax -fortran -jit -orc"
-
-# Ian Stakenvicius, 2014-09-03
-# Set a variable just to indicate that the current profile is a hardened one
-# This variable can be leveraged in ebuilds for pkg_postinst messages that
-# indicate said package is, say, configured in a way that defeats the purpose
-# of running hardened.
-PROFILE_IS_HARDENED=1
diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask
deleted file mode 100644
index 099e6f9e0e3a..000000000000
--- a/profiles/hardened/linux/package.mask
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Hardened versions of gcc-4.0* through gcc-4.2* are not available.
-=sys-devel/gcc-4.0*
-=sys-devel/gcc-4.1*
-=sys-devel/gcc-4.2*
-
-# broken on hardened, use sys-apps/elfix to fix gnustack
-sys-devel/prelink
-# depends on prelink
-app-crypt/hmaccalc
-
-# OpenAFS kernel module is not compatible with hardened kernels
-# due to C99 struct init requirement by hardened kernels,
-# see bug 540196 comment 9.
-net-fs/openafs-kernel
diff --git a/profiles/hardened/linux/package.use.force b/profiles/hardened/linux/package.use.force
deleted file mode 100644
index 28c4aed893e2..000000000000
--- a/profiles/hardened/linux/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Needed for XATTR_PAX flags
-app-arch/tar xattr
-sys-apps/coreutils xattr
-sys-apps/portage xattr
diff --git a/profiles/hardened/linux/package.use.mask b/profiles/hardened/linux/package.use.mask
deleted file mode 100644
index fe7ca15ac9fb..000000000000
--- a/profiles/hardened/linux/package.use.mask
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Matthias Maier <tamiko@gentoo.org> (11 May 2017)
-# masked in base, unmask for hardened profiles
-sys-devel/gcc -pie
-
-# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (19 Jan 2017)
-# Requires x11-drivers/nvidia-drivers. Needs testing first.
-media-video/mpv cuda
-
-sys-apps/hwloc gl
-
-sys-devel/gcc -hardened
-sys-libs/glibc -hardened
-
-# Ian Stakenvicius <axs@gentoo.org> (03 Dec 2014)
-# Have no way of knowing what Gecko Media Plugins will install in profiles
-www-client/firefox gmp-autoupdate
-
-# net-fs/openafs-kernel module can't be used on hardened,
-# see bug 540196.
-net-fs/openafs modules
diff --git a/profiles/hardened/linux/packages b/profiles/hardened/linux/packages
deleted file mode 100644
index 066037a411ee..000000000000
--- a/profiles/hardened/linux/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file extends the base packages file for all hardened profiles
-
-*sys-apps/paxctl
-*sys-apps/elfix
diff --git a/profiles/hardened/linux/parent b/profiles/hardened/linux/parent
deleted file mode 100644
index 6560aecc119d..000000000000
--- a/profiles/hardened/linux/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../releases/13.0
diff --git a/profiles/hardened/linux/use.force b/profiles/hardened/linux/use.force
deleted file mode 100644
index 35e56536ec64..000000000000
--- a/profiles/hardened/linux/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Make sure people don't accidentally turn of ssp/pie in important packages.
-pie
-ssp
diff --git a/profiles/hardened/linux/use.mask b/profiles/hardened/linux/use.mask
deleted file mode 100644
index e3999ad48706..000000000000
--- a/profiles/hardened/linux/use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
--hardened
-
-# precompiled headers are not compat with ASLR.
-pch
-
-# prelink is masked for hardened
-prelink
-
-# profile are incompatible when linking with pie
-profile
diff --git a/profiles/hardened/linux/x86/deprecated b/profiles/hardened/linux/x86/deprecated
deleted file mode 100644
index 2411cb5bd1d5..000000000000
--- a/profiles/hardened/linux/x86/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/hardened
diff --git a/profiles/hardened/linux/x86/eapi b/profiles/hardened/linux/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/x86/make.defaults b/profiles/hardened/linux/x86/make.defaults
deleted file mode 100644
index 98757037073c..000000000000
--- a/profiles/hardened/linux/x86/make.defaults
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-CHOST="i686-pc-linux-gnu"
-CFLAGS="-march=i686 -O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-USE="nptl"
-
-# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
-# Defaults for video drivers
-VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
-
-# 2006/12/21 - Andrej Kacian <ticho@gentoo.org>
-# Defaults for audio drivers
-ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 \
-	emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m \
-	maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
diff --git a/profiles/hardened/linux/x86/package.mask b/profiles/hardened/linux/x86/package.mask
deleted file mode 100644
index 5b60d78864ce..000000000000
--- a/profiles/hardened/linux/x86/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Depends on x11-drivers/nvidia-drivers
-#dev-python/pyopencl
diff --git a/profiles/hardened/linux/x86/package.use.mask b/profiles/hardened/linux/x86/package.use.mask
deleted file mode 100644
index c01895ca89e0..000000000000
--- a/profiles/hardened/linux/x86/package.use.mask
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Magnus Granberg <zorry@gentoo.org> (30 sep 2016)
-# This target supports VTV #547040.
->=sys-devel/gcc-4.9 -vtv
-
-# cyrus-sasl doesn't work w/ USE=berkdb (#192753)
-dev-libs/cyrus-sasl berkdb
-
-# Rick Farina <zerochaos@gentoo.org> (26 Nov 2012)
-# mask X and tools for we still miss the docs for revdep-pax
-# else hell will rule. (RWX in the libs)
-# Propogating changes from amd64.
-# Bug 433121
-# (static-libs require tools)
-x11-drivers/nvidia-drivers X tools static-libs
-
-# Magnus Granberg <zorry@gentoo.org> (29 Nov 2012)
-# Bug #444786 disable nvidia on app-admin/conky 
-app-admin/conky nvidia
diff --git a/profiles/hardened/linux/x86/parent b/profiles/hardened/linux/x86/parent
deleted file mode 100644
index e93ab13e6839..000000000000
--- a/profiles/hardened/linux/x86/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../base
-../../../default/linux
-../../../arch/x86
-..
diff --git a/profiles/hardened/linux/x86/selinux/deprecated b/profiles/hardened/linux/x86/selinux/deprecated
deleted file mode 100644
index 58212ed1f1e2..000000000000
--- a/profiles/hardened/linux/x86/selinux/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/hardened/selinux
diff --git a/profiles/hardened/linux/x86/selinux/eapi b/profiles/hardened/linux/x86/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/x86/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/x86/selinux/parent b/profiles/hardened/linux/x86/selinux/parent
deleted file mode 100644
index e5c7cefb6826..000000000000
--- a/profiles/hardened/linux/x86/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/selinux
diff --git a/profiles/hardened/linux/x86/use.mask b/profiles/hardened/linux/x86/use.mask
deleted file mode 100644
index a9ca50ead416..000000000000
--- a/profiles/hardened/linux/x86/use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Rick Farina <zerochaos@gentoo.org> 26 Nov 2012          
-video_cards_nvidia
-# removing mask on nvidia use flag as it is used by monitoring tools
-# which may be desireable for cuda users
-#nvidia
-# adjusting use flag mask as nvidia-drivers are usable for cuda at least
-#cuda
diff --git a/profiles/package.mask b/profiles/package.mask
index c7a96dc8e609..561252683682 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,9 +29,63 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (27 Jun 2019)
+# Badly outdated, EAPI=2. Removal in 30days, ack'ed by
+# cynede for dotnet. Bug 685626.
+dev-dotnet/flickrnet-bin
+
+# Ulrich Müller <ulm@gentoo.org> (24 Jun 2019)
+# Byte-compilation with recent Emacs versions fails.
+# SRC_URI is gone. Last visible upstream activity in 2008.
+# Use app-emacs/flim as replacement.
+# Masked for removal in 30 days, bug #688596.
+app-emacs/limit
+virtual/emacs-flim
+
+# Jonas Stein <jstein@gentoo.org> (24 Jun 2019)
+# Source is broken. Upstream is dead since 2011.
+# Removal after 2019-08-01. (bug #688552)
+media-sound/sfc
+
+# David Seifert <soap@gentoo.org> (23 Jun 2019)
+# QA issues, fails tests, RWX sections, ignores CC/CFLAGS,
+# builds only static libs, fails with GCC 9.
+# Bug #452220, #461288, #623360, #685728
+sci-mathematics/gwnum
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (23 Jun 2019)
+# EAPI2, broken HOMEPAGE, maintainer-needed, lots of QA warnings,
+# for hardware that was EOL'ed <=2007. Removal in 30 days. Bug 681060
+sys-apps/cobalt-panel-utils
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (23 Jun 2019)
+# last release was 2006, EAPI2, maintainer-needed, depends on
+# app-text/htmltidy; removal in 30 days, bug 686324
+www-apache/mod_tidy
+
+# Jimi Huotari <chiitoo@gentoo.org> (22 Jun 2019)
+# Deprecated package with no consumers left.
+# Removal in 30 days.
+lxqt-base/lxqt-l10n
+
+# David Seifert <soap@gentoo.org> (22 Jun 2019)
+# Abandoned upstream, last release 5 years ago,
+# extremely brittle codebase, requires constant
+# patching, removal in 30 days
+# Bug #664700, #685980
+sci-biology/vaal
+
+# David Seifert <soap@gentoo.org> (22 Jun 2019)
+# Abandoned upstream, last release 5 years ago,
+# extremely brittle codebase, requires constant
+# patching, removal in 30 days
+# Bug #664708, #685924
+sci-biology/allpathslg
+
 # Sobhan Mohammadpour <sobhan@gentoo.org> (19 Jun 2019)
 # this is new and it needs testing
 >=app-misc/geoclue-2.5.3
+=sys-apps/xdg-desktop-portal-1.4.2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (17 Jun 2019)
 # this is now provided by dev-lang/rust{-bin}[rustfmt]
@@ -84,17 +138,6 @@ dev-libs/liblazy
 # Removal in 30 days unless updated.
 dev-util/antlrworks
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (5 Jun 2019)
-# Fails to build, bug 680252. EAPI=2. Removal in 30 days
-# unless fixed.
-dev-java/glassfish-connector-api
-
-# Hans de Graaff <graaff@gentoo.org> (2 Jun 2019)
-# Test version with all new Gentoo defaults. 
-# Fixes bug 676946 bug may break other things.
-# Masked for testing.
-=dev-ruby/rubygems-3.0.3-r1
-
 # Zac Medico <zmedico@gentoo.org> (31 May 2019)
 # Upstream is dead and there are multiple security vulnerabilities.
 # Removal in 30 days. Bug #687100.
@@ -105,20 +148,6 @@ app-emulation/rkt
 lxde-base/lxshortcut
 lxde-base/lxsession-edit
 
-# Virgil Dupras <vdupras@gentoo.org> (24 May 2019)
-# py2 only, dead upstream, removal in 30 days. Bug #686668
-dev-python/drpython
-
-# Aaron Bauman <bman@gentoo.org> (23 May 2019)
-# Upstreami now requires registration to download
-# EAPI2. Removal in 30 days.
-net-misc/mindterm
-
-# Aaron Bauman <bman@gentoo.org> (23 May 2019)
-# Unmaintained, EAPI2, updates available upstream
-# Oh yea, removal in 30 days
-dev-util/pmd
-
 # Patrick Lauer <patrick@gentoo.org> (23 May 2019)
 # PostgreSQL beta and release candidate releases are pre-release testing
 # versions, not meant for production use. They are feature-frozen, and are
@@ -141,30 +170,10 @@ x11-plugins/gkrellflynn
 # Unfixed bug, dead upstream, not relevant enough
 sys-fs/pytagsfs
 
-# Stefan Strogin <steils@gentoo.org> (21 May 2019)
-# Unmaintained. Last release in 2005. Does not build with
-# >=dev-libs/bglibs-2.04. Bug #686438.
-net-mail/qmail-qfilter
-
-# Hans de Graaff <graaff@gentoo.org> (18 May 2019)
-# Old, ruby24-only, slots of ruby packages without any reverse
-# dependencies. Use the newer slot version instead.
-# (originally last-rited on 15 Apr 2019)
-# Masked for removal in 30 days.
-dev-ruby/elasticsearch:0
-dev-ruby/elasticsearch-api:0
-dev-ruby/elasticsearch-transport:0
-dev-ruby/filesize:0.1.1
-
 # Miroslav Šulc <fordfrog@gentoo.org> (15 May 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.20
 
-# Virgil Dupras <vdupras@gentoo.org> (13 May 2019)
-# detox has been deprecated by the release of tox 3.7.0 which duplicates the
-# feature. Removal in 30 days. Bug #685870
-dev-python/detox
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
 # Perl 5.24 will be removed soon. Please upgrade.
 <dev-lang/perl-5.26.2
@@ -277,16 +286,6 @@ sys-boot/systemrescuecd-x86-grub
 >dev-java/oracle-jdk-bin-1.8.0.202:1.8
 >dev-java/oracle-jre-bin-1.8.0.202:1.8
 
-# David Seifert <soap@gentoo.org> (15 Apr 2019)
-# Masked for testing, Bug #653878.
->=dev-libs/boost-1.70.0
->=dev-util/boost-build-1.70.0
->=net-mail/libpst-0.6.66-r2
->=net-proxy/trojan-1.12.2
->=dev-python/graph-tool-2.27
-=dev-python/graph-tool-9999
-=sys-fs/cryfs-0.10*
-
 # Robin H. Johnson <robbat2@gentoo.org> (25 Mar 2019)
 # Requires >=dev-lang/lua-5.3 which is masked
 sys-apps/likwid
diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc
index 3c12c6519673..b8def6390deb 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -22,7 +22,9 @@ windows_setup_dllhelper() {
 		# But as there is another file to install (the real dll),
 		# and installation is done using cp, we override cp to
 		# additionally copy the dll when the library is copied.
+		ebegin "Setting up wrapper to copy the DLL along the LIB"
 		windows_setup_dllhelper_cp
+		eend $?
 		;;
 	esac
 }
@@ -60,6 +62,18 @@ post_src_install() {
 			;;
 		esac
 	done
+	[[ -d usr/$(get_libdir) ]] &&
+	find usr/$(get_libdir) -maxdepth 1 -type f -name '*.dll' |
+	while read f
+	do
+		if test ! -f usr/bin/${f##*/}; then
+			ebegin "moving ${f} to usr/bin for native loader"
+			dodir usr/bin || die
+			mv -f "${f}" usr/bin || die
+			ln -sf "../bin/${f##*/}" "${f}" || die
+			eend $?
+		fi
+	done
 }
 
 windows_setup_dllhelper_cp() {
diff --git a/profiles/releases/17.0/package.use.mask b/profiles/releases/17.0/package.use.mask
index fe0316295765..f51cb60a76a4 100644
--- a/profiles/releases/17.0/package.use.mask
+++ b/profiles/releases/17.0/package.use.mask
@@ -4,9 +4,3 @@
 # Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017)
 # Unmask default-PIE on 17.0 profiles.
 sys-devel/gcc -pie
-
-# Ian Stakenvicius <axs@gentoo.org> (27 Sep 2017)
-# Remove system-icu masks (see base/package.use.mask)
-# that prevent the >=icu-59 dependency
->=www-client/firefox-56.0 -system-icu
->=mail-client/thunderbird-60.0 -system-icu
diff --git a/profiles/updates/2Q-2019 b/profiles/updates/2Q-2019
index beb3d93bac28..7e275607af8f 100644
--- a/profiles/updates/2Q-2019
+++ b/profiles/updates/2Q-2019
@@ -1,2 +1,3 @@
 move net-nds/gss-proxy net-nds/gssproxy
 move app-emacs/anything app-emacs/helm
+move games-fps/prboom games-fps/prboom-plus
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2260dded96b5..da098a96ab33 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -363,6 +363,7 @@ app-dicts/gwaei:mecab - Enable app-text/mecab support
 app-dicts/myspell-pt:preao - Use the pre ortographic agreement version of the dictionary
 app-doc/clsync-docs:api - Install doxygen generated API docs.
 app-doc/csound-manual:html - Install HTML documentation
+app-doc/devmanual:fallback - Use alternative minimal stylesheet instead of tyrian theme.
 app-doc/doxygen:clang - support for sys-devel/clang assisted parsing
 app-doc/doxygen:dot - allow to create dot graphs using media-gfx/graphviz
 app-doc/doxygen:doxysearch - build doxyindexer and doxysearch.cgi
@@ -462,6 +463,7 @@ app-emacs/bbdb:vm - Add support for app-emacs/vm
 app-emacs/calfw:howm - Add support for the app-emacs/howm note-taking tool
 app-emacs/company-mode:ropemacs - Install backend for dev-python/ropemacs
 app-emacs/emacs-common-gentoo:games - Support shared score files for games
+app-emacs/mu-cite:bbdb - Include support for app-emacs/bbdb
 app-emacs/org-mode:contrib - Install user-contributed files
 app-emacs/org-mode:odt-schema - Install non-free schema files for OpenDocument Text exporter
 app-emacs/remember:bbdb - Include support for app-emacs/bbdb
@@ -2508,6 +2510,7 @@ dev-libs/m17n-lib:gd - Build API and utilities based on media-libs/gd. This flag
 dev-libs/m17n-lib:libotf - Use dev-libs/libotf to handle OpenType fonts
 dev-libs/m17n-lib:libxml2 - Use dev-libs/libxml2 to parse XML
 dev-libs/msgpack:boost - Enable boost support
+dev-libs/nettle:cpu_flags_x86_sha - Enable support for Intel's SHA instruction set (SHA-NI)
 dev-libs/nss:cacert - Include root/class3 certs from CAcert (http://www.cacert.org/)
 dev-libs/nss:nss-pem - Add support for libnsspem
 dev-libs/nss:utils - Install utilities included with the library
@@ -3323,7 +3326,6 @@ games-action/hotline-miami:launcher - Install qt launcher
 games-action/minetest:client - Build Minetest client
 games-action/minetest:jsoncpp - Enable using a system-wide JSONCPP
 games-action/minetest:leveldb - Enable LevelDB backend
-games-action/minetest:postgres - Optionally use PostgreSQL as map backend
 games-action/minetest:redis - Enable redis backend via dev-libs/hiredis
 games-action/minetest:server - Build Minetest server
 games-action/minetest:spatial - Enable SpatialIndex AreaStore backend
@@ -3466,6 +3468,13 @@ games-fps/eduke32:vpx - Enable support for media-libs/libvpx.
 games-fps/eduke32:xmp - Enable support for media-libs/exempi.
 games-fps/gzdoom:gtk2 - Enable support for GTK+2 instead of GTK+3
 games-fps/nexuiz:maps - Install the community map pack
+games-fps/prboom-plus:dumb - Enable support for various tracker-style music formats via media-libs/dumb
+games-fps/prboom-plus:fluidsynth - Enable support for MIDI via media-sound/fluidsynth
+games-fps/prboom-plus:net - Enable support for network play
+games-fps/prboom-plus:nonfree - Enable non-free components
+games-fps/prboom-plus:portmidi - Enable support for MIDI via media-libs/portmidi
+games-fps/prboom-plus:sdl-image - Enable support for high-resolution texture support via media-libs/sdl-image
+games-fps/prboom-plus:sdl-mixer - Enable support for MIDI via media-libs/sdl-mixer
 games-fps/quake2-icculus:demo - Install the demo files (quake2-demodata) and configure for use
 games-fps/quake2-icculus:qmax - Build the pretty version (quake max)
 games-fps/quake2-icculus:rogue - Build support for the 'Ground Zero' Mission Pack (rogue)
@@ -3536,6 +3545,7 @@ games-rpg/dungeon-defenders:bundled-libs - Use the upstream provided bundled lib
 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/kqlives:cheats - Enable cheating mode
 games-rpg/manaplus:mumble - Enable support for voice chat
 games-rpg/manaplus:pugixml - Use dev-libs/pugixml for XML parsing isntead of dev-libs/libxml2
@@ -3603,6 +3613,7 @@ games-strategy/uqm:remix - download and install music remix files (large)
 games-strategy/uqm:voice - download and install voice files (large)
 games-strategy/wesnoth:fribidi - Support for right-to-left languages
 games-strategy/wesnoth:server - Enable compilation of server
+games-util/deutex:man - Build and install man pages
 games-util/gslist:web - Enable the web interface
 games-util/lgogdownloader:gui - Enable GUI login support for passing reCAPTCHA
 games-util/pyfa:graph - Enable support for graphs
@@ -3935,7 +3946,6 @@ lxqt-base/lxqt-meta:ssh-askpass - Install lxqt-base/lxqt-openssh-askpass user pa
 lxqt-base/lxqt-meta:sudo - Install lxqt-base/lxqt-sudo
 lxqt-base/lxqt-meta:terminal - Install x11-terms/qterminal package
 lxqt-base/lxqt-meta:trash - Install gnome-base/gvfs to enable 'trash' functionality in x11-misc/pcmanfm-qt
-lxqt-base/lxqt-panel:clock - Build clock plugin
 lxqt-base/lxqt-panel:colorpicker - Build colorpicker plugin
 lxqt-base/lxqt-panel:cpuload - Build cpuload plugin
 lxqt-base/lxqt-panel:desktopswitch - Build desktopswitch plugin
@@ -4606,6 +4616,7 @@ media-libs/opusfile:http - Enable http connections
 media-libs/osl:cpu_flags_x86_avx512f - SIMD Optimization
 media-libs/osl:cpu_flags_x86_f16c - SIMD Optimization
 media-libs/osl:partio - Use media-libs/partio
+media-libs/osl:qt5 - Build the osltoy binary
 media-libs/phonon:designer - Install plugin for dev-qt/designer
 media-libs/phonon:vlc - Install VLC Phonon backend
 media-libs/phonon-gstreamer:network - Enable network streaming support via libsoup
@@ -5485,7 +5496,6 @@ net-analyzer/icinga2:mail - Allows for mailing of alerts
 net-analyzer/icinga2:mariadb - Enable support for the mariadb database backend
 net-analyzer/icinga2:nano-syntax - Adds support for syntax used in the nano editor
 net-analyzer/icinga2:plugins - Adds support for nagios plugins
-net-analyzer/icinga2:studio - Adds support for Icinga-studio
 net-analyzer/ipsumdump:nanotimestamp - Enable timestamps with nano-second resolution
 net-analyzer/linkchecker:sqlite - Mozilla Bookmark parsing
 net-analyzer/metasploit:development - Install dependencies needed for metasploit and exploit development
@@ -5861,8 +5871,10 @@ net-firewall/iptables:conntrack - Build against net-libs/libnetfilter_conntrack
 net-firewall/iptables:netlink - Build against libnfnetlink which enables the nfnl_osf util
 net-firewall/iptables:nftables - Support nftables kernel interface
 net-firewall/iptables:pcap - Build against net-libs/libpcap which enables the nfbpf_compile util
+net-firewall/nftables:doc - Create man pages for the package (requires app-text/asciidoc)
 net-firewall/nftables:json - Enable JSON support via dev-libs/jansson
 net-firewall/nftables:modern_kernel - Install init scripts for 3.18 or higher kernels with atomic rule updates
+net-firewall/nftables:xtables - Add libxtables support to try to automatically translate rules added by iptables-compat
 net-firewall/nufw:nfconntrack - Use netfilter_conntrack
 net-firewall/nufw:nfqueue - Use NFQUEUE instead of QUEUE
 net-firewall/nufw:pam_nuauth - Add support for pam nufw from PAM
@@ -6463,10 +6475,11 @@ net-mail/vpopmail:maildrop - Enables mail-filter/maildrop support in vdelivermai
 net-mail/vpopmail:spamassassin - Enables mail-filter/spamassassin support
 net-misc/apt-cacher-ng:fuse - Install the sys-fs/fuse based acngfs, to use a userspace filesystem for the apt cache.
 net-misc/aria2:bittorrent - Enable support for the bittorrent protocol.
+net-misc/aria2:gnutls - Use net-libs/gnutls as TLS provider (preferred). Otherwise, dev-libs/openssl will be used as TLS provider. Both apply only with USE=ssl.
 net-misc/aria2:libuv - Use dev-libs/libuv backend.
 net-misc/aria2:libxml2 - Use dev-libs/libxml2 for XML parsing (preferred) instead of dev-libs/expat.
 net-misc/aria2:metalink - Enable support for metalink.
-net-misc/aria2:nettle - Use dev-libs/nettle and dev-libs/gmp for bittorrent/metalink crypto instead of dev-libs/libgcrypt (when dev-libs/openssl is not being used).
+net-misc/aria2:nettle - Use dev-libs/nettle for message digests, plus dev-libs/gmp for bittorrent (if enabled). If this flag is disabled, dev-libs/libgcrypt is used instead. This flag is ignored if dev-libs/openssl is used.
 net-misc/aria2:scripts - Install additional scripts which use aria2's xmlrpc functionality.
 net-misc/aria2:ssh - Enable SFTP support.
 net-misc/asterisk:cluster - Enable high-availability support through the Corosync Cluster Engine
@@ -6684,7 +6697,7 @@ net-misc/icaclient:l10n_zh_CN - Install Chinese translation
 net-misc/icecast:kate - Add karaoke and text encapsulation support for Ogg files
 net-misc/icecast:logrotate - Install support files for app-admin/logrotate?
 net-misc/icecast:yp - Build support for yp public directory listings
-net-misc/iperf:profiling - Create a profiled iperf3 binary
+net-misc/iperf:profiling - Install profiled iperf3 binary iperf3_profile
 net-misc/iputils:SECURITY_HAZARD - Allow non-root users to flood (ping -f). This is generally a very bad idea.
 net-misc/iputils:arping - Build and install arping -- tool for sending ARP requests to peers (see also net-analyzer/arping)
 net-misc/iputils:clockdiff - Build and install clockdiff -- tool for comparing clocks via ICMP packets
@@ -6725,6 +6738,7 @@ net-misc/minidlna:netgear - Enable netgear branding
 net-misc/minidlna:readynas - Enable readynas branding
 net-misc/miniupnpd:igd2 - Build for IGDv2 instead of an IGDv1
 net-misc/miniupnpd:leasefile - Enable lease file.
+net-misc/miniupnpd:nftables - Use net-firewall/nftables rather than net-firewall/iptables.
 net-misc/miniupnpd:pcp-peer - Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.
 net-misc/miniupnpd:portinuse - Check if a port is in use before allowing a NAT-PMP client to map it.
 net-misc/miniupnpd:strict - Be more strict regarding compliance with UPnP specifications.
@@ -7074,6 +7088,7 @@ net-proxy/haproxy:net_ns - Enable network namespace support (CONFIG_NET_NS)
 net-proxy/haproxy:pcre-jit - Use JIT support for PCRE
 net-proxy/haproxy:pcre2 - Enable PCRE2 RegEx support
 net-proxy/haproxy:pcre2-jit - Use JIT support for PCRE2
+net-proxy/haproxy:prometheus-exporter - Also build the prometheus exporter
 net-proxy/haproxy:slz - Use dev-libs/libslz compression library
 net-proxy/haproxy:tools - Install additional tools (halog, iprange)
 net-proxy/haproxy:wurfl - Device Detection using WURFL
@@ -7505,6 +7520,11 @@ sci-libs/atlas:generic - Build atlas assuming a fairly generic architecture (sse
 sci-libs/avogadrolibs:archive - Enable archive support using app-arch/libarchive
 sci-libs/avogadrolibs:static-plugins - Build all plugins statically into main plugin modules
 sci-libs/avogadrolibs:vtk - Enable sci-libs/vtk support
+sci-libs/blis:64bit-index - Enable 64bit array indexing, incompatible with runtime switching
+sci-libs/blis:eselect-ldso - Enable runtime library switching by eselect and ld.so.
+sci-libs/blis:openmp - Use openmp threadding model
+sci-libs/blis:pthread - Use pthread threadding model
+sci-libs/blis:serial - Use no threadding model
 sci-libs/cantera:cti - Install CTI tools (ck2cti, ctml_writer) for conversion of Chemkin files to Cantera format
 sci-libs/cddlib:tools - Add a few executables and tests for cddlib
 sci-libs/ceres-solver:c++11 - Build ceres-solver using the C++11 standard
@@ -7559,6 +7579,8 @@ sci-libs/hypre:fei - Build the internal Finite Element Interface routines
 sci-libs/hypre:int64 - Build the 64 bits integer library
 sci-libs/ipopt:hsl - hsl
 sci-libs/ipopt:mumps - Enable sci-libs/mumps support
+sci-libs/lapack:eselect-ldso - Enable runtime library switching by eselect and ld.so.
+sci-libs/lapack:lapacke - Build LAPACKE
 sci-libs/lapack-reference:deprecated - Build deprecated routines
 sci-libs/lemon:coin - Enable the sci-libs/coinor-clp and sci-libs/coinor-cbc graph algorithms
 sci-libs/lemon:glpk - Enable GNU Linear Programming Kit sci-mathematics/glpk support
@@ -7701,7 +7723,6 @@ sci-mathematics/fricas:gcl - Add support for GNU Common Lisp (dev-lisp/gcl)
 sci-mathematics/fricas:sbcl - Add support for Steel Bank Common Lisp (dev-lisp/sbcl)
 sci-mathematics/geomview:motionaveraging - Enable experimental motion averaging technique
 sci-mathematics/gmp-ecm:custom-tune - Improve performance of some operations by selecting machine-specific defaults
-sci-mathematics/gmp-ecm:gwnum - Use GWNum lib where possible
 sci-mathematics/gretl:R - Enable support for dev-lang/R
 sci-mathematics/gsl-shell:fox - Build a x11-libs/fox GUI
 sci-mathematics/isabelle:graphbrowsing - Generate theory browsing information, including HTML documents that show a theory's definition, the theorems proved in its ML file and the relationship with its ancestors and descendants.
@@ -7815,6 +7836,7 @@ sci-physics/root:tbb - Enable implicit multi-threading (IMT) with dev-cpp/tbb
 sci-physics/root:tmva - Built TMVA (ROOT's multi-variate analysis toolkit for machine learning)
 sci-physics/root:unuran - Enable support for sci-mathematics/unuran
 sci-physics/root:vc - Enable support for dev-libs/vc with VecCore
+sci-physics/root:vmc - Built the Virtual Monte Carlo library
 sci-physics/root:xrootd - Build the interface for net-libs/xrootd
 sci-physics/thepeg:c++11 - Build ThePEG using the C++11 standard. Experimental feature, not for production use.
 sci-physics/thepeg:fastjet - Adds support for sci-physics/fastjet