gentoo resync : 19.04.2018

37 files changed, 57 insertions, 291 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5a85dedc152f..c3b68838bb63 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index e674cd9a232b..4df313c54eb3 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -200,8 +200,8 @@ dev-python/wsgiproxy2 test
 dev-python/urllib3 test
 
 # Gilles Dartiguelongue <eva@gentoo.org> (09 Jun 2015)
-# dev-lang/luajit and dev-lua/lgi and lack alpha keyword, bug #551540
-dev-libs/libpeas lua jit
+# dev-lua/lgi lacks alpha keyword, bug #551540
+dev-libs/libpeas lua
 
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet tested #499974
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 03047ff56b80..3da21307f578 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -50,7 +50,6 @@ media-video/ffmpeg frei0r sofalizer
 # Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
 # Unkeyworded dependencies.
 app-doc/doxygen clang
-dev-libs/libpeas jit
 dev-perl/GD fcgi
 media-libs/libcanberra gnome
 media-libs/mesa vaapi
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 3b89d0f1559e..926766099c9d 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -23,12 +23,12 @@ mail-client/novell-groupwise-client
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
-=app-editors/emacs-18*
 >=app-i18n/atokx3-3.0.0
 app-accessibility/mbrola
 app-accessibility/perlbox-voice
 app-arch/stuffit
 app-benchmarks/cpuburn
+app-editors/emacs:18
 app-emulation/crossover-bin
 app-emulation/playonlinux
 app-emulation/q4wine
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 3992c3053e61..d41611604aeb 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Richard Yao <ryao@gentoo.org> (16 Apr 2018)
+# sys-fs/zfs is keyworded on amd64
+sys-cluster/ceph -zfs
+sys-boot/grub -libzfs
+
 # Amy Liffey <amynka@gentoo.org> (19 Sep 2017)
 # [cuda] is unmasked in this profiles.
 media-libs/opencv -contrib_xfeatures2d
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 6bc0e5760b78..3614c2756306 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -61,7 +61,3 @@ dev-python/apptools test
 # impl there anyway. Please keep this in sync with use.stable.mask.
 dev-lang/python-exec -python_targets_pypy
 dev-lang/python-exec -python_targets_pypy3
-
-# Tom Wijsman <TomWij@gentoo.org> (06 Feb 2014)
-# [QA] Masked jit USE flag on www-apps/cgit as dev-lang/luajit is not stable.
-www-apps/cgit jit
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index c83107d7c69a..4d7e22573456 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -25,10 +25,6 @@ media-sound/mpd fluidsynth
 <=media-video/ffmpeg-3.3.6 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (26 May 2017)
-# toolame not stable yet
-~media-video/mplayer-1.2.1 toolame
-
-# Alexis Ballier <aballier@gentoo.org> (26 May 2017)
 # No musepack-tools stable yet
 media-video/vlc musepack
 media-plugins/gst-plugins-meta:0.10 musepack
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 74e0daa9b4a6..e0f915bea877 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -111,8 +111,7 @@ media-libs/opencv vtk
 
 # Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
 # USE=lua requires dev-lua/lgi that is not keyworded yet.
-# USE=lua,jit required dev-lang/luajit that is not keyworded yet.
-dev-libs/libpeas lua jit
+dev-libs/libpeas lua
 
 # Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
 # Requires dev-libs/efl that is not keyworded.
@@ -275,7 +274,7 @@ net-libs/libpcap bluetooth
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
 # Not yet tested features/dependencies
 app-text/evince dvi nautilus postscript t1lib xps
-xfce-extra/xfce4-taskmanager gksu gtk3
+xfce-extra/xfce4-taskmanager gtk3
 net-wireless/blueman appindicator
 x11-libs/gtk+ cloudprint
 
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 001f04631e2f..6786118cca06 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Richard Yao <ryao@gentoo.org> (16 Apr 2018)
+# sys-fs/zfs is not available everywhere.
+sys-cluster/ceph zfs
+
 # Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
 # Moved from use.mask since it is a flag local to one package:
 # Joseph Jezak <josejx@gentoo.org> (11 Mar 2007)
@@ -156,6 +160,10 @@ net-libs/gnutls dane
 # fontconfig-infinality dependency not yet keyworded on most arches
 media-libs/freetype infinality
 
+# Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
+# sys-fs/zfs is not available everywhere.
+sys-boot/grub libzfs
+
 # Michał Górny <mgorny@gentoo.org> (11 Apr 2012)
 # JIT compilation in libzpaq generates code for x86/amd64.
 app-arch/zpaq jit
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 900b90b13010..7545b9fc9f77 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -24,9 +24,6 @@ cuda
 # masking here, and unmasking in arch/x86/use.mask
 vidix
 
-# Mask as long its not available everywhere
-zeitgeist
-
 # vdpau is currently only available with binary nvidia-drivers, thus amd64/x86*
 vdpau
 
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index c4e79c8e3f7f..f7b6072c7a59 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -135,10 +135,6 @@ dev-python/pymongo test
 # USE=gui requires x11-libs/qscintilla,
 sci-mathematics/octave gui
 
