gentoo resync : 15.09.2018

42 files changed, 115 insertions, 176 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c656d1d557b2..205ecae2dee7 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.mask b/profiles/arch/alpha/package.mask
index 965c9f54b449..30c85a1ca8ea 100644
--- a/profiles/arch/alpha/package.mask
+++ b/profiles/arch/alpha/package.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Tobias Klausmann <klausman@gentoo.org> (09 Mar 2017)
-# warning "__NR_copy_file_range not defined for your architecture"
-=sys-fs/udev-233
-
 # Alexey Shvetsov <alexxy@gentoo.org> (21 May 2012)
 # Need deps pecl-apc and pecl-uploadprogress bug #416897
 >=www-apps/drupal-7.14
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 345e39155bc0..15f821fcf70c 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -400,7 +400,7 @@ x11-misc/rss-glx quesoglc
 
 # Raúl Porcel <armin76@gentoo.org> (07 Jul 2008)
 # Make clisp deps minimal
-dev-lisp/clisp hyperspec pari svm
+dev-lisp/clisp hyperspec svm
 
 # Tobias Klausmann <klausman@gentoo.org> (15 Jun 2008)
 # No hardware to test net-dialup/linux-atm on alpha, so mask atm use flag
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index d23d8f51b19e..76c402ce7160 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -93,7 +93,6 @@ games-fps/etqw-demo
 games-fps/glxquake-bin
 games-fps/legends
 games-fps/postal2
-games-fps/postal2mp-demo
 games-fps/quake3-bin
 games-fps/quake3-demo
 games-fps/quake3-ra3
@@ -113,14 +112,12 @@ games-fps/ut2003-demo
 games-fps/ut2004-demo
 games-misc/little-inferno
 games-misc/papers-please
-games-puzzle/hoh-bin
 games-puzzle/triptych
 games-roguelike/adom
 games-rpg/baldurs-gate-ee
 games-rpg/dear-esther
 games-rpg/dungeon-defenders
 games-rpg/eschalon-book-1-demo
-games-rpg/penumbra-collection
 games-rpg/wasteland2
 games-server/etqw-ded
 games-server/nwn-ded
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index e6b74b911c05..680d1ab861f8 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Mikle Kolyada <zlogene@gentoo.org> (15 Sep 2018)
+# the de[endency is unstable
+media-video/libav nvidia
+
 # Thomas Deutschmann <whissi@gentoo.org> (01 Jun 2018)
 net-analyzer/wireshark -doc
 
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 939f5a954b0b..71d461827740 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -402,10 +402,6 @@ dev-libs/weston rdp screen-sharing
 # Firmware loader not keyworded yet
 sci-libs/linux-gpib firmware
 
-# Markus Meier <maekke@gentoo.org> (10 May 2013)
-# unkeyworded deps for dev-python/ipython
-dev-python/ipython mongodb
-
 # Christoph Junghans <junghans@gentoo.org> (29 Apr 2013)
 # MKL not available on this arch
 media-gfx/povray mkl
@@ -431,12 +427,10 @@ media-gfx/pstoedit emf
 # masking all stable packages with java use flag
 net-vpn/openconnect java
 dev-util/oprofile java
-=dev-db/qdbm-1.8.78-r1 java
 dev-libs/beecrypt java
 dev-libs/cyrus-sasl java
 dev-tex/tex4ht java
 dev-vcs/subversion java
-=media-libs/libcaca-0.99_beta18-r2 java
 media-libs/libjpeg-turbo java
 net-dns/libidn java
 net-misc/tigervnc java
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 59de8efcb03b..41f3d54559e1 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (11 Sep 2018)
+# net-wireless/bluez not stable yet
+dev-lang/python bluetooth
+
 # Mart Raudsepp <leio@gentoo.org> (24 Jul 2018)
 # Temporary mask due to test failures in sys-libs/libcxxabi
 # and sys-libs/compiler-rt-sanitizers
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 163006a1147b..ee0fa1d71c3e 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -18,7 +18,7 @@
 #--- END OF EXAMPLES ---
 
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
-# media-gfx/ufraw is not stable
+# media-libs/libraw is not stable
 media-gfx/imagemagick raw
 
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index b95829e24431..3f796af7144d 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -203,7 +203,6 @@ dev-libs/libpeas lua
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
 dev-libs/efl physics sdl
-media-libs/elementary sdl
 
 # Alexis Ballier <aballier@gentoo.org> (11 Feb 2015)
 # Missing ffmpeg deps, bug #510340
@@ -343,7 +342,7 @@ x11-wm/fvwm lock
 
 # Raúl Porcel <armin76@gentoo.org> (07 Jul 2008)
 # Make clisp deps minimal
-dev-lisp/clisp hyperspec pari svm
+dev-lisp/clisp hyperspec svm
 
 # missing keywords
 media-plugins/gst-plugins-meta dts dv lame libvisual modplug mms taglib vcd wavpack
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 766826ea060c..583a2734c70c 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -117,10 +117,6 @@ app-text/tesseract	webp
 sys-auth/consolekit pam
 sys-auth/pambase consolekit
 
-# Kacper Kowalik <xarthisius@gentoo.org> (20 May 2011)
-# depends on dev-libs/dmalloc which is not keyworded
-net-nds/ypbind debug
-
 # Richard Brown <rbrown@gentoo.org> (21 Jan 2008)
 # Needs dev-ruby/builder, which isn't keyworded
 dev-ruby/rubygems server
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 05d83174997d..74d1069dd3fe 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -99,7 +99,6 @@ openexr
 
 # Ryan Hill <dirtyepic@gentoo.org>
 # Various Gnome flags
-gtkhtml
 gnome
 
 # Peter Volkov <pva@gentoo.org> MPI was never tested on mips, but
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 96f818245343..b5844a549554 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,10 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Thode <prometheanfire@gentoo.org> (12 Sep 2018)
+# dev-db/mariadb-connector-c not yet keyworded
+net-analyzer/icinga2 mariadb
+
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
 # media-libs/libaom not yet keyworded
-# media-libs/aribb24 not yet keyworded, bug #665048
-media-video/vlc aom aribsub
+media-video/vlc aom
 
 # Luca Barbato <lu_zero@gentoo.org> (12 Aug 2018)
 # grub pc is not supported on powerpc
@@ -177,7 +180,6 @@ sys-auth/sssd samba
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
 dev-libs/efl physics sdl
-media-libs/elementary sdl
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (15 Feb 2015)
 # There's no keyworded office implementation anymore.
