gentoo resync : 16.01.2018

31 files changed, 132 insertions, 88 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e35729907e94..ec1867e1a21a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index caf8d15af3f0..c875bee78cda 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -6,6 +6,12 @@
 
 # SECTION: Unmask
 
+# Michael Orlitzky <mjo@gentoo.org> (07 Jan 2018)
+# Oracle database stuff should work on amd64.
+-oci8
+-oci8-instant-client
+-oracle
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
@@ -96,11 +102,6 @@
 # Lilo works on amd64, so ...
 -lilo
 
-# 2007/08/19 - Christoph Mende <angelos@gentoo.org>
-# Unmask support for dev-db/oracle-instantclient-basic
--oci8-instant-client
--oracle
-
 # 2007/03/10 - Mike Frysinger <vapier@gentoo.org>
 # NVRAM works on x86/amd64 hosts
 -nvram
@@ -125,10 +126,6 @@
 -video_cards_vmware
 -video_cards_qxl
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86/amd64
--oci8
-
 # Feb 16th 2007; Simon Stelling <blubb@gentoo.org>
 # Since this profile forces >=portage-2.1.2, we can unmask all
 # SIMD assembler flags
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index bf23c16f576b..19cc5e875db6 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -18,7 +18,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-12 frei0r
-<=media-video/ffmpeg-3.3.5 frei0r sofalizer
+<=media-video/ffmpeg-3.3.6 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (26 May 2017)
 # toolame not stable yet
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 752b4918b135..a97dce3a8c01 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -8,13 +8,6 @@
 # dev-libs/libressl not marked stable yet
 libressl
 
-# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
-# Mask python targets until dev-lang/python is stable.
-python_single_target_python3_6
-python_targets_python3_6
-python_single_target_python3_5
-python_targets_python3_5
-
 # Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
 # Temporary mask to support stable bug 615818
 ruby_targets_ruby22
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 6c23a4598d8b..730688845f01 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# app-arch/snappy is not tested
+dev-db/mariadb innodb-snappy
+
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # Requires dependency flags that are masked in this profile.
 media-libs/sdl-mixer midi
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 60ea7770845a..384fdee257c2 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -mips
 
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask tcmalloc as dev-util/google-perftools is unavailable
+tcmalloc
+
 # James Le Cuirot <chewi@gentoo.org> (29 Jun 2017)
 # Unmask as this profile is big endian.
 -big-endian
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 58f2fc383b66..61982cc07f41 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -4,6 +4,12 @@
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# Michael Orlitzky <mjo@gentoo.org> (13 Jan 2018)
+# Oracle database stuff should work on x86.
+-oci8
+-oci8-instant-client
+-oracle
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
@@ -120,10 +126,6 @@
 # Unmask nvidia XvMC support
 -nvidia
 
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
--oracle
-
 # Modular X: unmask for architectures on which they are available
 -input_devices_synaptics
 -input_devices_vmmouse
@@ -140,12 +142,6 @@
 -video_cards_virtualbox
 -video_cards_qxl
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86
-#
-# Shared with amd64
--oci8
-
 # Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
 # Unmask as it works on x86
 -lcd_devices_svga
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 972361178c67..f0f583ba3e77 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -1,9 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # 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> (16 Jan 2018)
+# USE=wxwidgets Requires x11-libs/wxGTK:3.0-gtk3 stabilisation
+# USE=tcl does not build reliably, bug #624576
+>=sci-libs/plplot-5.12 tcl wxwidgets
+
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Nov 2017)
 # Dependencies have no stable keyword
 app-backup/backup-manager s3
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/parent b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/parent
new file mode 100644
index 000000000000..665aafbea8db
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/parent b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/parent
new file mode 100644
index 000000000000..7eed652658f8
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/eapi b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/parent b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b3da232ba558
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/parent b/profiles/default/linux/amd64/17.0/no-multilib/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
index a1ebac8bd77c..2bb6d0614b8a 100644
--- a/profiles/default/linux/musl/package.use.mask
+++ b/profiles/default/linux/musl/package.use.mask
@@ -1,6 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
+# See bug #604542
+net-misc/iputils idn
+
 # See bug #504200
 sys-devel/gcc sanitize
 
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 0a6667cd9dce..8060b8e26b79 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -20,10 +20,6 @@ net-dns/bind seccomp
 # media-libs/libomxil-bellagio keyworded on amd64/x86
 media-libs/mesa openmax
 