-# Jeroen Roovers <jer@gentoo.org> (31 Jan 2014)
-# Mask x11-libs/libgksu dependency (bug #499900)
-xfce-extra/xfce4-taskmanager gksu
-
 # Julian Ospald <hasufell@gentoo.org> (23 Nov 2013)
 # needs app-arch/innoextract (bug #492326)
 games-fps/duke3d-data gog
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index ab487608b784..d38ac61fcce9 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -189,8 +189,8 @@ net-analyzer/wireshark doc-pdf
 net-misc/spice-gtk smartcard webdav
 
 # Gilles Dartiguelongue <eva@gentoo.org> (09 Jun 2015)
-# dev-lang/luajit and dev-lua/lgi and lack ia64 keyword, bug #551540
-dev-libs/libpeas lua jit
+# dev-lang/luajit lacks ia64 keyword, bug #551540
+dev-libs/libpeas lua
 
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
@@ -223,10 +223,6 @@ net-misc/modemmanager mbim
 # Various deps not ported to ia64.
 dev-python/ipython nbconvert notebook
 
-# Mike Frysinger <vapier@gentoo.org> (15 Mar 2014)
-# dev-python/greenlet is not ported to ia64.
-dev-python/pyzmq green test
-
 # Pacho Ramos <pacho@gentoo.org> (15 Mar 2014)
 # Missing keywords, bug #504672
 >=net-misc/vinagre-3.10 rdp
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 806ef205bdcf..34b87e8547d0 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -119,10 +119,6 @@ net-print/hplip qt5
 # Unkeyworded dependency x11-libs/snorenotify
 net-irc/quassel snorenotify
 
-# Rick Farina <zerochaos@gentoo.org> (23 Mar 2016)
-# rspec:3 is not keyworded for x86 at this time
-=dev-ruby/bundler-audit-0.5.0 test
-
 # Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
 # Missing test deps keyword #575366
 dev-cpp/eigen test
@@ -214,10 +210,6 @@ dev-python/ipython doc matplotlib mongodb nbconvert notebook qt4 test
 dev-ruby/actionpack test
 
 # Anthony G. Basile <blueness@gentoo.org> (12 Aug 2014)
-# Ultimately pulls in nodejs which is broken.
-dev-ruby/tilt test
-
-# Anthony G. Basile <blueness@gentoo.org> (12 Aug 2014)
 # Pulls in ceph which is broken.  Masked per dev-zero.
 sys-block/fio rbd
 
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 31362741dc8e..aadc14726b50 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -66,10 +66,6 @@ dev-qt/qtwebkit webchannel
 # missing keywords
 media-sound/audacity midi soundtouch
 
-# Gilles Dartiguelongue <eva@gentoo.org> (09 Jun 2015)
-# dev-lang/luajit lack ppc64 keyword, bug #551540
-dev-libs/libpeas jit
-
 # Matthias Maier <tamiko@gentoo.org> (24 Dec 2014)
 # sys-devel/clang is not keyworded
 app-doc/doxygen clang
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 4f80ef62c19d..0fbf87849226 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -181,8 +181,8 @@ net-misc/spice-gtk smartcard webdav
 gnome-base/gvfs nfs
 
 # Gilles Dartiguelongue <eva@gentoo.org> (09 Jun 2015)
-# dev-lang/luajit and dev-lua/lgi and lack sparc keyword, bug #551540
-dev-libs/libpeas lua jit
+# dev-lua/lgi lacks sparc keyword, bug #551540
+dev-libs/libpeas lua
 
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 66a141d336eb..4ce7a76c9bae 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,11 +3,6 @@
 
 # This file requires >=portage-2.1.1
 
-# Richard Yao <ryao@gentoo.org> (16 Mar 2018)
-# sys-fs/zfs is not keyworded stable.
-sys-cluster/ceph zfs
-sys-boot/grub libzfs
-
 # Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (14 Mar 2018)
 # Expose SVGA backend for x86 users
 app-emulation/fuse -backend-svga
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index bbfe51d2b16f..0613e38e5ad8 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -64,7 +64,3 @@ dev-python/apptools test
 # impl there anyway. Please keep this in sync with use.stable.mask.
 dev-lang/python-exec -python_targets_pypy
 dev-lang/python-exec -python_targets_pypy3
-
-# Tom Wijsman <TomWij@gentoo.org> (06 Feb 2014)
-# [QA] Masked jit USE flag on www-apps/cgit as dev-lang/luajit is not stable.
-www-apps/cgit jit
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0a8dd471109c..cb48137d09c9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -37,10 +37,6 @@ net-mail/fetchmail hesiod
 sys-freebsd/freebsd-lib hesiod
 
 # Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# dev-java/jad-bin will be removed (#619770)
