gentoo resync : 09.12.2017

47 files changed, 146 insertions, 55 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 637e3bac9751..d8b0e959b0e3 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/lib32/make.defaults b/profiles/arch/amd64/lib32/make.defaults
new file mode 100644
index 000000000000..19b102e42e0e
--- /dev/null
+++ b/profiles/arch/amd64/lib32/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LIBDIR_x86="lib32"
+SYMLINK_LIB="yes"
diff --git a/profiles/arch/amd64/lib32/parent b/profiles/arch/amd64/lib32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/amd64/lib32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index a9d2cc0549dc..1ca36a8d4f3d 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -18,10 +18,9 @@ DEFAULT_ABI="amd64"
 ABI="amd64"
 
 LIBDIR_amd64="lib64"
-# TODO: move this to a deprecated subprofile
-LIBDIR_x86="lib32"
+LIBDIR_x86="lib"
 LIBDIR_x32="libx32"
-SYMLINK_LIB="yes"
+SYMLINK_LIB="no"
 
 # 64bit specific settings.
 CFLAGS_amd64="-m64"
diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults
index 16e4a413a4cc..ad093457f3a2 100644
--- a/profiles/arch/amd64/x32/make.defaults
+++ b/profiles/arch/amd64/x32/make.defaults
@@ -5,9 +5,6 @@ DEFAULT_ABI="x32"
 ABI="x32"
 MULTILIB_ABIS="amd64 x86 x32"
 
-LIBDIR_x86="lib"
-SYMLINK_LIB="no"
-
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
 # Default to abi_x86_x32 for packages that don't have it forced.
 ABI_X86="x32"
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index f997bb167982..4cce0b3608ea 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,14 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# James Le Cuirot <chewi@gentoo.org> (05 Aug 2016)
-# The ARM32 JIT code is broken as of 7.2.6.6. Without this, Java 7 is
-# no faster than Java 8. It seems more likely that Java 8 will see a
-# new HotSpot port before this breakage is fixed. Earlier versions
-# have vulnerabilities so please switch to icedtea(-bin):8.
-dev-java/icedtea:7
-dev-java/icedtea-bin:7
-
 # James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index b28dda4b5f2a..95f0481da04f 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,12 @@
 
 # This file requires >=portage-2.1.1
 
+# Hans de Graaff <graaff@gentoo.org> (8 Dec 2017)
+# 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
 # dep tree that is unkeyworded at this time.
diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent
index 7c0377510996..644b98fa601f 100644
--- a/profiles/default/linux/amd64/13.0/parent
+++ b/profiles/default/linux/amd64/13.0/parent
@@ -1,2 +1,3 @@
 ..
+../../../../arch/amd64/lib32
 ../../../../releases/13.0
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/eapi b/profiles/default/linux/amd64/17.0/no-multilib/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/parent b/profiles/default/linux/amd64/17.0/no-multilib/hardened/parent
new file mode 100644
index 000000000000..f0b99fe02629
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64/no-multilib
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/eapi b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/parent b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/amd64/17.0/parent b/profiles/default/linux/amd64/17.0/parent
index 4ce24f0217a8..ddb69fdcdf84 100644
--- a/profiles/default/linux/amd64/17.0/parent
+++ b/profiles/default/linux/amd64/17.0/parent
@@ -1,2 +1,3 @@
 ..
+../../../../arch/amd64/lib32
 ../../../../releases/17.0
