gentoo resync : 15.12.2017

84 files changed, 252 insertions, 85 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 37ac2ac57fb7..0760f2362aaa 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/packages b/profiles/base/packages
index b782c6fb9315..2decf0cad968 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -43,8 +43,6 @@
 *sys-apps/kbd
 # temporary bugfix for #398295
 *sys-apps/less
-# stopgap solution for functions.sh #373219 and #504116
-*sys-apps/openrc
 *sys-process/procps
 *sys-process/psmisc
 *sys-apps/sed
diff --git a/profiles/default/linux/musl/amd64/eapi b/profiles/default/linux/musl/amd64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/amd64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/default/linux/musl/amd64/make.defaults
index 496becbfe820..496becbfe820 100644
--- a/profiles/hardened/linux/musl/amd64/make.defaults
+++ b/profiles/default/linux/musl/amd64/make.defaults
diff --git a/profiles/hardened/linux/musl/amd64/package.mask b/profiles/default/linux/musl/amd64/package.mask
index 2d46a562aced..2d46a562aced 100644
--- a/profiles/hardened/linux/musl/amd64/package.mask
+++ b/profiles/default/linux/musl/amd64/package.mask
diff --git a/profiles/hardened/linux/musl/amd64/package.use.force b/profiles/default/linux/musl/amd64/package.use.force
index ca264fedc8ce..ca264fedc8ce 100644
--- a/profiles/hardened/linux/musl/amd64/package.use.force
+++ b/profiles/default/linux/musl/amd64/package.use.force
diff --git a/profiles/hardened/linux/musl/amd64/package.use.mask b/profiles/default/linux/musl/amd64/package.use.mask
index 49830f81047d..49830f81047d 100644
--- a/profiles/hardened/linux/musl/amd64/package.use.mask
+++ b/profiles/default/linux/musl/amd64/package.use.mask
diff --git a/profiles/hardened/linux/musl/arm/parent b/profiles/default/linux/musl/amd64/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/hardened/linux/musl/arm/parent
+++ b/profiles/default/linux/musl/amd64/parent
diff --git a/profiles/hardened/linux/musl/amd64/use.force b/profiles/default/linux/musl/amd64/use.force
index 181cb39654fc..181cb39654fc 100644
--- a/profiles/hardened/linux/musl/amd64/use.force
+++ b/profiles/default/linux/musl/amd64/use.force
diff --git a/profiles/hardened/linux/musl/amd64/use.mask b/profiles/default/linux/musl/amd64/use.mask
index cc3b7ca5f0e3..cc3b7ca5f0e3 100644
--- a/profiles/hardened/linux/musl/amd64/use.mask
+++ b/profiles/default/linux/musl/amd64/use.mask
diff --git a/profiles/default/linux/musl/amd64/x32/eapi b/profiles/default/linux/musl/amd64/x32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/amd64/x32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/amd64/x32/make.defaults b/profiles/default/linux/musl/amd64/x32/make.defaults
index 88509a6717c0..88509a6717c0 100644
--- a/profiles/hardened/linux/musl/amd64/x32/make.defaults
+++ b/profiles/default/linux/musl/amd64/x32/make.defaults
diff --git a/profiles/default/linux/musl/amd64/x32/parent b/profiles/default/linux/musl/amd64/x32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/musl/amd64/x32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.force b/profiles/default/linux/musl/amd64/x32/use.force
index a837531f8a4a..a837531f8a4a 100644
--- a/profiles/hardened/linux/musl/amd64/x32/use.force
+++ b/profiles/default/linux/musl/amd64/x32/use.force
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.mask b/profiles/default/linux/musl/amd64/x32/use.mask
index fb16cbe71565..fb16cbe71565 100644
--- a/profiles/hardened/linux/musl/amd64/x32/use.mask
+++ b/profiles/default/linux/musl/amd64/x32/use.mask
diff --git a/profiles/default/linux/musl/arm/armv7a/eapi b/profiles/default/linux/musl/arm/armv7a/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/arm/armv7a/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/arm/armv7a/make.defaults b/profiles/default/linux/musl/arm/armv7a/make.defaults
index c680f6aa2e5a..c680f6aa2e5a 100644
--- a/profiles/hardened/linux/musl/arm/armv7a/make.defaults
+++ b/profiles/default/linux/musl/arm/armv7a/make.defaults
diff --git a/profiles/default/linux/musl/arm/armv7a/parent b/profiles/default/linux/musl/arm/armv7a/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/musl/arm/armv7a/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/musl/arm/eapi b/profiles/default/linux/musl/arm/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/arm/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/arm/make.defaults b/profiles/default/linux/musl/arm/make.defaults
index e0e4051efde6..e0e4051efde6 100644
--- a/profiles/hardened/linux/musl/arm/make.defaults
+++ b/profiles/default/linux/musl/arm/make.defaults
diff --git a/profiles/hardened/linux/musl/arm/package.use.force b/profiles/default/linux/musl/arm/package.use.force
index b92b1029f52a..b92b1029f52a 100644
--- a/profiles/hardened/linux/musl/arm/package.use.force
+++ b/profiles/default/linux/musl/arm/package.use.force
diff --git a/profiles/default/linux/musl/arm/parent b/profiles/default/linux/musl/arm/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/musl/arm/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/arm/use.force b/profiles/default/linux/musl/arm/use.force
index 11e95dae7631..11e95dae7631 100644
--- a/profiles/hardened/linux/musl/arm/use.force
+++ b/profiles/default/linux/musl/arm/use.force
diff --git a/profiles/hardened/linux/musl/arm/use.mask b/profiles/default/linux/musl/arm/use.mask
index 8dffd62b8e39..8dffd62b8e39 100644
--- a/profiles/hardened/linux/musl/arm/use.mask
+++ b/profiles/default/linux/musl/arm/use.mask
diff --git a/profiles/default/linux/musl/arm64/eapi b/profiles/default/linux/musl/arm64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/arm64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/arm64/make.defaults b/profiles/default/linux/musl/arm64/make.defaults
index d9ba618fa184..d9ba618fa184 100644
--- a/profiles/hardened/linux/musl/arm64/make.defaults
+++ b/profiles/default/linux/musl/arm64/make.defaults
diff --git a/profiles/hardened/linux/musl/arm64/package.use.force b/profiles/default/linux/musl/arm64/package.use.force
index d90dd06eaf22..d90dd06eaf22 100644
--- a/profiles/hardened/linux/musl/arm64/package.use.force
+++ b/profiles/default/linux/musl/arm64/package.use.force
diff --git a/profiles/default/linux/musl/arm64/parent b/profiles/default/linux/musl/arm64/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/musl/arm64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/arm64/use.force b/profiles/default/linux/musl/arm64/use.force
index 1fa2eca30677..1fa2eca30677 100644
--- a/profiles/hardened/linux/musl/arm64/use.force
+++ b/profiles/default/linux/musl/arm64/use.force
diff --git a/profiles/hardened/linux/musl/arm64/use.mask b/profiles/default/linux/musl/arm64/use.mask
index 04a2bed3cacf..04a2bed3cacf 100644
--- a/profiles/hardened/linux/musl/arm64/use.mask
+++ b/profiles/default/linux/musl/arm64/use.mask
diff --git a/profiles/default/linux/musl/eapi b/profiles/default/linux/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/musl/make.defaults b/profiles/default/linux/musl/make.defaults
new file mode 100644
index 000000000000..f0116539f6b1
--- /dev/null
+++ b/profiles/default/linux/musl/make.defaults
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+PORTAGE_LIBC="musl"
+ELIBC="musl"
+
+FEATURES="sandbox sfperms strict"
+
+USE="nptl unicode -berkdb"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
+
+SYMLINK_LIB="no"
+
+# TODO: fix so musl doesn't generate this for all packages
+# that use a charset, it causes package collisons.
+INSTALL_MASK="charset.alias"
diff --git a/profiles/default/linux/musl/mips/eapi b/profiles/default/linux/musl/mips/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/mips/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/mips/make.defaults b/profiles/default/linux/musl/mips/make.defaults
index 06fe764dc9f5..06fe764dc9f5 100644
--- a/profiles/hardened/linux/musl/mips/make.defaults
+++ b/profiles/default/linux/musl/mips/make.defaults
diff --git a/profiles/default/linux/musl/mips/mipsel/eapi b/profiles/default/linux/musl/mips/mipsel/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/mips/mipsel/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/mips/mipsel/make.defaults b/profiles/default/linux/musl/mips/mipsel/make.defaults
index dce419912712..dce419912712 100644
--- a/profiles/hardened/linux/musl/mips/mipsel/make.defaults
+++ b/profiles/default/linux/musl/mips/mipsel/make.defaults
diff --git a/profiles/default/linux/musl/mips/mipsel/parent b/profiles/default/linux/musl/mips/mipsel/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/musl/mips/mipsel/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/mips/package.mask b/profiles/default/linux/musl/mips/package.mask
index 8b52dc4d8d35..8b52dc4d8d35 100644
--- a/profiles/hardened/linux/musl/mips/package.mask
+++ b/profiles/default/linux/musl/mips/package.mask
diff --git a/profiles/hardened/linux/musl/mips/package.use.force b/profiles/default/linux/musl/mips/package.use.force
index c184bfa93060..c184bfa93060 100644
--- a/profiles/hardened/linux/musl/mips/package.use.force
+++ b/profiles/default/linux/musl/mips/package.use.force
diff --git a/profiles/default/linux/musl/mips/parent b/profiles/default/linux/musl/mips/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/musl/mips/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/mips/use.force b/profiles/default/linux/musl/mips/use.force
index e94d30137368..e94d30137368 100644
--- a/profiles/hardened/linux/musl/mips/use.force
+++ b/profiles/default/linux/musl/mips/use.force
diff --git a/profiles/hardened/linux/musl/mips/use.mask b/profiles/default/linux/musl/mips/use.mask
index b285b3b4746e..b285b3b4746e 100644
--- a/profiles/hardened/linux/musl/mips/use.mask
+++ b/profiles/default/linux/musl/mips/use.mask
diff --git a/profiles/hardened/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index 0a53545f7613..c4367eb84875 100644
--- a/profiles/hardened/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -11,9 +11,13 @@ sys-libs/glibc
 # We use eudev which is tested on both uclibc and musl
 sys-apps/systemd
 sys-fs/udev