-dev-lisp/abcl jad
-
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
 # app-misc/cwiid will be removed (#608780)
 media-sound/supercollider wiimote
 
@@ -90,10 +86,6 @@ dev-qt/qtdemo:4 phonon
 dev-python/PyQt4 phonon
 dev-python/pyside:0 phonon
 
-# Brian Evans <grknight@gentoo.org> (22 Feb 2018)
-# Depends on vulnerable dev-php/ZendFramework which is masked for removal
-www-apps/postfixadmin xmlrpc
-
 # Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2018)
 # Depends on unreleased media-libs/libaom, and 9999 is currently broken
 media-video/vlc aom
@@ -120,18 +112,11 @@ net-analyzer/nagios-plugin-check_raid i2o
 media-video/ffmpeg appkit
 
 # Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
-# The whole zeitgeist stuck is dead (#629180)
+# The whole zeitgeist stack is dead (#629180)
 gnome-extra/synapse zeitgeist
-www-client/midori zeitgeist
 app-editors/gedit-plugins zeitgeist
-app-misc/bijiben zeitgeist
 dev-libs/folks zeitgeist
-media-sound/rhythmbox zeitgeist
-media-video/totem zeitgeist
-
-# Pacho Ramos <pacho@gentoo.org> (27 Dec 2017)
-# We will remove ptlib, its support was broken anyway (#624578).
-net-voip/yate h323
+www-client/midori zeitgeist
 
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
 # Java 9 is not yet fully supported on Gentoo. Having a masked
@@ -393,14 +378,8 @@ dev-java/icedtea cacao jamvm
 
 # Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2016)
 # Need vulnerable libotr version (see bug #576914).
-net-im/centerim otr
 =net-im/climm-0.7.1 otr
 
-# James Le Cuirot <chewi@gentoo.org> (14 Mar 2016)
-# jtds:1.2 needs removing because it depends on Java 6. Unfortunately
-# we can't stabilise the latest sqldeveloper yet because of Java 8.
-<dev-db/sqldeveloper-4.1.3.20.78-r1 mssql sybase
-
 # Patrice Clement <monsieurp@gentoo.org> (27 Nov 2015)
 # Unsastified dependencies are upsetting repoman. Needs investigation.
 app-arch/cfv bittorrent
@@ -675,7 +654,6 @@ media-sound/pulseaudio system-wide
 
 # These are for BSD only
 net-proxy/squid ipf-transparent pf-transparent
-app-admin/sshguard ipfilter
 
 # Alexis Ballier <aballier@gentoo.org> <16 Feb 2011>
 # Win32 specific useflags for vlc. Can be used for cross-compiling.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 9d0606481eeb..789c8b522a4d 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -93,6 +93,10 @@ media-plugins/kipi-plugins mediawiki vkontakte
 # Requires testing version of media-libs/opencv
 media-libs/mlt opencv
 
+# Matthias Maier <tamiko@gentoo.org> (22 Jan 2017)
+# sys-fs/zfs isn't going to be marked stable anytime soon
+app-emulation/libvirt zfs
+
 # Michael Palimaka <kensington@gentoo.org (18 Jan 2017)
 # www-client/weboob is horribly outdated and not stable
 app-office/kmymoney weboob
@@ -105,8 +109,6 @@ sci-libs/vtk mpi
 # Doug Goldstein <cardoe@gentoo.org> (04 Jan 2017)
 # libcxx is not stable so we can't let users use it
 dev-lang/rust libcxx
-# llvm 3.8.x is not stable so we can't let users use it
-dev-lang/rust system-llvm
 
 # Alon Bar-Lev <alonbl@gentoo.org> (01 Jan 2017)
 # Will always require unstable packages.
@@ -150,10 +152,6 @@ net-analyzer/pmacct mongodb
 # See bug #541012
 sci-libs/openfoam paraview
 
-# Pacho Ramos <pacho@gentoo.org>
-# dev-libs/libappindicator isn't going to be stabilized
-x11-misc/redshift appindicator
-
 # Ben de Groot <yngwin@gentoo.org>
 # Mask experimental feature on stable. This also needs not yet stable mupdf.
 app-text/qpdfview fitz
diff --git a/profiles/default/bsd/package.mask b/profiles/default/bsd/package.mask
index bbd7655d6767..6dee40709090 100644
--- a/profiles/default/bsd/package.mask
+++ b/profiles/default/bsd/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Mask out the GNU versions of various packages.
@@ -10,7 +10,6 @@ net-misc/iputils
 sys-apps/hardened-shadow
 sys-apps/shadow
 sys-apps/utempter
-sys-apps/util-linux
 sys-apps/which
 sys-libs/glibc
 sys-libs/libcap
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 36c55aea30d4..f1326439248d 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -28,7 +28,6 @@ app-text/asciidoc test highlight
 # iproute2 - linux only
 net-vpn/openvpn iproute2
 
