[gentoo-commits] proj/grs:desktop-amd64-hardened commit in: core/etc/grs/

[Anthony G. Basile]

commit:     c06621b65ec6d8c6a6f056e5496e1c1015fb1f73
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 03:24:39 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May 11 03:24:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=c06621b6

world.conf: attempt to refresh again

 core/etc/grs/world.conf | 303 +++++++++++++++++++++++++-----------------------
 1 file changed, 155 insertions(+), 148 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 07a45c7..ccac08e 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -2,7 +2,7 @@
 package.use : app-accessibility/at-spi2-atk:2 -test
 
 [app-accessibility/at-spi2-core:2]
-package.use : app-accessibility/at-spi2-core:2 X introspection
+package.use : app-accessibility/at-spi2-core:2 -gtk-doc -test X introspection
 
 [app-admin/eselect:0]
 package.use : app-admin/eselect:0 -doc -emacs vim-syntax
@@ -28,9 +28,6 @@ package.use : app-arch/cpio:0 -nls
 [app-arch/file-roller:0]
 package.use : app-arch/file-roller:0 -libnotify -nautilus -packagekit
 
-[app-arch/gcab:0]
-package.use : app-arch/gcab:0 -vala introspection
-
 [app-arch/gzip:0]
 package.use : app-arch/gzip:0 -static pic
 
@@ -53,7 +50,7 @@ package.use : app-arch/xz-utils:0 -nls extra-filters static-libs threads
 package.use : app-crypt/gcr:0 -debug -test gtk introspection vala
 
 [app-crypt/gnupg:0]
-package.use : app-crypt/gnupg:0 -doc -nls -selinux -tofu -tools -usb -wks-server bzip2 ldap readline smartcard ssl
+package.use : app-crypt/gnupg:0 -doc -nls -selinux -tofu -tools -usb -user-socket -wks-server bzip2 ldap readline smartcard ssl
 
 [app-crypt/gpgme:1]
 package.use : app-crypt/gpgme:1 -common-lisp -python -qt5 cxx static-libs
@@ -91,7 +88,7 @@ package.use : app-editors/vim-core:0 -minimal -nls acl
 package.use : app-editors/vim:0 -debug -gpm -luajit -minimal -nls -racket -selinux -terminal -vim-pager X acl cscope lua perl python ruby tcl
 
 [app-i18n/enca:0]
-package.use : app-i18n/enca:0 -doc -static-libs iconv recode
+package.use : app-i18n/enca:0 -doc -recode -static-libs iconv
 
 [app-misc/ca-certificates:0]
 package.use : app-misc/ca-certificates:0 cacert
@@ -112,13 +109,13 @@ package.use : app-office/abiword:2 -collab -cups -debug -eds -grammar -map -ots
 package.use : app-office/gnumeric:0 -libgda -perl -python introspection
 
 [app-pda/libimobiledevice:0]
-package.use : app-pda/libimobiledevice:0 -libressl gnutls python static-libs
+package.use : app-pda/libimobiledevice:0 -gnutls -libressl -python -static-libs
 
 [app-pda/libplist:0]
-package.use : app-pda/libplist:0 python static-libs
+package.use : app-pda/libplist:0 -python -static-libs
 
 [app-pda/libusbmuxd:0]
-package.use : app-pda/libusbmuxd:0 static-libs
+package.use : app-pda/libusbmuxd:0 -static-libs
 
 [app-portage/gemato:0]
 package.use : app-portage/gemato:0 -lzma -sha3 -test -tools blake2 bzip2 gpg
@@ -148,10 +145,10 @@ package.use : app-text/docbook-xsl-stylesheets:0 ruby
 package.use : app-text/dvipsk:0 -doc -source
 
 [app-text/enchant:0]
-package.use : app-text/enchant:0 -aspell -test hunspell static-libs
+package.use : app-text/enchant:0 -aspell -static-libs -test hunspell
 
 [app-text/evince:0]
-package.use : app-text/evince:0 -djvu -dvi -gnome -gnome-keyring -gstreamer -nautilus -nsplugin -t1lib -xps introspection postscript tiff
+package.use : app-text/evince:0 -djvu -dvi -gnome -gnome-keyring -gstreamer -nautilus -nsplugin -spell -t1lib -xps introspection postscript tiff
 
 [app-text/ghostscript-gpl:0]
 package.use : app-text/ghostscript-gpl:0 -l10n_de -l10n_ja -l10n_ko -l10n_zh-CN -l10n_zh-TW -tiff X cups dbus gtk static-libs unicode
@@ -177,9 +174,6 @@ package.use : app-text/poppler:0 -cjk -debug -doc -nss -qt5 cairo curl cxx intro
 [app-text/qpdf:0]
 package.use : app-text/qpdf:0 -doc -examples -perl -static-libs -test
 
-[app-text/recode:0]
-package.use : app-text/recode:0 -nls static-libs
-
 [app-text/teckit:0]
 package.use : app-text/teckit:0 -static-libs
 
@@ -217,7 +211,7 @@ package.use : dev-db/libdbi-drivers:0 -doc -firebird -mysql -oci8 -postgres sqli
 package.use : dev-db/libdbi:0 -doc static-libs
 
 [dev-db/libiodbc:0]
-package.use : dev-db/libiodbc:0 gtk
+package.use : dev-db/libiodbc:0 -gtk
 
 [dev-db/lmdb:0]
 package.use : dev-db/lmdb:0 -static-libs
@@ -226,14 +220,17 @@ package.use : dev-db/lmdb:0 -static-libs
 package.use : dev-db/sqlite:3 -debug -doc -secure-delete -test -tools icu readline static-libs tcl
 
 [dev-db/tinycdb:0]
-package.use : dev-db/tinycdb:0 static-libs
+package.use : dev-db/tinycdb:0 -static-libs
 
 [dev-db/unixODBC:0]
-package.use : dev-db/unixODBC:0 -odbcmanual minimal static-libs unicode
+package.use : dev-db/unixODBC:0 -odbcmanual -static-libs minimal unicode
 
 [dev-lang/lua:0]
 package.use : dev-lang/lua:0 -emacs -static deprecated readline
 
+[dev-lang/nasm:0]
+package.use : dev-lang/nasm:0 -doc
+
 [dev-lang/perl:0]
 package.use : dev-lang/perl:0 -debug -doc -ithreads berkdb gdbm
 
@@ -246,20 +243,23 @@ package.use : dev-lang/python:3.6 -build -examples -libressl -sqlite -test -tk -
 [dev-lang/ruby:2.4]
 package.use : dev-lang/ruby:2.4 -berkdb -debug -doc -examples -gdbm -jemalloc -libressl -rubytests -socks5 -static-libs -tk -xemacs ipv6 rdoc ssl
 
+[dev-lang/spidermonkey:52]
+package.use : dev-lang/spidermonkey:52 -custom-cflags -custom-optimization -debug -minimal -test system-icu
+
 [dev-lang/swig:0]
 package.use : dev-lang/swig:0 -ccache -doc pcre
 
 [dev-lang/tcl:0]
 package.use : dev-lang/tcl:0 -debug threads
 
-[dev-lang/vala:0.36]
-package.use : dev-lang/vala:0.36 -test
+[dev-lang/vala:0.40]
+package.use : dev-lang/vala:0.40 -test -valadoc
 
 [dev-lang/yasm:0]