@@ -218,7 +220,7 @@ dev-ruby/haml test
 
 # Anthony G. Basile <blueness@gentoo.org> (14 Aug 2014)
 # Mask these flags since mongodb is broken on ppc/ppc64
-dev-python/ipython doc matplotlib mongodb nbconvert notebook test
+dev-python/ipython doc matplotlib nbconvert notebook test
 
 # Anthony G. Basile <blueness@gentoo.org> (12 Aug 2014)
 # Ultimately pulls in nodejs which is broken.
@@ -290,11 +292,6 @@ net-im/choqok telepathy
 >=dev-db/mariadb-5.5 tcmalloc
 >=dev-db/percona-server-5.5 tcmalloc
 
-# Anthony G. Basile <blueness@gentoo.org> (29 Sep 2012)
-# dev-cpp/tbb does not build on ppc ppc64 so mask any
-# dependencies on it
-media-libs/openimageio tbb
-
 # Samuli Suominen <ssuominen@gentoo.org> (27 Sep 2012)
 # I don't want to open this can of worms yet. Feel free
 # to do so.
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 5f10d31b0393..178d09b46be4 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -44,7 +44,6 @@ sci-libs/plplot ocaml
 
 # Pacho Ramos <pacho@gentoo.org> (02 Jul 2014)
 # Mask due Gnome3 not going to be stabilized on this arch
-dev-java/swt webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
 gnome-base/gvfs google
 mail-client/balsa webkit
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index e95bd989445b..d4d19ba69d63 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -19,7 +19,6 @@
 
 # Pacho Ramos <pacho@gentoo.org> (02 Jul 2014)
 # Mask due Gnome3 not going to be stabilized on this arch
-dev-java/swt webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
 gnome-base/gvfs google
 >=x11-libs/gtk+-3.12.2 cloudprint
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 857429e6c954..087b0c6aeb4a 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.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
 
 # Unmask the flag which corresponds to ARCH.
@@ -20,7 +20,6 @@ python_single_target_python3_7
 -big-endian
 
 # Stuff we don't want/not tested
-pbins
 R
 octave
 xindy
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 64efde3b7faf..b1349107c236 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -192,7 +192,6 @@ dev-libs/libpeas lua
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
 dev-libs/efl physics sdl
-media-libs/elementary sdl
 
 # Alexis Ballier <aballier@gentoo.org> (11 Feb 2015)
 # Missing ffmpeg deps, bug #510340
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index d9f4aa2db298..40d6e274774a 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (14 Sep 2018)
+# media-libs/libraw is not stable
+media-gfx/imagemagick raw
+
 # Virgil Dupras <vdupras@gentoo.org> (18 Aug 2018)
 # app-text/mupdf stable sparc keyword was dropped in bug #658618
 net-print/cups-filters pdf
@@ -58,4 +62,3 @@ dev-util/geany-plugins gtkspell
 gnome-base/gvfs google
 >=x11-libs/gtk+-3.12.2 cloudprint
 x11-libs/gksu gnome
-x11-wm/icewm gnome
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 89f518998980..b6c69adf7e09 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -9,8 +9,7 @@ sci-electronics/kicad oce
 
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
 # media-libs/libaom not yet keyworded
-# media-libs/aribb24 not yet keyworded, bug #665048
-media-video/vlc aom aribsub
+media-video/vlc aom
 
 # Ben Kohler <bkohler@gentoo.org> (23 Aug 2018)
 # Unmask iwd support where net-wireless/iwd is keyworded
@@ -56,7 +55,6 @@ app-laptop/pbbuttonsd -macbook
 # Test dependencies are no longer keyworded due to dropped Rails
 # keyword.
 dev-ruby/asciidoctor test
-dev-ruby/tilt:0 test
 
 # Tim Harder <radhermit@gentoo.org> (11 Sep 2017)
 # Pulls in dev-ruby/asciidoctor which has too large of a ruby testing
@@ -119,10 +117,6 @@ dev-db/percona-server -numa
 # Allow jdbc on this arch
 dev-db/mariadb -jdbc
 
-# 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
-
 # Mike Gilbert <floppym@gentoo.org> (03 Mar 2016)
 # chrome-binary-plugins dropped x86 support
 www-client/chromium widevine
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index ee4a7c236404..e437d8d4a1de 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,18 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 Sep 2018)
+# All glibc versions that include RPC code are masked now.
+dev-libs/libspt libtirpc
+dev-perl/Lab-VXI11 libtirpc
+net-analyzer/argus libtirpc
+net-analyzer/snort libtirpc
+net-firewall/conntrack-tools libtirpc
+net-fs/autofs libtirpc
+net-misc/netkit-bootparamd libtirpc
+sci-astronomy/esomidas libtirpc
+sys-cluster/glusterfs libtirpc
+
 # Matt Turner <mattst88@gentoo.org> (13 Jun 2018)
 # Upstream is transitioning to Meson, but does not yet have any configuration
 # options. Until those configuration options are provided, force USE flags on
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8e69a49056fd..05e9d457d2c0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Alon Bar-Lev <alonbl@gentoo.org> (11 Sep 2018)
+# Waiting for >=dev-libs/libressl-2.7 to be stablized.
+>=dev-libs/opensc-0.18.0 libressl
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (3 Aug 2018)
 # New and for Gentoo still quite experimental. You've been
 # warned. (Also, works only on x86_64 and with certain CPUs
@@ -23,10 +27,6 @@ app-emulation/wine-staging ffmpeg
 # only a subset of the archs rng-tools supports
 sys-apps/rng-tools jitterentropy
 
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# dev-libs/DirectFB is being removed (#606194)
-www-plugins/gnash directfb
-
 # Michał Górny <mgorny@gentoo.org> (13 Jun 2018)
 # Requires app-arch/snappy[static-libs] that is no longer available.
 # Bugs #651604, #651606.
@@ -54,10 +54,6 @@ sci-libs/ipopt hsl
 # in tree uses the latter at the moment (#645562)
 dev-lang/rust extended
 
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# dev-python/visual will be removed (#630252)
-net-analyzer/scapy visual
-
 # Lars Wendler <polynomial-c@gentoo.org> (14 Mar 2018)
 # Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having
 # no active upstream anymore.
@@ -80,7 +76,6 @@ app-admin/testdisk ewf
 # Mask embedded USE on virtual/mysql and friends to transition it to be obsolete
 virtual/mysql embedded
 dev-db/mariadb embedded