-app-admin/sshguard -ipfilter
 media-video/ffmpeg ieee1394 iec61883
 net-libs/c-client pam
 net-proxy/squid -ipf-transparent -pf-transparent
diff --git a/profiles/default/linux/musl/amd64/package.mask b/profiles/default/linux/musl/amd64/package.mask
index 2d46a562aced..e6bfd5387f92 100644
--- a/profiles/default/linux/musl/amd64/package.mask
+++ b/profiles/default/linux/musl/amd64/package.mask
@@ -3,5 +3,5 @@
 
 # Ulrich Müller <ulm@gentoo.org> (18 Mar 2013)
 # Packages that rely on multilib
-=app-editors/emacs-18*
+app-editors/emacs:18
 net-misc/icaclient
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index 313dfc4b59a8..00db1412867c 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 sys-libs/uclibc
@@ -16,9 +16,6 @@ sys-fs/udev
 dev-libs/elfutils
 >virtual/libelf-2
 
-# packages that unconditionally depend on dev-libs/elfutils
-<net-firewall/fwbuilder-5.3.7
-
 # packages that need masked packages or multilib
 dev-games/gtkradiant
 dev-games/ps2-packer
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index a864e077b43c..82dd641f675f 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -7,7 +7,7 @@ app-accessibility/mbrola
 app-accessibility/perlbox-voice
 app-arch/stuffit
 app-benchmarks/cpuburn
-=app-editors/emacs-18*
+app-editors/emacs:18
 app-emulation/crossover-bin
 app-emulation/playonlinux
 app-emulation/q4wine
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index b94a8ca92688..69d4b596c387 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 sys-libs/musl
@@ -13,9 +13,6 @@ sys-fs/udev
 dev-libs/elfutils
 >virtual/libelf-2
 
-# packages that unconditionally depend on dev-libs/elfutils
-<net-firewall/fwbuilder-5.3.7
-
 # These binary pkgs have a hard dep on glibc; make repoman shut up
 app-arch/rar
 dev-games/gtkradiant
diff --git a/profiles/desc/gpsd_protocols.desc b/profiles/desc/gpsd_protocols.desc
index dc148efc497b..d85396bb827c 100644
--- a/profiles/desc/gpsd_protocols.desc
+++ b/profiles/desc/gpsd_protocols.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of possible protocols for gpsd package.
@@ -18,7 +18,6 @@ isync - Isync protocol support
 itrax - iTrax protocol support
 mtk3301 - MTK-3301 protocol support
 navcom - Navcom protocol support
-nmea - NMEA protocol support
 nmea0183 - NMEA protocol support
 nmea2000 - NMEA2000/CAN support
 ntrip - NTRIP protocol support
diff --git a/profiles/desc/xfce_plugins.desc b/profiles/desc/xfce_plugins.desc
deleted file mode 100644
index 1e9f7d3cb6e5..000000000000
--- a/profiles/desc/xfce_plugins.desc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of XFCE_PLUGINS USE_EXPAND flags.
-
-# Keep it sorted.
-
-clock - Build xfce4-orageclock-plugin for panel
-power - Build power management plug-in for panel
-trash - Build thunar-tpa (trash) plugin for panel
diff --git a/profiles/features/hardened/amd64/package.mask b/profiles/features/hardened/amd64/package.mask
index 76612099e7c4..6320e8b0055e 100644
--- a/profiles/features/hardened/amd64/package.mask
+++ b/profiles/features/hardened/amd64/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Cernlib has address space issues on amd64 and package is no
@@ -7,5 +7,4 @@
 # See bug 426764.
 sci-physics/cernlib
 sci-physics/cernlib-montecarlo
-sci-physics/geant:3
 sci-physics/paw
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index cb795facd556..cf2cec955617 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -16,9 +16,6 @@ sys-fs/udev
 dev-libs/elfutils
 >virtual/libelf-2
 
-# packages that unconditionally depend on dev-libs/elfutils
-<net-firewall/fwbuilder-5.3.7
-
 # Ian Stakenvicius, 2017-06-14
 # on behalf of mozilla@gentoo.org
 # Mask firefox-54 and above as it requires rust
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 554b7b3ca5da..2e28bee7cd74 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -26,7 +26,7 @@ app-accessibility/mbrola
 app-accessibility/perlbox-voice
 app-arch/stuffit
 app-benchmarks/cpuburn
-=app-editors/emacs-18*
+app-editors/emacs:18
 app-emulation/crossover-bin
 app-emulation/genymotion-bin
 app-emulation/playonlinux
@@ -112,7 +112,6 @@ games-fps/ut2004-demo
 games-misc/little-inferno
 games-puzzle/hoh-bin
 games-roguelike/adom
-<games-roguelike/dwarf-fortress-0.43.0
 games-rpg/baldurs-gate-ee
 games-rpg/dear-esther
 games-rpg/eschalon-book-1-demo
