[gentoo-commits] proj/grs:desktop-amd64-musl-hardened commit in: core/etc/grs/, core/var/lib/portage/

[Anthony G. Basile]

commit:     47663f6ced9e38b837df98548d5e7aa08df4758d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 11:30:09 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 11:30:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=47663f6c

Refresh world and world.conf

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 core/etc/grs/world.conf            | 381 +++++++------------------------------
 core/var/lib/portage/world.CYCLE.2 |   1 -
 core/var/lib/portage/world.CYCLE.3 |   2 +-
 core/var/lib/portage/world.CYCLE.4 |   2 +-
 4 files changed, 73 insertions(+), 313 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 07a45c7..59a84c3 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -7,11 +7,8 @@ package.use : app-accessibility/at-spi2-core:2 X introspection
 [app-admin/eselect:0]
 package.use : app-admin/eselect:0 -doc -emacs vim-syntax
 
-[app-admin/gam-server:0]
-package.use : app-admin/gam-server:0 -debug
-
 [app-admin/sudo:0]
-package.use : app-admin/sudo:0 -gcrypt -nls -offensive -openssl -pam -sasl -selinux -sssd ldap sendmail skey
+package.use : app-admin/sudo:0 -gcrypt -ldap -offensive -openssl -sasl -selinux -skey -sssd nls pam sendmail
 
 [app-admin/syslog-ng:0]
 package.use : app-admin/syslog-ng:0 -amqp -geoip2 -http -json -libressl -mongodb -pacct -python -redis -smtp -spoof-source -systemd caps dbi geoip ipv6 tcpd
@@ -56,9 +53,7 @@ package.use : app-crypt/gcr:0 -debug -test gtk introspection vala
 package.use : app-crypt/gnupg:0 -doc -nls -selinux -tofu -tools -usb -wks-server bzip2 ldap readline smartcard ssl
 
 [app-crypt/gpgme:1]
-package.use : app-crypt/gpgme:1 -common-lisp -python -qt5 cxx static-libs
-package.env : app-crypt/gpgme:1 app-crypt_gpgme_1
-env : LDFLAGS=-largp
+package.use : app-crypt/gpgme:1 -common-lisp -python -qt5 -static-libs cxx
 
 [app-crypt/libsecret:0]
 package.use : app-crypt/libsecret:0 -test crypt introspection vala
@@ -79,7 +74,7 @@ package.use : app-crypt/pinentry:0 -emacs -fltk -qt5 -static caps gnome-keyring
 package.use : app-crypt/rhash:0 -debug -libressl -static-libs nls ssl
 
 [app-editors/gedit:0]
-package.use : app-editors/gedit:0 -test introspection python spell vala
+package.use : app-editors/gedit:0 -spell -test -vala introspection python
 
 [app-editors/nano:0]
 package.use : app-editors/nano:0 -debug -justify -minimal -nls -static magic ncurses slang spell unicode
@@ -90,8 +85,8 @@ package.use : app-editors/vim-core:0 -minimal -nls acl
 [app-editors/vim:0]
 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
+[app-i18n/uchardet:0]
+package.use : app-i18n/uchardet:0 -static-libs -test cpu_flags_x86_sse2
 
 [app-misc/ca-certificates:0]
 package.use : app-misc/ca-certificates:0 cacert
@@ -106,20 +101,11 @@ package.use : app-misc/pax-utils:0 -debug caps python seccomp
 package.use : app-misc/tmux:0 -debug -selinux -utempter vim-syntax
 
 [app-office/abiword:2]
-package.use : app-office/abiword:2 -collab -cups -debug -eds -grammar -map -ots -redland calendar goffice introspection latex math plugins readline spell thesaurus wmf wordperfect
+package.use : app-office/abiword:2 -calendar -collab -cups -debug -eds -grammar -latex -map -math -ots -redland -spell -thesaurus -wmf -wordperfect goffice introspection plugins readline
 
 [app-office/gnumeric:0]
 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
-
-[app-pda/libplist:0]
-package.use : app-pda/libplist:0 python static-libs
-
-[app-pda/libusbmuxd:0]
-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
 
@@ -135,9 +121,6 @@ package.use : app-portage/portage-utils:0 -nls -static
 [app-shells/bash:0]
 package.use : app-shells/bash:0 -afs -bashlogger -examples -mem-scramble -nls -plugins net readline
 
-[app-text/aiksaurus:0]
-package.use : app-text/aiksaurus:0 gtk
-
 [app-text/asciidoc:0]
 package.use : app-text/asciidoc:0 -examples -graphviz -highlight -test
 