-# Thomas Sachau <tommy@gentoo.org> (25 Dez 2013)
-# mask frost USE flag, broken with >=net-libs/polarssl-1.3.0, bug 489256
-net-p2p/fms frost
-
 # Diego Elio Pettenò (27 Aug 2012)
 # The libpci access is only used for linux.
 net-analyzer/net-snmp -pci
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/parent b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/parent
new file mode 100644
index 000000000000..c4bb168d81b2
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/parent b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/parent
new file mode 100644
index 000000000000..b4882488fc0c
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/eapi b/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/parent b/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b8a505e58f6c
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/x86/17.0/prefix/parent b/profiles/default/linux/x86/17.0/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
index 510e5e21b3ce..c64a419f389d 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
@@ -14,5 +14,5 @@ ac_cv_func_utimensat=no
 ac_cv_func_pipe2=no
 
 # >=python-3 is masked.
-PYTHON_TARGETS="-python3_*"
+PYTHON_TARGETS=python2_7
 PYTHON_SINGLE_TARGET=python2_7
diff --git a/profiles/package.mask b/profiles/package.mask
index 0774af71193e..83b0aece3a52 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Aaron W. Swenson <titanofold@gentoo.org> (14 Jan 2018)
+# Upstream is now Upwork. Use app-office/upwork instead.
+# Masked for removal in 30 days.
+app-office/odeskteam
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+sys-kernel/kccmp
+
 # Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
 # Dead upstream, depends on dead Qt4.
 # Masked for removal in 30 days.
@@ -375,10 +385,6 @@ media-libs/libdvb
 dev-lang/blassic
 
 # Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
-# Fails at runtime (#614314). Removal in a month.
-app-text/nfoview
-
-# Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
 # Needs to be migrated to pycryptodome, this was merged into paramiko
 # (#611616). Removal in a month.
 dev-python/ssh
@@ -703,13 +709,6 @@ virtual/jre:9
 # experimental features and accept a more unstable release.
 >=www-client/chromium-65
 
-# Aaron W. Swenson <titanofold.org> (15 Dec 2017)
-# Masked for removal in 30 days (2017-01-14). Upstream doesn't appear
-# to be active and is really far behind in supporting the latest
-# enhancements from PostgreSQL. Consider using dev-db/pgadmin4
-# instead. (Bug 641140)
-dev-db/phppgadmin
-
 # Andrey Grozin <grozin@gentoo.org> (15 Dec 2017)
 # Dead upstream. Removal in 30 days. Use bpython or ptpython instead.
 dev-python/dreampie
@@ -722,23 +721,11 @@ dev-python/pydb
 # Dead upstream, unclear license. Removal in 30 days.
 dev-python/pygui
 
-# Thomas Deutschmann <whissi@gentoo.org> (14 Dec 2017)
-# Unpatched security vulnerability per bug #537108
-# Removal in 30 days. Please migrate to net-libs/mbedtls if you have
-# not done yet.
-net-libs/polarssl
-
 # Patrice Clement <monsieurp@gentoo.org> (12 Dec 2017)
 # Masked due to a hard dependency on an ancient versions of dev-libs/msgpack
 # (<0.6) that have been punted from the tree.
 net-misc/cocaine-core
 