diff --git a/profiles/license_groups b/profiles/license_groups
index 261669420294..c8cc689bb9bc 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA supermicro TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs StarUML-EULA supermicro TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index cb84238efb1e..ee204f5648ac 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,17 +29,24 @@
 
 #--- END OF EXAMPLES ---
 
+# Lars Wendler <polynomial-c@gentoo.org> (18 Mar 2018)
+# Breaks consumers most likely because of the following change:
+#   * Add const to several classes and members
+# See tracker bug #653464
+>=app-text/poppler-0.64.0
+
+# Lars Wendler <polynomial-c@gentoo.org> (17 Apr 2018)
+# Changed output for ELF files, which results in no files (either
+# executables or libraries) being stripped.
+# Masked for about two weeks so package managers can be adjusted.
+# See https://bugs.gentoo.org/653352
+>=sys-apps/file-5.33
+
 # Andreas Sturmlechner <asturm@gentoo.org> (10 Apr 2018)
 # Depends on dead Qt4. Switch to media-gfx/scantailor-advanced instead.
 # Masked for removal in 30 days. Bug #633386
 media-gfx/scantailor
 
-# Andreas Sturmlechner <asturm@gentoo.org> (09 Apr 2018)
-# Obsolete dev-texlive/* cleanup. Content moved into other packages.
-dev-texlive/texlive-documentation-base
-dev-texlive/texlive-mathextra
-dev-texlive/texlive-science
-
 # Andreas Sturmlechner <asturm@gentoo.org> (08 Apr 2018)
 # Depends on dead Qt4. Masked for removal in 30 days. Bug #649124
 dev-python/PyFoam
@@ -207,11 +214,6 @@ dev-db/mysql-udf-infusion
 dev-python/visual
 
 # Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# Version bump pending for a long time, depends in QT4 (#630476). Removal in
-# a month.
-x11-misc/treeline
-
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
 # Security vulnerable (#630954, #635548). Removal in a month. 
 media-sound/mp3gain
 media-sound/aacgain
@@ -310,14 +312,6 @@ x11-misc/dockmanager
 games-arcade/monster-masher
 
 # Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# Relies on dead QT4 (#644422), build issues (#629728). Removal in a month.
-media-video/videocut
-
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# Depends on dead QT4 (#644480). Removal in a month.
-sci-electronics/plcedit
-
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
 # Tests fail, package has no reverse deps and is not really needed at
 # present time (#645166). Removal in a month.
 dev-python/jenkins-autojobs
@@ -352,24 +346,10 @@ app-editors/cooledit
 app-mobilephone/ringtonetools
 
 # Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# Dead for years, probably not needed anymore at present time (#648102).
-# Removal in a month.
-app-laptop/lphdisk
-
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# Dead for a long time, broken with current kernels (#648392). Removal in a
-# month.
-net-dialup/hcfpcimodem
-
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
 # Not useful anymore without warsow (#648676). Removal in a month.
 games-fps/warsow-community-map-pack
 
 # Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# Needs QT4, fails to build (#648706, #650640). Removal in a month.
-media-sound/qarecord
-
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
 # Library dead for years, finally nothing in the tree requires it anymore
 # (#648996). Removal in a month.
 dev-cpp/libgnomemm
@@ -518,14 +498,6 @@ games-server/cyphesis
 # Not buildable (#627102, #630850). Removal in a month.
 dev-games/crystalspace
 
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# Dead for years, nothing needs it (#627464). Removal in a month.
-dev-java/commons-betwixt
-
-# Fabian Groffen <grobian@gentoo.org> (16 Mar 2018)
-# Exim release candidates, use at your own risk
-=mail-mta/exim-4.91_rc*
-
 # Georgy Yakovlev <ya@sysdump.net> (13 Mar 2018)
 # 1.x version is no longer maintained by upstream
 # 2.x is in the tree and is better in almost every way
@@ -533,42 +505,11 @@ dev-java/commons-betwixt
 =net-dns/dnscrypt-proxy-1.9.5-r1
 
 # Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
-# Tests need network, nothing requires this old lib anymore and upstream is
-# dead for a long time (#335233). Removal in a month.
-net-libs/netembryo
-
-# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
-# Fails to build (#371401, #642676). Removal in a month.
-net-misc/netkit-rwall
-
-# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
-# Incomplete and unclear LICENSE, missing files in SRC_URI (#472602).
-# Removal in a month.
-sci-electronics/balsa
-
-# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
 # Upstream dead for a long time, requires obsolete gstreamer and other old
 # libs (#629192), buggy (#490344). Removal in a month.
 media-tv/me-tv
 
 # Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
-# Doesn't build for a long time (#514432). Removal in a month.
-sci-biology/beast-mcmc
-
-# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
-# Fails to build (#514632, #585606, #588710). Removal in a month.
-sys-power/phc-k8
-
-# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
-# Fails to build for a long time (#515734, 649840). Removal in a month.
-sys-fs/gfs2-utils
-
-# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
-# Many other ident daemons in the tree over this completely dead and
-# unmaintained (since 2003) implementation (#535868). Removal in a month.
-net-misc/linux-identd
-
-# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
 # Major version bump pending (#540322), current version in the tree is
 # completely broken in several ways (#471428, #598260, #621784, #638364).
 # Removal in a month.