-package.use : dev-lang/yasm:0 -nls python
+package.use : dev-lang/yasm:0 -python nls
 
 [dev-libs/appstream-glib:0]
-package.use : dev-libs/appstream-glib:0 -doc -stemmer introspection
+package.use : dev-libs/appstream-glib:0 -fonts -gtk-doc -stemmer introspection
 
 [dev-libs/apr-util:1]
 package.use : dev-libs/apr-util:1 -doc -libressl -mysql -nss -openssl -postgres berkdb gdbm ldap odbc sqlite static-libs
@@ -268,7 +268,7 @@ package.use : dev-libs/apr-util:1 -doc -libressl -mysql -nss -openssl -postgres
 package.use : dev-libs/apr:1 -doc -older-kernels-compatibility -selinux static-libs urandom
 
 [dev-libs/atk:0]
-package.use : dev-libs/atk:0 -nls -test introspection
+package.use : dev-libs/atk:0 -gtk-doc introspection
 
 [dev-libs/boehm-gc:0]
 package.use : dev-libs/boehm-gc:0 -static-libs cxx threads
@@ -288,6 +288,9 @@ package.use : dev-libs/dbus-glib:0 -debug -test static-libs
 [dev-libs/double-conversion:0]
 package.use : dev-libs/double-conversion:0 -static-libs -test
 
+[dev-libs/elfutils:0]
+package.use : dev-libs/elfutils:0 -lzma -static-libs -test -threads bzip2 nls utils
+
 [dev-libs/ell:0]
 package.use : dev-libs/ell:0 -glib pie
 
@@ -301,7 +304,7 @@ package.use : dev-libs/fribidi:0 static-libs
 package.use : dev-libs/geoip:0 static-libs
 
 [dev-libs/glib:2]
-package.use : dev-libs/glib:2 -debug -fam -selinux -systemtap -test dbus mime static-libs utils xattr
+package.use : dev-libs/glib:2 -debug -fam -gtk-doc -selinux -systemtap -test dbus mime static-libs utils xattr
 
 [dev-libs/gmp:0]
 package.use : dev-libs/gmp:0 -doc asm cxx static-libs
@@ -340,10 +343,10 @@ package.use : dev-libs/libassuan:0 static-libs
 package.use : dev-libs/libbsd:0 static-libs
 
 [dev-libs/libcdio-paranoia:0]
-package.use : dev-libs/libcdio-paranoia:0 -test cxx static-libs
+package.use : dev-libs/libcdio-paranoia:0 -static-libs -test cxx
 
 [dev-libs/libcdio:0]
-package.use : dev-libs/libcdio:0 -minimal -test cddb cxx static-libs
+package.use : dev-libs/libcdio:0 -cddb -minimal -static-libs -test cxx
 
 [dev-libs/libcroco:0.6]
 package.use : dev-libs/libcroco:0.6 -test
@@ -354,9 +357,6 @@ package.use : dev-libs/libdaemon:0 -doc -examples static-libs
 [dev-libs/libdbusmenu:0]
 package.use : dev-libs/libdbusmenu:0 -debug -gtk -test gtk3 introspection
 
-[dev-libs/libelf:0]
-package.use : dev-libs/libelf:0 -debug nls
-
 [dev-libs/libev:0]
 package.use : dev-libs/libev:0 static-libs
 
@@ -370,7 +370,7 @@ package.use : dev-libs/libevent:0 -debug -libressl -test ssl static-libs threads
 package.use : dev-libs/libffi:0 -debug -test pax_kernel static-libs
 
 [dev-libs/libgamin:0]
-package.use : dev-libs/libgamin:0 -debug python static-libs
+package.use : dev-libs/libgamin:0 -debug -python -static-libs
 
 [dev-libs/libgcrypt:0]
 package.use : dev-libs/libgcrypt:0 -doc -o-flag-munging static-libs
@@ -427,7 +427,7 @@ package.use : dev-libs/libtasn1:0 -doc -test -valgrind static-libs
 package.use : dev-libs/libunistring:0 -doc -static-libs
 
 [dev-libs/libusb:1]
-package.use : dev-libs/libusb:1 -debug -doc -examples -test -udev static-libs
+package.use : dev-libs/libusb:1 -debug -doc -examples -static-libs -test -udev
 
 [dev-libs/libverto:0]
 package.use : dev-libs/libverto:0 -glib -libevent -tevent libev static-libs threads
@@ -528,9 +528,6 @@ package.use : dev-perl/Module-Build:0 -test
 [dev-perl/Net-HTTP:0]
 package.use : dev-perl/Net-HTTP:0 -minimal -test
 
-[dev-perl/Net-SMTP-SSL:0]
-package.use : dev-perl/Net-SMTP-SSL:0 -test
-
 [dev-perl/Net-SSLeay:0]
 package.use : dev-perl/Net-SSLeay:0 -examples -libressl -minimal -test
 
@@ -579,6 +576,9 @@ package.use : dev-python/fixtures:0 -test
 [dev-python/linecache2:0]
 package.use : dev-python/linecache2:0 -test
 
+[dev-python/lxml:0]
+package.use : dev-python/lxml:0 -doc -examples -test threads
+
 [dev-python/m2crypto:0]
 package.use : dev-python/m2crypto:0 -libressl
 
@@ -630,6 +630,9 @@ package.use : dev-python/pyrsistent:0 -test
 [dev-python/pyxattr:0]
 package.use : dev-python/pyxattr:0 -doc -test
 
+[dev-python/pyyaml:0]
+package.use : dev-python/pyyaml:0 -examples -libyaml
+
 [dev-python/requests:0]
 package.use : dev-python/requests:0 -socks5 ssl
 
@@ -756,6 +759,9 @@ package.use : dev-util/ctags:0 -json -xml -yaml
 [dev-util/desktop-file-utils:0]
 package.use : dev-util/desktop-file-utils:0 -emacs
 
+[dev-util/gtk-doc:0]
+package.use : dev-util/gtk-doc:0 -debug -doc -emacs -highlight -vim
+
 [dev-util/meson:0]
 package.use : dev-util/meson:0 -test
 
@@ -769,7 +775,7 @@ package.use : dev-util/pkgconf:0 -test pkg-config
 package.use : dev-util/ragel:0 vim-syntax
 
 [dev-util/scons:0]
-package.use : dev-util/scons:0 -doc
+package.use : dev-util/scons:0 -doc -test
 
 [dev-util/strace:0]
 package.use : dev-util/strace:0 -aio -elfutils -static -unwind perl
@@ -781,10 +787,10 @@ package.use : dev-vcs/git:0 -cvs -doc -emacs -gpg -highlight -iconv -libressl -m
 package.use : dev-vcs/subversion:0 -apache2 -ctypes-python -debug -doc -dso -java -kwallet -nls -test berkdb extras gnome-keyring http perl python ruby sasl vim-syntax
 
 [gnome-base/dconf:0]
-package.use : gnome-base/dconf:0 -test
+package.use : gnome-base/dconf:0 -gtk-doc -test
 
 [gnome-base/gnome-desktop:3]
-package.use : gnome-base/gnome-desktop:3 -debug -test -udev introspection
+package.use : gnome-base/gnome-desktop:3 -debug -test -udev introspection seccomp
 package.env : gnome-base/gnome-desktop:3 gnome-base_gnome-desktop_3
 env : CPPFLAGS="-D_GNU_SOURCE"
 