-dev-db/mariadb-galera embedded
 dev-db/mysql embedded
 dev-db/mysql-cluster embedded
 dev-perl/DBD-mysql embedded
@@ -172,11 +167,6 @@ media-video/mpv libav
 
 # Michał Górny <mgorny@gentoo.org> (05 Jun 2017)
 # (on behalf of Treecleaner project)
-# dev-libs/dee is masked for removal, mask flags that requires it.
-gnome-extra/zeitgeist icu
-
-# Michał Górny <mgorny@gentoo.org> (05 Jun 2017)
-# (on behalf of Treecleaner project)
 # www-apache/mod_python is masked for removal, mask flags that
 # require it.
 net-analyzer/check_mk livestatus wato
@@ -201,10 +191,6 @@ sys-devel/gcc pie
 # Needs sandbox-2.11 (masked)
 >=www-client/chromium-59 tcmalloc
 
-# Michał Górny <mgorny@gentoo.org> (18 Mar 2017)
-# Requires removed old version of media-gfx/graphviz.
-media-gfx/nip2 graphviz
-
 # Matt Turner <mattst88@gentoo.org> (04 Mar 2017)
 # Requires dev-util/cmdtest stabilization, bug 611052
 x11-apps/xauth test
@@ -272,18 +258,10 @@ app-editors/emacs-vcs cairo
 # either unless somebody steps up to fix it.
 >=sys-devel/llvm-3.9.0_rc lldb
 
-# Brian Evans <grknight@gentoo.org> (22 Aug 2016)
-# Depends on masked, end-of-life php versions
-<=dev-libs/ossp-uuid-1.6.2-r4 php
-
 # Gilles Dartiguelongue <eva@gentoo.org> (21 Aug 2016)
 # Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date
 media-plugins/grilo-plugins chromaprint
 
-# Pacho Ramos <pacho@gentoo.org> (21 Aug 2016)
-# x11-libs/libsvg-cairo is being removed, bug #537918
-dev-ml/cairo-ocaml svg
-
 # Lars Wendler <polynomial-c@gentoo.org> (19 Aug 2016)
 # gnutls is broken for years
 >=net-libs/gsoap-2.8.0 gnutls
@@ -358,12 +336,6 @@ app-arch/cfv bittorrent
 # Unmasked in default/linux/package.use.mask.
 sys-auth/consolekit cgroups
 
-# Manuel Rüger <mrueg@gentoo.org> (03 Sep 2015)
-# Mask USE=ruby for packages that solely rely on the soon to be deprecated
-# ruby 1.9
-# See bug #541648
-<dev-libs/Ice-3.6 ruby
-
 # James Le Cuirot <chewi@gentoo.org> (18 Aug 2015)
 # gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by
 # anything in the tree. The toolchain folks aren't keen to support it
@@ -381,10 +353,6 @@ dev-java/gcj-jdk awt
 # dev-lang/python[berkdb] fails with recent multilib sys-libs/db (bug 519584).
 dev-lang/python berkdb
 
-# Jason Zaman <perfinion@gentoo.org> (08 May 2015)
-# java wrappers fail to build (bug #548858)
-=app-admin/setools-3.3.8-r7 java
-
 # Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015)
 # >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2
 games-strategy/freeciv system-lua
@@ -392,7 +360,6 @@ games-strategy/freeciv system-lua
 # Brian Evans <grknight@gentoo.org> (17 Mar 2015)
 # Mask the cluster flag for deprecation. Use dev-db/mysql-cluster if
 # you need NDB.
-dev-db/mariadb cluster
 dev-db/mysql cluster
 
 # Andrew Savchenko <bircoph@gentoo.org> (11 Feb 2015)
@@ -413,10 +380,6 @@ net-analyzer/nmap system-lua
 # Most targets do not support ASAN/etc... #504200.
 sys-devel/gcc sanitize
 
-# Pacho Ramos <pacho@gentoo.org> (19 Oct 2014)
-# swfdec is masked for removal, bug #525834
-dev-libs/DirectFB swfdec
-
 # Rick Farina <zerochaos@gentoo.org> (26 Aug 2014)
 # mirisdr does not seem to like making releases
 <net-wireless/gr-osmosdr-9999 mirisdr
@@ -434,10 +397,6 @@ dev-db/percona-server embedded
 # Mask pixman USE flag of dev-libs/efl for future removal, bug 501074
 dev-libs/efl pixman
 
-# Manuel Rüger <mrueg@gentoo.org> (05 Jun 2014)
-# Fails to build with net-libs/libotr-4.0.0
-net-im/climm otr
-
 # Pacho Ramos <pacho@gentoo.org> (01 Jun 2014)
 # Needs hardmasked lua-5.2
 >=media-plugins/grilo-plugins-0.2.12 lua
@@ -452,11 +411,6 @@ net-analyzer/metasploit development test
 # Tracked in Gentoo bug #509602.
 dev-java/jboss-logging doc
 
-# Manuel Rüger <mrueg@gentoo.org> (07 Mar 2014)
-# Mask ruby18-only compatible flags
-# Bugs: 483104, 483102
-<media-libs/libcaca-0.99_beta19 ruby
-
 # Mike Frysinger <vapier@gentoo.org> (03 Feb 2014)
 # Upstream says to not use this for now.
 dev-libs/elfutils threads
@@ -489,7 +443,6 @@ media-libs/libsdl2 custom-cflags
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
 # GL/GLES support in cairo is mutually exclusive, bug #428770.
 x11-libs/cairo gles2
-dev-libs/weston rpi
 
 # Kacper Kowalik <xarthisius@gentoo.org> (19 May 2013)
 # Fails to build, haven't had time to debug
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 6f64db71a53f..dbdac995c857 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,12 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (11 Sep 2018)
+# Sometimes crashes Plasma with Appstream versions pre-0.12.
+# Newer versions of dev-libs/appstream are not stable yet. See also:
+# https://mail.kde.org/pipermail/kde-distro-packagers/2018-September/000347.html
+kde-plasma/plasma-desktop appstream
+
 # Andreas Sturmlechner <asturm@gentoo.org> (22 Jul 2018)
 # >=media-video/libav-12 not stable yet, bug #617508
 >=media-libs/mlt-6.6.0 libav
@@ -132,10 +138,6 @@ app-office/kmymoney weboob
 # Stable-masking it so Boost 1.62 stabilization can go ahead
 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