-#
+
+# dev-libs/elfutils needs a port to musl, bug #602126
 dev-libs/elfutils
 
+# packages that unconditionally depend on dev-libs/elfutils
+<net-firewall/fwbuilder-5.3.7
+
 # packages that need masked packages or multilib
 dev-games/gtkradiant
 dev-games/ps2-packer
diff --git a/profiles/hardened/linux/musl/package.use b/profiles/default/linux/musl/package.use
index 2d99b60f76b4..2d99b60f76b4 100644
--- a/profiles/hardened/linux/musl/package.use
+++ b/profiles/default/linux/musl/package.use
diff --git a/profiles/hardened/linux/musl/package.use.force b/profiles/default/linux/musl/package.use.force
index 8122d90a6c88..8122d90a6c88 100644
--- a/profiles/hardened/linux/musl/package.use.force
+++ b/profiles/default/linux/musl/package.use.force
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
new file mode 100644
index 000000000000..9078b7c61920
--- /dev/null
+++ b/profiles/default/linux/musl/package.use.mask
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# See bug #504200
+sys-devel/gcc sanitize
+
+# llvm's sanitizers are also incompatible with musl
+sys-devel/llvm sanitize
+
+# These cause collisions with <libintl.h>
+# even with --without-included-gettext
+sys-devel/gettext nls
+sys-fs/e2fsprogs nls
+
+# Broken
+dev-vcs/git gpg
+
+# See bug #576928
+media-libs/mesa nptl
+x11-base/xorg-server nptl
diff --git a/profiles/hardened/linux/musl/packages b/profiles/default/linux/musl/packages
index 8e9700f13e8f..8e9700f13e8f 100644
--- a/profiles/hardened/linux/musl/packages
+++ b/profiles/default/linux/musl/packages
diff --git a/profiles/hardened/linux/musl/packages.build b/profiles/default/linux/musl/packages.build
index c07961aa76f7..c07961aa76f7 100644
--- a/profiles/hardened/linux/musl/packages.build
+++ b/profiles/default/linux/musl/packages.build
diff --git a/profiles/hardened/linux/musl/parent b/profiles/default/linux/musl/parent
index a9dd6fd5cb5b..2348d8d17b95 100644
--- a/profiles/hardened/linux/musl/parent
+++ b/profiles/default/linux/musl/parent
@@ -1,3 +1,3 @@
 ../../../arch/base
 ../../../base