@@ -795,13 +801,13 @@ package.use : gnome-base/gnome-keyring:0 -pam -selinux -test caps filecaps ssh-a
 package.use : gnome-base/gsettings-desktop-schemas:0 introspection
 
 [gnome-base/gvfs:0]
-package.use : gnome-base/gvfs:0 -afp -archive -bluray -elogind -fuse -gnome-keyring -gnome-online-accounts -google -gphoto2 -nfs -policykit -systemd -test -udisks cdda gtk http ios mtp samba udev zeroconf
+package.use : gnome-base/gvfs:0 -afp -archive -bluray -elogind -fuse -gnome-keyring -gnome-online-accounts -google -gphoto2 -nfs -policykit -systemd -test -udisks cdda http ios mtp samba udev zeroconf
 
 [gnome-base/libglade:2.0]
 package.use : gnome-base/libglade:2.0 -test -tools static-libs
 
 [gnome-base/libgnome-keyring:0]
-package.use : gnome-base/libgnome-keyring:0 -debug -test introspection vala
+package.use : gnome-base/libgnome-keyring:0 -debug -test -vala introspection
 
 [gnome-base/libgtop:2]
 package.use : gnome-base/libgtop:2 introspection
@@ -818,12 +824,6 @@ package.use : gnome-extra/libgsf:0 bzip2 gtk introspection
 [mail-client/claws-mail:0]
 package.use : mail-client/claws-mail:0 -archive -bogofilter -calendar -clamav -debug -dillo -doc -gdata -networkmanager -pda -pdf -perl -python -rss -sieve -smime -spam-report -spamassassin -svg -valgrind dbus gnutls imap ipv6 ldap libcanberra libindicate libnotify nls nntp notification pgp session spell startup-notification xface
 
-[mail-client/nail:0]
-package.use : mail-client/nail:0 -kerberos -libressl -net ssl
-
-[mail-mta/nullmailer:0]
-package.use : mail-mta/nullmailer:0 ssl
-
 [mail-mta/postfix:0]
 package.use : mail-mta/postfix:0 -dovecot-sasl -ldap-bind -libressl -lmdb -memcached -mysql -nis -pam -postgres -selinux berkdb cdb eai hardened ldap mbox sasl sqlite ssl
 
@@ -840,10 +840,13 @@ package.use : media-fonts/font-misc-misc:0 -X nls
 package.use : media-fonts/urw-fonts:0 X
 
 [media-gfx/eog:1]
-package.use : media-gfx/eog:1 -debug exif introspection jpeg lcms svg tiff xmp
+package.use : media-gfx/eog:1 -gtk-doc exif introspection jpeg lcms svg tiff xmp
+
+[media-gfx/exiv2:0]
+package.use : media-gfx/exiv2:0 -doc -examples -webready nls png xmp
 
 [media-gfx/gimp:2]
-package.use : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -test -udev aalib alsa bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse curl dbus exif jpeg jpeg2k lcms mng pdf png postscript python smp svg tiff wmf xpm
+package.use : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -heif -openexr -test -udev -unwind -vector-icons -webp aalib alsa cpu_flags_x86_mmx cpu_flags_x86_sse jpeg2k mng postscript python wmf xpm
 
 [media-gfx/graphite2:0]
 package.use : media-gfx/graphite2:0 -test perl
@@ -852,7 +855,7 @@ package.use : media-gfx/graphite2:0 -test perl
 package.use : media-gfx/imagemagick:0 -X -bzip2 -corefonts -djvu -fftw -fontconfig -fpx -graphviz -hdri -heif -jbig -jpeg -jpeg2k -lcms -lqr -lzma -opencl -openexr -pango -perl -png -postscript -q32 -q8 -raw -static-libs -svg -test -tiff -truetype -webp -wmf -xml cxx openmp zlib
 
 [media-libs/a52dec:0]
-package.use : media-libs/a52dec:0 -djbfft oss static-libs
+package.use : media-libs/a52dec:0 -djbfft -oss -static-libs
 
 [media-libs/aalib:0]
 package.use : media-libs/aalib:0 -gpm X slang static-libs
@@ -864,13 +867,13 @@ package.use : media-libs/alsa-lib:0 -alisp -debug -doc python thread-safety
 package.use : media-libs/audiofile:0 -test flac static-libs
 
 [media-libs/babl:0]
-package.use : media-libs/babl:0 -altivec -cpu_flags_x86_f16c -cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
+package.use : media-libs/babl:0 -altivec -cpu_flags_x86_f16c -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
 
 [media-libs/exempi:2]
-package.use : media-libs/exempi:2 -examples -test static-libs
+package.use : media-libs/exempi:2 -examples -static-libs -test
 
 [media-libs/faac:0]
-package.use : media-libs/faac:0 static-libs
+package.use : media-libs/faac:0 -static-libs
 
 [media-libs/flac:0]
 package.use : media-libs/flac:0 -altivec -debug cpu_flags_x86_sse cxx ogg static-libs
@@ -884,8 +887,14 @@ package.use : media-libs/freeglut:0 -debug static-libs
 [media-libs/freetype:2]
 package.use : media-libs/freetype:2 -debug -doc -fontforge -harfbuzz -infinality X adobe-cff bindist bzip2 cleartype_hinting png static-libs utils
 
-[media-libs/gegl:0]
-package.use : media-libs/gegl:0 -debug -libav -umfpack cairo cpu_flags_x86_mmx cpu_flags_x86_sse ffmpeg jpeg jpeg2k lensfun openexr png raw sdl svg
+[media-libs/gegl:0.3]
+package.use : media-libs/gegl:0.3 -cairo -debug -ffmpeg -jpeg2k -lcms -lensfun -openexr -raw -sdl -svg -test -tiff -umfpack -v4l -vala -webp cpu_flags_x86_mmx cpu_flags_x86_sse introspection
+
+[media-libs/gegl:0.4]
+package.use : media-libs/gegl:0.4 -debug -ffmpeg -jpeg2k -lcms -lensfun -libav -openexr -pdf -raw -sdl -svg -test -tiff -umfpack -v4l -vala -webp cairo cpu_flags_x86_mmx cpu_flags_x86_sse introspection zlib
+
+[media-libs/gexiv2:0]
+package.use : media-libs/gexiv2:0 -gtk-doc -python -static-libs -test introspection vala
 
 [media-libs/giflib:0]
 package.use : media-libs/giflib:0 -doc static-libs
@@ -908,9 +917,6 @@ package.use : media-libs/gstreamer:1.0 -orc -test -unwind caps introspection nls
 [media-libs/harfbuzz:0]
 package.use : media-libs/harfbuzz:0 -debug -test cairo glib graphite icu introspection static-libs truetype
 
-[media-libs/ilmbase:0]
-package.use : media-libs/ilmbase:0 static-libs
-
 [media-libs/imlib2:0]
 package.use : media-libs/imlib2:0 -cpu_flags_x86_mmx -doc -nls X bzip2 cpu_flags_x86_sse2 gif jpeg mp3 png shm static-libs tiff zlib
 
@@ -926,14 +932,11 @@ package.use : media-libs/jbigkit:0 static-libs
 [media-libs/lcms:2]
 package.use : media-libs/lcms:2 -doc -test jpeg static-libs threads tiff
 