-# Jonas Stein <jstein@gentoo.org> (10 Dec 2017)
-# Site blocks certain IP blocks from downloading files, while the package
-# may not be mirrored. (bug #640508)
-# Masked for removal on 2018-01-12
-app-arch/defluff
-
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
 # Depends on dead Qt4, upstream porting inquiry pending. Bug #631788
 games-kids/crayon-physics
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 4e3223a76b14..b1d5fdcdff74 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -48,19 +48,19 @@ amd64           default/linux/amd64/17.0/x32                            dev
 
 # Experimental SYMLINK_LIB=no profiles
 # Run app-portage/unsymlink-lib *before* switching the profile.
-#amd64           default/linux/amd64/17.1                           exp
-#amd64           default/linux/amd64/17.1/selinux                   exp
-#amd64           default/linux/amd64/17.1/hardened                  exp
-#amd64           default/linux/amd64/17.1/desktop                   exp
-#amd64           default/linux/amd64/17.1/desktop/gnome             exp
-#amd64           default/linux/amd64/17.1/desktop/gnome/systemd     exp
-#amd64           default/linux/amd64/17.1/desktop/plasma            exp
-#amd64           default/linux/amd64/17.1/desktop/plasma/systemd    exp
-#amd64           default/linux/amd64/17.1/developer                 exp
-#amd64           default/linux/amd64/17.1/no-multilib                    exp
-#amd64           default/linux/amd64/17.1/no-multilib/hardened           exp
-#amd64           default/linux/amd64/17.1/no-multilib/hardened/selinux   exp
-#amd64           default/linux/amd64/17.1/systemd                   exp
+amd64           default/linux/amd64/17.1                           exp
+amd64           default/linux/amd64/17.1/selinux                   exp
+amd64           default/linux/amd64/17.1/hardened                  exp
+amd64           default/linux/amd64/17.1/desktop                   exp
+amd64           default/linux/amd64/17.1/desktop/gnome             exp
+amd64           default/linux/amd64/17.1/desktop/gnome/systemd     exp
+amd64           default/linux/amd64/17.1/desktop/plasma            exp
+amd64           default/linux/amd64/17.1/desktop/plasma/systemd    exp
+amd64           default/linux/amd64/17.1/developer                 exp
+amd64           default/linux/amd64/17.1/no-multilib                    exp
+amd64           default/linux/amd64/17.1/no-multilib/hardened           exp
+amd64           default/linux/amd64/17.1/no-multilib/hardened/selinux   exp
+amd64           default/linux/amd64/17.1/systemd                   exp
 
 # ARM Profiles
 arm             default/linux/arm/13.0                          stable
@@ -90,9 +90,9 @@ arm             default/linux/arm/13.0/armv7a/desktop/gnome     dev
 arm             default/linux/arm/13.0/armv7a/developer         dev
 
 # ARM64 Profiles
-arm64           default/linux/arm64/13.0                        dev
+arm64           default/linux/arm64/13.0                        exp
 arm64           default/linux/arm64/13.0/desktop                exp
-arm64           default/linux/arm64/13.0/desktop/systemd        dev
+arm64           default/linux/arm64/13.0/desktop/systemd        exp
 arm64           default/linux/arm64/13.0/developer              exp
 arm64           default/linux/arm64/13.0/systemd                exp
 arm64           default/linux/arm64/17.0                        dev
@@ -290,18 +290,18 @@ x86		default/linux/musl/x86					exp
 x86		hardened/linux/musl/x86					exp
 
 # Non-embedded uclibc profiles