diff --git a/profiles/default/linux/amd64/17.1/desktop/eapi b/profiles/default/linux/amd64/17.1/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/eapi b/profiles/default/linux/amd64/17.1/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/parent b/profiles/default/linux/amd64/17.1/desktop/gnome/parent
new file mode 100644
index 000000000000..6589a0e01478
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/eapi b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/amd64/17.1/desktop/parent b/profiles/default/linux/amd64/17.1/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/eapi b/profiles/default/linux/amd64/17.1/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/parent b/profiles/default/linux/amd64/17.1/desktop/plasma/parent
new file mode 100644
index 000000000000..ff3a7b1ec814
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/eapi b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/parent b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/amd64/17.1/developer/eapi b/profiles/default/linux/amd64/17.1/developer/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/developer/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/developer/make.defaults b/profiles/default/linux/amd64/17.1/developer/make.defaults
new file mode 100644
index 000000000000..f74d4f114ab6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/developer/make.defaults
@@ -0,0 +1,7 @@
+# Copyright 1999-2013 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
+# This will help developers track packages, that don't respect LDFLAGS, down
+# more effectively
+LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
diff --git a/profiles/default/linux/amd64/17.1/developer/parent b/profiles/default/linux/amd64/17.1/developer/parent
new file mode 100644
index 000000000000..4c893748ce71
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/developer
diff --git a/profiles/default/linux/amd64/17.1/eapi b/profiles/default/linux/amd64/17.1/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/hardened/eapi b/profiles/default/linux/amd64/17.1/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/hardened/parent b/profiles/default/linux/amd64/17.1/hardened/parent
new file mode 100644
index 000000000000..0ea564cadee9
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/hardened/amd64
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/eapi b/profiles/default/linux/amd64/17.1/no-multilib/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/hardened/eapi b/profiles/default/linux/amd64/17.1/no-multilib/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/hardened/parent b/profiles/default/linux/amd64/17.1/no-multilib/hardened/parent
new file mode 100644
index 000000000000..f0b99fe02629
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64/no-multilib
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/eapi b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/parent b/profiles/default/linux/amd64/17.1/no-multilib/parent
new file mode 100644
index 000000000000..7f1f3bc017ee
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/amd64/no-multilib
diff --git a/profiles/default/linux/amd64/17.1/parent b/profiles/default/linux/amd64/17.1/parent
new file mode 100644
index 000000000000..7d28da966e47
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/parent
@@ -0,0 +1,3 @@
+..
+../../../../arch/amd64
+../../../../releases/17.0
diff --git a/profiles/default/linux/amd64/17.1/selinux/eapi b/profiles/default/linux/amd64/17.1/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/selinux/parent b/profiles/default/linux/amd64/17.1/selinux/parent
new file mode 100644
index 000000000000..933e67923d1a
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/selinux
diff --git a/profiles/default/linux/amd64/17.1/systemd/eapi b/profiles/default/linux/amd64/17.1/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/systemd/parent b/profiles/default/linux/amd64/17.1/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/default/linux/amd64/dev/parent b/profiles/default/linux/amd64/dev/parent
index f3229c5b9876..36c90bd12373 100644
--- a/profiles/default/linux/amd64/dev/parent
+++ b/profiles/default/linux/amd64/dev/parent
@@ -1 +1,2 @@
 ..
+../../../../arch/amd64/lib32
diff --git a/profiles/default/linux/amd64/parent b/profiles/default/linux/amd64/parent
index 158dd88c5c69..9f9d2cbed246 100644
--- a/profiles/default/linux/amd64/parent
+++ b/profiles/default/linux/amd64/parent
@@ -1,3 +1,2 @@
 ../../../base
 ..
-../../../arch/amd64
diff --git a/profiles/features/hardened/make.defaults b/profiles/features/hardened/make.defaults
index 1f5030f9a41b..f63895853347 100644
--- a/profiles/features/hardened/make.defaults
+++ b/profiles/features/hardened/make.defaults
@@ -16,6 +16,7 @@ PROFILE_IS_HARDENED=1
 
 # We set the default markings to XATTR_PAX
 PAX_MARKINGS="XT"
+USE="${USE} -ptpax"
 
 # Default starting set of USE flags for all default/linux profiles.
 # We unset them so we get a clean use flag profile.
diff --git a/profiles/hardened/linux/amd64/parent b/profiles/hardened/linux/amd64/parent
index f2e50ba2cf4e..815cf82784f9 100644
--- a/profiles/hardened/linux/amd64/parent
+++ b/profiles/hardened/linux/amd64/parent
@@ -1,4 +1,4 @@
 ../../../base
 ../../../default/linux
-../../../arch/amd64
+../../../arch/amd64/lib32
 ..
diff --git a/profiles/package.mask b/profiles/package.mask
index 76ffd31ed64f..abff57d74e80 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Palimaka <kensington@gentoo.org> (07 Dec 2017)
+# Dead upstream. Requires dead Qt4.
+# Masked for removal in 30 days. Bug #640138.
+net-ftp/oneclickftp
+
+# Michael Palimaka <kensington@gentoo.org> (07 Dec 2017)
+# Dead upstream. Requires dead Qt4.
+# Masked for removal in 30 days. Bug #640138.
+dev-vcs/qct
+
+# Andreas Sturmlechner <asturm@gentoo.org> (06 Dec 2017)
+# No maintainer, depends on dead PyQt4/Qt4.
+# Masked for removal in 30 days. Bugs #480250, #640114
+dev-vcs/qbzr
+dev-vcs/bzr-explorer
+
 # Bernard Cafarelli <voyageur@gentoo.org> (05 Dec 2017)
 # Dead Window Maker dockapps, dead upstreams and download links
 # (no release for more than 10 years)