-[media-libs/lensfun:0]
-package.use : media-libs/lensfun:0 -doc -test cpu_flags_x86_sse cpu_flags_x86_sse2
-
 [media-libs/libass:0]
 package.use : media-libs/libass:0 fontconfig harfbuzz static-libs
 
 [media-libs/libbluray:0]
-package.use : media-libs/libbluray:0 -aacs -bdplus -java fontconfig static-libs truetype utils xml
+package.use : media-libs/libbluray:0 -aacs -bdplus -java -static-libs -utils fontconfig truetype xml
 
 [media-libs/libcaca:0]
 package.use : media-libs/libcaca:0 -doc -java -mono -ruby -test -truetype X cxx imlib ncurses opengl python slang static-libs
@@ -943,26 +946,23 @@ env : CPPFLAGS="-std=gnu++11"
 [media-libs/libcanberra:0]
 package.use : media-libs/libcanberra:0 -gnome -gstreamer -pulseaudio -tdb -udev alsa gtk gtk3 oss sound
 
-[media-libs/libcddb:0]
-package.use : media-libs/libcddb:0 -doc static-libs
-
 [media-libs/libdc1394:2]
-package.use : media-libs/libdc1394:2 -doc static-libs
+package.use : media-libs/libdc1394:2 -doc -static-libs
 
 [media-libs/libdca:0]
-package.use : media-libs/libdca:0 -debug oss static-libs
+package.use : media-libs/libdca:0 -debug -oss -static-libs
 
 [media-libs/libdv:0]
-package.use : media-libs/libdv:0 static-libs
+package.use : media-libs/libdv:0 -static-libs
 
 [media-libs/libdvdcss:1.2]
-package.use : media-libs/libdvdcss:1.2 -doc static-libs
+package.use : media-libs/libdvdcss:1.2 -doc -static-libs
 
 [media-libs/libdvdnav:0]
-package.use : media-libs/libdvdnav:0 static-libs
+package.use : media-libs/libdvdnav:0 -static-libs
 
 [media-libs/libdvdread:0]
-package.use : media-libs/libdvdread:0 css static-libs
+package.use : media-libs/libdvdread:0 -static-libs css
 
 [media-libs/libepoxy:0]
 package.use : media-libs/libepoxy:0 -test X
@@ -971,15 +971,13 @@ package.use : media-libs/libepoxy:0 -test X
 package.use : media-libs/libexif:0 -doc -nls static-libs
 
 [media-libs/libggi:0]
-package.use : media-libs/libggi:0 -3dfx -debug -svga -vis X aalib cpu_flags_x86_mmx fbcon
+package.use : media-libs/libggi:0 -3dfx -X -aalib -debug -fbcon -svga -vis cpu_flags_x86_mmx
 
 [media-libs/libggiwmh:0]
-package.use : media-libs/libggiwmh:0 X
+package.use : media-libs/libggiwmh:0 -X
 
 [media-libs/libgii:0]
-package.use : media-libs/libgii:0 X
-package.env : media-libs/libgii:0 media-libs_libgii_0
-env : CPPFLAGS=-D_POSIX_SOURCE
+package.use : media-libs/libgii:0 -X
 
 [media-libs/libid3tag:0]
 package.use : media-libs/libid3tag:0 -debug static-libs
@@ -988,26 +986,26 @@ package.use : media-libs/libid3tag:0 -debug static-libs
 package.use : media-libs/libjpeg-turbo:0 -java static-libs
 
 [media-libs/libmad:0]
-package.use : media-libs/libmad:0 -debug static-libs
+package.use : media-libs/libmad:0 -debug -static-libs
 
 [media-libs/libmng:0]
-package.use : media-libs/libmng:0 lcms static-libs
+package.use : media-libs/libmng:0 -lcms -static-libs
 
 [media-libs/libmodplug:0]
-package.use : media-libs/libmodplug:0 static-libs
+package.use : media-libs/libmodplug:0 -static-libs
 
 [media-libs/libmpeg2:0]
-package.use : media-libs/libmpeg2:0 X sdl static-libs
+package.use : media-libs/libmpeg2:0 -X -sdl -static-libs
 
 [media-libs/libmtp:0]
-package.use : media-libs/libmtp:0 -doc -examples crypt static-libs
+package.use : media-libs/libmtp:0 -doc -examples -static-libs crypt
+
+[media-libs/libmypaint:0]
+package.use : media-libs/libmypaint:0 -introspection gegl nls openmp
 
 [media-libs/libogg:0]
 package.use : media-libs/libogg:0 static-libs
 
-[media-libs/libopenraw:0]
-package.use : media-libs/libopenraw:0 -test gtk static-libs
-
 [media-libs/libpng:0]
 package.use : media-libs/libpng:0 -neon apng cpu_flags_x86_sse static-libs
 
@@ -1015,16 +1013,16 @@ package.use : media-libs/libpng:0 -neon apng cpu_flags_x86_sse static-libs
 package.use : media-libs/libsamplerate:0 -sndfile static-libs
 
 [media-libs/libsdl2:0]
-package.use : media-libs/libsdl2:0 -altivec -aqua -cpu_flags_x86_3dnow -custom-cflags -gles -haptic -kms -libsamplerate -pulseaudio -tslib -udev -video_cards_vc4 -vulkan -wayland X alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dbus joystick nas opengl oss sound static-libs threads video xinerama xscreensaver
+package.use : media-libs/libsdl2:0 -X -alsa -altivec -aqua -cpu_flags_x86_3dnow -custom-cflags -dbus -gles -haptic -kms -libsamplerate -nas -opengl -oss -pulseaudio -static-libs -tslib -udev -video_cards_vc4 -vulkan -wayland -xinerama -xscreensaver cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 joystick sound threads video
 
 [media-libs/libsdl:0]
 package.use : media-libs/libsdl:0 -custom-cflags -pulseaudio -tslib X aalib alsa dga fbcon joystick libcaca nas opengl oss sound static-libs video xinerama xv
 
 [media-libs/libsndfile:0]
-package.use : media-libs/libsndfile:0 -minimal -test alsa sqlite static-libs
+package.use : media-libs/libsndfile:0 -alsa -minimal -sqlite -static-libs -test
 
 [media-libs/libtheora:0]
-package.use : media-libs/libtheora:0 -doc -examples encode static-libs
+package.use : media-libs/libtheora:0 -doc -examples -static-libs encode
 
 [media-libs/libv4l:0]
 package.use : media-libs/libv4l:0 -jpeg
@@ -1033,13 +1031,13 @@ package.use : media-libs/libv4l:0 -jpeg
 package.use : media-libs/libvorbis:0 static-libs
 
 [media-libs/libvpx:0]
-package.use : media-libs/libvpx:0 -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_ssse3 -doc -svc -test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 postproc static-libs threads
+package.use : media-libs/libvpx:0 -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_ssse3 -doc -postproc -static-libs -svc -test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 threads
 
 [media-libs/libwebp:0]
-package.use : media-libs/libwebp:0 -cpu_flags_x86_avx2 -cpu_flags_x86_sse4_1 -experimental -neon -swap-16bit-csp cpu_flags_x86_sse2 gif jpeg opengl png static-libs tiff
+package.use : media-libs/libwebp:0 -cpu_flags_x86_sse4_1 -neon -swap-16bit-csp cpu_flags_x86_sse2 gif jpeg opengl png static-libs tiff
 
 [media-libs/libwmf:0]