-
 # Alon Bar-Lev <alonbl@gentoo.org> (01 Jan 2017)
 # Will always require unstable packages.
 net-libs/gnutls test-full
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 560311c41759..6082a4689254 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,14 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Aaron W. Swenson <titanofold@gentoo.org> (09 Sep 2018)
+# Mask PostgreSQL 12 while in (pre-)alpha.
+postgres_targets_postgres12
+
+# Aaron W. Swenson <titanofold@gentoo.org> (09 Sep 2018)
+# Mask PostgreSQL 11 while in beta/RC.
+postgres_targets_postgres11
+
 # Brian Evans <grknight@gentoo.org> (10 Aug 2018)
 # Mask PHP 7.3 target while in beta
 php_targets_php7-3
diff --git a/profiles/default/bsd/fbsd/packages b/profiles/default/bsd/fbsd/packages
index 090c00874b0f..470e41dec3dc 100644
--- a/profiles/default/bsd/fbsd/packages
+++ b/profiles/default/bsd/fbsd/packages
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
 
 # This files contains a small list of packages that define a 
@@ -13,7 +13,6 @@
 *sys-freebsd/freebsd-ubin
 *sys-freebsd/freebsd-usbin
 *sys-freebsd/freebsd-share
-*sys-freebsd/freebsd-contrib
 
 *sys-devel/gettext
 *dev-libs/libiconv
diff --git a/profiles/default/bsd/fbsd/packages.build b/profiles/default/bsd/fbsd/packages.build
index ffb1f5550ccd..4d7682dad3f6 100644
--- a/profiles/default/bsd/fbsd/packages.build
+++ b/profiles/default/bsd/fbsd/packages.build
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file describes the packages needed to build a stage 1 based on this
@@ -47,5 +47,4 @@ sys-freebsd/freebsd-bin
 sys-freebsd/freebsd-sbin
 sys-freebsd/freebsd-ubin
 sys-freebsd/freebsd-usbin
-sys-freebsd/freebsd-contrib
 sys-libs/timezone-data
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index 4dbd1e687ac7..e0a59b79143b 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -49,7 +49,6 @@ games-fps/enemy-territory-truecombat
 games-fps/etqw-demo
 games-fps/glxquake-bin
 games-fps/legends
-games-fps/postal2mp-demo
 games-fps/quake3-bin
 games-fps/quake3-demo
 games-fps/rtcwmp-demo
@@ -82,14 +81,12 @@ games-fps/ut2004-troopers
 games-fps/ut2004-unwheel
 games-misc/little-inferno
 games-misc/papers-please
-games-puzzle/hoh-bin
 games-puzzle/world-of-goo
 games-puzzle/world-of-goo-demo
 games-roguelike/adom
 games-rpg/dear-esther
 games-rpg/dungeon-defenders
 games-rpg/eschalon-book-1-demo
-games-rpg/penumbra-collection
 games-rpg/wasteland2
 games-server/etqw-ded
 games-server/ut2004-ded
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index 01e61b866575..e575798087fc 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -17,10 +17,8 @@ app-emulation/virtualbox-guest-additions
 >=app-i18n/atokx3-3.0.0
 app-office/ooextras
 app-emulation/winetricks
-app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
-dev-perl/Archive-Rar
 dev-util/android-sdk-update-manager
 dev-util/android-ndk
 dev-util/biew
@@ -65,7 +63,6 @@ games-fps/etqw-demo
 games-fps/glxquake-bin
 games-fps/legends
 games-fps/postal2
-games-fps/postal2mp-demo
 games-fps/quake3-bin
 games-fps/quake3-demo
 games-fps/quake3-ra3
@@ -83,10 +80,8 @@ games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
 games-fps/ut2004-demo
-games-puzzle/hoh-bin
 games-roguelike/adom
 games-rpg/eschalon-book-1-demo
-games-rpg/penumbra-collection
 games-server/etqw-ded
 games-server/nwn-ded
 games-server/ut2003-ded
@@ -99,7 +94,6 @@ games-strategy/heroes3
 games-strategy/majesty-demo
 games-strategy/smac
 games-strategy/spaz
-media-fonts/acroread-asianfonts
 media-sound/ventrilo-server-bin
 media-video/binkplayer
 media-video/tsmuxer
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index 56369db82066..86d06804eb80 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -29,7 +29,6 @@ games-fps/etqw-bin
 games-fps/glxquake-bin
 games-fps/legends
 games-fps/postal2
-games-fps/postal2mp-demo
 games-fps/quake3-bin
 games-fps/quake3-demo
 games-fps/rtcwmp-demo
diff --git a/profiles/features/selinux/package.use.force b/profiles/features/selinux/package.use.force
index c7e70425d6bb..143f28ca89de 100644
--- a/profiles/features/selinux/package.use.force
+++ b/profiles/features/selinux/package.use.force
@@ -3,11 +3,9 @@
 
 # Sven Vermeulen <swift@gentoo.org> (19 Apr 2013)
 # sys-apps/policycoreutils (semanage command) uses sepolgen, which requires libselinux with USE="python". 
-# sys-apps/policycoreutils also requires libsemanage with USE="python" and
-# setools with USE="python"
+# sys-apps/policycoreutils also requires libsemanage with USE="python"
 sys-libs/libselinux python
 sys-libs/libsemanage python
-app-admin/setools python
 
 # Sven Vermeulen <swift@gentoo.org> (21 May 2013)
 # sys-apps/policycoreutils has PYTHON_USE_WITH="xml" set, so we force it
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 19621c773d9d..85b720dc8ab8 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -36,7 +36,6 @@ app-emulation/winetricks
 app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
-dev-perl/Archive-Rar
 dev-util/android-sdk-update-manager
 dev-util/biew
 games-action/cs2d
@@ -85,7 +84,6 @@ games-fps/etqw-demo
 games-fps/glxquake-bin
 games-fps/legends
 games-fps/postal2
-games-fps/postal2mp-demo
 games-fps/quake3-bin
 games-fps/quake3-demo
 games-fps/quake3-ra3
@@ -104,7 +102,6 @@ games-fps/ut2003
 games-fps/ut2003-demo
 games-fps/ut2004-demo
 games-misc/little-inferno
-games-puzzle/hoh-bin
 games-roguelike/adom
 games-rpg/baldurs-gate-ee
 games-rpg/dear-esther
@@ -121,7 +118,6 @@ games-strategy/heroes3
 games-strategy/majesty-demo
 games-strategy/smac
 games-strategy/spaz
-media-fonts/acroread-asianfonts
 media-sound/aucdtect
 media-sound/ventrilo-server-bin
 media-video/binkplayer
