gentoo resync : 18.12.2020

17 files changed, 104 insertions, 164 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 88e64f64ad76..3930716fb750 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index c6604dc698f3..867b10b32718 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Rolf Eike Beer <eike@sf-mail.de> (2020-12-14)
+# noone actually tests it on real hardware anymore
+x11-base/xorg-server xorg
+
 # Rolf Eike Beer <eike@sf-mail.de> (2020-12-11)
 # not all needed sphinx modules are stable on hppa.
 dev-python/aiohttp doc
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 21eb2c9e1837..cc8cbed6dd30 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Matt Turner <mattst88@gentoo.org> (2020-12-14)
+# dev-lang/php is not stable for hppa
+php
+
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # media-libs/gstreamer is not stable for hppa
 gstreamer
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 73cf92df7de2..35091c29de08 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -107,7 +107,7 @@ dev-util/pkgconf test
 dev-util/strace unwind
 dev-vcs/git cvs highlight gnome-keyring subversion tk xinetd
 dev-vcs/mercurial tk rust zsh-completion
-media-libs/freetype harfbuzz png
+media-libs/freetype harfbuzz
 media-libs/harfbuzz doc
 sys-libs/libomp hwloc
 sys-libs/libcxx libcxxabi libunwind static-libs
diff --git a/profiles/arch/riscv/rv32imac/package.mask b/profiles/arch/riscv/rv32imac/package.mask
new file mode 100644
index 000000000000..fae8be793357
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/package.mask
@@ -0,0 +1,5 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# sys-libs/libseccomp has not been ported to rv32 yet
+sys-libs/libseccomp
diff --git a/profiles/arch/riscv/rv32imac/use.mask b/profiles/arch/riscv/rv32imac/use.mask
index 9de5ab734497..9779cbad81b5 100644
--- a/profiles/arch/riscv/rv32imac/use.mask
+++ b/profiles/arch/riscv/rv32imac/use.mask
@@ -1,2 +1,5 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# sys-libs/libseccomp has not been ported to rv32 yet
+seccomp
diff --git a/profiles/arch/riscv/use.force b/profiles/arch/riscv/use.force
index d97bd1215470..5e5e335685cb 100644
--- a/profiles/arch/riscv/use.force
+++ b/profiles/arch/riscv/use.force
@@ -3,7 +3,3 @@
 
 # Force the flag which corresponds to ARCH.
 riscv
-
-# Right now we have only one Python available, so we must use it
-python_targets_python3_7
-python_single_target_python3_7
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 70e3d1e505da..2539ed7e981e 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -6,6 +6,7 @@
 # runtime bugs (bug #758446) which are not worth it.
 # Building Firefox/Thunderbird with GCC is no longer supported
 # in Gentoo until further notice.
+dev-lang/spidermonkey clang
 mail-client/thunderbird clang
 www-client/firefox clang
 
@@ -14,6 +15,11 @@ www-client/firefox clang
 # support it already.
 sys-boot/refind gnuefi
 
+# Alexey Sokolov <alexey+gentoo@asokolov.org> (2020-12-06)
+# Doesn't build without X. Not removing IUSE from ebuild yet in hope that
+# https://github.com/TomenetGame/tomenet/issues/14 will be fixed.
+>=games-roguelike/tomenet-4.7.3 X
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-08-08)
 # Ensure tools flag is enabled for @system set
 sys-apps/kmod tools
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a4d6231ed7bc..381cadc2d597 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# app-text/ots is masked for removal.  Bug #648964.
+app-office/abiword ots
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-12-07)
 # Waiting for unmasking of slotted Lua.
 >=app-i18n/fcitx-4.2.9.8:4 lua
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 02362a94077e..7c81e4c940cd 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -111,10 +111,6 @@ kde-plasma/powerdevil brightness-control
 # Needs dev-ruby/asciidoctor which has a lot of unstable deps
 net-analyzer/wireshark doc
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-05-21)
-# Depends on lots of unstable dependencies
-dev-python/s3fs test
-
 # Matthias Maier <tamiko@gentoo.org> (2018-03-18)
 # dev-libs/capstone hasn't been stabilized yet
 app-emulation/qemu capstone
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 097ee8b095ea..1a09d0c5d9f8 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -10,7 +10,7 @@ www-misc/profile-sync-daemon
 
 # Jason Zaman <perfinion@gentoo.org> (2015-06-27)
 # SystemD has no support in the SELinux policy at the moment.
-# Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
+# Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_systemd.3F
 app-admin/systemdgenie
 app-eselect/eselect-gnome-shell-extensions
 app-office/wps-office
diff --git a/profiles/package.mask b/profiles/package.mask
index 8bfea7d46006..6611593a20b6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,49 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Last bumped in 2008.  Last upstream (beta) in 2014.
+# The current Gentoo version fails to install.
+# Removal in 30 days.  Bug #701044.
+net-mail/vacation
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Homepage gone.  Last bumped in 2008.  Carries multiple
+# patches.  Fails to build again.
+# Removal in 30 days.  Bug #675364.
+net-ftp/tlswrap
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Upstream gone.  Last bumped in 2007.  Fails to build, again.
+# Removal in 30 days.  Bug #648964.
+app-text/ots
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  The current Gentoo version fails to build, it needs
+# a version bump.
+# Removal in 30 days.  Bug #669452.
+net-misc/dhcpd-pools
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Last bumped in 2018.  Vulnerable.  No revdeps.
+# Removal in 30 days.  Bug #736050.
+dev-db/aerospike-server-community
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Abandoned upstream, circa 2013.  Vulnerable.  No revdeps.
+# Removal in 30 days.  Bug #744217.
+app-text/peg-markdown
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Abandoned in 2008.  No reverse dependencies left.
+# Removal in 30 days.  Bug #652192.
+dev-libs/ustr
+
+# Jack Todaro <solpeth@posteo.org> (2020-12-17)
+# Old and redundant package. Has not been kept
+# up to date and no longer works. Masked for removal.
+sci-mathematics/agda-lib-ffi
+
 # Eray Aslan <eras@gentoo.org> (2020-12-14)
 # Dead. Last release in 2014. Only works with vulnerable dovecot version.
 # Recent Outlook versions should have this functionality built in.  Switch to a
@@ -99,11 +142,6 @@ dev-util/creduce
 # paths.
 =net-libs/gnutls-3.7.0
 
-# Lars Wendler <polynomial-c@gentoo.org> (2020-12-07)
-# Masked for testing
->=app-shells/bash-5.1
->=sys-libs/readline-8.1
-
 # Joonas Niilola <juippis@gentoo.org> (2020-12-06)
 # Not keyworded, unmaintained, unbuildable for a long time, EAPI-5.
 # Removal in ~30 days. List sorted by their bug numbers.
@@ -115,18 +153,6 @@ net-wireless/qradiolink
 net-libs/liba53
 app-emulation/qt-virt-manager
 
-# Michał Górny <mgorny@gentoo.org> (2020-12-03)
-# Explicit namespace support was necessary for Python 2 only.  Empty
-# directories work best for Python 3.
-# Removal in 14 days.
-dev-python/backports
-dev-python/namespace-jaraco
-
-# Aaron Bauman <bman@gentoo.org> (2020-12-02)
-# Deprecated. Functionality is native to dev-python/pytest now
-# Removal in 14 days
-dev-python/pytest-catchlog
-
 # Joonas Niilola <juippis@gentoo.org> (2020-12-01)
 # Not maintained in Gentoo, multiple versions behind, unsafe, EAPI-5,
 # Use other kernel source / binary packages instead,
@@ -177,11 +203,6 @@ net-libs/libkvkontakte
 # Removal in 30 days. (bug #756370)
 sys-block/rts_pstor
 