-package.use : media-libs/libwmf:0 -debug -doc -expat X
+package.use : media-libs/libwmf:0 -X -debug -doc -expat
 
 [media-libs/mesa:0]
 package.use : media-libs/mesa:0 -d3d9 -debug -gallium -gles1 -gles2 -llvm -lm_sensors -opencl -osmesa -selinux -test -unwind -vaapi -valgrind -vdpau -video_cards_freedreno -video_cards_i915 -video_cards_i965 -video_cards_imx -video_cards_r100 -video_cards_r200 -video_cards_r300 -video_cards_r600 -video_cards_radeonsi -video_cards_vc4 -video_cards_virgl -video_cards_vivante -video_cards_vmware -vulkan -wayland -xa classic dri3 egl gbm pax_kernel pic video_cards_intel video_cards_nouveau video_cards_radeon xvmc
@@ -1051,34 +1049,25 @@ package.use : media-libs/nas:0 -doc static-libs
 package.use : media-libs/netpbm:0 -doc -postscript -rle -svga X cpu_flags_x86_sse2 jbig jpeg jpeg2k png static-libs tiff xml zlib
 
 [media-libs/openal:0]
-package.use : media-libs/openal:0 -coreaudio -cpu_flags_x86_sse4_1 -debug -jack -pulseaudio -qt5 alsa cpu_flags_x86_sse cpu_flags_x86_sse2 oss portaudio
+package.use : media-libs/openal:0 -alsa -coreaudio -cpu_flags_x86_sse4_1 -debug -jack -oss -portaudio -pulseaudio -qt5 -sdl cpu_flags_x86_sse cpu_flags_x86_sse2
 
 [media-libs/opencore-amr:0]
-package.use : media-libs/opencore-amr:0 static-libs
-
-[media-libs/openexr:0]
-package.use : media-libs/openexr:0 -cpu_flags_x86_avx -examples static-libs
+package.use : media-libs/opencore-amr:0 -static-libs
 
 [media-libs/openjpeg:2]
 package.use : media-libs/openjpeg:2 -doc -static-libs -test
 
 [media-libs/opus:0]
-package.use : media-libs/opus:0 -ambisonics -custom-modes -doc cpu_flags_x86_sse static-libs
-
-[media-libs/portaudio:0]
-package.use : media-libs/portaudio:0 -debug -doc alsa cxx jack oss static-libs
+package.use : media-libs/opus:0 -custom-modes -doc cpu_flags_x86_sse static-libs
 
 [media-libs/speex:0]
-package.use : media-libs/speex:0 -utils cpu_flags_x86_sse static-libs vbr
-
-[media-libs/t1lib:5]
-package.use : media-libs/t1lib:5 -doc X static-libs
+package.use : media-libs/speex:0 -static-libs -utils cpu_flags_x86_sse vbr
 
 [media-libs/tiff:0]
-package.use : media-libs/tiff:0 -test cxx jbig jpeg lzma static-libs zlib
+package.use : media-libs/tiff:0 -test -webp -zstd cxx jbig jpeg lzma static-libs zlib
 
 [media-libs/x265:0]
-package.use : media-libs/x265:0 -12bit -numa -power8 -test 10bit pic
+package.use : media-libs/x265:0 -numa -pic -power8 -test 10bit 12bit
 
 [media-libs/xvid:0]
 package.use : media-libs/xvid:0 -examples pic threads
@@ -1087,26 +1076,23 @@ package.use : media-libs/xvid:0 -examples pic threads
 package.use : media-sound/alsa-utils:0.9 -bat -doc -nls -selinux libsamplerate ncurses
 
 [media-sound/jack-audio-connection-kit:0]
-package.use : media-sound/jack-audio-connection-kit:0 -altivec -coreaudio -cpu_flags_x86_3dnow -debug -doc -examples -pam alsa cpu_flags_x86_sse oss
+package.use : media-sound/jack-audio-connection-kit:0 -alsa -altivec -coreaudio -cpu_flags_x86_3dnow -debug -doc -examples -oss cpu_flags_x86_sse pam
 
 [media-sound/lame:0]
-package.use : media-sound/lame:0 -cpu_flags_x86_mmx -debug -mp3rtp -sndfile frontend static-libs
+package.use : media-sound/lame:0 -cpu_flags_x86_mmx -debug -mp3rtp -sndfile -static-libs frontend
 
 [media-sound/mpg123:0]
-package.use : media-sound/mpg123:0 -altivec -coreaudio -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_mmx -int-quality -pulseaudio alsa cpu_flags_x86_sse ipv6 jack nas oss portaudio sdl
+package.use : media-sound/mpg123:0 -alsa -altivec -coreaudio -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_mmx -int-quality -jack -nas -oss -portaudio -pulseaudio -sdl cpu_flags_x86_sse ipv6
 
 [media-sound/twolame:0]
-package.use : media-sound/twolame:0 static-libs
+package.use : media-sound/twolame:0 -static-libs
 
 [media-sound/wavpack:0]
-package.use : media-sound/wavpack:0 static-libs
+package.use : media-sound/wavpack:0 -static-libs
 
 [media-video/ffmpeg:0]
 package.use : media-video/ffmpeg:0 -altivec -amrenc -appkit -chromaprint -chromium -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_aes -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_fma3 -cpu_flags_x86_fma4 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_sse4_2 -cpu_flags_x86_ssse3 -cpu_flags_x86_xop -debug -doc -fdk -flite -frei0r -fribidi -gcrypt -gmp -iec61883 -kvazaar -libdrm -libilbc -librtmp -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -mmal -nvenc -opencl -openh264 -openssl -pulseaudio -rubberband -snappy -ssh -svg -test -truetype -vdpau -x264 -zeromq -zimg -zvbi X alsa amr bluray bs2b bzip2 cdio cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpudetection encode fftools_aviocat fftools_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper fftools_qt-faststart fftools_sidxindex fftools_trasher fontconfig gme gnutls gpl gsm hardcoded-tables iconv ieee1
 394 jack jpeg2k ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss pic postproc samba sdl speex static-libs theora threads twolame v4l vaapi vorbis vpx wavpack webp x265 xcb xvid zlib
 
-[media-video/mplayer:0]
-package.use : media-video/mplayer:0 -altivec -aqua -bluray -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_ssse3 -cpudetection -debug -doc -faad -lirc -live -pulseaudio -rar -rtc -selinux -toolame -tremor -vcd -vdpau -video_cards_tdfx -vidix -x264 -yuv4mpeg X a52 aalib alsa bidi bl bs2b cddb cdio cdparanoia cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 dga dts dv dvb dvd dvdnav enca encode faac fbcon ftp ggi gif gsm iconv ipv6 jack joystick jpeg ladspa libass libcaca libmpeg2 lzo mad md5sum mng mp3 nas network nut openal opengl osdmenu oss png pnm pvr radio rtmp samba sdl shm speex tga theora truetype twolame unicode v4l video_cards_mga vorbis xinerama xscreensaver xv xvid zoran
-
 [media-video/rtmpdump:0]
 package.use : media-video/rtmpdump:0 -libressl gnutls ssl
 
@@ -1154,16 +1140,16 @@ package.use : net-im/telepathy-mission-control:0 -debug -networkmanager
 package.use : net-irc/hexchat:0 -debug -libcanberra -libproxy -libressl -lua -nls -plugin-checksum -plugin-fishlim -plugin-sysinfo dbus gtk libnotify perl python spell ssl
 
 [net-libs/glib-networking:0]