@@ -590,33 +531,10 @@ app-forensics/rdd
 # month.
 net-p2p/tribler
 
-# Tobias Klausmann <klausman@gentoo.org> (13 Mar 2018)
-# Has a bug in the storage engine, details:
-# https://www.robustperception.io/new-features-in-prometheus-2-2-0/
-# https://github.com/prometheus/prometheus/issues/3943
-=net-analyzer/prometheus-2.2.0
-
 # Sebastian Pipping <sping@gentoo.org> (11 Mar 2018)
 # Breaks XFCE, 1.19.6 was fine (in that regard). Bug #650228
 >=x11-base/xorg-server-1.19.7
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (03 Mar 2018)
-# Fails to build without rpc support in glibc (bug 631044);
-# no maintainer, requires obsolete hardware. Removal in
-# 30 days.
-app-pda/p3nfs
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (03 Mar 2018)
-# Fails to build without rpc support in glibc (bug 377867);
-# fails to build with libtirpc; apparently functionality is
-# now included in libtirpc. No consumers. Removal in 30 days.
-net-libs/librpcsecgss
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (03 Mar 2018)
-# Marked obsolete on CTAN. EAPI=3 ebuild. No consumers.
-# Masked for removal in 30 days. Bug 644258
-app-text/noweb
-
 # Tim Harder <radhermit@gentoo.org> (01 Mar 2018)
 # Masked for testing.
 >=dev-python/aiohttp-3
@@ -661,12 +579,6 @@ media-libs/libdvdplay
 # Masked for removal in 30 days. Bug #648560
 media-video/aacskeys
 
-# Michael Palimaka <kensington@gentoo.org> (22 Feb 2018)
-# Plugin for removed package media-sound/amarok. Dead upstream.
-# Depends on vulnerable gstreamer:0.10.
-# Masked for removal in 30 days. Bug #629184.
-media-sound/moodbar
-
 # Eray Aslan <eras@gentoo.org> (08 Feb 2018)
 # Mask experimental software
 =mail-mta/postfix-3.4*
@@ -758,10 +670,6 @@ games-kids/crayon-physics
 # Missing dependencies.
 >=dev-python/scrapy-1.4.0
 
-# Robin H. Johnson <robbat2@gentoo.org> (22 Oct 2017)
-# Masking for testing, contains Fedora Hobbled-EC for USE=bindist
-=dev-libs/openssl-1.0.2l-r1
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (22 Oct 2017)
 # Broken with recent Perl (5.26) and not used by anything
 # in the Gentoo repository. Please uninstall.
@@ -795,15 +703,6 @@ sys-devel/automake:1.8
 # See bug #634040
 <perl-core/Unicode-Collate-1.190.0-r99
 
-# Michał Górny <mgorny@gentoo.org> (05 Oct 2017)
-# (on behalf of QA)
-# Rogue version bumps that reintroduce QA violations that were fixed
-# in #598527 and #598529, breaking the current verison
-# of app-portage/eix as a result, #633424. Do not reintroduce without
-# prior review from QA.
-=app-shells/push-3.0
-=app-shells/quoter-4.0
-
 # Patrice Clement <monsieurp@gentoo.org> (01 Oct 2017)
 # Mask Atom betas for testing.
 app-editors/atom:beta
@@ -842,12 +741,6 @@ app-arch/unrar-gpl
 # Unset python_targets_python2_7 for ipykernel and ipyparallel if needed.
 >=dev-python/ipython-6
 
-# Michael Orlitzky <mjo@gentoo.org> (18 Aug 2017)
-# Last version from 2011, and has a vulnerable init script
-# (bug 603382). The proxy-maintainer is unknown to bugzilla,
-# and the previous maintainer jmbsvicetto is OK with masking.
-<net-misc/vde-2.3.2-r4
-
 # Mats Lidell <matsl@gentoo.org> (17 Aug 2017)
 # Masked ede and all its dependencies due to security reasons. 
 # bug #398241
@@ -896,18 +789,6 @@ net-vpn/kvpnc
 # Unmask when it is finally fixed, so people can build the package.
 dev-util/mutrace
 
-# Matthias Schwarzott <zzam@gentoo.org> (03 Jul 2017)
-# The snapshots got a wrong version number assigned.
-# They are from before version 2.0.0. Masking them to force
-# an update to version 2.0.0 as soon as it is added to the tree.
-=media-plugins/vdr-xineliboutput-2.0.0_p20130821
-=media-plugins/vdr-xineliboutput-2.0.0_p20150220
-
-# Thomas Deutschmann <whissi@gentoo.org> (28 Jun 2017)
-# New strip feature which is enabled by default causes genkernel
-# to create unbootable kernel/initramfs images. Bug #622716
-=sys-kernel/genkernel-3.5.1.0
-
 # Hans de Graaff <graaff@gentoo.org> (05 Jun 2017)
 # Bundles obsolete and vulnerable webkit version.
 # Upstream has stopped development and recommends using