-# Sam James <sam@gentoo.org> (2020-11-25)
-# Temporary mask to fix tree breakage
-# Dependency x11-libs/pangox-compat does not exist
-=net-misc/anydesk-6.0.1
-
 # Marek Szuba <marecki@gentoo.org> (2020-11-24)
 # No releases since 2008, deprecated upstream in favour of dev-lua/ldoc,
 # unmaintained, no revdeps. Removal in 30 days (Bug #756343).
@@ -291,104 +312,6 @@ sys-apps/hwdata-gentoo
 sys-apps/hwsetup
 sys-libs/libkudzu
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-18)
-# Depends on deprecated QtWebKit, dead upstream.
-# Alternatives: kde-apps/okular[chm], app-text/xchm
-# Removal in 30 days.
-app-text/kchmviewer
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-18)
-# Depends on deprecated QtWebKit, no maintainer.
-# Bugs #712200 and 725388. Removal in 30 days.
-sci-misc/mendeleydesktop
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-18)
-# Upstream has switched to aiobotocore.  It's a huge hack that requires
-# a very specific botocore version, currently 3 months old.  Given that
-# boto* makes releases daily and various revdeps require newer boto3 /
-# botocore versions, this makes aiobotocore unmaintainable.
-# As a result, we'd be stuck with the old version forever.
-#
-# See also:
-# https://github.com/aio-libs/aiobotocore/issues/829
-# https://github.com/dask/s3fs/issues/357
-#
-# Removal in 30 days.  Bug #755266.
-dev-python/s3fs
-
-# Zac Medico <zmedico@gentoo.org> (2020-11-17)
-# Unit tests fail. No revdeps.
-# Removal in 30 days.  Bug #723674.
-dev-python/diff-cover
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Discontinued upstream.  No revdeps.  Use dev-python/toml instead.
-# Removal in 30 days.  Bug #755125.
-dev-python/pytoml
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# A drive-by package with one release in 2015, no revdeps and no tests.
-# The same purpose is served e.g. by dev-python/parameterized.
-# Removal in 30 days.  Bug #755122.
-dev-python/parametrized
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Old dependencies of dev-python/GitPython.  The current versions (3)
-# have been renamed back to dev-python/{gitdb,smmap}.
-# Removal in 30 days.  Bug #755080.
-dev-python/gitdb2
-dev-python/smmap2
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Old backport package with no revdeps.
-# Removal in 30 days.  Bug #755074.
-dev-python/funcsigs
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Fail to build with gcc-10.  No recent activity upstream.  Seems that
-# Exherbo is dead and buried.
-# Removal in 30 days.  Bug #708528.
-sys-apps/sydbox
-sys-libs/pinktrace
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Both packages provide backports that are only meaningful to Python 2
-# and have no reverse dependencies.
-# Removal in 30 days.  Bug #754984.
-dev-python/backports-csv
-dev-python/backports-os
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, needs dedicated maintainer and version bump
-# to 20.11 with new dependency dev-python/PyQtChart.
-# Bugs #607130, #701318 and #709862. Removal in 30 days.
-dev-util/eric
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, upstream has no capacities to port away.
-# Bugs #508160, #654968 and #687840. Qt-based alternative: net-news/rssguard
-# Removal in 30 days.
-net-news/quiterss
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, upstream did not make a release in 10 years
-# (current RC2 is from 2016). Bugs #653100 and #734880. Removal in 30 days.
-app-text/goldendict
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-15)
-# Fails to build.  Lots of bugs filed.  Not touched by maintainer
-# since 2018.
-# Removal in 30 days.  Bug #721990.
-media-video/cinelerra
-
-# Aisha Tammy <gentoo@aisha.cc> (2020-11-13)
-# dead packages with latest releases before 2013
-# these are superseded by other scikit packages
-# scikit-optimize, sktime
-# Removal in 30 days (Bug #749297)
-sci-libs/scikits_optimization
-sci-libs/scikits_timeseries
-
 # Jonas Stein <jstein@gentoo.org> (2020-11-12)
 # Adobe will stop distributing Flash Player after 2020-12-31.
 # Masked for removal after 2020-12-31