@@ -377,11 +393,6 @@ dev-java/icedtea-bin:7
 virtual/jdk:1.7
 virtual/jre:1.7
 
-# James Le Cuirot <chewi@gentoo.org> (05 Nov 2017)
-# Upstream dead, bundles a vulnerable mupdf, nothing depends on it,
-# and blocks the removal of Java 7. Removal in 30 days. Bug #472832.
-app-text/jmupdf
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017)
 # Many, many, many open bugs. Blocks gcc-6 stabilization.
 # Removal of the old versions in 30 days; please upgrade to
@@ -614,6 +625,14 @@ dev-lang/spidermonkey:52
 # upstream.
 =app-text/jabref-bin-4.0
 
+# Nicolas Bock <nicolasbock@gentoo.org> (6 Dec 2017)
+# Development has ceased, the last commit to the upstream repository was
+# on 16 July 2016 with a note stating that its status is unmaintained [1].
+# See also Bug 640034.
+#
+# [1] https://github.com/projecthamster/hamster/commit/c3e5fb761c88fdecfd1566cac8b6836228a27cce
+app-office/hamster-time-tracker
+
 # Pacho Ramos <pacho@gentoo.org> (14 Jul 2017)
 # Doesn't work with >=openvpn-2.3, bug 470696
 # Fix is work in progress, see above bug. dilfridge@g.o
@@ -735,11 +754,6 @@ media-plugins/gst-plugins-ffmpeg
 # Alpha release with new features, masked for testing
 =app-text/tesseract-4.00.00_alpha*
 
-# Michał Górny <mgorny@gentoo.org> (26 Jan 2017)
-# Pre-release, masked for testing. Major changes since 2.0.4,
-# including dropped support for BlueZ 4.
-=net-wireless/blueman-2.1_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
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 0a8b6baee11f..bb3babe2b098 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -19,30 +19,48 @@ alpha           default/linux/alpha/17.0/desktop/gnome/systemd  exp
 alpha           default/linux/alpha/17.0/developer              exp
 
 # AMD64 Profiles