@@ -147,29 +130,17 @@ package.use : app-text/docbook-xsl-stylesheets:0 ruby
 [app-text/dvipsk:0]
 package.use : app-text/dvipsk:0 -doc -source
 
-[app-text/enchant:0]
-package.use : app-text/enchant:0 -aspell -test hunspell static-libs
-
 [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 -postscript -t1lib -tiff -xps introspection
 
 [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
-
-[app-text/gspell:0]
-package.use : app-text/gspell:0 -test -vala introspection
+package.use : app-text/ghostscript-gpl:0 -X -dbus -gtk -l10n_de -l10n_ja -l10n_ko -l10n_zh-CN -l10n_zh-TW -static-libs -tiff cups unicode
 
 [app-text/hunspell:0]
 package.use : app-text/hunspell:0 -l10n_af -l10n_bg -l10n_ca -l10n_cs -l10n_cy -l10n_da -l10n_de -l10n_de-1901 -l10n_el -l10n_en -l10n_eo -l10n_es -l10n_et -l10n_fo -l10n_fr -l10n_ga -l10n_gl -l10n_he -l10n_hr -l10n_hu -l10n_ia -l10n_id -l10n_is -l10n_it -l10n_kk -l10n_km -l10n_ku -l10n_lt -l10n_lv -l10n_mi -l10n_mk -l10n_ms -l10n_nb -l10n_nl -l10n_nn -l10n_pl -l10n_pt -l10n_pt-BR -l10n_ro -l10n_ru -l10n_sk -l10n_sl -l10n_sq -l10n_sv -l10n_sw -l10n_tn -l10n_uk -l10n_zu -nls ncurses readline static-libs
 
 [app-text/libspectre:0]
-package.use : app-text/libspectre:0 -debug -doc static-libs
-
-[app-text/libwpd:0.10]
-package.use : app-text/libwpd:0.10 -doc tools
-
-[app-text/libwpg:0.3]
-package.use : app-text/libwpg:0.3 -doc -static-libs
+package.use : app-text/libspectre:0 -debug -doc -static-libs
 
 [app-text/poppler:0]
 package.use : app-text/poppler:0 -cjk -debug -doc -nss -qt5 cairo curl cxx introspection jpeg jpeg2k lcms png tiff utils
@@ -177,9 +148,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
 
@@ -187,7 +155,7 @@ package.use : app-text/teckit:0 -static-libs
 package.use : app-text/texlive-core:0 -doc -source -tk X cjk luajittex xetex
 
 [app-text/wv:0]
-package.use : app-text/wv:0 -tools wmf
+package.use : app-text/wv:0 -tools -wmf
 
 [app-text/xmlto:0]
 package.use : app-text/xmlto:0 latex text
@@ -216,24 +184,18 @@ package.use : dev-db/libdbi-drivers:0 -doc -firebird -mysql -oci8 -postgres sqli
 [dev-db/libdbi:0]
 package.use : dev-db/libdbi:0 -doc static-libs
 
-[dev-db/libiodbc:0]
-package.use : dev-db/libiodbc:0 gtk
-
 [dev-db/lmdb:0]
 package.use : dev-db/lmdb:0 -static-libs
 
 [dev-db/sqlite:3]
 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
-
-[dev-db/unixODBC:0]
-package.use : dev-db/unixODBC:0 -odbcmanual minimal static-libs 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
 
@@ -252,17 +214,14 @@ 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/yasm:0]
-package.use : dev-lang/yasm:0 -nls python
+[dev-lang/vala:0.40]
+package.use : dev-lang/vala:0.40 -test -valadoc
 
 [dev-libs/appstream-glib:0]
 package.use : dev-libs/appstream-glib:0 -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
+package.use : dev-libs/apr-util:1 -berkdb -doc -gdbm -ldap -libressl -mysql -nss -odbc -openssl -postgres -sqlite -static-libs
 
 [dev-libs/apr:1]
 package.use : dev-libs/apr:1 -doc -older-kernels-compatibility -selinux static-libs urandom
@@ -301,7 +260,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
@@ -339,12 +298,6 @@ package.use : dev-libs/libassuan:0 static-libs
 [dev-libs/libbsd:0]
 package.use : dev-libs/libbsd:0 static-libs
 
-[dev-libs/libcdio-paranoia:0]
-package.use : dev-libs/libcdio-paranoia:0 -test cxx static-libs
-
-[dev-libs/libcdio:0]
-package.use : dev-libs/libcdio:0 -minimal -test cddb cxx static-libs
-
 [dev-libs/libcroco:0.6]
 package.use : dev-libs/libcroco:0.6 -test
 
@@ -369,9 +322,6 @@ package.use : dev-libs/libevent:0 -debug -libressl -test ssl static-libs threads
 [dev-libs/libffi:0]
 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
-
 [dev-libs/libgcrypt:0]
 package.use : dev-libs/libgcrypt:0 -doc -o-flag-munging static-libs
 
@@ -414,9 +364,6 @@ package.use : dev-libs/libpeas:0 -glade -lua -luajit -test gtk python
 [dev-libs/libpipeline:0]
 package.use : dev-libs/libpipeline:0 -test static-libs
 
-[dev-libs/librevenge:0]
-package.use : dev-libs/librevenge:0 -doc -test
-
 [dev-libs/libsigc++:2]
 package.use : dev-libs/libsigc++:2 -doc -test static-libs
 
@@ -426,9 +373,6 @@ package.use : dev-libs/libtasn1:0 -doc -test -valgrind static-libs
 [dev-libs/libunistring:0]
 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
-
 [dev-libs/libverto:0]
 package.use : dev-libs/libverto:0 -glib -libevent -tevent libev static-libs threads
 
@@ -528,9 +472,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
 
@@ -564,9 +505,6 @@ package.use : dev-python/cryptography:0 -libressl -test
 [dev-python/cython:0]
 package.use : dev-python/cython:0 -doc -emacs -test
 
-[dev-python/dbus-python:0]
-package.use : dev-python/dbus-python:0 -doc -examples -test
-
 [dev-python/enum34:0]
 package.use : dev-python/enum34:0 -doc
 
@@ -579,15 +517,15 @@ 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
 
 [dev-python/mako:0]
 package.use : dev-python/mako:0 -doc -test
 
-[dev-python/numpy:0]
-package.use : dev-python/numpy:0 -doc -lapack -test
-
 [dev-python/pbr:0]
 package.use : dev-python/pbr:0 -test
 
@@ -609,15 +547,9 @@ package.use : dev-python/pyelftools:0 -examples
 [dev-python/pygments:0]
 package.use : dev-python/pygments:0 -doc -test
 
-[dev-python/pygobject:2]
-package.use : dev-python/pygobject:2 -examples -test libffi
-
 [dev-python/pygobject:3]
 package.use : dev-python/pygobject:3 -examples -test cairo
 
-[dev-python/pygtk:2]
-package.use : dev-python/pygtk:2 -doc -examples -test
-
 [dev-python/pyopenssl:0]
 package.use : dev-python/pyopenssl:0 -doc -examples -test
 
@@ -630,6 +562,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
 
@@ -769,7 +704,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
@@ -778,7 +713,7 @@ package.use : dev-util/strace:0 -aio -elfutils -static -unwind perl
 package.use : dev-vcs/git:0 -cvs -doc -emacs -gpg -highlight -iconv -libressl -mediawiki -mediawiki-experimental -nls -pcre-jit -ppcsha1 -test -tk blksha1 cgi curl gnome-keyring pcre perl python subversion threads webdav xinetd
 
 [dev-vcs/subversion:0]
-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
+package.use : dev-vcs/subversion:0 -apache2 -berkdb -ctypes-python -debug -doc -dso -extras -gnome-keyring -java -kwallet -python -ruby -sasl -test -vim-syntax http nls perl
 
 [gnome-base/dconf:0]
 package.use : gnome-base/dconf:0 -test
@@ -789,43 +724,34 @@ package.env : gnome-base/gnome-desktop:3 gnome-base_gnome-desktop_3
 env : CPPFLAGS="-D_GNU_SOURCE"
 
 [gnome-base/gnome-keyring:0]
-package.use : gnome-base/gnome-keyring:0 -pam -selinux -test caps filecaps ssh-agent
+package.use : gnome-base/gnome-keyring:0 -selinux -test caps filecaps pam ssh-agent
 
 [gnome-base/gsettings-desktop-schemas:0]
 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 -cdda -elogind -fuse -gnome-keyring -gnome-online-accounts -google -gphoto2 -gtk -ios -mtp -nfs -policykit -samba -systemd -test -udisks -zeroconf http udev
 
 [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/libglade:2.0 -static-libs -test -tools
 
 [gnome-base/libgtop:2]
 package.use : gnome-base/libgtop:2 introspection
 
 [gnome-base/librsvg:2]
-package.use : gnome-base/librsvg:2 -tools introspection vala
+package.use : gnome-base/librsvg:2 introspection tools vala
 
 [gnome-extra/gnome-system-monitor:0]
-package.use : gnome-extra/gnome-system-monitor:0 -systemd X
+package.use : gnome-extra/gnome-system-monitor:0 -X -systemd
 
 [gnome-extra/libgsf:0]
 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
+package.use : mail-client/claws-mail:0 -archive -bogofilter -calendar -clamav -dbus -debug -dillo -doc -gdata -ldap -networkmanager -nntp -pda -pdf -perl -python -rss -session -sieve -smime -spam-report -spamassassin -spell -startup-notification -svg -valgrind -xface gnutls imap ipv6 libcanberra libindicate libnotify nls notification pgp
 
 [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
+package.use : mail-mta/postfix:0 -berkdb -cdb -dovecot-sasl -ldap -ldap-bind -libressl -lmdb -mbox -memcached -mysql -nis -postgres -sasl -selinux -sqlite eai hardened pam ssl
 
 [media-fonts/dejavu:0]
 package.use : media-fonts/dejavu:0 -fontforge X
@@ -840,10 +766,10 @@ 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 -debug -lcms -tiff -xmp exif introspection jpeg svg
 
 [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 -aalib -alsa -altivec -aqua -curl -dbus -debug -doc -exif -gnome -jpeg -jpeg2k -lcms -mng -pdf -png -postscript -python -smp -svg -test -tiff -udev -wmf -xpm bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse
 
 [media-gfx/graphite2:0]
 package.use : media-gfx/graphite2:0 -test perl
@@ -851,9 +777,6 @@ package.use : media-gfx/graphite2:0 -test perl
 [media-gfx/imagemagick:0]
 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
-
 [media-libs/aalib:0]
 package.use : media-libs/aalib:0 -gpm X slang static-libs
 
@@ -866,12 +789,6 @@ 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
 
-[media-libs/exempi:2]
-package.use : media-libs/exempi:2 -examples -test static-libs
-
-[media-libs/faac:0]
-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
 
@@ -885,7 +802,7 @@ package.use : media-libs/freeglut:0 -debug static-libs
 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
+package.use : media-libs/gegl:0 -cairo -debug -ffmpeg -jpeg -jpeg2k -lensfun -libav -openexr -png -raw -sdl -svg -umfpack cpu_flags_x86_mmx cpu_flags_x86_sse
 
 [media-libs/giflib:0]
 package.use : media-libs/giflib:0 -doc static-libs
@@ -908,9 +825,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,43 +840,16 @@ 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
-
 [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
 package.env : media-libs/libcaca:0 media-libs_libcaca_0
 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
-
-[media-libs/libdca:0]
-package.use : media-libs/libdca:0 -debug oss static-libs
-
-[media-libs/libdv:0]
-package.use : media-libs/libdv:0 static-libs
-
-[media-libs/libdvdcss:1.2]
-package.use : media-libs/libdvdcss:1.2 -doc static-libs
-
-[media-libs/libdvdnav:0]
-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/libcanberra:0 -alsa -gnome -gstreamer -oss -pulseaudio -tdb -udev gtk gtk3 sound
 
 [media-libs/libepoxy:0]
 package.use : media-libs/libepoxy:0 -test X
@@ -970,77 +857,30 @@ package.use : media-libs/libepoxy:0 -test X
 [media-libs/libexif:0]
 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
-
-[media-libs/libggiwmh:0]
-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
-
 [media-libs/libid3tag:0]
 package.use : media-libs/libid3tag:0 -debug static-libs
 
 [media-libs/libjpeg-turbo:0]
 package.use : media-libs/libjpeg-turbo:0 -java static-libs
 
-[media-libs/libmad:0]
-package.use : media-libs/libmad:0 -debug static-libs
-
-[media-libs/libmng:0]
-package.use : media-libs/libmng:0 lcms static-libs
-
-[media-libs/libmodplug:0]
-package.use : media-libs/libmodplug:0 static-libs
-
-[media-libs/libmpeg2:0]
-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
-
 [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
 
 [media-libs/libsamplerate:0]
 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
-
 [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
-
-[media-libs/libtheora:0]
-package.use : media-libs/libtheora:0 -doc -examples encode static-libs
-
-[media-libs/libv4l:0]
-package.use : media-libs/libv4l:0 -jpeg
-
 [media-libs/libvorbis:0]
 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
-
 [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
 
-[media-libs/libwmf:0]
-package.use : media-libs/libwmf:0 -debug -doc -expat X
-
 [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
 
@@ -1050,77 +890,38 @@ package.use : media-libs/nas:0 -doc static-libs
 [media-libs/netpbm:0]
 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
-
-[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
-
 [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
-
-[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/opus:0 -custom-modes -doc cpu_flags_x86_sse static-libs
 
 [media-libs/tiff:0]
-package.use : media-libs/tiff:0 -test cxx jbig jpeg lzma static-libs zlib
-
-[media-libs/x265:0]
-package.use : media-libs/x265:0 -12bit -numa -power8 -test 10bit pic
-
-[media-libs/xvid:0]
-package.use : media-libs/xvid:0 -examples pic threads
+package.use : media-libs/tiff:0 -test -webp -zstd cxx jbig jpeg lzma static-libs zlib
 
 [media-sound/alsa-utils:0.9]
 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
-
-[media-sound/lame:0]
-package.use : media-sound/lame:0 -cpu_flags_x86_mmx -debug -mp3rtp -sndfile frontend static-libs
-
-[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
-
-[media-sound/twolame:0]
-package.use : media-sound/twolame:0 static-libs
-
-[media-sound/wavpack:0]
-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
+package.use : media-video/ffmpeg:0 -X -alsa -altivec -amr -amrenc -appkit -bluray -bs2b -cdio -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 -cpudetection -debug -doc -fdk -flite -fontconfig -frei0r -fribidi -gcrypt -gme -gmp -gnutls -gsm -iec61883 -ieee1394 -jack -jpeg2k -kvazaar -ladspa -libass -libcaca -libdrm -libilbc -librtmp -libsoxr -libv4l -lzma -mipsdspr1 -mipsdspr2 -mipsfpu -mmal -modplug -mp3 -nvenc -openal -opencl -opengl -openh264 -openssl -opus -oss -pulseaudio -rubberband -samba -sdl -snappy -speex -ssh -static-libs -svg -test -theora -truetype -twolame -v4l -vaapi -vdpau -vorbis -vpx -wavpack -webp -x264 -x265 -xcb -xvid -zeromq -zimg -zvbi bzip2 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 encode fftools_aviocat ffto
 ols_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper fftools_qt-faststart fftools_sidxindex fftools_trasher gpl hardcoded-tables iconv network pic postproc threads 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/mpv:0]
+package.use : media-video/mpv:0 -aqua -archive -bluray -cdda -coreaudio -cplugins -cuda -doc -drm -dvb -dvd -encode -gbm -jack -javascript -jpeg -lcms -libav -libcaca -luajit -openal -oss -pulseaudio -raspberry-pi -rubberband -samba -sdl -selinux -test -tools -v4l -vaapi -vdpau -wayland -zsh-completion X alsa cli egl iconv libass libmpv lua opengl uchardet xv zlib
 
 [media-video/rtmpdump:0]
 package.use : media-video/rtmpdump:0 -libressl gnutls ssl
 
 [media-video/smplayer:0]
-package.use : media-video/smplayer:0 -autoshutdown -debug -mpris bidi
+package.use : media-video/smplayer:0 -autoshutdown -bidi -debug -mpris
 
 [net-analyzer/tcpdump:0]
-package.use : net-analyzer/tcpdump:0 -libressl -smi -test drop-root samba ssl suid
+package.use : net-analyzer/tcpdump:0 -libressl -samba -smi -suid -test drop-root ssl
 
 [net-dialup/linux-atm:0]
 package.use : net-dialup/linux-atm:0 -static-libs
 
 [net-dns/avahi:0]
-package.use : net-dns/avahi:0 -bookmarks -doc -howl-compat -mono -nls -qt5 -selinux -test autoipd dbus gdbm gtk gtk3 introspection ipv6 mdnsresponder-compat python
+package.use : net-dns/avahi:0 -autoipd -bookmarks -dbus -doc -gdbm -gtk -gtk3 -howl-compat -mdnsresponder-compat -mono -python -qt5 -selinux -test introspection ipv6 nls
 
 [net-dns/bind-tools:0]
 package.use : net-dns/bind-tools:0 -doc -gost -gssapi -libedit -libidn2 -libressl -seccomp -urandom idn ipv6 readline ssl xml
@@ -1137,12 +938,8 @@ package.use : net-dns/libidn:0 -doc -emacs -java -mono -nls static-libs
 [net-firewall/iptables:0]
 package.use : net-firewall/iptables:0 -conntrack -netlink -nftables -pcap ipv6 static-libs
 
-[net-fs/cifs-utils:0]
-package.use : net-fs/cifs-utils:0 -creds acl ads caps caps-ng pam
-
 [net-fs/samba:0]
-package.use : net-fs/samba:0 -addc -addns -ceph -cluster -cups -debug -dmapi -gpg -iprint -pam -python -quota -selinux -system-heimdal -systemd -test -zeroconf acl ads client fam gnutls ldap syslog system-mitkrb5 winbind
-package.unmask : =net-fs/samba-4.3.9-r99
+package.use : net-fs/samba:0 -addc -addns -ads -ceph -client -cluster -cups -debug -dmapi -fam -gnutls -gpg -iprint -ldap -python -quota -selinux -syslog -system-heimdal -systemd -test -winbind -zeroconf acl pam system-mitkrb5
 
 [net-ftp/lftp:0]
 package.use : net-ftp/lftp:0 -convert-mozilla-cookies -libressl -nls -socks5 -verify-file gnutls idn ipv6 ssl
@@ -1151,16 +948,16 @@ package.use : net-ftp/lftp:0 -convert-mozilla-cookies -libressl -nls -socks5 -ve
 package.use : net-im/telepathy-mission-control:0 -debug -networkmanager
 
 [net-irc/hexchat:0]
-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
+package.use : net-irc/hexchat:0 -dbus -debug -libcanberra -libnotify -libproxy -libressl -lua -perl -plugin-checksum -plugin-fishlim -plugin-sysinfo -python -spell gtk nls 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
+package.use : net-libs/gtk-vnc:0 -examples -pulseaudio -sasl -vala introspection
 
 [net-libs/libetpan:0]
 package.use : net-libs/libetpan:0 -debug -liblockfile -libressl berkdb gnutls ipv6 sasl ssl static-libs
@@ -1181,7 +978,7 @@ package.use : net-libs/libpcap:0 -netlink -usb bluetooth dbus static-libs
 package.use : net-libs/libqmi:0 -doc -static-libs mbim
 
 [net-libs/libsoup:2.4]
-package.use : net-libs/libsoup:2.4 -debug -gssapi -test introspection samba ssl vala
+package.use : net-libs/libsoup:2.4 -debug -gssapi -samba -test introspection ssl vala
 
 [net-libs/libtirpc:0]
 package.use : net-libs/libtirpc:0 -kerberos -static-libs ipv6
@@ -1189,9 +986,6 @@ package.use : net-libs/libtirpc:0 -kerberos -static-libs ipv6
 [net-libs/miniupnpc:0]
 package.use : net-libs/miniupnpc:0 ipv6 static-libs
 
-[net-libs/openslp:0]
-package.use : net-libs/openslp:0 -libressl
-
 [net-libs/serf:1]
 package.use : net-libs/serf:1 -kerberos -libressl -static-libs
 
@@ -1202,7 +996,7 @@ package.use : net-libs/telepathy-glib:0 -debug -test introspection vala
 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
 
 [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
+package.use : net-mail/dovecot:0 -argon2 -caps -doc -kerberos -ldap -libressl -lua -lucene -lz4 -lzma -managesieve -mysql -postgres -selinux -sieve -solr -sqlite -static-libs -suid -tcpd -textcat -vpopmail bzip2 ipv6 pam zlib
 
 [net-mail/mailbase:0]
 package.use : net-mail/mailbase:0 -pam
@@ -1214,10 +1008,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
@@ -1238,10 +1032,10 @@ package.use : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
 package.use : net-misc/wget:0 -debug -libressl -nls -ntlm -static -test gnutls idn ipv6 pcre ssl uuid zlib
 
 [net-nds/openldap:0]
-package.use : net-nds/openldap:0 -debug -experimental -kerberos -kinit -libressl -minimal -overlays -pbkdf2 -selinux -sha2 -smbkrb5passwd -static-libs berkdb crypt cxx gnutls iodbc ipv6 odbc perl samba sasl slp ssl syslog tcpd
+package.use : net-nds/openldap:0 -berkdb -cxx -debug -experimental -gnutls -iodbc -kerberos -kinit -libressl -minimal -odbc -overlays -pbkdf2 -perl -samba -sasl -selinux -sha2 -slp -smbkrb5passwd -static-libs -tcpd crypt ipv6 ssl syslog
 
 [net-p2p/transmission:0]
-package.use : net-p2p/transmission:0 -ayatana -libressl -lightweight -qt5 -systemd -xfs gtk
+package.use : net-p2p/transmission:0 -ayatana -gtk -libressl -lightweight -qt5 -systemd -xfs
 
 [net-print/cups-filters:0]
 package.use : net-print/cups-filters:0 -dbus -ipp_autosetup -jpeg -ldap -pclm -pdf -perl -png -static-libs -test -tiff -zeroconf foomatic postscript
@@ -1259,7 +1053,7 @@ package.use : net-wireless/bluez:0 -alsa -cups -debug -deprecated -doc -experime
 package.use : net-wireless/crda:0 -gcrypt -libressl
 
 [net-wireless/wpa_supplicant:0]
-package.use : net-wireless/wpa_supplicant:0 -bindist -eapol_test -fasteap -libressl -privsep -ps3 -qt5 -selinux -suiteb -wimax ap dbus eap-sim gnutls hs2-0 p2p readline smartcard ssl tdls uncommon-eap-types wps
+package.use : net-wireless/wpa_supplicant:0 -ap -bindist -dbus -eap-sim -eapol_test -fasteap -gnutls -libressl -p2p -privsep -ps3 -qt5 -selinux -smartcard -suiteb -tdls -uncommon-eap-types -wimax -wps hs2-0 readline ssl
 
 [sys-apps/acl:0]
 package.use : sys-apps/acl:0 -nls static-libs
@@ -1342,9 +1136,6 @@ package.use : sys-apps/opentmpfiles:0 -selinux
 [sys-apps/pciutils:0]
 package.use : sys-apps/pciutils:0 -dns kmod static-libs udev zlib
 
-[sys-apps/pcsc-lite:0]
-package.use : sys-apps/pcsc-lite:0 -libusb -policykit -python -selinux -systemd udev
-
 [sys-apps/portage:0]
 package.use : sys-apps/portage:0 -build -doc -epydoc -gentoo-dev -selinux ipc native-extensions rsync-verify xattr
 
@@ -1390,8 +1181,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
@@ -1430,7 +1221,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
@@ -1468,9 +1259,6 @@ package.use : sys-libs/libcap-ng:0 python static-libs
 [sys-libs/libcap:0]
 package.use : sys-libs/libcap:0 -pam -static-libs
 
-[sys-libs/libraw1394:0]
-package.use : sys-libs/libraw1394:0 static-libs
-
 [sys-libs/libseccomp:0]
 package.use : sys-libs/libseccomp:0 -static-libs
 
@@ -1537,9 +1325,6 @@ package.use : virtual/libgudev:0 -introspection static-libs
 [virtual/libudev:0]
 package.use : virtual/libudev:0 -systemd static-libs
 
-[virtual/libusb:1]
-package.use : virtual/libusb:1 -udev
-
 [virtual/notification-daemon:0]
 package.use : virtual/notification-daemon:0 -gnome -kde
 
@@ -1552,9 +1337,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,7 +1347,7 @@ 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
@@ -1608,9 +1390,6 @@ package.use : x11-libs/gtk+:2 -aqua -cups -examples -test introspection vim-synt
 [x11-libs/gtk+:3]
 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
-
 [x11-libs/gtksourceview:3.0]
 package.use : x11-libs/gtksourceview:3.0 -glade -test introspection vala
 
@@ -1692,9 +1471,6 @@ package.use : x11-libs/libXv:0 static-libs
 [x11-libs/libXvMC:0]
 package.use : x11-libs/libXvMC:0 static-libs
 
-[x11-libs/libXxf86dga:0]
-package.use : x11-libs/libXxf86dga:0 static-libs
-
 [x11-libs/libXxf86misc:0]
 package.use : x11-libs/libXxf86misc:0 static-libs
 
@@ -1713,23 +1489,8 @@ package.use : x11-libs/libnotify:0 -test introspection
 [x11-libs/libpciaccess:0]
 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
-
-[x11-libs/libva-vdpau-driver:0]
-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
-
-[x11-libs/libvdpau:0]
-package.use : x11-libs/libvdpau:0 -doc -test dri
-
 [x11-libs/libwnck:1]
-package.use : x11-libs/libwnck:1 introspection startup-notification
-
-[x11-libs/libwnck:3]
-package.use : x11-libs/libwnck:3 -tools introspection startup-notification
+package.use : x11-libs/libwnck:1 -startup-notification introspection
 
 [x11-libs/libxcb:0]
 package.use : x11-libs/libxcb:0 -doc -selinux -test static-libs xkb
@@ -1752,9 +1513,6 @@ 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
 
-[x11-libs/startup-notification:0]
-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
 
@@ -1785,8 +1543,11 @@ package.use : x11-misc/shared-mime-info:0 -test
 [x11-misc/slim:0]
 package.use : x11-misc/slim:0 -branding -consolekit -pam
 
+[x11-misc/xdg-user-dirs:0]
+package.use : x11-misc/xdg-user-dirs:0 -gtk
+
 [x11-misc/xscreensaver:0]
-package.use : x11-misc/xscreensaver:0 -gdm -new-login -offensive -pam -selinux jpeg opengl perl suid xinerama
+package.use : x11-misc/xscreensaver:0 -gdm -jpeg -new-login -offensive -opengl -selinux -suid -xinerama pam perl
 
 [x11-terms/xfce4-terminal:0]
 package.use : x11-terms/xfce4-terminal:0 -utempter
@@ -1801,29 +1562,29 @@ package.use : x11-themes/adwaita-icon-theme:0 -branding
 package.use : xfce-base/garcon:0 gtk2
 
 [xfce-base/libxfce4ui:0]
-package.use : xfce-base/libxfce4ui:0 -debug -glade -introspection -vala startup-notification
+package.use : xfce-base/libxfce4ui:0 -debug -glade -introspection -startup-notification -vala
 
 [xfce-base/libxfce4util:0]
 package.use : xfce-base/libxfce4util:0 -introspection -vala
 
 [xfce-base/thunar:0]
-package.use : xfce-base/thunar:0 -test -udisks dbus exif libnotify pcre trash-panel-plugin
+package.use : xfce-base/thunar:0 -exif -libnotify -test -udisks dbus pcre trash-panel-plugin
 
 [xfce-base/xfce4-meta:0]
 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 -policykit -systemd -upower nls xscreensaver
 
 [xfce-base/xfce4-settings:0]
-package.use : xfce-base/xfce4-settings:0 -libcanberra -upower input_devices_libinput libnotify xklavier
+package.use : xfce-base/xfce4-settings:0 -libcanberra -libnotify -upower input_devices_libinput xklavier
 
 [xfce-base/xfconf:0]
 package.use : xfce-base/xfconf:0 -debug -test perl
 
 [xfce-base/xfdesktop:0]
-package.use : xfce-base/xfdesktop:0 -debug libnotify thunar
+package.use : xfce-base/xfdesktop:0 -debug -libnotify thunar
 
 [xfce-base/xfwm4:0]
-package.use : xfce-base/xfwm4:0 dri startup-notification xcomposite
+package.use : xfce-base/xfwm4:0 -dri -startup-notification xcomposite
 

diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2
index 7c6ff93..b630081 100644
--- a/core/var/lib/portage/world.CYCLE.2
+++ b/core/var/lib/portage/world.CYCLE.2
@@ -18,7 +18,6 @@ dev-util/strace
 dev-vcs/git
 gnome-extra/gnome-system-monitor
 mail-client/claws-mail
-mail-client/nail
 mail-mta/postfix
 media-gfx/eog
 media-gfx/gimp

diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.3
index 21d173a..f8e007e 100644
--- a/core/var/lib/portage/world.CYCLE.3
+++ b/core/var/lib/portage/world.CYCLE.3
@@ -10,6 +10,7 @@ app-office/gnumeric
 app-portage/gentoolkit
 app-portage/grs
 app-portage/layman
+app-portage/repoman
 app-text/evince
 app-text/tree
 dev-lang/python
@@ -19,7 +20,6 @@ dev-util/strace
 dev-vcs/git
 gnome-extra/gnome-system-monitor
 mail-client/claws-mail
-mail-client/nail
 mail-mta/postfix
 media-gfx/eog
 media-gfx/gimp

diff --git a/core/var/lib/portage/world.CYCLE.4 b/core/var/lib/portage/world.CYCLE.4
index 1e504fc..17e927c 100644
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
@@ -10,6 +10,7 @@ app-office/gnumeric
 app-portage/gentoolkit
 app-portage/grs
 app-portage/layman
+app-portage/repoman
 app-text/evince
 app-text/tree
 dev-lang/python
@@ -19,7 +20,6 @@ dev-util/strace
 dev-vcs/git
 gnome-extra/gnome-system-monitor
 mail-client/claws-mail
-mail-client/nail
 mail-mta/postfix
 media-gfx/eog
 media-gfx/gimp