-package.use : net-libs/glib-networking:0 -libproxy -test gnome smartcard ssl
+package.use : net-libs/glib-networking:0 -libproxy -test gnome ssl
 
 [net-libs/gnutls:0]
-package.use : net-libs/gnutls:0 -dane -doc -examples -nls -openpgp -sslv2 -sslv3 -test -test-full -tools -valgrind cxx guile idn openssl pkcs11 seccomp static-libs tls-heartbeat zlib
+package.use : net-libs/gnutls:0 -dane -doc -examples -nls -sslv2 -sslv3 -test -test-full -tools -valgrind cxx guile idn openssl pkcs11 seccomp static-libs tls-heartbeat
 
 [net-libs/gtk-vnc:0]
 package.use : net-libs/gtk-vnc:0 -examples -pulseaudio introspection sasl vala
 
 [net-libs/libetpan:0]
-package.use : net-libs/libetpan:0 -debug -liblockfile -libressl berkdb gnutls ipv6 sasl ssl static-libs
+package.use : net-libs/libetpan:0 -liblockfile -libressl -lmdb berkdb gnutls ipv6 sasl ssl static-libs
 
 [net-libs/libmbim:0]
 package.use : net-libs/libmbim:0 -static-libs -udev
@@ -1177,6 +1163,9 @@ package.use : net-libs/libnatpmp:0 static-libs
 [net-libs/libpcap:0]
 package.use : net-libs/libpcap:0 -netlink -usb bluetooth dbus static-libs
 
+[net-libs/libpsl:0]
+package.use : net-libs/libpsl:0 -icu idn man
+
 [net-libs/libqmi:0]
 package.use : net-libs/libqmi:0 -doc -static-libs mbim
 
@@ -1199,7 +1188,7 @@ package.use : net-libs/serf:1 -kerberos -libressl -static-libs
 package.use : net-libs/telepathy-glib:0 -debug -test introspection vala
 
 [net-libs/webkit-gtk:4]
-package.use : net-libs/webkit-gtk:4 -aqua -coverage -doc -gles2 -gnome-keyring -jit -libnotify -nsplugin -spell -test -wayland X egl geolocation gstreamer introspection opengl webgl
+package.use : net-libs/webkit-gtk:4 -aqua -coverage -doc -gles2 -gnome-keyring -jpeg2k -libnotify -nsplugin -spell -test -wayland X egl geolocation gstreamer introspection opengl webgl
 
 [net-mail/dovecot:0]
 package.use : net-mail/dovecot:0 -argon2 -doc -kerberos -libressl -lua -lucene -lz4 -managesieve -mysql -pam -postgres -selinux -sieve -solr -textcat -vpopmail bzip2 caps ipv6 ldap lzma sqlite static-libs suid tcpd zlib
@@ -1214,10 +1203,10 @@ package.use : net-mail/ytnef:0 -static-libs
 package.use : net-misc/curl:0 -adns -brotli -curl_ssl_gnutls -curl_ssl_libressl -curl_ssl_mbedtls -curl_ssl_openssl -curl_ssl_winssl -http2 -kerberos -metalink -ssh -test curl_ssl_nss idn ipv6 ldap rtmp samba ssl static-libs threads
 
 [net-misc/iputils:0]
-package.use : net-misc/iputils:0 -SECURITY_HAZARD -arping -clockdiff -doc -gcrypt -idn -libressl -nettle -rarpd -rdisc -static -tftpd -tracepath -traceroute caps filecaps ipv6 ssl
+package.use : net-misc/iputils:0 -SECURITY_HAZARD -arping -clockdiff -doc -gcrypt -idn -libressl -nettle -rarpd -rdisc -static -tftpd -tracepath -traceroute6 caps filecaps ipv6 ssl
 
 [net-misc/modemmanager:0]
-package.use : net-misc/modemmanager:0 -mbim -policykit -systemd -vala introspection qmi udev
+package.use : net-misc/modemmanager:0 -elogind -mbim -policykit -systemd -vala introspection qmi udev
 
 [net-misc/ntp:0]
 package.use : net-misc/ntp:0 -caps -debug -libressl -openntpd -parse-clocks -samba -selinux -snmp -vim-syntax -zeroconf ipv6 readline ssl threads
@@ -1231,6 +1220,9 @@ package.use : net-misc/rdate:0 ipv6
 [net-misc/rsync:0]
 package.use : net-misc/rsync:0 -examples -static -stunnel acl iconv ipv6 xattr
 
+[net-misc/tigervnc:0]
+package.use : net-misc/tigervnc:0 -dri3 -gnutls -java -libressl -server -xinerama drm nls opengl pam xorgmodule
+
 [net-misc/vinagre:0]
 package.use : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
 
@@ -1270,6 +1262,9 @@ package.use : sys-apps/attr:0 -nls static-libs
 [sys-apps/baselayout:0]
 package.use : sys-apps/baselayout:0 -build split-usr
 
+[sys-apps/bubblewrap:0]
+package.use : sys-apps/bubblewrap:0 -selinux suid
+
 [sys-apps/busybox:0]
 package.use : sys-apps/busybox:0 -debug -livecd -make-symlinks -mdev -pam -savedconfig -selinux -sep-usr -static -systemd ipv6 math syslog
 
@@ -1295,7 +1290,7 @@ package.use : sys-apps/file:0 -python static-libs zlib
 package.use : sys-apps/findutils:0 -nls -selinux -static -test
 
 [sys-apps/gawk:0]
-package.use : sys-apps/gawk:0 -mpfr -nls readline
+package.use : sys-apps/gawk:0 -forced-sandbox -mpfr -nls readline
 
 [sys-apps/gradm:0]
 package.use : sys-apps/gradm:0 -pam
@@ -1330,11 +1325,14 @@ package.use : sys-apps/less:0 pcre unicode
 [sys-apps/man-db:0]
 package.use : sys-apps/man-db:0 -nls -selinux berkdb gdbm manpager static-libs zlib
 
+[sys-apps/man-pages:0]
+package.use : sys-apps/man-pages:0 -l10n_da -l10n_de -l10n_fr -l10n_it -l10n_ja -l10n_nl -l10n_pl -l10n_ru -l10n_zh-CN nls
+
 [sys-apps/net-tools:0]
 package.use : sys-apps/net-tools:0 -nis -nls -plipconfig -selinux -slattach -static arp hostname ipv6
 
 [sys-apps/openrc:0]
-package.use : sys-apps/openrc:0 -audit -debug -newnet -pam -prefix -selinux ncurses netifrc static-libs unicode
+package.use : sys-apps/openrc:0 -audit -bash -debug -newnet -pam -prefix -selinux ncurses netifrc static-libs unicode
 
 [sys-apps/opentmpfiles:0]
 package.use : sys-apps/opentmpfiles:0 -selinux
@@ -1369,12 +1367,24 @@ package.use : sys-apps/util-linux:0 -build -fdformat -kill -nls -pam -selinux -s
 [sys-apps/xinetd:0]
 package.use : sys-apps/xinetd:0 -selinux perl tcpd
 