diff --git a/profiles/license_groups b/profiles/license_groups
index 79b88fbf04f1..4c5438935df1 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -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 AdobeFlash-11.x AMD-GPU-PRO-EULA ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 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 Mendeley-terms Microsemi Mojang 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 protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS ubiquiti UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
+EULA AdobeFlash-11.x AMD-GPU-PRO-EULA ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 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 Mendeley-terms Microsemi Mojang MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs Sourcetrail SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS ubiquiti UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index 9ee6fb345cde..7b0f33de56c8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,33 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (13 Sep 2018)
+# Depends on old version of dev-libs/jsoncpp, blocking its pruning.
+# Downstream maintainer is inactive to bump it.  Removal in 30 days.
+# Bug #656678.
+dev-lang/solidity
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 Sep 2018)
+# Mask transition ebuilds that were needed only for <glibc-2.26
+# We will keep them in the tree as long as we have masked
+# <glibc-2.26.
+~net-libs/libnsl-0
+~net-libs/rpcsvc-proto-0
+
+# Aaron W. Swenson <titanofold@gentoo.org> (09 Sep 2018)
+# PostgreSQL beta and release candidate releases are pre-release testing
+# versions, not meant for production use. They are feature-frozen, and are
+# released to the public for testing before final release
+#
+# NOTE: Successive beta or candidate releases may not be backwards compatible,
+# so it is important that you review the release notes before upgrading.
+#
+# For more information about beta and release candidate versions, see:
+#     https://www.postgresql.org/developer/beta/
+=dev-db/postgresql-11_beta1
+=dev-db/postgresql-11_beta2
+=dev-db/postgresql-11_beta3
+
 # Lars Wendler <polynomial-c@gentoo.org> (05 Sep 2018)
 # Broken "killall -SIG". Breaks many scripts.
 # See https://bugs.gentoo.org/664066
@@ -189,23 +216,6 @@ dev-python/pyfire
 # Beta release with new features, masked for testing
 =app-text/tesseract-4.0.0_beta*
 
-# Virgil Dupras <vdupras@gentoo.org> (12 Aug 2018)
-# django-pipeline hasn't been maintained and has been broken for a while.
-# No revdep. Removal in 30 days. Bug #649838
-dev-python/django-pipeline
-
-# Ulrich Müller <ulm@gentoo.org> (07 Aug 2018)
-# Fails to build with emacs-26.1. Last release in 2003, last commit
-# to upstream CVS in 2010. Masked for removal in 30 days. Bug #663030.
-app-emacs/cmail
-
-# Thomas Deutschmann <whissi@gentoo.org> (05 Aug 2018)
-# Deprecated. Using recent microcodes with this package either won't work
-# or crash your system. Please change your setup and make use of kernel's
-# early microcode loading feature, see https://wiki.gentoo.org/wiki/Microcode
-# for more details. Removal in 30 days.
-sys-apps/microcode-ctl
-
 # Mike Gilbert <floppym@gentoo.org> (04 Aug 2018)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
@@ -278,11 +288,6 @@ dev-python/wxpython:2.8
 =virtual/perl-threads-2.220.0
 =virtual/perl-version-0.992.300
 
-# Brian Dolbec <dolsen@gentoo.org> (4 July 2018)
-# No longer needed, newer gpg-2 versions have simple cli options
-# for generating new keys and doing key maintenance. Removal in a month
-app-crypt/gkeys-gen
-
 # Thomas Deutschmann <whissi@gentoo.org> (23 Jun 2018)
 # Doesn't pass QA full boot test
 =sys-kernel/ck-sources-4.16.17