-amd64		default/linux/uclibc/amd64				dev
-amd64		hardened/linux/uclibc/amd64				dev
-arm		default/linux/uclibc/arm/armv7a				dev
-arm		hardened/linux/uclibc/arm/armv7a			dev
-mips		default/linux/uclibc/mips				dev
-mips		hardened/linux/uclibc/mips				dev
-mips		default/linux/uclibc/mips/mipsel			dev
-mips		hardened/linux/uclibc/mips/mipsel			dev
-ppc		default/linux/uclibc/ppc				dev
-ppc		hardened/linux/uclibc/ppc				dev
-x86		default/linux/uclibc/x86				dev
-x86		hardened/linux/uclibc/x86				dev
+amd64		default/linux/uclibc/amd64				exp
+amd64		hardened/linux/uclibc/amd64				exp
+arm		default/linux/uclibc/arm/armv7a				exp
+arm		hardened/linux/uclibc/arm/armv7a			exp
+mips		default/linux/uclibc/mips				exp
+mips		hardened/linux/uclibc/mips				exp
+mips		default/linux/uclibc/mips/mipsel			exp
+mips		hardened/linux/uclibc/mips/mipsel			exp
+ppc		default/linux/uclibc/ppc				exp
+ppc		hardened/linux/uclibc/ppc				exp
+x86		default/linux/uclibc/x86				exp
+x86		hardened/linux/uclibc/x86				exp
 
 # uclibc/embedded multiarch profiles
 #amd64		uclibc/amd64					dev
@@ -334,8 +334,14 @@ x86-linux		prefix/linux/x86				exp
 # Linux Standalone Profiles
 amd64-linux		prefix/linux-standalone/amd64			exp
 amd64-linux		prefix/linux-standalone/amd64/legacy		exp
+amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+		exp
+amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+	exp
+amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+	exp
 x86-linux		prefix/linux-standalone/x86			exp
 x86-linux		prefix/linux-standalone/x86/legacy		exp
+x86-linux		default/linux/x86/17.0/prefix/kernel-3.2+	exp
+x86-linux		default/linux/x86/17.0/prefix/kernel-2.6.32+	exp
+x86-linux		default/linux/x86/17.0/prefix/kernel-2.6.16+	exp
 arm-linux		prefix/linux-standalone/arm/armv7a		exp
 arm64-linux		prefix/linux-standalone/arm64			exp
 ppc64-linux		prefix/linux-standalone/ppc64			exp
diff --git a/profiles/releases/freebsd-11.1/package.use.mask b/profiles/releases/freebsd-11.1/package.use.mask
new file mode 100644
index 000000000000..a31b625b320f
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/package.use.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask innodb-snappy as app-arch/snappy is untested
+# Mask innodb-lz4 as app-arch/lz4 is untested
+# Mask oqgraph as dev-libs/judy is untested
+# Mask numa as sys-process-numactl is untested
+dev-db/mariadb innodb-snappy innodb-lz4 oqgraph numa
diff --git a/profiles/releases/freebsd-11.1/use.mask b/profiles/releases/freebsd-11.1/use.mask
new file mode 100644
index 000000000000..6014f7dee6cc
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/use.mask
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask dev-util/systemtap is untested
+systemtap
+
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask dev-libs/jemalloc is untested
+jemalloc
+
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask dev-libs/libressl is untested
+libressl
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 0a9e3e0b3c4b..55c8cd93e968 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -14,7 +14,7 @@ gnome		https://download.gnome.org/
 gnu		http://ftpmirror.gnu.org/ http://ftp.gnu.org/gnu/
 gnu-alpha	ftp://alpha.gnu.org/gnu/ http://alpha.gnu.org/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ http://gnualpha.uib.no/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/
 gnupg		ftp://ftp.gnupg.org/gcrypt/ http://mirrors.dotsrc.org/gcrypt/ http://artfiles.org/gnupg.org/ http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ ftp://sunsite.icm.edu.pl/pub/security/gnupg/ http://gd.tuwien.ac.at/privacy/gnupg/ http://www.ring.gr.jp/pub/net/gnupg/ ftp://ftp.ring.gr.jp/pub/net/gnupg/