-amd64           default/linux/amd64/13.0                           stable
-amd64           default/linux/amd64/13.0/selinux                   dev
-amd64           default/linux/amd64/13.0/desktop                   stable
-amd64           default/linux/amd64/13.0/desktop/gnome             stable
-amd64           default/linux/amd64/13.0/desktop/gnome/systemd     stable
-amd64           default/linux/amd64/13.0/desktop/plasma            stable
-amd64           default/linux/amd64/13.0/desktop/plasma/systemd    stable
-amd64           default/linux/amd64/13.0/developer                 stable
-amd64           default/linux/amd64/13.0/no-multilib               dev
-amd64           default/linux/amd64/13.0/systemd                   stable
-amd64           default/linux/amd64/13.0/x32                       dev
-amd64           default/linux/amd64/17.0                           stable
-amd64           default/linux/amd64/17.0/selinux                   dev
-amd64           default/linux/amd64/17.0/hardened                  dev
-amd64           default/linux/amd64/17.0/hardened/selinux          dev
-amd64           default/linux/amd64/17.0/desktop                   stable
-amd64           default/linux/amd64/17.0/desktop/gnome             stable
-amd64           default/linux/amd64/17.0/desktop/gnome/systemd     stable
-amd64           default/linux/amd64/17.0/desktop/plasma            stable
-amd64           default/linux/amd64/17.0/desktop/plasma/systemd    stable
-amd64           default/linux/amd64/17.0/developer                 stable
-amd64           default/linux/amd64/17.0/no-multilib               dev
-amd64           default/linux/amd64/17.0/systemd                   stable
-amd64           default/linux/amd64/17.0/x32                       dev
+amd64           default/linux/amd64/13.0                                stable
+amd64           default/linux/amd64/13.0/selinux                        dev
+amd64           default/linux/amd64/13.0/desktop                        stable
+amd64           default/linux/amd64/13.0/desktop/gnome                  stable
+amd64           default/linux/amd64/13.0/desktop/gnome/systemd          stable
+amd64           default/linux/amd64/13.0/desktop/plasma                 stable
+amd64           default/linux/amd64/13.0/desktop/plasma/systemd         stable
+amd64           default/linux/amd64/13.0/developer                      stable
+amd64           default/linux/amd64/13.0/no-multilib                    dev
+amd64           default/linux/amd64/13.0/systemd                        stable
+amd64           default/linux/amd64/13.0/x32                            dev
+amd64           default/linux/amd64/17.0                                stable
+amd64           default/linux/amd64/17.0/selinux                        dev
+amd64           default/linux/amd64/17.0/hardened                       dev
+amd64           default/linux/amd64/17.0/hardened/selinux               dev
+amd64           default/linux/amd64/17.0/desktop                        stable
+amd64           default/linux/amd64/17.0/desktop/gnome                  stable
+amd64           default/linux/amd64/17.0/desktop/gnome/systemd          stable
+amd64           default/linux/amd64/17.0/desktop/plasma                 stable
+amd64           default/linux/amd64/17.0/desktop/plasma/systemd         stable
+amd64           default/linux/amd64/17.0/developer                      stable
+amd64           default/linux/amd64/17.0/no-multilib                    dev
+amd64           default/linux/amd64/17.0/no-multilib/hardened           dev
+amd64           default/linux/amd64/17.0/no-multilib/hardened/selinux   dev
+amd64           default/linux/amd64/17.0/systemd                        stable
+amd64           default/linux/amd64/17.0/x32                            dev
+
+# Experimental SYMLINK_LIB=no profiles (work-in-progress)
+# 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.0/no-multilib                    exp
+#amd64           default/linux/amd64/17.0/no-multilib/hardened           exp
+#amd64           default/linux/amd64/17.0/no-multilib/hardened/selinux   exp
+#amd64           default/linux/amd64/17.1/systemd                   exp
 
 # ARM Profiles
 arm             default/linux/arm/13.0                          stable
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 89f3c5cff76f..06543975791e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -444,7 +444,6 @@ app-emacs/calfw:howm - Add support for the app-emacs/howm note-taking tool
 app-emacs/company-mode:ropemacs - Install backend for dev-python/ropemacs
 app-emacs/emacs-common-gentoo:games - Support shared score files for games
 app-emacs/emhacks:jde - Enable support for Java Development Environment
-app-emacs/magit:contrib - Install user-contributed files
 app-emacs/org-mode:contrib - Install user-contributed files
 app-emacs/org-mode:odt-schema - Install non-free schema files for OpenDocument Text exporter
 app-emacs/remember:bbdb - Include support for app-emacs/bbdb
@@ -1147,7 +1146,6 @@ app-text/groonga:zeromq - Enable net-libs/zeromq used for suggestion
 app-text/gtranslator:gnome-dictionary - Enable plugin for dictionary lookups using app-dicts/gnome-dictionary.
 app-text/gtranslator:gucharmap - Enable plugin for unicode symbols selection using gnome-extra/gucharmap.
 app-text/hyperestraier:mecab - Enable app-text/mecab support for Estraier
-app-text/jmupdf:system-mupdf - Link against system version of app-text/mupdf
 app-text/kbibtex:webengine - Use dev-qt/qtwebengine for HTML previews
 app-text/kbibtex:webkit - Use dev-qt/qtwebkit for HTML previews
 app-text/kbibtex:zotero - Enable support for synchronisation with zotero.org web service
@@ -1800,7 +1798,6 @@ dev-java/icedtea:headless-awt - Don't install the X backend for AWT, needed by s
 dev-java/icedtea:jamvm - Use the JamVM virtual machine rather than HotSpot.
 dev-java/icedtea:jbootstrap - If possible, recompile the final IcedTea executables with itself.
 dev-java/icedtea:nsplugin - Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.
-dev-java/icedtea:nss - Enable NSS security provider support.
 dev-java/icedtea:pax_kernel - Apply patch needed for pax enabled kernels.
 dev-java/icedtea:shenandoah - Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (x86_64 only)
 dev-java/icedtea:smartcard - Build the PCSC driver against pcsc-lite
@@ -1808,7 +1805,6 @@ dev-java/icedtea:sunec - Build the SunEC provider against system NSS
 dev-java/icedtea:webstart - Enable Web Start support (via NetX).
 dev-java/icedtea:zero - Enable Zero assembler port (usually for non-HotSpot architectures)
 dev-java/icedtea-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