@@ -957,13 +838,6 @@ net-wireless/cpyrit-cuda
 =net-ftp/filezilla-3.30.0-r300
 =net-ftp/filezilla-3.31.0-r300
 
-# Rick Farina <zerochaos@gentoo.org> (17 Apr 2017)
-# Masking old versions because upstream changed versioning
-# Please keep this mask for 1 year to ease upgrades for users
-=app-crypt/hashcat-3.10-r1
-=app-crypt/hashcat-3.30
-=app-crypt/hashcat-3.40
-
 # Lars Wendler <polynomial-c@gentoo.org> (24 Mar 2017)
 # Masked until Mozilla and Chrome agreed how to handle
 # Symantec trust issues properly (bug #613714)
@@ -994,12 +868,6 @@ media-plugins/gst-plugins-ffmpeg
 # Alpha release with new features, masked for testing
 =app-text/tesseract-4.00.00_alpha*
 
-# Yixun Lan <dlan@gentoo.org> (16 Jan 2017)
-# Masked, Vulnerable due to RGW Denial of Service (bug #598206)
-# We mask it instead of removing them, due user may need them while
-# upgrade from old versions (<0.94.x)
-<sys-cluster/ceph-10.2.3-r1
-
 # Jeroen Roovers <jer@gentoo.org> (12 Jan 2017)
 # Use x11-drivers/nvidia-drivers[tools] instead.
 media-video/nvidia-settings
@@ -1034,11 +902,6 @@ app-admin/amazon-ec2-init
 # Masked while being tested and reverse deps aren't fully compatible
 =dev-libs/openssl-1.1*
 
-# Chris Reffett <creffett@gentoo.org> (25 May 2016)
-# The webkit-gtk:4 backend for Xiphos has known text display issues.
-# Use at your own risk.
-=app-text/xiphos-4.0.4-r1
-
 # James Le Cuirot <chewi@gentoo.org> (03 Apr 2016)
 # Masking Spring Framework for the time being as 3.2.4 is old, has
 # multiple vulnerabilities, and we're not likely to update it
@@ -1126,7 +989,6 @@ games-strategy/smac
 # Rafael Martins <rafaelmartins@gentoo.org> (04 Dec 2016)
 # Adding Lua 5.3 to mask
 app-eselect/eselect-lua
-=dev-lang/lua-5.1.5-r2
 =dev-lang/lua-5.1.5-r100
 =dev-lang/lua-5.1.5-r101
 =dev-lang/lua-5.2.3
diff --git a/profiles/prefix/aix/package.mask b/profiles/prefix/aix/package.mask
index 623528a0bf3a..fc5cca327375 100644
--- a/profiles/prefix/aix/package.mask
+++ b/profiles/prefix/aix/package.mask
@@ -1,14 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (03 Mar 2017)
 # Breaks (openssh, ...) because of PR target/65058
 >=sys-devel/gcc-4.8.5
 
-# Michael Haubenwallner <haubi@gentoo.org> (14 Apr 2014)
-# Endless loop while compiling gcc-4.2.4 for yet unknown reason.
-~sys-devel/make-4.0
-
 # Fabian Groffen <grobian@gentoo.org> (04 Apr 2007)
 # This is the only linker for AIX
 -sys-devel/native-cctools
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index ef90eac4facc..df8c57b6683a 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,11 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-
-# Fabian Groffen <grobian@gentoo.org> (18 Dec 2016)
-# has multiple compilation issue, resolved for 1.1.8, bug #602990
-=app-misc/pax-utils-1.1.7
-
 # Fabian Groffen <grobian@gentoo.org> (31 May 2015)
 # fails to compile due to some missing compilerrt stuff, hints at asan,
 # not sure what the problem actually is, 3.7 and 3.8 compile just fine
@@ -28,11 +23,6 @@ sys-devel/gcc
 # Does not support Darwin, http://mj.ucw.cz/pciutils.html
 sys-apps/pciutils
 
-# Fabian Groffen <grobian@gentoo.org> (11 May 2011)
-# Uses the horribly broken build-system waf.  When hacked far enough,
-# produces a MH_OBJ with invalid install_name called _cairo.bundle.
-~dev-python/pycairo-1.10.0
-
 # Fabian Groffen <grobian@gentoo.org> (21 Apr 2010)
 # state of mesa is probably not too good on OSX, opengl-apple is
 # preferred
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 5e9d14563ad5..c794eb922582 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,11 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-
-# Fabian Groffen <grobian@gentoo.org> (18 Dec 2016)
-# has multiple compilation issue, resolved for 1.1.8, bug #602990
-=app-misc/pax-utils-1.1.7
-
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Solaris systems
 sys-apps/util-linux