+[sys-auth/elogind:0]
+package.use : sys-auth/elogind:0 -debug -doc -selinux acl pam policykit
+
 [sys-auth/pambase:0]
 package.use : sys-auth/pambase:0 -consolekit -debug -elogind -minimal -mktemp -pam_krb5 -pam_ssh -passwdqc -securetty -selinux -systemd cracklib nullok sha512
 
+[sys-auth/polkit:0]
+package.use : sys-auth/polkit:0 -consolekit -examples -gtk -jit -kde -selinux -systemd -test elogind introspection nls pam
+
 [sys-auth/skey:0]
 package.use : sys-auth/skey:0 static-libs
 
+[sys-block/parted:0]
+package.use : sys-block/parted:0 -device-mapper -selinux -static-libs debug nls readline
+
+[sys-boot/grub:2]
+package.use : sys-boot/grub:2 -debug -device-mapper -doc -efiemu -grub_platforms_coreboot -grub_platforms_efi-32 -grub_platforms_emu -grub_platforms_ieee1275 -grub_platforms_loongson -grub_platforms_multiboot -grub_platforms_qemu -grub_platforms_qemu-mips -grub_platforms_uboot -grub_platforms_xen -grub_platforms_xen-32 -libzfs -mount -multislot -sdl -static -test -truetype fonts grub_platforms_efi-64 grub_platforms_pc nls themes
+
 [sys-boot/lilo:0]
 package.use : sys-boot/lilo:0 -device-mapper -minimal -pxeserial -static
 
@@ -1390,8 +1400,8 @@ package.use : sys-devel/automake:1.16 -test
 [sys-devel/bc:0]
 package.use : sys-devel/bc:0 -libedit -static readline
 
-[sys-devel/binutils:2.30]
-package.use : sys-devel/binutils:2.30 -doc -multitarget -static-libs -test cxx nls
+[sys-devel/binutils:2.31]
+package.use : sys-devel/binutils:2.31 -default-gold -doc -multitarget -static-libs -test cxx gold nls plugins
 
 [sys-devel/bison:0]
 package.use : sys-devel/bison:0 -examples -nls -static -test
@@ -1399,8 +1409,8 @@ package.use : sys-devel/bison:0 -examples -nls -static -test
 [sys-devel/flex:0]
 package.use : sys-devel/flex:0 -nls -static -test
 
-[sys-devel/gcc:8.2.0]
-package.use : sys-devel/gcc:8.2.0 -altivec -debug -doc -fixed-point -fortran -go -graphite -jit -libssp -mpx -multilib -objc -objc++ -objc-gc -pch -pgo -regression-test -sanitize -systemtap -vanilla -vtv cxx hardened nls nptl openmp pie ssp
+[sys-devel/gcc:8.3.0]
+package.use : sys-devel/gcc:8.3.0 -altivec -debug -doc -fixed-point -fortran -go -graphite -jit -libssp -mpx -multilib -objc -objc++ -objc-gc -pch -pgo -sanitize -systemtap -test -vanilla -vtv cxx hardened nls nptl openmp pie ssp
 
 [sys-devel/gdb:0]
 package.use : sys-devel/gdb:0 -multitarget -nls -test -vanilla -xml client lzma python server
@@ -1430,7 +1440,7 @@ package.use : sys-fs/e2fsprogs:0 -fuse -nls static-libs
 package.use : sys-fs/eudev:0 -introspection -rule-generator -selinux -test hwdb kmod static-libs
 
 [sys-fs/lvm2:0]
-package.use : sys-fs/lvm2:0 -device-mapper-only -lvm1 -lvm2create_initrd -selinux -static -systemd -thin readline static-libs udev
+package.use : sys-fs/lvm2:0 -device-mapper-only -lvm2create_initrd -sanlock -selinux -static -systemd -thin readline static-libs udev
 
 [sys-kernel/genkernel:0]
 package.use : sys-kernel/genkernel:0 -cryptsetup -ibm -selinux firmware
@@ -1441,9 +1451,6 @@ package.use : sys-kernel/linux-firmware:0 -savedconfig
 [sys-kernel/linux-headers:0]
 package.use : sys-kernel/linux-headers:0 -headers-only
 
-[sys-libs/argp-standalone:0]
-package.use : sys-libs/argp-standalone:0 -static-libs
-
 [sys-libs/binutils-libs:0]
 package.use : sys-libs/binutils-libs:0 -64-bit-bfd -multitarget -nls -static-libs
 
@@ -1459,6 +1466,9 @@ package.use : sys-libs/e2fsprogs-libs:0 static-libs
 [sys-libs/gdbm:0]
 package.use : sys-libs/gdbm:0 -exporter -nls berkdb readline static-libs
 
+[sys-libs/glibc:2.2]
+package.use : sys-libs/glibc:2.2 -audit -caps -cet -compile-locales -doc -gd -headers-only -multilib -nscd -profile -selinux -suid -systemtap -test -vanilla multiarch ssp
+
 [sys-libs/ldb:0]
 package.use : sys-libs/ldb:0 -doc ldap python
 
@@ -1469,7 +1479,7 @@ package.use : sys-libs/libcap-ng:0 python static-libs
 package.use : sys-libs/libcap:0 -pam -static-libs
 
 [sys-libs/libraw1394:0]
-package.use : sys-libs/libraw1394:0 static-libs
+package.use : sys-libs/libraw1394:0 -static-libs
 
 [sys-libs/libseccomp:0]
 package.use : sys-libs/libseccomp:0 -static-libs
@@ -1480,9 +1490,6 @@ package.use : sys-libs/libutempter:0 static-libs
 [sys-libs/mtdev:0]
 package.use : sys-libs/mtdev:0 static-libs
 
-[sys-libs/musl:0]
-package.use : sys-libs/musl:0 -headers-only
-
 [sys-libs/ncurses:0]
 package.use : sys-libs/ncurses:0 -ada -debug -doc -gpm -minimal -profile -test -threads -tinfo -trace cxx static-libs unicode
 
@@ -1552,9 +1559,6 @@ package.use : virtual/ssh:0 -minimal
 [virtual/udev:0]
 package.use : virtual/udev:0 -systemd
 
-[www-client/midori:0]
-package.accept_keywords : =www-client/midori-7.0 ~amd64
-
 [www-client/w3m:0]
 package.use : www-client/w3m:0 -X -fbcon -gdk-pixbuf -gpm -imlib -l10n_de -l10n_ja -libressl -lynxkeymap -nntp -xface nls ssl unicode
 
@@ -1565,10 +1569,10 @@ package.use : x11-apps/xauth:0 -test ipv6
 package.use : x11-apps/xinit:0 minimal
 
 [x11-base/xorg-drivers:0]
-package.use : x11-base/xorg-drivers:0 -input_devices_elographics -input_devices_vmmouse -video_cards_dummy -video_cards_freedreno -video_cards_geode -video_cards_i915 -video_cards_i965 -video_cards_nvidia -video_cards_omap -video_cards_radeonsi -video_cards_tdfx -video_cards_tegra -video_cards_vc4 -video_cards_via -video_cards_virtualbox -video_cards_vmware -video_cards_voodoo input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_synaptics input_devices_void input_devices_wacom video_cards_amdgpu video_cards_ast video_cards_fbdev video_cards_glint video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_siliconmotion video_cards_vesa
+package.use : x11-base/xorg-drivers:0 -input_devices_elographics -input_devices_vmmouse -video_cards_dummy -video_cards_freedreno -video_cards_geode -video_cards_i915 -video_cards_i965 -video_cards_nvidia -video_cards_omap -video_cards_radeonsi -video_cards_tegra -video_cards_vc4 -video_cards_via -video_cards_virtualbox -video_cards_vmware input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_synaptics input_devices_void input_devices_wacom video_cards_amdgpu video_cards_ast video_cards_fbdev video_cards_glint video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_siliconmotion video_cards_vesa
 
 [x11-base/xorg-server:0]