@@ -295,11 +300,6 @@ app-crypt/gkeys-gen
 # and start actively maintaining it.  Otherwise -- removal in 90 days.
 sys-apps/paludis
 
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Dead since 2013, not compatible with latest profiles (#642568). Removal in
-# a month
-net-vpn/miredo
-
 # Mart Raudsepp <leio@gentoo.org> (16 Jun 2018)
 # No upstream (website disappeared), no upstream plugin maintainer,
 # and pretty much a fringe format anyway.
@@ -552,7 +552,7 @@ dev-ruby/poltergeist
 # (isolated) use case, feel free to unmask them on your system.
 # (updated 27 Dec 2017 with gcc < 5.4)
 <sys-devel/gcc-5.4
-<sys-libs/glibc-2.25-r9
+<sys-libs/glibc-2.26
 <sys-devel/binutils-2.29.1-r1
 
 # Michał Górny <mgorny@gentoo.org> (20 May 2017)
@@ -655,6 +655,8 @@ dev-java/jcs
 # is working on replacing them in the wip/dedup-syscall branch.
 # Keep it masked until they are done. sys-fs/duperemove is
 # the suggested replacement for the meantime.
+# Michał Górny <mgorny@gentoo.org> (13 Sep 2018)
+# No upstream commits since 2016.  Removal in 30 days.  Bug #546144.
 sys-fs/bedup
 
 # Robin H. Johnson <robbat2@gentoo.org> (04 Aug 2014)
diff --git a/profiles/releases/17.0/package.mask b/profiles/releases/17.0/package.mask
index 10e18dec100e..d02a1c3d9f13 100644
--- a/profiles/releases/17.0/package.mask
+++ b/profiles/releases/17.0/package.mask
@@ -17,7 +17,6 @@ dev-java/ecj-gcj
 dev-java/gcj-jdk
 <dev-util/nvidia-cuda-toolkit-9
 <dev-util/nvidia-cuda-sdk-9
-<dev-libs/dietlibc-0.34_pre20140729-r1
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
 # The following packages require pdftk and are therefore
diff --git a/profiles/releases/freebsd-11.1/package.mask b/profiles/releases/freebsd-11.1/package.mask
index d977a2e2e323..c2612711475c 100644
--- a/profiles/releases/freebsd-11.1/package.mask
+++ b/profiles/releases/freebsd-11.1/package.mask
@@ -24,8 +24,6 @@
 >sys-freebsd/freebsd-usbin-11.1.99
 <sys-freebsd/freebsd-share-11.1_alpha
 >sys-freebsd/freebsd-share-11.1.99
-<sys-freebsd/freebsd-contrib-11.1_alpha
->sys-freebsd/freebsd-contrib-11.1.99
 <sys-freebsd/freebsd-cddl-11.1_alpha
 >sys-freebsd/freebsd-cddl-11.1.99
 <sys-freebsd/boot0-11.1_alpha
diff --git a/profiles/releases/freebsd-11.1/packages b/profiles/releases/freebsd-11.1/packages
index a68d7505d934..2f2822721a66 100644
--- a/profiles/releases/freebsd-11.1/packages
+++ b/profiles/releases/freebsd-11.1/packages
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
 
 *>=sys-apps/baselayout-2.0.0
 *>=sys-apps/openrc-0.2.5
 
-# dev-libs/libiconv and freebsd-contrib aren't necessary in 10.0 and later.
+# dev-libs/libiconv isn't necessary in 10.0 and later.
 -*dev-libs/libiconv
--*sys-freebsd/freebsd-contrib
 
 # sys-freebsd/freebsd-libexec was merged into freebsd-lib in 11.1 and later.
 -*sys-freebsd/freebsd-libexec
diff --git a/profiles/releases/freebsd-11.1/packages.build b/profiles/releases/freebsd-11.1/packages.build
index a6ca5a9327c9..eb15f165044a 100644
--- a/profiles/releases/freebsd-11.1/packages.build
+++ b/profiles/releases/freebsd-11.1/packages.build
@@ -1,7 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
 
 -dev-libs/libiconv
--sys-freebsd/freebsd-contrib
 -sys-freebsd/freebsd-libexec
 sys-freebsd/freebsd-share
diff --git a/profiles/releases/freebsd-9.1/package.mask b/profiles/releases/freebsd-9.1/package.mask
index 686dc81d524e..305aae620478 100644
--- a/profiles/releases/freebsd-9.1/package.mask
+++ b/profiles/releases/freebsd-9.1/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
 
 # Make sure we don't get wrong versions
@@ -24,8 +24,6 @@
 >sys-freebsd/freebsd-usbin-9.1.99
 <sys-freebsd/freebsd-share-9.1_alpha
 >sys-freebsd/freebsd-share-9.1.99
-<sys-freebsd/freebsd-contrib-9.1_alpha
->sys-freebsd/freebsd-contrib-9.1.99
 <sys-freebsd/freebsd-cddl-9.1_alpha
 >sys-freebsd/freebsd-cddl-9.1.99
 <sys-freebsd/boot0-9.1_alpha
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index 84731cd9fd65..6ad779174603 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -23,9 +23,6 @@ dev-lang/python sqlite
 # Required by app-accessibility/orca-3
 app-accessibility/speech-dispatcher python
 
-# gtk3 input method plugins required for gnome3; gnome-shell wants ibus[dconf]
-app-i18n/uim gtk3
-
 # Pulled in by grilo-plugins which is needed for gnome-music
 media-libs/grilo playlist
 
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index cb0f13731f3d..4b1b1a923c3b 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -83,7 +83,6 @@ media-libs/libpng apng
 # introspection, exception, enabled from here instead of ebuild to skip extra deps for a system package
 dev-libs/libgudev introspection
 sys-fs/eudev introspection
-sys-fs/udev gudev introspection
 virtual/libgudev introspection
 
 # Samuli Suominen <ssuominen@gentoo.org> (19 Dec 2010)
diff --git a/profiles/targets/desktop/package.use.mask b/profiles/targets/desktop/package.use.mask
index bee08748bd6b..26f3c6d94580 100644
--- a/profiles/targets/desktop/package.use.mask
+++ b/profiles/targets/desktop/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Lars Wendler <polynomial-c@gentoo.org> (11 Apr 2018)
-# Masked until we have a working ldap patch again.
-# See https://bugs.gentoo.org/652438
->=net-misc/openssh-7.7_p1 ldap
-
 # USE=gles2 in the following packages disables full OpenGL
 # Upstream does not test for that case and packages frequently
 # fail to build or run if set.
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index d2abc3d4a5ce..6197195026f2 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -6,7 +6,6 @@ cran		http://cran.r-project.org http://cran.us.r-project.org
 debian		http://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
 fedora-dev	http://archives.fedoraproject.org/pub/archive/fedora/linux/
 freebsd		https://download.freebsd.org/ftp/
-freedesktop	https://www.freedesktop.org/software/
 gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles http://gentoo.ussg.indiana.edu/distfiles
 gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ http://artfiles.org/gimp.org/pub/gimp/ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ http://pirbot.com/mirrors/gimp/gimp/
 github		https://github.com/downloads
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index 58910201a65a..135c7c9e2352 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -18,7 +18,6 @@ move net-misc/vpnc net-vpn/vpnc
 move net-misc/vpncwatch net-vpn/vpncwatch
 move net-misc/wireguard net-vpn/wireguard
 move net-misc/vtun net-vpn/vtun
-move net-misc/miredo net-vpn/miredo
 move net-misc/isatapd net-vpn/isatapd
 move net-misc/iodine net-vpn/iodine
 move net-misc/corkscrew net-vpn/corkscrew
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index dabef61c5a41..d179d9fdae89 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -113,6 +113,7 @@ app-admin/puppet-agent:experimental - Add patches for things in testing
 app-admin/puppet-agent:puppetdb - Adds puppetdb support
 app-admin/puppetserver:puppetdb - Adds support for connecting to puppetdb
 app-admin/pwgen:livecd - Install init script for root password scrambling on boot
+app-admin/pwman3:mongodb - Add support for MongoDB
 app-admin/rsyslog:curl - Enable http_request() function in RainerScript (requires net-misc/curl)
 app-admin/rsyslog:dbi - Build the general database output module (requires dev-db/libdbi)
 app-admin/rsyslog:elasticsearch - Build the Elasticsearch output module (requires net-misc/curl)
@@ -343,6 +344,7 @@ app-crypt/qca:pkcs11 - Enable PKCS#11 plugin
 app-crypt/qca:sasl - Enable SASL plugin
 app-crypt/qca:softstore - Enable softstore plugin
 app-crypt/seahorse:ldap - Enable seahorse to manipulate GPG keys on a LDAP server.
+app-crypt/tpm-emulator:mtm-emulator - Build the MTM emulator
 app-crypt/tpm-tools:pkcs11 - Build Token data management utilities based on OpenCryptoki's (dev-libs/opencryptoki) PKCS#11 implementation.
 app-crypt/veracrypt:asm - Enable assembly for optimization
 app-crypt/zulucrypt:gnome - Enable support for the freedesktop.org Secret Service API via app-crypt/libsecret
@@ -927,6 +929,7 @@ app-misc/freemind:groovy - Build plugin for scripting via Groovy
 app-misc/freemind:latex - Build plugin for inserting mathematical formulas in LaTeX syntax
 app-misc/freemind:pdf - Build plugin for exporting mindmaps to SVG and PDF
 app-misc/freemind:svg - Build plugin for exporting mindmaps to SVG and PDF
+app-misc/g810-led:hidapi - Use dev-libs/hidapi instead of virtual/libusb for talking to the device (advertised to be faster)
 app-misc/gcstar:stats - Enable statistics reporting
 app-misc/gcstar:tellico - Enable support for kde-misc/tellico files
 app-misc/geoclue:geonames - Install geonames.org provider
@@ -1419,6 +1422,7 @@ dev-cpp/libjson-rpc-cpp:http-server - Build support for HTTP server using net-li
 dev-cpp/libjson-rpc-cpp:redis-client - Build support for Redis client using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:redis-server - Build support for Redis server using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for development and when pregenerated headers are not bundled)