@@ -541,8 +464,8 @@ kde-apps/kdebase-meta:5
 >=dev-lua/luacov-0.14.0-r100
 >=dev-lua/luadbi-0.7.2-r100
 >=dev-lua/luaevent-0.4.6-r100
-=dev-lua/luaexpat-1.3.0-r101
-=dev-lua/luaexpat-1.3.3-r101
+=dev-lua/luaexpat-1.3.0-r102
+=dev-lua/luaexpat-1.3.3-r102
 >=dev-lua/luafilesystem-1.8.0-r100
 >=dev-lua/lualdap-1.2.5-r100
 >=dev-lua/luajson-1.3.4-r100
@@ -570,6 +493,7 @@ kde-apps/kdebase-meta:5
 >=games-engines/love-0.8.0-r100:0.8
 >=games-engines/love-11.3-r100:0
 >=games-engines/solarus-1.3.1-r100
+>=games-engines/stratagus-2.4.3-r100
 >=games-puzzle/fish-fillets-1.0.1-r100
 >=games-roguelike/crossfire-client-1.71.0-r100
 >=games-roguelike/stone-soup-0.25.1-r100
@@ -598,15 +522,23 @@ kde-apps/kdebase-meta:5
 >=net-p2p/eiskaltdcpp-2.2.10-r100
 >=sci-astronomy/celestia-1.7.0_pre20200316-r100
 >=sci-libs/plplot-5.15.0-r100
->=sci-visualization/gnuplot-5.4.0-r100
+=sci-visualization/gnuplot-5.4.0-r100
+=sci-visualization/gnuplot-5.4.1-r1
 >=sci-visualization/fityk-1.3.1-r100
 >=sys-apps/likwid-4.3.4
+>=sys-apps/qcontrol-0.4.2-r100
+>=sys-apps/roccat-tools-5.9.0-r100
+>=sys-cluster/slurm-20.11.0.1-r100
 >=www-apache/mod_security-2.9.3-r100
 >=www-client/elinks-0.13.5-r100
 >=www-client/luakit-2.2.1-r100
 >=www-servers/lighttpd-1.4.55-r100
+>=www-servers/nginx-1.19.6-r100
+>=www-servers/uwsgi-2.0.19.1-r100
 >=x11-misc/devilspie2-0.43-r100
+>=x11-themes/gtk-engines-2.20.2-r100
 >=x11-wm/awesome-4.3-r100
+>=x11-wm/notion-3_p2015061300-r100
 >=mail-filter/opendkim-2.10.3-r25
 
 # Azamat H. Hackimov <azamat.hackimov@gmail.com> (2020-10-06)
diff --git a/profiles/prefix/darwin/macos/10.15/package.unmask b/profiles/prefix/darwin/macos/10.15/package.unmask
deleted file mode 100644
index 08df86b1e664..000000000000
--- a/profiles/prefix/darwin/macos/10.15/package.unmask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Sam James <sam@gentoo.org> (2020-12-10)
-# Unmask only working versions for Catalina
-# (and Big Sur)
-# They're currently masked in main tree
-# for testing.
-~sys-libs/readline-8.1
-~app-shells/bash-5.1
diff --git a/profiles/prefix/darwin/macos/11.0/package.unmask b/profiles/prefix/darwin/macos/11.0/package.unmask
deleted file mode 100644
index c962eae041f1..000000000000
--- a/profiles/prefix/darwin/macos/11.0/package.unmask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Sam James <sam@gentoo.org> (2020-12-07)
-# Unmask only working versions for Big Sur
-# (and Catalina)
-# They're currently masked in main tree
-# for testing.
-~sys-libs/readline-8.1
-~app-shells/bash-5.1
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 370f5d610445..b34b6e6c78d8 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -193,6 +193,8 @@ riscv		default/linux/riscv/17.0/rv64gc/lp64d		stable
 riscv		default/linux/riscv/17.0/rv64gc/lp64d/systemd	stable
 riscv		default/linux/riscv/17.0/rv64gc/lp64		stable
 riscv		default/linux/riscv/17.0/rv64gc/lp64/systemd	stable