-hackage		http://hackage.haskell.org/ https://dev.gentoo.org/~qnikst/hdiff.luite.com/
+hackage		https://hackage.haskell.org/
 idsoftware	ftp://ftp.idsoftware.com/idstuff ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff ftp://ftp.gamers.org/pub/idgames/idstuff
 imagemagick	http://mirror.checkdomain.de/imagemagick/ ftp://mirror.checkdomain.de/imagemagick/ ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org ftp://ftp.nluug.nl/pub/ImageMagick http://ftp.nluug.nl/ImageMagick/ ftp://sunsite.icm.edu.pl/packages/ImageMagick/ http://ftp.acc.umu.se/mirror/imagemagick.org/ftp/ https://www.imagemagick.org/download http://transloadit.imagemagick.org/download ftp://transloadit.imagemagick.org/ImageMagick ftp://ftp.fifi.org/pub/ImageMagick
 kde		https://download.kde.org http://mirror.csclub.uwaterloo.ca/kde ftp://mirrors.dotsrc.org/kde ftp://kde.mirror.anlx.net
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5daa8a2d2f70..8336e87e2c93 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -222,6 +222,10 @@ app-arch/pigz:symlink - Install symlinks which override app-arch/gzip implementa
 app-arch/rar:all_sfx - Install all SFX (Self-Extracting) files rather than just the native format (allows creation of Windows EXEs on Linux ELF systems)
 app-arch/tar:minimal - just install `tar`
 app-arch/unzip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
+app-arch/wimlib:fuse - Use fuse libraries
+app-arch/wimlib:ntfs - Use libntfs-3g library from sys-fs/ntfs3g
+app-arch/wimlib:openssl - Use the SHA-1 message digest from libcrypto instead of compilling another implementation
+app-arch/wimlib:yasm - Use yasm assembler instead of nasm
 app-arch/xz-utils:extra-filters - Build additional filters that are not used in any of the default xz presets. This includes delta and BCJ coders, additional match finders and SHA256 checks.
 app-arch/zip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
 app-backup/amanda:ndmp - Support for the NDMP protocol
@@ -996,9 +1000,11 @@ app-office/calligra:phonon - Build stage/eventplugins and videoshape plugin usin
 app-office/calligra:pim - Enable support for KDE PIM resources integration
 app-office/calligra:spacenav - Enable support for the 3Dconnexion spacenav input device via dev-libs/libspnav
 app-office/glabels:barcode - Enable barcode support through external libraries.
+app-office/gnucash:aqbanking - Connect to some internet banks via AqBanking
 app-office/gnucash:chipcard - Enable support for chipcard reading and processing.
 app-office/gnucash:hbci - Enable HBCI support, for connecting to some internet banks
 app-office/gnucash:quotes - Enable Online Stock Quote retrieval
+app-office/gnucash:register2 - Use the new register (Experimental)
 app-office/gnumeric:libgda - Enable database support through gnome-extra/libgda.
 app-office/gnumeric:perl - Enable perl plugin loader.
 app-office/gnumeric:python - Enable python plugin loader.
@@ -2082,6 +2088,7 @@ dev-libs/libdynd:mkl - Enable a plugin for Intel Math Kernel Library sci-libs/mk
 dev-libs/libevent:debug - Support runtime debug mode and malloc hooks (for programmers)
 dev-libs/libffi:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
+dev-libs/libgcrypt:o-flag-munging - Enable O-flag mangling during build
 dev-libs/libgdata:gnome-online-accounts - Enable net-libs/gnome-online-accounts support
 dev-libs/libgit2:gssapi - Enable GSSAPI support for SPNEGO auth
 dev-libs/libgit2:ssh - Enable SSH transport support
@@ -3274,6 +3281,11 @@ games-sports/xmoto:editor - Depend on inkscape, scripts to convert svg to level
 games-strategy/0ad:editor - Include Atlas scenario editor projects
 games-strategy/0ad:lobby - Enable the use of net-libs/gloox and the multiplayer lobby
 games-strategy/0ad:nvtt - Support for some uncompressed data formats via media-gfx/nvidia-texture-tools (might be needed for some mods)
+games-strategy/colobot:devbuild - TODO
+games-strategy/colobot:tools - Build tools
+games-strategy/colobot-data:music - Enable music support
+games-strategy/colobot-data:music_flac_convert - Fetch flac music and convert it to ogg
+games-strategy/colobot-data:music_ogg - Fetch ogg music
 games-strategy/defcon-demo:system-libs - Use system libraries instead of the ones included in the upstream distribution.
 games-strategy/freeciv:aimodules - Support for dynamically loadable AI modules (server-side)
 games-strategy/freeciv:auth - Add authentication capability via mysql, postgres or sqlite3