+dev-cpp/sourcetrail:examples - Install example projects.
 dev-cpp/websocketpp:boost - Use dev-libs/boost instead of C++11
 dev-cpp/xsd:ace - Enable support for serializing to/from an ACE CDR stream
 dev-db/aerospike-server-community:tools - Install extra tools
@@ -2472,6 +2476,7 @@ dev-libs/openct:pcsc-lite - Build a driver library for sys-apps/pcsc-lite, provi
 dev-libs/openct:udev - Install rules for sys-fs/udev to auto-start openct.
 dev-libs/openobex:irda - Enable IrDA support
 dev-libs/opensc:ctapi - Use CT-API for accessing Smartcard hardware
+dev-libs/opensc:notify - Enable notifications
 dev-libs/opensc:openct - Use dev-libs/openct (and CT-API) for accessing Smartcard hardware
 dev-libs/opensc:pcsc-lite - Use sys-apps/pcsc-lite (and PC/SC API) for accessing Smartcard hardware
 dev-libs/opensc:secure-messaging - Enable secure messaging
@@ -3633,8 +3638,10 @@ kde-apps/dolphin-plugins:bazaar - Enable support for the bazaar VCS
 kde-apps/dolphin-plugins:dropbox - Enable support for the dropbox fileviewer plugin
 kde-apps/dolphin-plugins:git - Enable support for the git VCS
 kde-apps/dolphin-plugins:mercurial - Enable support for the mercurial VCS
+kde-apps/gwenview:activities - Enable kactivities support
 kde-apps/gwenview:fits - Enable support for NASA's sci-libs/cfitsio library
-kde-apps/gwenview:kipi - Support for the KDE Image Plugin Interface
+kde-apps/gwenview:kipi - Enable support for the KDE Image Plugin Interface
+kde-apps/gwenview:mpris - Enable support for MPRIS2 interface, requiring dev-qt/qtdbus as dependency.
 kde-apps/k3b:emovix - Enable burning support for eMoviX images
 kde-apps/kalzium:editor - Enable the embedded molecule editor/viewer
 kde-apps/kalzium:solver - Enable the equation solver