-../../../default/linux
+..
diff --git a/profiles/default/linux/musl/ppc/eapi b/profiles/default/linux/musl/ppc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/ppc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/ppc/make.defaults b/profiles/default/linux/musl/ppc/make.defaults
index 2022413f04a2..2022413f04a2 100644
--- a/profiles/hardened/linux/musl/ppc/make.defaults
+++ b/profiles/default/linux/musl/ppc/make.defaults
diff --git a/profiles/hardened/linux/musl/ppc/package.mask b/profiles/default/linux/musl/ppc/package.mask
index 56345622fa74..56345622fa74 100644
--- a/profiles/hardened/linux/musl/ppc/package.mask
+++ b/profiles/default/linux/musl/ppc/package.mask
diff --git a/profiles/hardened/linux/musl/ppc/package.use.force b/profiles/default/linux/musl/ppc/package.use.force
index e18275fe8cd6..e18275fe8cd6 100644
--- a/profiles/hardened/linux/musl/ppc/package.use.force
+++ b/profiles/default/linux/musl/ppc/package.use.force
diff --git a/profiles/default/linux/musl/ppc/parent b/profiles/default/linux/musl/ppc/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/musl/ppc/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/ppc/use.force b/profiles/default/linux/musl/ppc/use.force
index f4c29429b272..f4c29429b272 100644
--- a/profiles/hardened/linux/musl/ppc/use.force
+++ b/profiles/default/linux/musl/ppc/use.force
diff --git a/profiles/hardened/linux/musl/ppc/use.mask b/profiles/default/linux/musl/ppc/use.mask
index e1f5512c8bb0..e1f5512c8bb0 100644
--- a/profiles/hardened/linux/musl/ppc/use.mask
+++ b/profiles/default/linux/musl/ppc/use.mask
diff --git a/profiles/default/linux/musl/use.force b/profiles/default/linux/musl/use.force
new file mode 100644
index 000000000000..cf1d9c0d3ca4
--- /dev/null
+++ b/profiles/default/linux/musl/use.force
@@ -0,0 +1,5 @@
+# Copyright 1999-2013 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+elibc_musl
+
diff --git a/profiles/default/linux/musl/use.mask b/profiles/default/linux/musl/use.mask
new file mode 100644
index 000000000000..4e935628268a
--- /dev/null
+++ b/profiles/default/linux/musl/use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+-elibc_musl
+elibc_uclibc
+elibc_glibc
diff --git a/profiles/default/linux/musl/x86/eapi b/profiles/default/linux/musl/x86/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/musl/x86/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/hardened/linux/musl/x86/make.defaults b/profiles/default/linux/musl/x86/make.defaults
index 73fedb030e1d..73fedb030e1d 100644
--- a/profiles/hardened/linux/musl/x86/make.defaults
+++ b/profiles/default/linux/musl/x86/make.defaults
diff --git a/profiles/hardened/linux/musl/x86/package.use.force b/profiles/default/linux/musl/x86/package.use.force
index ca264fedc8ce..ca264fedc8ce 100644
--- a/profiles/hardened/linux/musl/x86/package.use.force
+++ b/profiles/default/linux/musl/x86/package.use.force
diff --git a/profiles/default/linux/musl/x86/parent b/profiles/default/linux/musl/x86/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/musl/x86/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/hardened/linux/musl/x86/use.force b/profiles/default/linux/musl/x86/use.force
index eb8c5dfc7f70..eb8c5dfc7f70 100644
--- a/profiles/hardened/linux/musl/x86/use.force
+++ b/profiles/default/linux/musl/x86/use.force
diff --git a/profiles/hardened/linux/musl/x86/use.mask b/profiles/default/linux/musl/x86/use.mask
index 61e5564be9fc..61e5564be9fc 100644
--- a/profiles/hardened/linux/musl/x86/use.mask
+++ b/profiles/default/linux/musl/x86/use.mask
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index b257ae14c4fe..da2e709730f9 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -12,6 +12,9 @@ sys-fs/udev
 # Working on it, bug #470884
 dev-libs/elfutils
 
+# packages that unconditionally depend on dev-libs/elfutils
+<net-firewall/fwbuilder-5.3.7
+
 # These binary pkgs have a hard dep on glibc; make repoman shut up
 app-arch/rar
 dev-games/gtkradiant