-dev-java/icedtea-bin:nss - Enable NSS security provider support
 dev-java/icedtea-bin:webstart - Provide javaws command through symlink to icedtea-web
 dev-java/icedtea-web:javascript - Enable support for using proxy auto config (PAC) files.
 dev-java/icedtea-web:nsplugin - Enable the browser plugin (NPPlugin).
@@ -5078,6 +5074,8 @@ media-video/vdr:vasarajanauloja - replacement for the liemikuutio patch, adds so
 media-video/vdr:wareagleicon - Replace original icon set in menu
 media-video/vdr:yaepg - Enables support for the vdr-yaepg plugin
 media-video/vlc:X - Enables support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface.
+media-video/vlc:aom - Enables experimental support for AV1 codec
+media-video/vlc:archive - Enables support for libarchive stream extractor
 media-video/vlc:atmo - Enables support for AtmoLight (homebrew Ambient Lighting Technology)
 media-video/vlc:audioqueue - Enables AudioQueue audio module for Mac OS X.
 media-video/vlc:avcodec - Enables libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg.
@@ -5111,6 +5109,7 @@ media-video/vlc:macosx-qtkit - Enables Mac OS X qtkit module: qtcapture (video)
 media-video/vlc:macosx-quartztext - Enables Mac OS X quartz text module.
 media-video/vlc:matroska - Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)
 media-video/vlc:mpeg - Add libmpeg2 support for mpeg-1 and mpeg-2 video streams
+media-video/vlc:nfs - Enables support for nfs protocol via net-fs/libnfs
 media-video/vlc:omxil - Enables OpenMAX Integration Layer codec module.
 media-video/vlc:opencv - Enabled OpenCV (computer vision) filter module.
 media-video/vlc:optimisememory - Enable optimisation for memory rather than performance.
@@ -6972,9 +6971,11 @@ net-wireless/wepattack:john - Build with app-crypt/johntheripper support
 net-wireless/wireless-tools:multicall - Build the most commonly used tools as one binary
 net-wireless/wpa_supplicant:ap - Add support for access point mode
 net-wireless/wpa_supplicant:eap-sim - Add support for EAP-SIM authentication algorithm
+net-wireless/wpa_supplicant:eapol_test - Build and install eapol_test binary
 net-wireless/wpa_supplicant:fasteap - Add support for FAST-EAP authentication algorithm
 net-wireless/wpa_supplicant:hs2-0 - Add support for 802.11u and Passpoint for HotSpot 2.0
 net-wireless/wpa_supplicant:p2p - Add support for Wi-Fi Direct mode
+net-wireless/wpa_supplicant:privsep - Enable wpa_priv privledge separation binary
 net-wireless/wpa_supplicant:ps3 - Add support for ps3 hypervisor driven gelic wifi
 net-wireless/wpa_supplicant:smartcard - Add support for smartcards
 net-wireless/wpa_supplicant:tdls - Add support for Tunneled Direct Link Setup (802.11z)
@@ -7726,6 +7727,7 @@ 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 ;)
 sys-block/parted:device-mapper - Enable device-mapper support from sys-fs/lvm2 in parted
 sys-block/partimage:nologin - Do not include login support when connecting partimaged
+sys-block/perccli:efi - Install EFI variant as well
 sys-block/sas2ircu:efi - Install EFI variant as well
 sys-block/sas3flash:efi - Install EFI variant as well
 sys-block/sas3ircu:efi - Install EFI variant as well
@@ -8867,6 +8869,7 @@ xfce-extra/xfce4-playercontrol-plugin:audacious - Enable Audacious support
 xfce-extra/xfce4-playercontrol-plugin:mpd - Enable Music Player Daemon support
 xfce-extra/xfce4-power-manager:panel-plugin - Build the power management plugin for the XFCE panel
 xfce-extra/xfce4-pulseaudio-plugin:keybinder - Enable support for global hotkeys using dev-libs/keybinder.
+xfce-extra/xfce4-pulseaudio-plugin:wnck - Enable experimental support for raising media player windows using x11-libs/libwnck.
 xfce-extra/xfce4-soundmenu-plugin:glyr - Enable music metadata searchengine support using media-libs/glyr
 xfce-extra/xfce4-soundmenu-plugin:keybinder - Enable shortcut support using dev-libs/keybinder
 xfce-extra/xfce4-soundmenu-plugin:lastfm - Enable last.fm support using media-libs/libclastfm