@@ -3650,6 +3657,7 @@ kde-apps/kdenetwork-meta:telepathy - Enable support for Plasma Telepathy (instan
 kde-apps/kdenlive:freesound - Enable freesound.org credentials support via dev-qt/qtwebkit to download files
 kde-apps/kdenlive:gles2 - Use GLES 2.0 or later instead of full OpenGL
 kde-apps/kdenlive:jogshuttle - Enable support for Jog-Shuttle devices
+kde-apps/kdenlive:share - Enable support for a share menu using kde-frameworks/purpose
 kde-apps/kdepim-addons:importwizard - Enable additional import plugins for kde-apps/akonadi-import-wizard
 kde-apps/kdepim-runtime:speech - Enable text-to-speech support
 kde-apps/kdeutils-meta:floppy - Install kde-apps/kfloppy to format and create DOS or ext2fs filesystems in a floppy.
@@ -3729,6 +3737,7 @@ kde-frameworks/kimageformats:eps - Support the EPS graphics file format
 kde-frameworks/kinit:caps - Capabilities support for improved security and better OOM handling
 kde-frameworks/kinit:man - Build and install man pages
 kde-frameworks/kio:kwallet - Enable permanent storage of passwords for kpasswdserver with kde-frameworks/kwallet
+kde-frameworks/knotifications:phonon - Play notification sounds via media-libs/phonon instead of media-libs/libcanberra
 kde-frameworks/knotifications:speech - Enable text-to-speech notification support
 kde-frameworks/knotifyconfig:phonon - Add sound support via media-libs/phonon
 kde-frameworks/kpackage:man - Build and install man pages
@@ -4224,7 +4233,8 @@ media-gfx/gthumb:webp - Enable support for webp image format
 media-gfx/hugin:sift - automatically align images with media-gfx/autopano-sift-C
 media-gfx/imagemagick:corefonts - Use media-fonts/corefonts which is required by some commands
 media-gfx/imagemagick:fpx - Enable media-libs/libfpx support
-media-gfx/imagemagick:hdri - enable High Dynamic Range Images formats
+media-gfx/imagemagick:hdri - Enable High Dynamic Range Images formats
+media-gfx/imagemagick:heif - Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using media-libs/libheif
 media-gfx/imagemagick:lqr - Enable experimental liquid rescale support using media-libs/liblqr
 media-gfx/imagemagick:opencl - Enable OpenCL support
 media-gfx/imagemagick:pango - Enable Pango support using x11-libs/pango
@@ -4293,7 +4303,6 @@ media-libs/alsa-lib:alisp - Enable support for ALISP (ALSA LISP) interpreter for
 media-libs/alsa-lib:thread-safety - thread-safe API functions
 media-libs/alure:dumb - Enable media-libs/dumb module library support
 media-libs/alure:fluidsynth - Enables Fluidsynth MIDI software synthesis
-media-libs/assimp:boost - Build assimp with boost support
 media-libs/assimp:samples - Build viewer library
 media-libs/assimp:tools - Build assimp tool binary
 media-libs/aubio:double-precision - Compile in double precision mode.
@@ -4836,14 +4845,17 @@ media-sound/musescore:portmidi - Enable support for building against media-libs/
 media-sound/musescore:vorbis - Enable SoundFont support using media-libs/libvorbis
 media-sound/musescore:webengine - Use dev-qt/qtwebengine for embedded web browser
 media-sound/ncmpc:artist-screen - Enable artist screen
+media-sound/ncmpc:async-connect - Enable asynchronous connect
 media-sound/ncmpc:chat-screen - Enable the chat screen
 media-sound/ncmpc:colors - Enable color support
 media-sound/ncmpc:help-screen - Enable the help screen
 media-sound/ncmpc:key-screen - Enable key editor screen
 media-sound/ncmpc:lyrics-screen - Enable lyrics screen
 media-sound/ncmpc:mouse - Enable curses getmouse support
+media-sound/ncmpc:outputs-screen - Enable the outputs screen
 media-sound/ncmpc:search-screen - Enable search screen
 media-sound/ncmpc:song-screen - Enable song viewer screen
+media-sound/ncmpc:tcp - Enable TCP support
 media-sound/ncmpcpp:clock - Enable clock screen
 media-sound/ncmpcpp:outputs - Enable outputs screen
 media-sound/ncmpcpp:visualizer - Enable visualizer screen with sound wave/frequency spectrum modes
@@ -4980,6 +4992,7 @@ media-tv/kodi:gbm - Use the Graphics Buffer Manager for EGL on KMS.
 media-tv/kodi:gles - Enable support for GLES
 media-tv/kodi:libusb - Use virtual/libusb for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use sys-fs/udev.
 media-tv/kodi:lirc - Enable support for controlling Totem with a remote control using app-misc/lirc
+media-tv/kodi:mariadb - Add MariaDB support
 media-tv/kodi:nfs - Enable NFS client support
 media-tv/kodi:nonfree - Enable non-free components
 media-tv/kodi:sftp - Support browsing files over SFTP
@@ -5432,6 +5445,7 @@ net-analyzer/icinga2:classicui - Adds support for the old interface
 net-analyzer/icinga2:console - Adds support for line-editing in the console
 net-analyzer/icinga2:lto - Adds support for link time optimization
 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
@@ -5768,7 +5782,9 @@ net-dns/resolvconf-symlink:symlink - Actually replace /etc/resolv.conf with a sy
 net-dns/unbound:dnscrypt - Enable DNSCrypt support
 net-dns/unbound:dnstap - Enable dnstap support
 net-dns/unbound:ecdsa - Enable ECDSA support
+net-dns/unbound:ecs - Enable EDNS client subnet support
 net-dns/unbound:gost - Enable GOST support
+net-dns/unbound:redis - Enable cache db backend which uses dev-libs/hiredis
 net-firewall/arno-iptables-firewall:plugins - Install optional plugins
 net-firewall/conntrack-tools:cthelper - Use net-libs/libnetfilter_cthelper for userspace conntrack helper support
 net-firewall/conntrack-tools:cttimeout - Use net-libs/libnetfilter_cttimeout for conntrack timeout support
@@ -5846,7 +5862,6 @@ net-fs/s3ql:contrib - Install additional contributed scripts
 net-fs/samba:addc - Enable Active Directory Domain Controller support
 net-fs/samba:addns - Enable AD DNS integration
 net-fs/samba:ads - Enable Active Directory support
-net-fs/samba:aio - Enable asynchronous IO support
 net-fs/samba:ceph - Enable support for Ceph distributed filesystem via sys-cluster/ceph
 net-fs/samba:client - Enables the client part
 net-fs/samba:cluster - Enable support for clustering
@@ -7832,10 +7847,11 @@ sys-apps/fwupd:colorhug - Enable ColorHug support through x11-misc/colord packag
 sys-apps/fwupd:dell - Enable Dell-specific support.
 sys-apps/fwupd:gpg - Enable GPG support.
 sys-apps/fwupd:man - Build and install man pages
+sys-apps/fwupd:nvme - Build and install nvme plugin
 sys-apps/fwupd:pkcs7 - Enable PKCS7 verification support via net-libs/gnutls.
 sys-apps/fwupd:redfish - Install redfish plugin
+sys-apps/fwupd:thunderbolt - Install thunderbolt plugin
 sys-apps/fwupd:uefi - Enable UEFI support
-sys-apps/fwupd:uefi_labels - Enable UEFI labels support
 sys-apps/gawk:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)
 sys-apps/gawk:mpfr - use mpfr for high precision arithmetic (-M / --bignum)
 sys-apps/gnome-disk-utility:fat - Include FAT16/FAT32 support (sys-fs/dosfstools)
@@ -7976,6 +7992,7 @@ sys-auth/consolekit:pm-utils - Adds support for suspend/resume using sys-power/p
 sys-auth/consolekit:policykit - Use the PolicyKit framework (sys-auth/polkit) to get authorization for suspend/shutdown.
 sys-auth/consolekit:systemd-units - Install systemd unit files to replace the modern functionality of logind in sys-apps/systemd. Not recommended.
 sys-auth/fingerprint-gui:upekbsapi - Add UPEK BSAPI drivers for identify functions on some readers
+sys-auth/google-authenticator-libpam-hardened:qrcode - Display QRcode after setup to accomodate automatic setup of OTP client apps.
 sys-auth/keystone:memcached - Installs dependencies needed for using memcached as a backend
 sys-auth/keystone:mongo - Installs dependencies needed for using mongo as a backend
 sys-auth/munge:gcrypt - Use libgcrypt instead of openssl
@@ -8284,6 +8301,7 @@ sys-devel/parity:vc_x86 - Enable support for 32bit Visual Studio compilers
 sys-devel/sparse:gtk - Build the test-inspect utility (requires x11-libs/gtk+ version 2)
 sys-devel/sparse:llvm - Build the sparse-llvm utility
 sys-devel/sparse:xml - Build the c2xml utility (requires dev-libs/libxml2)
+sys-fabric/mstflint:inband - Enable firmware updates for Mellanox SwitchX and ConnectIB devices
 sys-fabric/ofed:dapl - Add support for DAPL abstraction layer
 sys-fabric/ofed:diags - Add dignostic tools for infiniband
 sys-fabric/ofed:ibacm - Add support for userspace pre-connection services
@@ -8333,6 +8351,7 @@ sys-freebsd/freebsd-usbin:audit - Build auditing tools.
 sys-freebsd/freebsd-usbin:floppy - Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).
 sys-freebsd/freebsd-usbin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
 sys-freebsd/freebsd-usbin:zfs - Enable ZFS support.
+sys-fs/android-file-transfer-linux:fuse - Add FUSE mount helper
 sys-fs/btrfs-progs:convert - Build ext2 conversion utility (btrfs-convert)
 sys-fs/btrfs-progs:reiserfs - Enable reiserfs support in btrfs-convert tool.
 sys-fs/btrfs-progs:static - Build static binaries in addition to the dynamic ones