@@ -5750,6 +5762,7 @@ net-im/pyicq-t:webinterface - Install dependencies needed for the web interface
 net-im/qtox:X - Adds support for X11
 net-im/qtox:gtk - Adds support for GTK and Status Notifier tray backends
 net-im/skypeforlinux:pax_kernel - Triggers a paxmarking of the main skype binary
+net-im/slack-bin:pax_kernel - Triggers a paxmarking of the binary
 net-im/telepathy-connection-managers:gadu - Enable Gadu Gadu protocol support.
 net-im/telepathy-connection-managers:irc - Enable Internet Relay Chat (IRC) support.
 net-im/telepathy-connection-managers:meanwhile - Enable meanwhile support for Sametime protocol.
@@ -6051,8 +6064,6 @@ net-libs/pjproject:resample - Include resampling implementations in the build
 net-libs/pjproject:silk - Include SILK support in the build
 net-libs/pjproject:v4l2 - Include Video4Linux v2 support in the build
 net-libs/pjproject:webrtc - Enable WebRTC support
-net-libs/polarssl:havege - Enable the HAVEGE random generator. Warning: the HAVEGE random generator is not suitable for virtualized environments
-net-libs/polarssl:programs - Build PolarSSL programs
 net-libs/ptlib:asn - Enable ASN decoding/encoding support
 net-libs/ptlib:dtmf - Enable DTMF encoding/decoding support
 net-libs/ptlib:http - Enable HTTP support
@@ -6260,6 +6271,7 @@ net-misc/bfgminer:udev-broad-rules - Enable broader udev rules that may match no
 net-misc/bfgminer:x6500 - Enable support for mining with X6500 FPGAs
 net-misc/bfgminer:zeusminer - Enable support for mining with ZeusMiner units
 net-misc/bfgminer:ztex - Enable support for mining with Ztex FPGAs
+net-misc/bird:client - Build the ncurses/readline full featured CLI
 net-misc/cfengine:html - Install HTML documentation
 net-misc/cfengine:libvirt - Enable support for virtual machine management through app-emulation/libvirt
 net-misc/cfengine:masterfiles - Install the Masterfiles Policy Framework
@@ -7348,7 +7360,6 @@ sci-libs/ceres-solver:sparse - Enable support for sparse matrix algebra with var
 sci-libs/cfitsio:tools - Build execs fpack, funpack, imcopy, fitscopy, listhead
 sci-libs/cgnslib:legacy - Enable or disable building legacy code (3.0 compatible)
 sci-libs/cgnslib:tools - A number of utility programs: cgnscheck, cgnscompress, cgnsdiff, cgnslist, cgnsnames, cgnsupdate, cgnsconvert, adf2hdf, hdf2adf.
-sci-libs/chemkit:applications - Build also applications not only the libraries
 sci-libs/cholmod:cuda - Use nvidia cuda toolkit for speeding up computations
 sci-libs/cholmod:metis - Enable the Partition module to cholmod using sci-libs/metis
 sci-libs/clblas:client - Build a command line clBLAS client program.
@@ -7668,7 +7679,6 @@ sci-visualization/qtiplot:linguas_zh_CN - Chinese locale for China
 sci-visualization/veusz:emf - Add FITS format via dev-python/pyemf
 sci-visualization/veusz:fits - Add FITS format via dev-python/astropy
 sci-visualization/veusz:minuit - Use Minuit during fitting viadev-python/pyminuit
-sci-visualization/veusz:vo - Add Virtual Observatory tools via dev-python/astropy
 sci-visualization/visit:cgns - Builds the reader for the CFD General Notation System file format.
 sci-visualization/visit:silo - Adds support for reading .silo files.
 sci-visualization/visit:xdmf2 - Support for xdmf2 formated data.