-package.use : x11-base/xorg-server:0 -debug -dmx -doc -kdrive -libressl -minimal -selinux -systemd -unwind -wayland -xcsecurity -xephyr -xnest -xvfb glamor ipv6 static-libs suid udev xorg
+package.use : x11-base/xorg-server:0 -debug -dmx -doc -elogind -kdrive -libressl -minimal -selinux -systemd -unwind -wayland -xcsecurity -xephyr -xnest -xvfb glamor ipv6 static-libs suid udev xorg
 
 [x11-drivers/xf86-input-wacom:0]
 package.use : x11-drivers/xf86-input-wacom:0 -debug
@@ -1596,8 +1600,11 @@ package.use : x11-drivers/xf86-video-r128:0 dri
 [x11-libs/cairo:0]
 package.use : x11-libs/cairo:0 -aqua -debug -gles2 -utils -valgrind X glib opengl static-libs svg xcb
 
+[x11-libs/fltk:1]
+package.use : x11-libs/fltk:1 -cairo -debug -doc -examples -games -static-libs opengl threads xft xinerama
+
 [x11-libs/gdk-pixbuf:2]
-package.use : x11-libs/gdk-pixbuf:2 -debug -test X introspection jpeg jpeg2k tiff
+package.use : x11-libs/gdk-pixbuf:2 -gtk-doc X introspection jpeg jpeg2k tiff
 
 [x11-libs/goffice:0.10]
 package.use : x11-libs/goffice:0.10 introspection
@@ -1609,7 +1616,7 @@ package.use : x11-libs/gtk+:2 -aqua -cups -examples -test introspection vim-synt
 package.use : x11-libs/gtk+:3 -aqua -broadway -cloudprint -colord -cups -examples -gtk-doc -test -wayland X introspection vim-syntax xinerama
 
 [x11-libs/gtkmathview:0]
-package.use : x11-libs/gtkmathview:0 -mathml -t1lib gtk svg
+package.use : x11-libs/gtkmathview:0 -gtk -mathml -svg -t1lib
 
 [x11-libs/gtksourceview:3.0]
 package.use : x11-libs/gtksourceview:3.0 -glade -test introspection vala
@@ -1639,7 +1646,7 @@ package.use : x11-libs/libXaw:0 -deprecated -doc static-libs
 package.use : x11-libs/libXcomposite:0 -doc static-libs
 
 [x11-libs/libXcursor:0]
-package.use : x11-libs/libXcursor:0 static-libs
+package.use : x11-libs/libXcursor:0 -doc static-libs
 
 [x11-libs/libXdamage:0]
 package.use : x11-libs/libXdamage:0 static-libs
@@ -1657,7 +1664,7 @@ package.use : x11-libs/libXfixes:0 static-libs
 package.use : x11-libs/libXfont2:0 -doc -static-libs -truetype bzip2 ipv6
 
 [x11-libs/libXft:0]
-package.use : x11-libs/libXft:0 static-libs
+package.use : x11-libs/libXft:0 -doc static-libs
 
 [x11-libs/libXi:0]
 package.use : x11-libs/libXi:0 -doc static-libs
@@ -1672,7 +1679,7 @@ package.use : x11-libs/libXmu:0 -doc ipv6 static-libs
 package.use : x11-libs/libXpm:0 static-libs
 
 [x11-libs/libXrandr:0]
-package.use : x11-libs/libXrandr:0 static-libs
+package.use : x11-libs/libXrandr:0 -doc static-libs
 
 [x11-libs/libXrender:0]
 package.use : x11-libs/libXrender:0 static-libs
@@ -1693,7 +1700,7 @@ package.use : x11-libs/libXv:0 static-libs
 package.use : x11-libs/libXvMC:0 static-libs
 
 [x11-libs/libXxf86dga:0]
-package.use : x11-libs/libXxf86dga:0 static-libs
+package.use : x11-libs/libXxf86dga:0 -doc -static-libs
 
 [x11-libs/libXxf86misc:0]
 package.use : x11-libs/libXxf86misc:0 static-libs
@@ -1714,16 +1721,16 @@ package.use : x11-libs/libnotify:0 -test introspection
 package.use : x11-libs/libpciaccess:0 static-libs zlib
 
 [x11-libs/libva-intel-driver:0]
-package.use : x11-libs/libva-intel-driver:0 -wayland X drm
+package.use : x11-libs/libva-intel-driver:0 -X -wayland drm
 
 [x11-libs/libva-vdpau-driver:0]
-package.use : x11-libs/libva-vdpau-driver:0 -debug opengl
+package.use : x11-libs/libva-vdpau-driver:0 -debug -opengl
 
 [x11-libs/libva:0]
-package.use : x11-libs/libva:0 -egl -vdpau -video_cards_dummy -video_cards_i965 -video_cards_nvidia -wayland X drm opengl video_cards_intel video_cards_nouveau
+package.use : x11-libs/libva:0 -egl -opengl -vdpau -video_cards_i965 -video_cards_nvidia -wayland X drm video_cards_dummy video_cards_intel video_cards_nouveau
 
 [x11-libs/libvdpau:0]
-package.use : x11-libs/libvdpau:0 -doc -test dri
+package.use : x11-libs/libvdpau:0 -doc -dri -test
 
 [x11-libs/libwnck:1]
 package.use : x11-libs/libwnck:1 introspection startup-notification
@@ -1750,10 +1757,10 @@ package.use : x11-libs/libxshmfence:0 static-libs
 package.use : x11-libs/pango:0 -test X introspection
 
 [x11-libs/pixman:0]
-package.use : x11-libs/pixman:0 -altivec -cpu_flags_x86_ssse3 -loongson2f -neon cpu_flags_x86_mmxext cpu_flags_x86_sse2 static-libs
+package.use : x11-libs/pixman:0 -altivec -cpu_flags_x86_ssse3 -loongson2f -neon cpu_flags_x86_mmxext cpu_flags_x86_sse2
 
 [x11-libs/startup-notification:0]
-package.use : x11-libs/startup-notification:0 static-libs
+package.use : x11-libs/startup-notification:0 -static-libs
 
 [x11-libs/vte:2.91]
 package.use : x11-libs/vte:2.91 -debug -glade -vanilla crypt introspection vala
@@ -1813,7 +1820,7 @@ package.use : xfce-base/thunar:0 -test -udisks dbus exif libnotify pcre trash-pa
 package.use : xfce-base/xfce4-meta:0 -minimal svg
 
 [xfce-base/xfce4-session:0]
-package.use : xfce-base/xfce4-session:0 -nls -policykit -systemd -upower xscreensaver
+package.use : xfce-base/xfce4-session:0 -elogind -nls -policykit -systemd -upower xscreensaver
 
 [xfce-base/xfce4-settings:0]
 package.use : xfce-base/xfce4-settings:0 -libcanberra -upower input_devices_libinput libnotify xklavier