+riscv		default/linux/riscv/17.0/rv32imac/ilp32		exp
+riscv		default/linux/riscv/17.0/rv32imac/ilp32d	exp
 
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
diff --git a/profiles/use.desc b/profiles/use.desc
index ef9f4da57215..e51db5982020 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -245,7 +245,7 @@ pie - Build programs as Position Independent Executables (a security hardening t
 plasma - Build optional KDE plasma addons
 plotutils - Add support for plotutils (library for 2-D vector graphics)
 png - Add support for libpng (PNG images)
-policykit - Enable PolicyKit authentication support
+policykit - Enable PolicyKit (polkit) authentication support
 portaudio - Add support for the crossplatform portaudio audio API
 posix - Add support for POSIX-compatible functions
 postgres - Add support for the postgresql database
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0eca9fca5f28..5f66386042d3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1479,9 +1479,7 @@ dev-haskell/chimera:representable - Define Representable instance from adjunctio
 dev-haskell/cmark:system-cmark - use app-text/cmark instead of bundled copy
 dev-haskell/cmdargs:quotation - Build quote module
 dev-haskell/cmdargs:testprog - Build the test program
-dev-haskell/comonad:containers - You can disable the use of the `containers` package using `-f-containers`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-dev-haskell/comonad:distributive - You can disable the use of the `distributive` package using `-f-distributive`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Distributive`
-dev-haskell/comonad:test-doctests - Run the doctests test suite
+dev-haskell/comonad:indexed-traversable - You can disable the use of the `indexed-traversable` package using `-f-indexed-traversable`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `FunctorWithIndex`
 dev-haskell/contravariant:semigroups - You can disable the use of the `semigroups` package using `-f-semigroups`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/contravariant:statevar - You can disable the use of the `StateVar` package using `-f-StateVar`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/contravariant:tagged - You can disable the use of the `tagged` package on older versons of GHC using `-f-tagged`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
@@ -1634,6 +1632,8 @@ dev-haskell/tls:compat - Accept SSLv2 compatible handshake.
 dev-haskell/tls:network - Use the base network library.
 dev-haskell/transformers-base:orphaninstances - Build instances for orphan datatypes.
 dev-haskell/unix-compat:old-time - build against old-time package
+dev-haskell/uri-encode:network-uri - Get Network.URI from the network-uri package.
+dev-haskell/uri-encode:tools - Build executables.
 dev-haskell/uuagc:loag - Use MiniSat as external SAT-solver to schedule all Linear Ordered AGs
 dev-haskell/vector:boundschecks - Enable bounds checking
 dev-haskell/vector:internalchecks - Enable internal consistency checks at the cost of a significant performance penalty
@@ -1870,6 +1870,7 @@ dev-lang/rust-bin:rls - Install rls, Rust Language Server (used with IDEs suppor
 dev-lang/rust-bin:rustfmt - Install rustfmt, Rust code formatter
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
 dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
+dev-lang/spidermonkey:clang - Use Clang compiler instead of GCC
 dev-lang/spidermonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 dev-lang/spidermonkey:debug - Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems
 dev-lang/spidermonkey:lto - Enable Link Time Optimization (LTO)
@@ -2800,7 +2801,7 @@ dev-util/diffoscope:gpg - Use app-crypt/gnupg
 dev-util/diffoscope:haskell - Use dev-lang/ghc
 dev-util/diffoscope:hdf5 - Use sci-libs/hdf5
 dev-util/diffoscope:hex - Use app-editors/vim-core
-dev-util/diffoscope:iso - Use virtual/cdrtools
+dev-util/diffoscope:iso - Use app-cdr/cdrtools
 dev-util/diffoscope:llvm - Use sys-devel/llvm
 dev-util/diffoscope:opendocument - Use app-text/odt2txt
 dev-util/diffoscope:pascal - Use dev-lang/fpc
@@ -3206,7 +3207,8 @@ games-roguelike/FTL:bundled-libs - Use bundled libraries.
 games-roguelike/angband:sound - Enable and install sounds
 games-roguelike/stone-soup:ncurses - Enable for console (uses ncurses) based build. (can be enabled on top of tiles)
 games-roguelike/stone-soup:tiles - Enable for graphical (tiled) build. (can be enabled on top of ncurses)
-games-roguelike/tomenet:server - Compile server support
+games-roguelike/tomenet:client - Compile client
+games-roguelike/tomenet:server - Compile server
 games-rpg/daimonin-client:music - Install extra music
 games-rpg/drascula:sound - Install optional audio files
 games-rpg/dreamweb:doc - High-resolution scans of the written material in the original UK game box
@@ -3740,6 +3742,7 @@ mail-client/s-nail:ssl - If network is enabled, this adds support for S/MIME and
 mail-client/sylpheed:oniguruma - Use dev-libs/oniguruma for regular expression
 mail-client/thunderbird:clang - Use Clang compiler instead of GCC
 mail-client/thunderbird:eme-free - Disable EME (DRM plugin) cabability at build time
+mail-client/thunderbird:hwaccel - Force-enable hardware-accelerated rendering (Mozilla bug 594876)
 mail-client/thunderbird:lto - Enable Link Time Optimization (LTO). Requires Gold linker when using GCC or LDD linker when using Clang
 mail-client/thunderbird:openh264 - Use media-libs/openh264 for H.264 support instead of downloading binary blob from Mozilla at runtime
 mail-client/thunderbird:pgo - Add support for profile-guided optimization using gcc-4.5, for faster binaries. This option will double the compile time.
@@ -5791,6 +5794,8 @@ net-im/telepathy-connection-managers:xmpp - Enable XMPP protocol handler (this i
 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-notify - Enables native sound notifications
+net-im/toxic:llvm - Enables support for LLVM Address Sanitizer
 net-im/toxic:notification - Enables desktop notifications with libnotify, with sound support.
 net-im/toxic:qrcode - Enables QR code support
 net-im/toxic:sound - Enables audio calling
@@ -7407,8 +7412,9 @@ sci-libs/vtk:xdmf2 - Support for xdmf2 formatted data
 sci-libs/xkaapi:blas - Kaapi BLAS tasks for PLASMA
 sci-libs/xkaapi:gpu - Build library for gpu threading
 sci-mathematics/agda:cpphs - Use cpphs instead of cpp.
+sci-mathematics/agda:debug - Enable debugging features that may slow Agda down.
+sci-mathematics/agda:enable-cluster-counting - Enable the --count-clusters flag. (If enable-cluster-counting is False, then the --count-clusters flag triggers an error message.)
 sci-mathematics/agda:stdlib - Install the standard library.
-sci-mathematics/agda-stdlib:ffi - Install agda-lib-ffi for compilation using the MAlonzo backend
 sci-mathematics/bertini:optimization - Accept upstream's choices for -O option.
 sci-mathematics/cgal:mpfi - Enable support for multiple recision interval arithmetic via sci-libs/mpfi
 sci-mathematics/cgal:ntl - Enable support for dev-libs/ntl
@@ -8287,7 +8293,6 @@ sys-kernel/aufs-sources:module - Patch kernel to allow aufs being build as a mod
 sys-kernel/aufs-sources:vanilla - Use vanilla kernel sources without applying genpatches. WARNING: This flag will drop all support from the Gentoo Kernel Security team
 sys-kernel/bliss-kernel-bin:initramfs - Build initramfs along with the kernel.
 sys-kernel/ck-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
-sys-kernel/dracut:debug - Module installing additional tools like strace, file editor, ssh and more
 sys-kernel/genkernel:cryptsetup - Enable support for Luks disk encryption using sys-fs/cryptsetup
 sys-kernel/genkernel:firmware - Prefer system firmware sys-kernel/linux-firmware over local copy.
 sys-kernel/gentoo-kernel:initramfs - Build initramfs along with the kernel.
@@ -8574,6 +8579,12 @@ www-client/netsurf:gtk2 - Build GTK2 GUI
 www-client/netsurf:psl - Use public suffix list via media-libs/libnspsl
 www-client/netsurf:rosprite - RISC OS Sprite bitmap image support (media-libs/librosprite)
 www-client/netsurf:svgtiny - SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
+www-client/opera:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
+www-client/opera:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
+www-client/opera-beta:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
+www-client/opera-beta:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
+www-client/opera-developer:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
+www-client/opera-developer:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
 www-client/qutebrowser:scripts - Installs userscripts from the misc/userscripts directory to /usr/share/qutebrowser/userscripts.
 www-client/seamonkey:calendar - Build Mozilla's calendar
 www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
@@ -8602,7 +8613,6 @@ www-client/w3m:lynxkeymap - If you prefer Lynx-like key binding
 www-misc/litmus:libproxy - Support for automatic proxy configuratino management through net-libs/libproxy.
 www-misc/litmus:libxml2 - Use dev-libs/libxml2 to parse XML
 www-misc/litmus:pkcs11 - Support for PKCS #11 through PaKChoiS (dev-libs/pakchois).
-www-misc/vdradmin-am:vdr - Support for media-video/vdr. Disable this if the VDR you want to control runs at a remote machine.
 www-misc/xxv:themes - Enable more themes via x11-themes/xxv-skins
 www-plugins/adobe-flash:nsplugin - Install the Netscape Flash API plugin (for Firefox and similar browsers)
 www-plugins/adobe-flash:ppapi - Install the Pepper Flash API plugin (for Chrome and similar browsers)
@@ -8706,7 +8716,6 @@ x11-libs/cairo:utils - Build support for Cairo script and trace utilities
 x11-libs/cairo:valgrind - Built-in support to mark memory regions
 x11-libs/fltk:games - Builds and installs some extra games
 x11-libs/fox:tools - Install adie, calculator, shutterbug, and pathfinder apps.
-x11-libs/gdk-pixbuf:X - Build and install the legacy gdk_pixbuf_xlib-2.0 library
 x11-libs/gtk+:broadway - Enable the GDK Broadway backend.
 x11-libs/gtk+:cloudprint - Enable printing via Google Cloud Print.
 x11-libs/gtk+:colord - Use x11-misc/colord for color management in printing
@@ -8981,7 +8990,6 @@ xfce-base/exo:gtk2 - Build deprecated GTK+2 libexo-1 library.
 xfce-base/garcon:gtk2 - Build the garcon-gtk2-1 library (required for xfce-base/xfce4-panel < 4.13 only).
 xfce-base/libxfce4ui:glade - Build support for Glade 3's GtkBuilder implementation
 xfce-base/libxfce4ui:gtk2 - Build deprecated GTK+2 libxfce4ui-1 library.
-xfce-base/libxfce4ui:libgtop - Enable system information via gnome-base/libgtop.
 xfce-base/libxfce4ui:system-info - Enable system information in xfce4-about.
 xfce-base/thunar:trash-panel-plugin - Build the trash status indicator plugin for the XFCE panel
 xfce-base/xfce4-panel:dbusmenu - Enable dev-libs/libdbusmenu integration (in status notifier plugin)