diff --git a/profiles/features/prefix/use.mask b/profiles/features/prefix/use.mask
index 61f29a075894..4340ef9aa4c4 100644
--- a/profiles/features/prefix/use.mask
+++ b/profiles/features/prefix/use.mask
@@ -17,7 +17,3 @@ pam
 
 # USE=udev just does not make sense in Gentoo Prefix. bug 293480
 udev
-
-# suid requires root privilege, which is not support by prefix in general
-# one example: bug 447340.
-suid
diff --git a/profiles/hardened/linux/musl/amd64/parent b/profiles/hardened/linux/musl/amd64/parent
index f3229c5b9876..e5409d5f56f4 100644
--- a/profiles/hardened/linux/musl/amd64/parent
+++ b/profiles/hardened/linux/musl/amd64/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/amd64
 ..
diff --git a/profiles/hardened/linux/musl/amd64/x32/parent b/profiles/hardened/linux/musl/amd64/x32/parent
index f3229c5b9876..6deffb52fb62 100644
--- a/profiles/hardened/linux/musl/amd64/x32/parent
+++ b/profiles/hardened/linux/musl/amd64/x32/parent
@@ -1 +1,2 @@
+../../../../../default/linux/musl/amd64/x32
 ..
diff --git a/profiles/hardened/linux/musl/arm/armv7a/parent b/profiles/hardened/linux/musl/arm/armv7a/parent
index f3229c5b9876..4be939d87ce7 100644
--- a/profiles/hardened/linux/musl/arm/armv7a/parent
+++ b/profiles/hardened/linux/musl/arm/armv7a/parent
@@ -1 +1,3 @@
+../../../../../default/linux/musl/arm/armv7a
 ..
+../..
diff --git a/profiles/hardened/linux/musl/arm64/parent b/profiles/hardened/linux/musl/arm64/parent
index f3229c5b9876..f687b3f5f7c4 100644
--- a/profiles/hardened/linux/musl/arm64/parent
+++ b/profiles/hardened/linux/musl/arm64/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/arm64
 ..
diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
index 518c214765bc..1212f635f54f 100644
--- a/profiles/hardened/linux/musl/make.defaults
+++ b/profiles/hardened/linux/musl/make.defaults
@@ -1,15 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-ELIBC="musl"
-
-FEATURES="sandbox sfperms strict"
-
-USE="hardened nptl pic unicode -berkdb -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pic -berkdb -jit -nls -orc"
-
-SYMLINK_LIB="no"
-
-# TODO: fix so musl doesn't generate this for all packages
-# that use a charset, it causes package collisons.
-INSTALL_MASK="charset.alias"
+USE="${USE} hardened pic -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic -jit -orc"
diff --git a/profiles/hardened/linux/musl/mips/mipsel/parent b/profiles/hardened/linux/musl/mips/mipsel/parent
index f3229c5b9876..c3e31b297154 100644
--- a/profiles/hardened/linux/musl/mips/mipsel/parent
+++ b/profiles/hardened/linux/musl/mips/mipsel/parent
@@ -1 +1,2 @@
+../../../../../default/linux/musl/mips/mipsel
 ..
diff --git a/profiles/hardened/linux/musl/mips/parent b/profiles/hardened/linux/musl/mips/parent
index f3229c5b9876..506bb45139d0 100644
--- a/profiles/hardened/linux/musl/mips/parent
+++ b/profiles/hardened/linux/musl/mips/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/mips
 ..
diff --git a/profiles/hardened/linux/musl/package.use.mask b/profiles/hardened/linux/musl/package.use.mask
index d66f247717f5..fe62de6696a8 100644
--- a/profiles/hardened/linux/musl/package.use.mask
+++ b/profiles/hardened/linux/musl/package.use.mask
@@ -4,21 +4,3 @@
 # Matthias Maier <tamiko@genoto.org> (11 May 2017)
 # masked in base, unmask for hardened/musl/
 sys-devel/gcc -pie
-
-# See bug #504200
-sys-devel/gcc sanitize
-
-# llvm's sanitizers are also incompatible with musl
-sys-devel/llvm sanitize
-
-# These cause collisions with <libintl.h>
-# even with --without-included-gettext
-sys-devel/gettext nls
-sys-fs/e2fsprogs nls
-
-# Broken
-dev-vcs/git gpg
-
-# See bug #576928
-media-libs/mesa nptl
-x11-base/xorg-server nptl
diff --git a/profiles/hardened/linux/musl/ppc/parent b/profiles/hardened/linux/musl/ppc/parent
index f3229c5b9876..08b096c5a3e0 100644
--- a/profiles/hardened/linux/musl/ppc/parent
+++ b/profiles/hardened/linux/musl/ppc/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/ppc
 ..
diff --git a/profiles/hardened/linux/musl/use.force b/profiles/hardened/linux/musl/use.force
index 79e5575d13c3..e2d7cf05ec5c 100644
--- a/profiles/hardened/linux/musl/use.force
+++ b/profiles/hardened/linux/musl/use.force
@@ -2,3 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 elibc_musl
+
+# Make sure people don't accidentally turn of ssp/pie in important packages.
+pie
+ssp
diff --git a/profiles/hardened/linux/musl/use.mask b/profiles/hardened/linux/musl/use.mask
index 190b01bbbe98..b851b043ca08 100644
--- a/profiles/hardened/linux/musl/use.mask
+++ b/profiles/hardened/linux/musl/use.mask
@@ -6,3 +6,12 @@ elibc_uclibc
 elibc_glibc
 
 -hardened