diff --git a/profiles/use.desc b/profiles/use.desc
index 5bf9a1d7f693..860efe224b26 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -14,7 +14,6 @@ acl - Add support for Access Control Lists
 acpi - Add support for Advanced Configuration and Power Interface
 adns - Add support for asynchronous DNS resolution
 afs - Add OpenAFS support (distributed file system)
-aim - Enable AIM IM protocol support
 alsa - Add support for media-libs/alsa-lib (Advanced Linux Sound Architecture)
 altivec - Add support for optimizations for G4 and G5/ppc970 processors
 ao - Use libao audio output library for sound playback
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 59e3b12f18d6..88152c75a2bb 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -398,7 +398,6 @@ app-editors/emacs-vcs:gzip-el - Compress bundled Emacs Lisp source
 app-editors/emacs-vcs:imagemagick - Use media-gfx/imagemagick for image processing
 app-editors/emacs-vcs:libxml2 - Use dev-libs/libxml2 to parse XML instead of the internal Lisp implementations
 app-editors/emacs-vcs:mailutils - Retrieve e-mail using net-mail/mailutils instead of the internal movemail substitute
-app-editors/emacs-vcs:pax_kernel - Enable building under a PaX enabled kernel
 app-editors/emacs-vcs:source - Install C source files and make them available for find-function
 app-editors/emacs-vcs:threads - Add elisp threading support
 app-editors/emacs-vcs:toolkit-scroll-bars - Use the selected toolkit's scrollbars in preference to Emacs' own scrollbars
@@ -3322,6 +3321,7 @@ games-strategy/freeciv:server - Enable server support. Disabling this will also
 games-strategy/freeciv:sound - Add support for sound provided by media-libs/sdl-mixer
 games-strategy/freeciv:system-lua - Use dev-lang/lua instead of the bundled liblua
 games-strategy/freesynd:devtools - Build development tools
+games-strategy/hedgewars:server - Enable local server
 games-strategy/heroes3:maps - Installs optional map data
 games-strategy/heroes3:music - Installs optional music data
 games-strategy/heroes3:sounds - Installs optional sound data
@@ -4795,7 +4795,6 @@ media-tv/kodi:udev - Use sys-fs/udev rules to handle devices' permissions and ho
 media-tv/kodi:webserver - Enable internal webserver
 media-tv/kodi:xslt - Enable XSLT support using dev-libs/libxslt
 media-tv/linuxtv-dvb-apps:alevt - Build videotext decoder
-media-tv/me-tv:http - Installation of Web-frontend
 media-tv/mythtv:alsa - Allows MythTV to directly output sound to ALSA devices, this is needed if you are using ALSA dmix or SPDIF. Note, you will have to physically type your device into the MythTV configuration since it will only give you /dev/dsp devices in the drop down.
 media-tv/mythtv:altivec - Builds ffmpeg's codec libraries with altivec support.
 media-tv/mythtv:autostart - Uses a custom autostart configuration gleaned from experience with MythTV since its early versions and discussed with other MythTV maintainers and users. Does not rely on KDE being installed like most methods do.
@@ -5483,6 +5482,7 @@ net-dns/avahi:howl-compat - Enable compat libraries for howl
 net-dns/avahi:mdnsresponder-compat - Enable compat libraries for mDNSResponder
 net-dns/avahi:utils - Install the avahi gtk+ utils avahi-discover, bssh, and bvnc
 net-dns/bind:dlz - Enables dynamic loaded zones, 3rd party extension
+net-dns/bind:dnsrps - Enable the DNS Response Policy Service (DNSRPS) API, a mechanism to allow an external response policy provider
 net-dns/bind:dnstap - Enables dnstap packet logging
 net-dns/bind:filter-aaaa - Enable filtering of AAAA records over IPv4
 net-dns/bind:fixed-rrset - Enables fixed rrset-order option
@@ -7780,6 +7780,7 @@ sys-block/gparted:reiser4 - Include ReiserFS4 support (sys-fs/reiser4progs)
 sys-block/gparted:reiserfs - Include ReiserFS support (sys-fs/reiserfsprogs)
 sys-block/gparted:udf - Include UDF support (sys-fs/udftools)
 sys-block/gparted:xfs - Include XFS support (sys-fs/xfsprogs, sys-fs/xfsdump)
+sys-block/nbd:netlink - Add support for netlink protocol via dev-libs/libnl
 sys-block/open-iscsi:rdma - Support iSCSI over RDMA
 sys-block/open-iscsi:tcp - Support iSCSI over TCP
 sys-block/parted:debug - Enable debugging as encouraged by upstream: [The default configuration] includes --enable-debug (by default), which contains many assertions. Obviously, these "waste" space, but in the past, they have caught potentially dangerous bugs before they would have done damage, so we think it's worth it. Also, it means we get more bug reports ;)