+
+# precompiled headers are not compat with ASLR.
+pch
+
+# prelink is masked for hardened
+prelink
+
+# profile are incompatible when linking with pie
+profile
diff --git a/profiles/hardened/linux/musl/x86/parent b/profiles/hardened/linux/musl/x86/parent
index f3229c5b9876..54abcade7471 100644
--- a/profiles/hardened/linux/musl/x86/parent
+++ b/profiles/hardened/linux/musl/x86/parent
@@ -1 +1,2 @@
+../../../../default/linux/uclibc/x86
 ..
diff --git a/profiles/hardened/linux/uclibc/package.use.mask b/profiles/hardened/linux/uclibc/package.use.mask
new file mode 100644
index 000000000000..d1925ca7ab72
--- /dev/null
+++ b/profiles/hardened/linux/uclibc/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Anthony G. Basile <blueness@gentoo.org> (12 Dec 2017)
+# masked in base, unmask for hardened/uclibc
+sys-devel/gcc -pie
diff --git a/profiles/hardened/linux/uclibc/use.force b/profiles/hardened/linux/uclibc/use.force
new file mode 100644
index 000000000000..b0ea1237d5a6
--- /dev/null
+++ b/profiles/hardened/linux/uclibc/use.force
@@ -0,0 +1,8 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+elibc_uclibc
+
+# Make sure people don't accidentally turn of ssp/pie in important packages.
+pie
+ssp
diff --git a/profiles/hardened/linux/uclibc/use.mask b/profiles/hardened/linux/uclibc/use.mask
index 3d0c2a2a416d..174226cb64e3 100644
--- a/profiles/hardened/linux/uclibc/use.mask
+++ b/profiles/hardened/linux/uclibc/use.mask
@@ -1,4 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+-elibc_uclibc
+elibc_musl
+elibc_glibc
+
 -hardened
+
+# precompiled headers are not compat with ASLR.
+pch
+
+# prelink is masked for hardened
+prelink
+
+# profile are incompatible when linking with pie
+profile
diff --git a/profiles/package.mask b/profiles/package.mask
index 13688f695538..4d8af6fa807d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,80 @@
 
 #--- END OF EXAMPLES ---
 
+# 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
+
+# Andrey Grozin <grozin@gentoo.org> (15 Dec 2017)
+# Dead upstream. Removal in 30 days.
+dev-python/pydb
+
+# Andrey Grozin <grozin@gentoo.org> (15 Dec 2017)
+# 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
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
+# Depends on dead kdelibs4/qt4, unmaintained upstream. No port to
+# KF5 released. If you depend on this package, please help test KF5-based
+# amarok-9999 in KDE ebuild repository to decide on a possible snapshot.
+# Possible alternatives are media-sound/cantata (an awesome mpd client),
+# media-sound/clementine and media-sound/tomahawk (the latter also declared
+# unmaintained upstream).
+# Bug #635468. Masked for removal in 30 days.
+media-sound/amarok
+kde-apps/kdebase-kioslaves
+kde-apps/phonon-kde
+x11-libs/qtscriptgenerator
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
+# Depends on dead media-sound/amarok:4, dead upstream,
+# last release in 2006. Bug #635468. Masked for removal in 30 days.
+media-sound/vdramgw
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
+# Depends on dead kdelibs4/qt4, unmaintained upstream. No port to
+# KF5 released. If you depend on this package, please help test KF5-based
+# cirkuit-9999 in KDE ebuild repository to decide on a possible snapshot.
+# Bug #640884. Masked for removal in 30 days.
+sci-electronics/cirkuit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
+# Depends on dead kdelibs4/qt4, no port to KF5 released yet.
+# If you depend on this package, help test KF5-based simon-9999
+# to decide on a possible snapshot. Bugs #640846, 639960, 635816.
+# Masked for removal in 30 days.
+app-accessibility/simon:4
+
+# 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
+
+# Thomas Beierlein <tomjbe@gentoo.org> (10 Dec 2017)
+# Development stopped, nasty build system.
+# Functionality superseded by media-radio/wsjtx.
+# Masked for removal in 30 days.
+media-radio/wspr
+
 # Michael Palimaka <kensington@gentoo.org> (07 Dec 2017)
 # Dead upstream. Requires dead Qt4.
 # Masked for removal in 30 days. Bug #640138.
@@ -161,21 +235,11 @@ kde-misc/kopete-antispam
 kde-misc/kopete-thinklight
 
 # Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
-# Still depends on dead kdelibs4/Qt3Support/Qt4, no KF5-based release.
-# Masked for removal in 30 days. Bug #629018
-<=dev-util/kdbg-2.9.1
-
-# Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
 # Dead upstream, depends on dead kdelibs4/Qt3Support/Qt4.
 # Masked for removal in 30 days. Bug #634324
 games-mud/kmuddy
 
 # Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
-# Depends on dead kdelibs4/Qt4, no KF5-based release.
-# Masked for removal in 30 days. Bug #629018
-media-gfx/kcoloredit:4
-
-# Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
 # Dead upstream, depends on dead kdelibs4/Qt3Support/Qt4.
 # Masked for removal in 30 days. Bug #629018
 kde-misc/krcstat
@@ -233,6 +297,7 @@ x11-drivers/xf86-input-pentouch
 # Masked until the latter sees a new release.
 >=dev-python/thunarx-python-0.4.0
 >=xfce-base/thunar-1.7
+>=xfce-extra/thunar-archive-plugin-0.4.0
 
 # Jonas Stein <jstein@gentoo.org> (25 Nov 2017)
 # The latest version of this LaTeX package is part of 
@@ -344,12 +409,6 @@ net-misc/arm
 # Removal in 30 days.
 app-admin/python-updater
 
-# Zac Medico <zmedico@gentoo.org> (13 Nov 2017)
-# Masked for removal in 30 days. Current versions do not include a
-# standalone web server command, and there is an open security issue
-# (bug #630976). A fork is available as www-servers/civetweb.
-www-servers/mongoose
-
 # Jonas Stein <jstein@gentoo.org> (11 Nov 2017)
 # The upstream developer and former maintainer asked to treeclean these 
 # packages, because they can be used only with the Siemens Mediacenter 
@@ -365,18 +424,6 @@ media-plugins/vdr-alcd
 # See also bug #624046. Masked for removal on 2017-12-12
 sci-geosciences/gmapcatcher
 
-# Brian Evans <grknight@gentoo.org> (07 Nov 2017)
-# Remote service removed this method, dead upstream
-# Masked for removal in 30 days.
-# Bug 636796
-dev-php/PEAR-Services_W3C_HTMLValidator
-
-# Brian Evans <grknight@gentoo.org> (06 Nov 2017)
-# Broken with new PHP, dead upstream, broken tests
-# Masked for removal in 30 days.
-# Bug 636742
-dev-php/PEAR-HTTP_Download
-
 # Mike Gilbert <floppym@gentoo.org> (05 Nov 2017)
 # Breaks several reverse dependencies.
 # https://bugs.gentoo.org/635934
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index bb3babe2b098..4f3aed27c5be 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -260,15 +260,9 @@ amd64		hardened/linux/amd64/selinux				stable
 amd64		hardened/linux/amd64/no-multilib			stable
 amd64		hardened/linux/amd64/no-multilib/selinux		stable
 amd64		hardened/linux/amd64/x32				dev
-amd64		hardened/linux/musl/amd64				exp
-amd64		hardened/linux/musl/amd64/x32				exp
 arm		hardened/linux/arm/armv7a				dev
 arm		hardened/linux/arm/armv6j				dev
-arm		hardened/linux/musl/arm/armv7a				exp
-arm64		hardened/linux/musl/arm64 				exp
 ia64		hardened/linux/ia64					dev
-mips		hardened/linux/musl/mips				exp
-mips		hardened/linux/musl/mips/mipsel				exp
 mips		hardened/linux/mips/mipsel/multilib/n32			exp
 mips		hardened/linux/mips/mipsel/multilib/n64			exp
 mips		hardened/linux/mips/mipsel/n32				exp
@@ -279,10 +273,26 @@ mips		hardened/linux/mips/n32					exp
 mips		hardened/linux/mips/n64					exp
 ppc		hardened/linux/powerpc/ppc32				dev
 ppc		hardened/linux/powerpc/ppc64/32bit-userland		dev
-ppc		hardened/linux/musl/ppc					exp
 ppc64		hardened/linux/powerpc/ppc64/64bit-userland		dev
 x86		hardened/linux/x86					stable
 x86		hardened/linux/x86/selinux				stable
+
+# musl profiles
+amd64		default/linux/musl/amd64				exp
+amd64		hardened/linux/musl/amd64				exp
+amd64		default/linux/musl/amd64/x32				exp
+amd64		hardened/linux/musl/amd64/x32				exp
+arm		default/linux/musl/arm/armv7a				exp
+arm		hardened/linux/musl/arm/armv7a				exp
+arm64		default/linux/musl/arm64 				exp
+arm64		hardened/linux/musl/arm64 				exp
+mips		default/linux/musl/mips					exp
+mips		hardened/linux/musl/mips				exp
+mips		default/linux/musl/mips/mipsel				exp
+mips		hardened/linux/musl/mips/mipsel				exp
+ppc		default/linux/musl/ppc					exp
+ppc		hardened/linux/musl/ppc					exp
+x86		default/linux/musl/x86					exp
 x86		hardened/linux/musl/x86					exp
 
 # Non-embedded uclibc profiles
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 930b381af803..7ef04dcdb1cf 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -16,6 +16,7 @@ app-accessibility/freetts:jsapi - build Java Speech API (JSAPI)
 app-accessibility/freetts:mbrola - Adds support for mbrola voices
 app-accessibility/orca:braille - Enable braille support
 app-accessibility/simon:opencv - Use media-libs/opencv
+app-accessibility/simon:pim - Enable support for KDE PIM resources integration
 app-accessibility/simon:sphinx - Build sphinx backend (pulls app-accessibility/julius if disabled
 app-accessibility/speech-dispatcher:espeak - Adds support for espeak speech engine
 app-accessibility/speech-dispatcher:flite - Adds support for flite speech engine
@@ -1074,6 +1075,7 @@ app-portage/eix:sqlite - Compile in support for portage's sqlite backend; to act
 app-portage/g-sorcery:bson - Support BSON file format for package DB
 app-portage/gemato:blake2 - Install dependencies needed for BLAKE2 hash functions
 app-portage/gemato:gpg - Install dependencies needed for OpenPGP signature verification support
+app-portage/gemato:portage-postsync - Install a Portage hook to verify the repository after fetching via rsync
 app-portage/gemato:sha3 - Install dependencies needed for SHA3 hash functions
 app-portage/layman:bazaar - Support dev-vcs/bzr based overlays
 app-portage/layman:cvs - Support dev-vcs/cvs based overlays
@@ -2163,6 +2165,8 @@ dev-libs/libucl:regex - Enable regex checking for schema
 dev-libs/libucl:signatures - Enable signatures check
 dev-libs/libucl:urlfetch - Enable URLs fetch
 dev-libs/libucl:utils - Install the chargen and objdump utilities
+dev-libs/libunibreak:doc - Install html API documentation.
+dev-libs/libunibreak:man - Generate man pages with doxygen.
 dev-libs/libverto:glib - Support event loops using dev-libs/glib
 dev-libs/libverto:libev - Support event loops using dev-libs/libev
 dev-libs/libverto:libevent - Support event loops using dev-libs/libevent
@@ -2394,8 +2398,6 @@ dev-perl/Text-CSV:xs - Install dev-perl/Text-CSV_XS for accelerated decoding
 dev-perl/WWW-Form-UrlEncoded:xs - Install C-Based dependieces for faster performance
 dev-perl/perl-headers:debug - Add source locations in generated .ph files to assist with debugging when errors occur
 dev-perl/perl-headers:sizeof-warning - Include logic to warn when a .ph file tries to use a sizeof() that is unknown
-dev-php/PEAR-HTTP_Download:minimal - Do not include support for PEAR-MIME_Type
-dev-php/PEAR-HTTP_Download:postgres - Send postgres LOBs without buffering
 dev-php/PEAR-HTTP_Request2:curl - Force dev-lang/php to be compiled with curl extension
 dev-php/PEAR-HTTP_Request2:fileinfo - Force dev-lang/php to be compiled with fileinfo extension
 dev-php/PEAR-HTTP_Request2:ssl - Force dev-lang/php to be compiled with ssl extension
@@ -3133,7 +3135,7 @@ games-emulation/mupen64plus:audio-sdl - Enable SDL audio plugin.
 games-emulation/mupen64plus:input-sdl - Enable SDL input plugin.
 games-emulation/mupen64plus:rsp-hle - Enable HLE RSP plugin.
 games-emulation/mupen64plus:ui-console - Enable default console UI.
-games-emulation/mupen64plus:ui-m64py - Enable PyQt4 UI using games-emulation/m64py.
+games-emulation/mupen64plus:ui-m64py - Enable PyQt5 UI using games-emulation/m64py.
 games-emulation/mupen64plus:video-glide64mk2 - Enable Glide64mk2 video plugin.
 games-emulation/mupen64plus:video-rice - Enable Rice video plugin.
 games-emulation/mupen64plus-core:debugger - Build the debugger
@@ -3440,6 +3442,7 @@ 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:fits - Enable support for NASA's sci-libs/cfitsio library
 kde-apps/gwenview:kipi - Support for the KDE Image Plugin Interface
 kde-apps/k3b:emovix - Enable burning support for eMoviX images
 kde-apps/kaccessible:speechd - Enable support for the speech-dispatcher speech synthesizer
@@ -3460,6 +3463,8 @@ kde-apps/kdepim-addons:importwizard - Enable additional import plugins for kde-a
 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.
 kde-apps/keditbookmarks:man - Build and install man pages
+kde-apps/kget:bittorrent - Enable bittorrent transfer plugin through net-libs/libktorrent
+kde-apps/kget:gpg - Enable signature verification by GpgME++ via app-crypt/gpgme
 kde-apps/kget:mms - Enable MMS (Microsoft Media Server) plugin through media-libs/libmms
 kde-apps/kig:geogebra - Support files created by sci-mathematics/geogebra
 kde-apps/kig:scripting - Support Python scripting
@@ -3515,11 +3520,13 @@ kde-apps/marble:phonon - Enable sound support via media-libs/phonon
 kde-apps/marble:shapefile - Enable support for ESRI shapefiles
 kde-apps/okteta:designer - Build plugins for dev-qt/designer
 kde-apps/okular:chm - Enable support for Microsoft Compiled HTML Help files
-kde-apps/okular:epub - Add E-Book support via app-text/ebook-tools
+kde-apps/okular:epub - Enable E-Book support via app-text/ebook-tools
 kde-apps/okular:image-backend - Enable image viewing support
-kde-apps/okular:mobi - Add mobipocket support
+kde-apps/okular:markdown - Enable Markdown support via app-text/discount
+kde-apps/okular:mobi - Enable mobipocket support
 kde-apps/okular:mobile - Enable Plasma mobile support
 kde-apps/okular:plucker - Enable Plucker E-Book for Palm OS devices support
+kde-apps/okular:share - Enable support for a share menu using dev-libs/purpose
 kde-apps/okular:speech - Enable text-to-speech support
 kde-apps/pimcommon:designer - Build plugins for dev-qt/designer
 kde-apps/spectacle:kipi - Enable support for the KDE Image Plugin Interface
@@ -3660,14 +3667,18 @@ mail-client/evolution:spamassassin - Build mail-filter/spamassassin plugin
 mail-client/evolution:weather - Enable optional weather calendar support
 mail-client/mail-notification:sylpheed - Enable support for MH mailboxes used by mail-client/sylpheed
 mail-client/mutt:berkdb - Enable sys-libs/db database backend for header caching
+mail-client/mutt:crypt - Add support for encryption -- using mcrypt or gpg where applicable
 mail-client/mutt:gdbm - Enable sys-libs/gdbm database backend for header caching
-mail-client/mutt:gpg - Enable support for app-crypt/gpgme to sign/verify and encrypt/decrypt OpenPGP messages
+mail-client/mutt:gpg - Enable support for app-crypt/gpgme
+mail-client/mutt:gpgme - Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP
 mail-client/mutt:hcache - Enable header cache, one database backend needs to be enabled
 mail-client/mutt:lmdb - Enable dev-db/lmdb database backend for header caching
 mail-client/mutt:notmuch - Enable support for net-mail/notmuch
+mail-client/mutt:pgp_classic - Build classic_pgp backend to support PGP/MIME and traditional/inline PGP
 mail-client/mutt:pop - Enable support for POP3 mailboxes
 mail-client/mutt:sidebar - Enable the sidebar feature
-mail-client/mutt:smime - Enable support for S/MIME mailparts
+mail-client/mutt:smime - Enable support for smime
+mail-client/mutt:smime_classic - Build classic_smime backend to support S/MIME
 mail-client/mutt:smtp - Enable support for direct SMTP delivery
 mail-client/mutt:tokyocabinet - Enable dev-db/tokyocabinet database backend for header caching
 mail-client/nail:kerberos - If network is enabled, this adds support for GSSAPI login on IMAP through virtual/krb5.
@@ -4863,7 +4874,7 @@ media-video/dcpomatic:pulseaudio - Utilize pulseaudio output of media-libs/rtaud
 media-video/dv2sub:kino - install kino plugin
 media-video/dvdrip:fping - Enables fping support for cluster rendering
 media-video/dvdrip:subtitles - Enables support for subtitle ripping
-media-video/ffdiaporama:openclipart - Support openslipart database
+media-video/ffdiaporama:openclipart - Support openclipart database
 media-video/ffdiaporama:texturemate - Install extra backgrounds
 media-video/ffmpeg:amr - Enables Adaptive Multi-Rate Audio support
 media-video/ffmpeg:amrenc - Enables Adaptive Multi-Rate Audio encoding support with media-libs/vo-amrwbenc.
@@ -5392,6 +5403,7 @@ net-analyzer/wireshark:dumpcap - Install dumpcap, to dump network traffic from i
 net-analyzer/wireshark:editcap - Install editcap, to edit and/or translate the format of capture files
 net-analyzer/wireshark:libssh - Use net-libs/libssh (for sshdump)
 net-analyzer/wireshark:libxml2 - Use dev-libs/libxml2 for handling XML configuration in dissectors
+net-analyzer/wireshark:lz4 - Use app-arch/lz4 for compression/decompression
 net-analyzer/wireshark:mergecap - Install mergecap, to merge two or more capture files into one
 net-analyzer/wireshark:netlink - Use dev-libs/libnl
 net-analyzer/wireshark:nghttp2 - Use net-libs/nghttp2 for HTTP/2 support
@@ -5767,7 +5779,6 @@ net-im/telepathy-connection-managers:yahoo - Enable Yahoo! messaging support.
 net-im/telepathy-connection-managers:zeroconf - Enable Link-Local Messaging via the zeroconf or Bonjour protocol.
 net-im/tkabber:plugins - Enables installation the extra plugins
 net-im/toxic:audio - Enables audio calling
-net-im/toxic:av - Enables audio/video functionality (deprecated)
 net-im/toxic:notifications - Enables desktop notifications with libnotify, with sound support.
 net-im/toxic:qrcode - Enables QR code support
 net-im/toxic:video - Enables video calling
@@ -7416,19 +7427,30 @@ sci-physics/pythia:hepmc - Adds support for High Energy Physics Monte Carlo Gene
 sci-physics/pythia:lhapdf - Support the use of external PDF sets via sci-physics/lhapdf
 sci-physics/pythia:root - Use sci-physics/root trees and histograms (in examples only)
 sci-physics/root:R - Enable support for dev-lang/R
+sci-physics/root:asimage - Enable support for media-libs/libafterimage
 sci-physics/root:c++11 - Build ROOT using the C++11 standard
 sci-physics/root:c++14 - Build ROOT using the C++14 standard
-sci-physics/root:fits - Support for images and data from FITS files with sci-libs/cfitsio
+sci-physics/root:davix - Enable support for DAVIX Data Management Client (https://cern.ch/davix)
+sci-physics/root:fits - Enable support for images and data from FITS files with sci-libs/cfitsio
+sci-physics/root:fortran - Compile included Fortran programs
 sci-physics/root:gdml - Enable GDML writer and reader
-sci-physics/root:geocad - Enable ROOT-CAD interface using sci-libs/opencascade
 sci-physics/root:http - Enable http server support including but not limited to fastcgi support
+sci-physics/root:jemalloc - Enable support for dev-libs/jemalloc
+sci-physics/root:libcxx - Build ROOT against sys-libs/libcxx
 sci-physics/root:math - Build all math related libraries plugins, needs sci-libs/gsl
 sci-physics/root:memstat - Build memory statistics library, helps to detect memory leaks
+sci-physics/root:minuit - Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)
 sci-physics/root:pythia6 - Build the interface for sci-physics/pythia version 6.x
 sci-physics/root:pythia8 - Build the interface for sci-physics/pythia version 8.x
 sci-physics/root:reflex - Build the reflection database for the C++ interpreter
+sci-physics/root:roofit - Build RooFit function fitting package
+sci-physics/root:root7 - Build experimental features to be released with ROOT 7
 sci-physics/root:shadow - Enable shadow authentication in rootd and proofd
 sci-physics/root:table - Build libTable contrib library
+sci-physics/root:tbb - Enable implicit multi-threading (IMT) with dev-cpp/tbb
+sci-physics/root:tmva - Built TMVA (ROOT's multi-variate analysis toolkit for machine learning)
+sci-physics/root:unuran - Enable support for sci-mathematics/unuran
+sci-physics/root:vc - Enable support for dev-libs/vc with VecCore
 sci-physics/root:xrootd - Build the interface for net-libs/xrootd
 sci-physics/thepeg:c++11 - Build ThePEG using the C++11 standard. Experimental feature, not for production use.
 sci-physics/thepeg:fastjet - Adds support for sci-physics/fastjet
@@ -8137,6 +8159,7 @@ sys-libs/glibc:suid - Make internal pt_chown helper setuid -- not needed if usin
 sys-libs/glibc:systemtap - enable systemtap static probe points
 sys-libs/gwenhywfar:fox - Use x11-libs/fox graphical toolkit
 sys-libs/libblockdev:bcache - Enable block device cache support.
+sys-libs/libblockdev:cryptsetup - Enable sys-fs/cryptsetup support
 sys-libs/libblockdev:dmraid - Support for dmraid devices, also known as ATA-RAID, or Fake RAID.
 sys-libs/libblockdev:kbd - Enable kernel block device support.
 sys-libs/libblockdev:lvm - Enable support for Logical Volume Management via sys-fs/lvm2.