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

[Anthony G. Basile]

commit:     f48dc202496b698af29926dc2d1f04ea8e957895
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: Sat Apr 20 22:14:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=f48dc202

Refresh world and world.conf

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

 core/etc/grs/world.conf            | 585 ++++++++++++++++++-------------------
 core/var/lib/portage/world.CYCLE.2 |   1 -
 core/var/lib/portage/world.CYCLE.3 |   5 +-
 core/var/lib/portage/world.CYCLE.4 |   3 +-
 4 files changed, 284 insertions(+), 310 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 2448c00..ecb2173 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -11,10 +11,13 @@ package.use : app-admin/eselect:0 -doc -emacs vim-syntax
 package.use : app-admin/gam-server:0 -debug
 
 [app-admin/sudo:0]
-package.use : app-admin/sudo:0 -gcrypt -nls -offensive -openssl -pam -selinux ldap sendmail skey
+package.use : app-admin/sudo:0 -gcrypt -nls -offensive -openssl -pam -sasl -selinux -sssd ldap sendmail skey
 
 [app-admin/syslog-ng:0]
-package.use : app-admin/syslog-ng:0 -amqp -json -libressl -mongodb -pacct -python -redis -smtp -spoof-source -systemd caps dbi geoip ipv6 tcpd
+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
+
+[app-arch/brotli:0]
+package.use : app-arch/brotli:0 -python -test
 
 [app-arch/bzip2:0]
 package.use : app-arch/bzip2:0 -static static-libs
@@ -23,7 +26,7 @@ package.use : app-arch/bzip2:0 -static static-libs
 package.use : app-arch/cpio:0 -nls
 
 [app-arch/file-roller:0]
-package.use : app-arch/file-roller:0 -libnotify -packagekit
+package.use : app-arch/file-roller:0 -libnotify -nautilus -packagekit
 
 [app-arch/gcab:0]
 package.use : app-arch/gcab:0 -vala introspection
@@ -41,34 +44,34 @@ package.use : app-arch/tar:0 -minimal -nls -selinux -static acl xattr
 package.use : app-arch/unzip:0 bzip2 natspec unicode
 
 [app-arch/xz-utils:0]
-package.use : app-arch/xz-utils:0 -nls static-libs threads
-
-[app-cdr/cdrtools:0]
-package.use : app-cdr/cdrtools:0 -acl -caps -nls filecaps unicode
+package.use : app-arch/xz-utils:0 -nls extra-filters static-libs threads
 
 [app-crypt/gcr:0]
 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 gnutls ldap readline smartcard
+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
 
 [app-crypt/libsecret:0]
-package.use : app-crypt/libsecret:0 -debug -test crypt introspection vala
+package.use : app-crypt/libsecret:0 -test crypt introspection vala
 
 [app-crypt/mit-krb5:0]
 package.use : app-crypt/mit-krb5:0 -doc -libressl -openldap -selinux -test keyutils nls pkinit threads xinetd
 
+[app-crypt/openpgp-keys-gentoo-release:0]
+package.use : app-crypt/openpgp-keys-gentoo-release:0 -test
+
 [app-crypt/p11-kit:0]
 package.use : app-crypt/p11-kit:0 -debug asn1 libffi trust
 
 [app-crypt/pinentry:0]
-package.use : app-crypt/pinentry:0 -emacs -qt5 -static caps gnome-keyring gtk ncurses
+package.use : app-crypt/pinentry:0 -emacs -fltk -qt5 -static caps gnome-keyring gtk ncurses
 
 [app-crypt/rhash:0]
-package.use : app-crypt/rhash:0 -debug -openssl -static-libs nls
+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
@@ -80,13 +83,13 @@ package.use : app-editors/nano:0 -debug -justify -minimal -nls -static magic ncu
 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 -vim-pager X acl cscope lua perl python ruby tcl
+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-misc/ca-certificates:0]
-package.use : app-misc/ca-certificates:0 -insecure_certs cacert
+package.use : app-misc/ca-certificates:0 cacert
 
 [app-misc/geoclue:2.0]
 package.use : app-misc/geoclue:2.0 -zeroconf introspection modemmanager
@@ -104,7 +107,7 @@ package.use : app-office/abiword:2 -collab -debug -eds -grammar -map -ots -redla
 package.use : app-office/gnumeric:0 -libgda -perl -python introspection
 
 [app-pda/libimobiledevice:0]
-package.use : app-pda/libimobiledevice:0 gnutls python static-libs
+package.use : app-pda/libimobiledevice:0 -libressl gnutls python static-libs
 
 [app-pda/libplist:0]
 package.use : app-pda/libplist:0 python static-libs
@@ -112,8 +115,14 @@ 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
+
+[app-portage/grs:0]
+package.use : app-portage/grs:0 -server
+
 [app-portage/layman:0]
-package.use : app-portage/layman:0 -bazaar -cvs -darcs -g-sorcery -gpg -mercurial -sqlite -squashfs -sync-plugin-portage -test git subversion
+package.use : app-portage/layman:0 -bazaar -cvs -darcs -g-sorcery -gpg -mercurial -sqlite -squashfs -subversion -sync-plugin-portage -test git
 
 [app-portage/portage-utils:0]
 package.use : app-portage/portage-utils:0 -nls -static
@@ -134,7 +143,7 @@ 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 -zemberek hunspell static-libs
+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
@@ -158,7 +167,7 @@ package.use : app-text/libwpd:0.10 -doc tools
 package.use : app-text/libwpg:0.3 -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 qt4 tiff utils
+package.use : app-text/poppler:0 -cjk -debug -doc -nss -qt5 cairo curl cxx introspection jpeg jpeg2k lcms png tiff utils
 
 [app-text/qpdf:0]
 package.use : app-text/qpdf:0 -doc -examples -perl -static-libs -test
@@ -214,29 +223,23 @@ package.use : dev-db/sqlite:3 -debug -doc -secure-delete -test -tools icu readli
 [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/orc:0]
-package.use : dev-lang/orc:0 -examples pax_kernel static-libs
+[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
 
 [dev-lang/python:2.7]
-package.use : dev-lang/python:2.7 -berkdb -build -doc -examples -libressl -tk -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads wide-unicode xml
+package.use : dev-lang/python:2.7 -berkdb -bluetooth -build -doc -examples -libressl -tk -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads wide-unicode xml
 
-[dev-lang/python:3.4]
-package.use : dev-lang/python:3.4 -build -examples -libressl -tk -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads xml
+[dev-lang/python:3.6]
+package.use : dev-lang/python:3.6 -build -examples -libressl -sqlite -test -tk -wininst gdbm hardened ipv6 ncurses readline ssl threads xml
 
-[dev-lang/python:3.5]
-package.use : dev-lang/python:3.5 -build -examples -gdbm -libressl -sqlite -tk -wininst hardened ipv6 ncurses readline ssl threads xml
-
-[dev-lang/ruby:2.2]
-package.use : dev-lang/ruby:2.2 -berkdb -debug -doc -examples -gdbm -jemalloc -libressl -rubytests -socks5 -tk -xemacs ipv6 ncurses rdoc readline ssl
+[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/swig:0]
 package.use : dev-lang/swig:0 -ccache -doc pcre
@@ -244,29 +247,20 @@ 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.34]
-package.use : dev-lang/vala:0.34 -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
 
-[dev-libs/DirectFB:0]
-package.use : dev-libs/DirectFB:0 -X -alsa -bmp -cddb -debug -divine -doc -drmkms -egl -fusiondale -fusionsound -gif -gles2 -gstreamer -imlib2 -input_devices_dynapro -input_devices_elo2300 -input_devices_lirc -input_hub -jpeg2k -mad -mng -mpeg2 -mpeg3 -multicore -opengl -oss -pnm -sawman -sdl -static-libs -swfdec -tiff -timidity -tremor -v4l -vdpau -video_cards_nsc -video_cards_nvidia -video_cards_via -video_cards_vmware -vorbis -webp -xine cpu_flags_x86_mmx cpu_flags_x86_sse dynload fbcon input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_tslib jpeg png truetype video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_r128 video_cards_radeon video_cards_s3 video_cards_sis video_cards_tdfx zlib
-
 [dev-libs/appstream-glib:0]
-package.use : dev-libs/appstream-glib:0 -nls -stemmer introspection
-
-[dev-libs/apr-util:1]
-package.use : dev-libs/apr-util:1 -doc -freetds -mysql -nss -openssl -postgres berkdb gdbm ldap odbc sqlite static-libs
-
-[dev-libs/apr:1]
-package.use : dev-libs/apr:1 -doc -older-kernels-compatibility -selinux static-libs urandom
+package.use : dev-libs/appstream-glib:0 -doc -stemmer introspection
 
 [dev-libs/atk:0]
 package.use : dev-libs/atk:0 -nls -test introspection
 
 [dev-libs/boehm-gc:0]
-package.use : dev-libs/boehm-gc:0 -static-libs -threads cxx
+package.use : dev-libs/boehm-gc:0 -static-libs cxx threads
 
 [dev-libs/boost:0]
 package.use : dev-libs/boost:0 -context -debug -doc -mpi -nls -tools icu python static-libs threads
@@ -275,13 +269,19 @@ package.use : dev-libs/boost:0 -context -debug -doc -mpi -nls -tools icu python
 package.use : dev-libs/check:0 -subunit static-libs
 
 [dev-libs/cyrus-sasl:2]
-package.use : dev-libs/cyrus-sasl:2 -authdaemond -java -kerberos -ldapdb -mysql -openldap -pam -postgres -sample -selinux -srp -urandom berkdb gdbm sqlite ssl static-libs
+package.use : dev-libs/cyrus-sasl:2 -authdaemond -java -kerberos -ldapdb -libressl -mysql -openldap -pam -postgres -sample -selinux -srp -urandom berkdb gdbm sqlite ssl static-libs
 
 [dev-libs/dbus-glib:0]
 package.use : dev-libs/dbus-glib:0 -debug -test static-libs
 
-[dev-libs/eventlog:0]
-package.use : dev-libs/eventlog:0 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
 
 [dev-libs/expat:0]
 package.use : dev-libs/expat:0 -examples static-libs unicode
@@ -293,10 +293,10 @@ 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 -pgo asm cxx static-libs
+package.use : dev-libs/gmp:0 -doc asm cxx static-libs
 
 [dev-libs/gobject-introspection:0]
 package.use : dev-libs/gobject-introspection:0 -doctool -test cairo
@@ -310,11 +310,14 @@ package.use : dev-libs/icu:0 -debug -doc -examples static-libs
 [dev-libs/iniparser:0]
 package.use : dev-libs/iniparser:0 -doc -examples static-libs
 
+[dev-libs/ivykis:0]
+package.use : dev-libs/ivykis:0 -static-libs
+
 [dev-libs/json-c:0]
 package.use : dev-libs/json-c:0 -doc static-libs
 
 [dev-libs/json-glib:0]
-package.use : dev-libs/json-glib:0 -debug introspection
+package.use : dev-libs/json-glib:0 -gtk-doc introspection
 
 [dev-libs/kpathsea:0]
 package.use : dev-libs/kpathsea:0 -doc -source static-libs
@@ -334,9 +337,6 @@ 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/libcgroup:0]
-package.use : dev-libs/libcgroup:0 -pam daemon static-libs tools
-
 [dev-libs/libcroco:0.6]
 package.use : dev-libs/libcroco:0.6 -test
 
@@ -344,16 +344,13 @@ package.use : dev-libs/libcroco:0.6 -test
 package.use : dev-libs/libdaemon:0 -doc -examples static-libs
 
 [dev-libs/libdbusmenu:0]
-package.use : dev-libs/libdbusmenu:0 -debug -gtk gtk3 introspection
-
-[dev-libs/libelf:0]
-package.use : dev-libs/libelf:0 -debug nls
+package.use : dev-libs/libdbusmenu:0 -debug -gtk -test gtk3 introspection
 
 [dev-libs/libev:0]
 package.use : dev-libs/libev:0 static-libs
 
 [dev-libs/libevdev:0]
-package.use : dev-libs/libevdev:0 static-libs
+package.use : dev-libs/libevdev:0 -doc static-libs
 
 [dev-libs/libevent:0]
 package.use : dev-libs/libevent:0 -debug -libressl -test ssl static-libs threads
@@ -365,7 +362,7 @@ package.use : dev-libs/libffi:0 -debug -test pax_kernel static-libs
 package.use : dev-libs/libgamin:0 -debug python static-libs
 
 [dev-libs/libgcrypt:0]
-package.use : dev-libs/libgcrypt:0 -doc static-libs
+package.use : dev-libs/libgcrypt:0 -doc -o-flag-munging static-libs
 
 [dev-libs/libgpg-error:0]
 package.use : dev-libs/libgpg-error:0 -common-lisp -nls static-libs
@@ -374,13 +371,13 @@ package.use : dev-libs/libgpg-error:0 -common-lisp -nls static-libs
 package.use : dev-libs/libgudev:0 -introspection static-libs
 
 [dev-libs/libical:0]
-package.use : dev-libs/libical:0 -doc -examples static-libs
+package.use : dev-libs/libical:0 -berkdb -doc -examples -test static-libs
 
 [dev-libs/libindicate:3]
 package.use : dev-libs/libindicate:3 gtk introspection
 
 [dev-libs/libinput:0]
-package.use : dev-libs/libinput:0 -input_devices_wacom -test
+package.use : dev-libs/libinput:0 -doc -input_devices_wacom
 
 [dev-libs/libksba:0]
 package.use : dev-libs/libksba:0 static-libs
@@ -392,23 +389,20 @@ package.use : dev-libs/libltdl:0 static-libs
 package.use : dev-libs/libnatspec:0 -doc python
 
 [dev-libs/libnl:3]
-package.use : dev-libs/libnl:3 python static-libs utils
+package.use : dev-libs/libnl:3 debug python static-libs threads utils
 
 [dev-libs/libpcre2:0]
-package.use : dev-libs/libpcre2:0 -bzip2 -jit -libedit -pcre16 -pcre32 -static-libs readline recursion-limit unicode zlib
+package.use : dev-libs/libpcre2:0 -bzip2 -jit -libedit -pcre32 -static-libs pcre16 readline recursion-limit unicode zlib
 
 [dev-libs/libpcre:3]
 package.use : dev-libs/libpcre:3 -jit -libedit -pcre32 bzip2 cxx pcre16 readline recursion-limit static-libs unicode zlib
 
 [dev-libs/libpeas:0]
-package.use : dev-libs/libpeas:0 -glade -jit -lua -test gtk python
+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/libpthread-stubs:0]
-package.use : dev-libs/libpthread-stubs:0 static-libs
-
 [dev-libs/librevenge:0]
 package.use : dev-libs/librevenge:0 -doc -test
 
@@ -416,7 +410,7 @@ package.use : dev-libs/librevenge:0 -doc -test
 package.use : dev-libs/libsigc++:2 -doc -test static-libs
 
 [dev-libs/libtasn1:0]
-package.use : dev-libs/libtasn1:0 -doc -valgrind static-libs
+package.use : dev-libs/libtasn1:0 -doc -test -valgrind static-libs
 
 [dev-libs/libunistring:0]
 package.use : dev-libs/libunistring:0 -doc -static-libs
@@ -476,14 +470,23 @@ package.use : dev-libs/zziplib:0 -doc -test sdl static-libs
 package.use : dev-perl/Authen-SASL:0 -kerberos
 
 [dev-perl/CGI:0]
-package.use : dev-perl/CGI:0 -test
+package.use : dev-perl/CGI:0 -examples -test
+
+[dev-perl/Encode-Locale:0]
+package.use : dev-perl/Encode-Locale:0 -test
 
 [dev-perl/Error:0]
 package.use : dev-perl/Error:0 -test
 
+[dev-perl/ExtUtils-Depends:0]
+package.use : dev-perl/ExtUtils-Depends:0 -test
+
 [dev-perl/HTML-Parser:0]
 package.use : dev-perl/HTML-Parser:0 -test
 
+[dev-perl/HTTP-Cookies:0]
+package.use : dev-perl/HTTP-Cookies:0 -test
+
 [dev-perl/HTTP-Message:0]
 package.use : dev-perl/HTTP-Message:0 -test
 
@@ -493,29 +496,41 @@ package.use : dev-perl/IO-HTML:0 -test
 [dev-perl/IO-Socket-SSL:0]
 package.use : dev-perl/IO-Socket-SSL:0 -examples idn
 
+[dev-perl/LWP-Protocol-https:0]
+package.use : dev-perl/LWP-Protocol-https:0 -test
+
 [dev-perl/Locale-Maketext-Lexicon:0]
 package.use : dev-perl/Locale-Maketext-Lexicon:0 -test
 
 [dev-perl/Log-Agent:0]
 package.use : dev-perl/Log-Agent:0 -test
 
+[dev-perl/MIME-tools:0]
+package.use : dev-perl/MIME-tools:0 -examples -test
+
+[dev-perl/MailTools:0]
+package.use : dev-perl/MailTools:0 -examples -test
+
 [dev-perl/Module-Build:0]
 package.use : dev-perl/Module-Build:0 -test
 
 [dev-perl/Net-HTTP:0]
-package.use : dev-perl/Net-HTTP:0 -minimal
-
-[dev-perl/Net-SMTP-SSL:0]
-package.use : dev-perl/Net-SMTP-SSL:0 -test
+package.use : dev-perl/Net-HTTP:0 -minimal -test
 
 [dev-perl/Net-SSLeay:0]
 package.use : dev-perl/Net-SSLeay:0 -examples -libressl -minimal -test
 
+[dev-perl/Sub-Name:0]
+package.use : dev-perl/Sub-Name:0 -suggested -test
+
+[dev-perl/Try-Tiny:0]
+package.use : dev-perl/Try-Tiny:0 -minimal -test
+
 [dev-perl/URI:0]
 package.use : dev-perl/URI:0 -test
 
 [dev-perl/libwww-perl:0]
-package.use : dev-perl/libwww-perl:0 ssl
+package.use : dev-perl/libwww-perl:0 -test ssl
 
 [dev-python/asn1crypto:0]
 package.use : dev-python/asn1crypto:0 -test
@@ -541,18 +556,24 @@ package.use : dev-python/enum34:0 -doc
 [dev-python/extras:0]
 package.use : dev-python/extras:0 -test
 
+[dev-python/fixtures:0]
+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/packaging:0]
-package.use : dev-python/packaging:0 -test
-
 [dev-python/pbr:0]
 package.use : dev-python/pbr:0 -test
 
@@ -563,7 +584,7 @@ package.use : dev-python/ply:0 -examples
 package.use : dev-python/pyasn1:0 -doc
 
 [dev-python/pycairo:0]
-package.use : dev-python/pycairo:0 -doc -examples -test xcb
+package.use : dev-python/pycairo:0 -doc -examples -test
 
 [dev-python/pycparser:0]
 package.use : dev-python/pycparser:0 -test
@@ -578,7 +599,7 @@ package.use : dev-python/pygments:0 -doc -test
 package.use : dev-python/pygobject:2 -examples -test libffi
 
 [dev-python/pygobject:3]
-package.use : dev-python/pygobject:3 -examples -test cairo threads
+package.use : dev-python/pygobject:3 -examples -test cairo
 
 [dev-python/pygtk:2]
 package.use : dev-python/pygtk:2 -doc -examples -test
@@ -586,17 +607,20 @@ package.use : dev-python/pygtk:2 -doc -examples -test
 [dev-python/pyopenssl:0]
 package.use : dev-python/pyopenssl:0 -doc -examples -test
 
-[dev-python/pyparsing:0]
-package.use : dev-python/pyparsing:0 -doc -examples
-
 [dev-python/pypax:0]
 package.use : dev-python/pypax:0 -ptpax xtpax
 
+[dev-python/pyrsistent:0]
+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 -test ssl
+package.use : dev-python/requests:0 -socks5 ssl
 
 [dev-python/setuptools:0]
 package.use : dev-python/setuptools:0 -test
@@ -613,56 +637,74 @@ package.use : dev-python/testtools:0 -doc -test
 [dev-python/urllib3:0]
 package.use : dev-python/urllib3:0 -doc -test
 
-[dev-qt/qt3support:4]
-package.use : dev-qt/qt3support:4 -aqua -debug -pch accessibility exceptions
+[dev-qt/linguist-tools:5]
+package.use : dev-qt/linguist-tools:5 -debug -qml -test
 
 [dev-qt/qtchooser:0]
 package.use : dev-qt/qtchooser:0 -test
 
-[dev-qt/qtcore:4]
-package.use : dev-qt/qtcore:4 -aqua -debug -libressl -pch exceptions glib iconv icu qt3support ssl
+[dev-qt/qtcore:5]
+package.use : dev-qt/qtcore:5 -debug -icu -systemd -test
 
-[dev-qt/qtgui:4]
-package.use : dev-qt/qtgui:4 -aqua -debug -egl -gtkstyle -nis -pch -trace accessibility cups exceptions glib mng nas qt3support tiff xinerama xv
+[dev-qt/qtgui:5]
+package.use : dev-qt/qtgui:5 -accessibility -dbus -debug -egl -eglfs -evdev -gles2 -ibus -jpeg -test -tslib -tuio -vnc gif libinput png udev xcb
 
 [dev-qt/qtlockedfile:0]
-package.use : dev-qt/qtlockedfile:0 -doc qt4 qt5
+package.use : dev-qt/qtlockedfile:0 -doc
 
-[dev-qt/qtscript:4]
-package.use : dev-qt/qtscript:4 -aqua -debug -jit -pch exceptions
+[dev-qt/qtnetwork:5]
+package.use : dev-qt/qtnetwork:5 -bindist -connman -debug -libproxy -networkmanager -test ssl
+
+[dev-qt/qtscript:5]
+package.use : dev-qt/qtscript:5 -debug -jit -scripttools -test
 
 [dev-qt/qtsingleapplication:0]
-package.use : dev-qt/qtsingleapplication:0 -doc X qt4 qt5
+package.use : dev-qt/qtsingleapplication:0 -doc X
+
+[dev-qt/qtwidgets:5]
+package.use : dev-qt/qtwidgets:5 -debug -gles2 -gtk -test png xcb
+
+[dev-qt/qtxml:5]
+package.use : dev-qt/qtxml:5 -debug -test
 
-[dev-qt/qtsql:4]
-package.use : dev-qt/qtsql:4 -aqua -debug -freetds -mysql -oci8 -pch -postgres exceptions odbc qt3support sqlite
+[dev-ruby/did_you_mean:2.4]
+package.use : dev-ruby/did_you_mean:2.4 -test
 
-[dev-ruby/json:0]
-package.use : dev-ruby/json:0 -doc ruby_targets_ruby23 -ruby_targets_ruby24 -test ruby_targets_ruby22
+[dev-ruby/json:2]
+package.use : dev-ruby/json:2 -doc -test
+
+[dev-ruby/kpeg:1]
+package.use : dev-ruby/kpeg:1 -doc -test
 
 [dev-ruby/minitest:5]
-package.use : dev-ruby/minitest:5 -doc ruby_targets_ruby23 -test ruby_targets_ruby22
+package.use : dev-ruby/minitest:5 -doc -test
+
+[dev-ruby/net-telnet:1]
+package.use : dev-ruby/net-telnet:1 -doc -test
 
 [dev-ruby/power_assert:0]
-package.use : dev-ruby/power_assert:0 -doc ruby_targets_ruby23 -test ruby_targets_ruby22
+package.use : dev-ruby/power_assert:0 -doc -test
 
 [dev-ruby/racc:0]
-package.use : dev-ruby/racc:0 -doc -test ruby_targets_ruby22
+package.use : dev-ruby/racc:0 -doc -test
 
 [dev-ruby/rake:0]
-package.use : dev-ruby/rake:0 -doc ruby_targets_ruby23 -test ruby_targets_ruby22
+package.use : dev-ruby/rake:0 -doc -test
 
 [dev-ruby/rdoc:0]
-package.use : dev-ruby/rdoc:0 -doc -test ruby_targets_ruby22
+package.use : dev-ruby/rdoc:0 -doc -test
 
 [dev-ruby/rubygems:0]
-package.use : dev-ruby/rubygems:0 ruby_targets_ruby23 -ruby_targets_ruby24 -server -test ruby_targets_ruby22
+package.use : dev-ruby/rubygems:0 -server -test
 
 [dev-ruby/test-unit:2]
-package.use : dev-ruby/test-unit:2 -doc ruby_targets_ruby23 -test ruby_targets_ruby22
+package.use : dev-ruby/test-unit:2 -doc -test
+
+[dev-ruby/xmlrpc:0]
+package.use : dev-ruby/xmlrpc:0 -doc -test
 
 [dev-scheme/guile:12]
-package.use : dev-scheme/guile:12 -debug -debug-freelist -debug-malloc -discouraged -emacs -nls deprecated networking readline regex threads
+package.use : dev-scheme/guile:12 -debug -debug-malloc -nls deprecated networking regex threads
 
 [dev-tex/bibtexu:0]
 package.use : dev-tex/bibtexu:0 -doc -source
@@ -676,9 +718,6 @@ package.use : dev-texlive/texlive-fontsrecommended:0 -doc -source
 [dev-texlive/texlive-fontutils:0]
 package.use : dev-texlive/texlive-fontutils:0 -doc -source
 
-[dev-texlive/texlive-genericrecommended:0]
-package.use : dev-texlive/texlive-genericrecommended:0 -doc -source
-
 [dev-texlive/texlive-latex:0]
 package.use : dev-texlive/texlive-latex:0 -doc -source
 
@@ -691,6 +730,9 @@ package.use : dev-util/boost-build:0 -examples -test python
 [dev-util/cmake:0]
 package.use : dev-util/cmake:0 -doc -emacs -qt5 -server -system-jsoncpp -test ncurses
 
+[dev-util/cmocka:0]
+package.use : dev-util/cmocka:0 -doc -examples -static-libs -test
+
 [dev-util/cppunit:0]
 package.use : dev-util/cppunit:0 -doc -examples static-libs
 
@@ -703,8 +745,11 @@ 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/meson:0]
+package.use : dev-util/meson:0 -test
+
 [dev-util/ninja:0]
-package.use : dev-util/ninja:0 -doc -emacs -test -vim-syntax -zsh-completion
+package.use : dev-util/ninja:0 -doc -emacs -test -vim-syntax
 
 [dev-util/pkgconfig:0]
 package.use : dev-util/pkgconfig:0 -internal-glib hardened
@@ -712,27 +757,15 @@ package.use : dev-util/pkgconfig:0 -internal-glib hardened
 [dev-util/ragel:0]
 package.use : dev-util/ragel:0 vim-syntax
 
-[dev-util/scons:0]
-package.use : dev-util/scons:0 -doc
-
 [dev-util/strace:0]
-package.use : dev-util/strace:0 -aio -static -unwind perl
+package.use : dev-util/strace:0 -aio -elfutils -static -unwind perl
 
 [dev-vcs/git:0]
-package.use : dev-vcs/git:0 -cvs -doc -emacs -gpg -highlight -iconv -libressl -mediawiki -mediawiki-experimental -nls -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/git:0 -cvs -doc -emacs -gpg -highlight -iconv -libressl -mediawiki -mediawiki-experimental -nls -pcre-jit -ppcsha1 -subversion -test -tk blksha1 cgi curl gnome-keyring pcre perl python threads webdav xinetd
 
 [gnome-base/dconf:0]
 package.use : gnome-base/dconf:0 -test
 
-[gnome-base/gconf:2]
-package.use : gnome-base/gconf:2 -debug -policykit introspection ldap
-
-[gnome-base/gnome-common:3]
-package.use : gnome-base/gnome-common:3 autoconf-archive
-
 [gnome-base/gnome-desktop:3]
 package.use : gnome-base/gnome-desktop:3 -debug -test -udev introspection
 
@@ -743,19 +776,16 @@ 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 -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 gtk 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
-
 [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
@@ -764,17 +794,17 @@ package.use : gnome-extra/gnome-system-monitor:0 -systemd X
 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 -doc -gdata -gtk3 -networkmanager -pda -pdf -perl -python -rss -sieve -smime -spam-report -spamassassin -valgrind -webkit dbus gnutls imap ipv6 ldap libcanberra libindicate libnotify nntp notification pgp session spell startup-notification xface
-
-[mail-client/nail:0]
-package.use : mail-client/nail:0 -kerberos -net ssl
+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-mta/postfix:0]
-package.use : mail-mta/postfix:0 -doc -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 -dovecot-sasl -ldap-bind -libressl -lmdb -memcached -mysql -nis -pam -postgres -selinux berkdb cdb eai hardened ldap mbox sasl sqlite ssl
 
 [media-fonts/dejavu:0]
 package.use : media-fonts/dejavu:0 -fontforge X
 
+[media-fonts/encodings:0]
+package.use : media-fonts/encodings:0 -X
+
 [media-fonts/font-misc-misc:0]
 package.use : media-fonts/font-misc-misc:0 -X nls
 
@@ -791,7 +821,7 @@ package.use : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -test -udev aal
 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 -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
+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
@@ -800,7 +830,7 @@ package.use : media-libs/a52dec:0 -djbfft oss static-libs
 package.use : media-libs/aalib:0 -gpm X slang static-libs
 
 [media-libs/alsa-lib:0]
-package.use : media-libs/alsa-lib:0 -alisp -debug -doc python
+package.use : media-libs/alsa-lib:0 -alisp -debug -doc python thread-safety
 
 [media-libs/audiofile:0]
 package.use : media-libs/audiofile:0 -test flac static-libs
@@ -808,9 +838,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/celt:0]
-package.use : media-libs/celt:0 ogg static-libs
-
 [media-libs/exempi:2]
 package.use : media-libs/exempi:2 -examples -test static-libs
 
@@ -838,26 +865,29 @@ package.use : media-libs/giflib:0 -doc static-libs
 [media-libs/glu:0]
 package.use : media-libs/glu:0 static-libs
 
+[media-libs/graphene:0]
+package.use : media-libs/graphene:0 -doc -test cpu_flags_x86_sse2 introspection
+
 [media-libs/gst-plugins-bad:1.0]
 package.use : media-libs/gst-plugins-bad:1.0 -bzip2 -gles2 -gtk -orc -test -vcd -vnc -wayland X egl introspection nls opengl
 
 [media-libs/gst-plugins-base:1.0]
-package.use : media-libs/gst-plugins-base:1.0 -X -alsa -ivorbis -orc -theora introspection nls ogg pango vorbis
+package.use : media-libs/gst-plugins-base:1.0 -alsa -gbm -gles2 -ivorbis -orc -theora -wayland X egl introspection nls ogg opengl pango vorbis
 
 [media-libs/gstreamer:1.0]
 package.use : media-libs/gstreamer:1.0 -orc -test -unwind caps introspection nls
 
 [media-libs/harfbuzz:0]
-package.use : media-libs/harfbuzz:0 -debug -fontconfig -test cairo glib graphite icu introspection static-libs truetype
+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 static-libs tiff zlib
+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
 
 [media-libs/jasper:0]
-package.use : media-libs/jasper:0 -doc jpeg opengl
+package.use : media-libs/jasper:0 -doc -test jpeg opengl
 
 [media-libs/jbig2dec:0]
 package.use : media-libs/jbig2dec:0 -test png static-libs
@@ -866,7 +896,7 @@ package.use : media-libs/jbig2dec:0 -test png static-libs
 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 zlib
+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
@@ -875,7 +905,7 @@ package.use : media-libs/lensfun:0 -doc -test cpu_flags_x86_sse cpu_flags_x86_ss
 package.use : media-libs/libass:0 fontconfig harfbuzz static-libs
 
 [media-libs/libbluray:0]
-package.use : media-libs/libbluray:0 -aacs -bdplus -java -udf fontconfig static-libs truetype utils xml
+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
@@ -889,7 +919,7 @@ package.use : media-libs/libcanberra:0 -gnome -gstreamer -pulseaudio -tdb -udev
 package.use : media-libs/libcddb:0 -doc static-libs
 
 [media-libs/libdc1394:2]
-package.use : media-libs/libdc1394:2 -doc X 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
@@ -913,7 +943,7 @@ 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 directfb fbcon
+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
@@ -936,9 +966,6 @@ package.use : media-libs/libmng:0 lcms static-libs
 [media-libs/libmodplug:0]
 package.use : media-libs/libmodplug:0 static-libs
 
-[media-libs/libmp4v2:0]
-package.use : media-libs/libmp4v2:0 -test static-libs utils
-
 [media-libs/libmpeg2:0]
 package.use : media-libs/libmpeg2:0 X sdl static-libs
 
@@ -958,7 +985,7 @@ 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 -cpu_flags_x86_3dnow -custom-cflags -fusionsound -gles -haptic -pulseaudio -tslib -udev -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 -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
@@ -982,49 +1009,46 @@ package.use : media-libs/libvpx:0 -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_fl
 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 xml
+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 -nptl -opencl -openmax -osmesa -selinux -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_vivante -video_cards_vmware -vulkan -wayland -xa bindist classic dri3 egl gbm pax_kernel pic video_cards_intel video_cards_nouveau video_cards_radeon xvmc
+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
 
 [media-libs/nas:0]
 package.use : media-libs/nas:0 -doc static-libs
 
 [media-libs/netpbm:0]
-package.use : media-libs/netpbm:0 -doc -rle -svga X cpu_flags_x86_sse2 jbig jpeg jpeg2k png static-libs tiff xml zlib
+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 -debug -neon -pulseaudio alsa cpu_flags_x86_sse oss portaudio
+package.use : media-libs/openal:0 -coreaudio -cpu_flags_x86_sse4_1 -debug -jack -pulseaudio -qt5 -sdl 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 -examples static-libs
+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 -neon cpu_flags_x86_sse static-libs
+package.use : media-libs/opus:0 -custom-modes -doc cpu_flags_x86_sse static-libs
 
 [media-libs/portaudio:0]
-package.use : media-libs/portaudio:0 -debug alsa cxx jack oss static-libs
-
-[media-libs/schroedinger:0]
-package.use : media-libs/schroedinger:0 static-libs
+package.use : media-libs/portaudio:0 -debug -doc alsa cxx jack oss static-libs
 
 [media-libs/speex:0]
-package.use : media-libs/speex:0 cpu_flags_x86_sse ogg static-libs
+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
 
 [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 -neon -numa -power8 -test 10bit pic
+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
@@ -1033,7 +1057,7 @@ 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_mmx cpu_flags_x86_sse cpudetection oss
+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
@@ -1048,16 +1072,16 @@ package.use : media-sound/twolame:0 static-libs
 package.use : media-sound/wavpack:0 static-libs
 
 [media-video/ffmpeg:0]
-package.use : media-video/ffmpeg:0 -altivec -amrenc -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 -libilbc -librtmp -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -mmal -nvenc -openh264 -openssl -pulseaudio -rubberband -snappy -sofalizer -ssh -test -truetype -vdpau -x264 -zeromq -zimg -zvbi X alsa amr bluray bs2b bzip2 cdio celt 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 ieee1394 jack jpeg
 2k ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss pic postproc samba schroedinger sdl speex static-libs theora threads twolame v4l vaapi vorbis vpx wavpack webp x265 xcb xvid zlib
+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 -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 directfb 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 video_cards_s3virge video_cards_tdfx vorbis xinerama xscreensaver xv xvid xvmc zoran
+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 -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
 
 [media-video/smplayer:0]
-package.use : media-video/smplayer:0 -autoshutdown -debug -mpris -qt5 -streaming bidi
+package.use : media-video/smplayer:0 -autoshutdown -debug -mpris bidi
 
 [net-analyzer/tcpdump:0]
 package.use : net-analyzer/tcpdump:0 -libressl -smi -test drop-root samba ssl suid
@@ -1066,10 +1090,10 @@ package.use : net-analyzer/tcpdump:0 -libressl -smi -test drop-root samba ssl su
 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 -selinux -test autoipd dbus gdbm gtk gtk3 introspection ipv6 mdnsresponder-compat python qt4
+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
 
 [net-dns/bind-tools:0]
-package.use : net-dns/bind-tools:0 -doc -gost -gssapi -libressl -seccomp -urandom idn ipv6 readline ssl xml
+package.use : net-dns/bind-tools:0 -doc -gost -gssapi -libedit -libidn2 -libressl -seccomp -urandom idn ipv6 readline ssl xml
 
 [net-dns/idnkit:0]
 package.use : net-dns/idnkit:0 static-libs
@@ -1081,13 +1105,13 @@ package.use : net-dns/libidn2:0 static-libs
 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 ipv6 static-libs
+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
+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 -cluster -dmapi -gpg -iprint -pam -quota -selinux -system-heimdal -systemd -test -zeroconf acl ads client cups fam gnutls ldap syslog system-mitkrb5 winbind
+package.use : net-fs/samba:0 -addc -addns -ceph -cluster -debug -dmapi -gpg -iprint -pam -python -quota -selinux -system-heimdal -systemd -test -zeroconf acl ads client cups fam gnutls ldap syslog system-mitkrb5 winbind
 package.unmask : =net-fs/samba-4.3.9-r99
 
 [net-ftp/lftp:0]
@@ -1097,16 +1121,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 -theme-manager dbus gtk libnotify perl python spell ssl
+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 -python gtk3 introspection sasl vala
+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
@@ -1127,7 +1151,10 @@ 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 -vala introspection samba ssl
+package.use : net-libs/libsoup:2.4 -debug -gssapi -test introspection samba ssl vala
+
+[net-libs/libtirpc:0]
+package.use : net-libs/libtirpc:0 -kerberos -static-libs ipv6
 
 [net-libs/miniupnpc:0]
 package.use : net-libs/miniupnpc:0 ipv6 static-libs
@@ -1135,35 +1162,35 @@ 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
-
 [net-libs/telepathy-glib:0]
 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 -doc -kerberos -libressl -lucene -lz4 -managesieve -mysql -pam -postgres -selinux -sieve -solr -textcat -vpopmail bzip2 caps ipv6 ldap lzma sqlite ssl static-libs suid tcpd zlib
+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
 
 [net-mail/mailbase:0]
 package.use : net-mail/mailbase:0 -pam
 
+[net-mail/ytnef:0]
+package.use : net-mail/ytnef:0 -static-libs
+
 [net-misc/curl:0]
-package.use : net-misc/curl:0 -adns -curl_ssl_axtls -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
+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 -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
+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
 
 [net-misc/openssh:0]
-package.use : net-misc/openssh:0 -X509 -audit -bindist -debug -hpn -kerberos -ldns -libedit -libressl -livecd -pam -sctp -selinux -ssh1 -static -test X ldap pie skey ssl
+package.use : net-misc/openssh:0 -X509 -audit -bindist -debug -hpn -kerberos -ldns -libedit -libressl -livecd -pam -sctp -selinux -static -test X pie ssl
 
 [net-misc/rdate:0]
 package.use : net-misc/rdate:0 ipv6
@@ -1178,28 +1205,28 @@ 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 -selinux -smbkrb5passwd -static-libs berkdb crypt cxx gnutls iodbc ipv6 odbc perl samba sasl slp ssl syslog tcpd
+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
 
 [net-p2p/transmission:0]
 package.use : net-p2p/transmission:0 -ayatana -libressl -lightweight -qt5 -systemd -xfs gtk
 
 [net-print/cups-filters:0]
-package.use : net-print/cups-filters:0 -dbus -ipp_autosetup -jpeg -ldap -pdf -perl -png -static-libs -test -tiff -zeroconf foomatic postscript
+package.use : net-print/cups-filters:0 -dbus -ipp_autosetup -jpeg -ldap -pclm -pdf -perl -png -static-libs -test -tiff -zeroconf foomatic postscript
 
 [net-print/cups:0]
 package.use : net-print/cups:0 -X -acl -dbus -debug -java -kerberos -lprng-compat -python -selinux -static-libs -systemd -usb -xinetd -zeroconf pam ssl threads
 
 [net-vpn/tor:0]
-package.use : net-vpn/tor:0 -libressl -lzma -scrypt -selinux -systemd -test -tor-hardening -web -zstd seccomp
+package.use : net-vpn/tor:0 -caps -libressl -lzma -scrypt -selinux -systemd -test -tor-hardening -zstd seccomp
 
 [net-wireless/bluez:0]
-package.use : net-wireless/bluez:0 -alsa -debug -deprecated -doc -experimental -extra-tools -selinux -systemd -test -test-programs -user-session cups mesh obex readline udev
+package.use : net-wireless/bluez:0 -alsa -btpclient -debug -deprecated -doc -experimental -extra-tools -selinux -systemd -test -test-programs -user-session cups mesh obex readline udev
 
 [net-wireless/crda:0]
 package.use : net-wireless/crda:0 -gcrypt -libressl
 
 [net-wireless/wpa_supplicant:0]
-package.use : net-wireless/wpa_supplicant:0 -fasteap -libressl -ps3 -qt5 -selinux -wimax ap dbus eap-sim gnutls hs2-0 p2p readline smartcard ssl tdls uncommon-eap-types wps
+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
 
 [sys-apps/acl:0]
 package.use : sys-apps/acl:0 -nls static-libs
@@ -1208,13 +1235,13 @@ package.use : sys-apps/acl:0 -nls static-libs
 package.use : sys-apps/attr:0 -nls static-libs
 
 [sys-apps/baselayout:0]
-package.use : sys-apps/baselayout:0 -build
+package.use : sys-apps/baselayout:0 -build split-usr
 
 [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
 
 [sys-apps/coreutils:0]
-package.use : sys-apps/coreutils:0 -hostname -kill -multicall -nls -selinux -static -vanilla acl caps gmp xattr
+package.use : sys-apps/coreutils:0 -hostname -kill -multicall -nls -selinux -static -test -vanilla acl caps gmp split-usr xattr
 
 [sys-apps/dbus:0]
 package.use : sys-apps/dbus:0 -debug -doc -elogind -selinux -systemd -test -user-session X static-libs
@@ -1244,7 +1271,7 @@ package.use : sys-apps/gradm:0 -pam
 package.use : sys-apps/grep:0 -nls -static pcre
 
 [sys-apps/groff:0]
-package.use : sys-apps/groff:0 -examples -l10n_ja X
+package.use : sys-apps/groff:0 -examples X
 
 [sys-apps/help2man:0]
 package.use : sys-apps/help2man:0 -nls
@@ -1253,13 +1280,13 @@ package.use : sys-apps/help2man:0 -nls
 package.use : sys-apps/hwids:0 net pci udev usb
 
 [sys-apps/iproute2:0]
-package.use : sys-apps/iproute2:0 -minimal -selinux atm berkdb iptables ipv6
+package.use : sys-apps/iproute2:0 -caps -elf -minimal -selinux atm berkdb iptables ipv6
 
 [sys-apps/kbd:0]
 package.use : sys-apps/kbd:0 -nls -pam -test
 
 [sys-apps/keyutils:0]
-package.use : sys-apps/keyutils:0 -test
+package.use : sys-apps/keyutils:0 -static -static-libs -test
 
 [sys-apps/kmod:0]
 package.use : sys-apps/kmod:0 -debug -doc lzma python static-libs tools zlib
@@ -1270,6 +1297,9 @@ 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
 
@@ -1283,13 +1313,13 @@ package.use : sys-apps/opentmpfiles:0 -selinux
 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 udev
+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 -selinux ipc native-extensions xattr
+package.use : sys-apps/portage:0 -build -doc -epydoc -gentoo-dev -selinux ipc native-extensions rsync-verify xattr
 
 [sys-apps/sed:0]
-package.use : sys-apps/sed:0 -nls -selinux -static acl
+package.use : sys-apps/sed:0 -forced-sandbox -nls -selinux -static acl
 
 [sys-apps/shadow:0]
 package.use : sys-apps/shadow:0 -audit -nls -pam -selinux acl cracklib skey xattr
@@ -1307,10 +1337,10 @@ package.use : sys-apps/texinfo:0 -nls -static
 package.use : sys-apps/util-linux:0 -build -fdformat -kill -nls -pam -selinux -systemd -test -tty-helpers -udev caps cramfs ncurses python readline slang static-libs suid unicode
 
 [sys-apps/xinetd:0]
-package.use : sys-apps/xinetd:0 -rpc perl tcpd
+package.use : sys-apps/xinetd:0 -selinux perl tcpd
 
 [sys-auth/pambase:0]
-package.use : sys-auth/pambase:0 -consolekit -debug -gnome-keyring -minimal -mktemp -pam_krb5 -pam_ssh -passwdqc -securetty -selinux -systemd cracklib nullok sha512
+package.use : sys-auth/pambase:0 -consolekit -debug -elogind -minimal -mktemp -pam_krb5 -pam_ssh -passwdqc -securetty -selinux -systemd cracklib nullok sha512
 
 [sys-auth/skey:0]
 package.use : sys-auth/skey:0 static-libs
@@ -1324,14 +1354,20 @@ package.use : sys-boot/grub:2 -debug -device-mapper -doc -efiemu -grub_platforms
 [sys-boot/lilo:0]
 package.use : sys-boot/lilo:0 -device-mapper -minimal -pxeserial -static
 
-[sys-devel/autoconf:2.5]
-package.use : sys-devel/autoconf:2.5 -emacs
+[sys-devel/autoconf:2.69]
+package.use : sys-devel/autoconf:2.69 -emacs
+
+[sys-devel/automake:1.11]
+package.use : sys-devel/automake:1.11 -test
+
+[sys-devel/automake:1.16]
+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.28.1]
-package.use : sys-devel/binutils:2.28.1 -multitarget -static-libs -test -vanilla 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
@@ -1339,8 +1375,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:5.4.0]
-package.use : sys-devel/gcc:5.4.0 -altivec -awt -cilk -debug -doc -fixed-point -fortran -gcj -go -graphite -jit -libssp -mpx -multilib -nopie -nossp -objc -objc++ -objc-gc -regression-test -sanitize -vanilla -vtv cxx hardened nls nptl openmp
+[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 -systemtap -vanilla cxx hardened nls nptl openmp pie sanitize ssp vtv
 
 [sys-devel/gdb:0]
 package.use : sys-devel/gdb:0 -multitarget -nls -test -vanilla -xml client lzma python server
@@ -1370,17 +1406,17 @@ 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 -clvm -cman -corosync -device-mapper-only -lvm1 -lvm2create_initrd -openais -selinux -static -systemd -thin readline static-libs udev
-
-[sys-fs/squashfs-tools:0]
-package.use : sys-fs/squashfs-tools:0 -debug -lz4 -lzma -lzo -static xattr xz
+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
+package.use : sys-kernel/genkernel:0 -cryptsetup -ibm -selinux firmware
 
 [sys-kernel/linux-firmware:0]
 package.use : sys-kernel/linux-firmware:0 -savedconfig
 
+[sys-kernel/linux-headers:0]
+package.use : sys-kernel/linux-headers:0 -headers-only
+
 [sys-libs/binutils-libs:0]
 package.use : sys-libs/binutils-libs:0 -64-bit-bfd -multitarget -nls -static-libs
 
@@ -1391,10 +1427,13 @@ package.use : sys-libs/cracklib:0 -nls python static-libs zlib
 package.use : sys-libs/db:5.3 -doc -examples -java -tcl -test cxx
 
 [sys-libs/e2fsprogs-libs:0]
-package.use : sys-libs/e2fsprogs-libs:0 -nls static-libs
+package.use : sys-libs/e2fsprogs-libs:0 static-libs
 
 [sys-libs/gdbm:0]
-package.use : sys-libs/gdbm:0 -exporter -nls berkdb static-libs
+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
@@ -1421,7 +1460,7 @@ package.use : sys-libs/mtdev:0 static-libs
 package.use : sys-libs/ncurses:0 -ada -debug -doc -gpm -minimal -profile -test -threads -tinfo -trace cxx static-libs unicode
 
 [sys-libs/pam:0]
-package.use : sys-libs/pam:0 -audit -berkdb -debug -nis -selinux -test -vim-syntax cracklib nls pie
+package.use : sys-libs/pam:0 -audit -berkdb -debug -nis -selinux -test -vim-syntax cracklib filecaps nls pie
 
 [sys-libs/readline:0]
 package.use : sys-libs/readline:0 static-libs utils
@@ -1438,6 +1477,9 @@ package.use : sys-libs/tdb:0 python
 [sys-libs/tevent:0]
 package.use : sys-libs/tevent:0 python
 
+[sys-libs/timezone-data:0]
+package.use : sys-libs/timezone-data:0 -leaps_timezone nls
+
 [sys-libs/zlib:0]
 package.use : sys-libs/zlib:0 minizip static-libs
 
@@ -1445,10 +1487,10 @@ package.use : sys-libs/zlib:0 minizip static-libs
 package.use : sys-process/fcron:0 -audit -debug -l10n_fr -selinux mta pam readline system-crontab
 
 [sys-process/lsof:0]
-package.use : sys-process/lsof:0 -examples -rpc -selinux -static ipv6
+package.use : sys-process/lsof:0 -examples -rpc -selinux ipv6
 
 [sys-process/procps:0]
-package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test kill ncurses static-libs unicode
+package.use : sys-process/procps:0 -elogind -modern-top -nls -selinux -systemd -test kill ncurses static-libs unicode
 
 [sys-process/psmisc:0]
 package.use : sys-process/psmisc:0 -nls -selinux X ipv6
@@ -1474,9 +1516,6 @@ package.use : virtual/libusb:1 -udev
 [virtual/notification-daemon:0]
 package.use : virtual/notification-daemon:0 -gnome -kde
 
-[virtual/rubygems:0]
-package.use : virtual/rubygems:0 -ruby_targets_rbx ruby_targets_ruby23 ruby_targets_ruby22
-
 [virtual/service-manager:0]
 package.use : virtual/service-manager:0 -prefix
 
@@ -1486,24 +1525,20 @@ package.use : virtual/ssh:0 -minimal
 [virtual/udev:0]
 package.use : virtual/udev:0 -systemd
 
-[www-client/midori:0]
-package.use : www-client/midori:0 -doc -granite -jit -xscreensaver -zeitgeist
-package.accept_keywords : www-client/midori ~amd64
-
 [www-client/w3m:0]
-package.use : www-client/w3m:0 -X -fbcon -gpm -gtk -imlib -l10n_ja -libressl -lynxkeymap -nntp -xface nls ssl unicode
+package.use : www-client/w3m:0 -X -fbcon -gdk-pixbuf -gpm -imlib -l10n_de -l10n_ja -libressl -lynxkeymap -nntp -xface nls ssl unicode
 
 [x11-apps/xauth:0]
 package.use : x11-apps/xauth:0 -test ipv6
 
 [x11-apps/xinit:0]
-package.use : x11-apps/xinit:0 -systemd minimal
+package.use : x11-apps/xinit:0 minimal
 
 [x11-base/xorg-drivers:0]
-package.use : x11-base/xorg-drivers:0 -input_devices_libinput -input_devices_vmmouse -video_cards_amdgpu -video_cards_ark -video_cards_dummy -video_cards_fglrx -video_cards_freedreno -video_cards_geode -video_cards_i740 -video_cards_i915 -video_cards_i965 -video_cards_newport -video_cards_nvidia -video_cards_omap -video_cards_radeonsi -video_cards_sis -video_cards_sunbw2 -video_cards_suncg14 -video_cards_suncg3 -video_cards_suncg6 -video_cards_sunffb -video_cards_sunleo -video_cards_suntcx -video_cards_tegra -video_cards_vc4 -video_cards_via -video_cards_virtualbox -video_cards_vmware -video_cards_voodoo input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_synaptics input_devices_tslib input_devices_void input_devices_wacom video_cards_apm video_cards_ast video_cards_chips video_cards
 _cirrus video_cards_epson video_cards_fbdev video_cards_glint video_cards_i128 video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa
+package.use : x11-base/xorg-drivers:0 -input_devices_libinput -input_devices_vmmouse -video_cards_amdgpu -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_elographics input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_synaptics input_devices_void input_devices_wacom 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 -tslib -unwind -wayland -xcsecurity -xephyr -xnest -xvfb glamor ipv6 static-libs suid udev xorg
+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
 
 [x11-drivers/xf86-input-wacom:0]
 package.use : x11-drivers/xf86-input-wacom:0 -debug
@@ -1514,9 +1549,6 @@ package.use : x11-drivers/xf86-video-ati:0 -udev glamor
 [x11-drivers/xf86-video-intel:0]
 package.use : x11-drivers/xf86-video-intel:0 -debug -dri3 -tools -uxa dri sna udev xvmc
 
-[x11-drivers/xf86-video-mach64:0]
-package.use : x11-drivers/xf86-video-mach64:0 dri
-
 [x11-drivers/xf86-video-mga:0]
 package.use : x11-drivers/xf86-video-mga:0 dri
 
@@ -1526,21 +1558,12 @@ package.use : x11-drivers/xf86-video-qxl:0 -xspice
 [x11-drivers/xf86-video-r128:0]
 package.use : x11-drivers/xf86-video-r128:0 dri
 
-[x11-drivers/xf86-video-savage:0]
-package.use : x11-drivers/xf86-video-savage:0 dri
-
-[x11-drivers/xf86-video-tdfx:0]
-package.use : x11-drivers/xf86-video-tdfx:0 dri
-
 [x11-libs/cairo:0]
-package.use : x11-libs/cairo:0 -aqua -debug -directfb -gles2 -valgrind X glib opengl static-libs svg xcb
+package.use : x11-libs/cairo:0 -aqua -debug -gles2 -utils -valgrind X glib opengl static-libs svg xcb
 
 [x11-libs/gdk-pixbuf:2]
 package.use : x11-libs/gdk-pixbuf:2 -debug -test X introspection jpeg jpeg2k tiff
 
-[x11-libs/gksu:0]
-package.use : x11-libs/gksu:0 -doc -gnome
-
 [x11-libs/goffice:0.10]
 package.use : x11-libs/goffice:0.10 introspection
 
@@ -1548,7 +1571,7 @@ package.use : x11-libs/goffice:0.10 introspection
 package.use : x11-libs/gtk+:2 -aqua -examples -test cups introspection vim-syntax xinerama
 
 [x11-libs/gtk+:3]
-package.use : x11-libs/gtk+:3 -aqua -broadway -cloudprint -colord -examples -test -wayland X cups introspection vim-syntax xinerama
+package.use : x11-libs/gtk+:3 -aqua -broadway -cloudprint -colord -examples -gtk-doc -test -wayland X cups introspection vim-syntax xinerama
 
 [x11-libs/gtkmathview:0]
 package.use : x11-libs/gtkmathview:0 -mathml -t1lib gtk svg
@@ -1572,7 +1595,7 @@ package.use : x11-libs/libXScrnSaver:0 static-libs
 package.use : x11-libs/libXau:0 static-libs
 
 [x11-libs/libXaw3d:0]
-package.use : x11-libs/libXaw3d:0 static-libs unicode
+package.use : x11-libs/libXaw3d:0 -xpm static-libs unicode
 
 [x11-libs/libXaw:0]
 package.use : x11-libs/libXaw:0 -deprecated -doc static-libs
@@ -1598,9 +1621,6 @@ package.use : x11-libs/libXfixes:0 static-libs
 [x11-libs/libXfont2:0]
 package.use : x11-libs/libXfont2:0 -doc -static-libs -truetype bzip2 ipv6
 
-[x11-libs/libXfont:0]
-package.use : x11-libs/libXfont:0 -doc -truetype bzip2 ipv6 static-libs
-
 [x11-libs/libXft:0]
 package.use : x11-libs/libXft:0 static-libs
 
@@ -1613,9 +1633,6 @@ package.use : x11-libs/libXinerama:0 static-libs
 [x11-libs/libXmu:0]
 package.use : x11-libs/libXmu:0 -doc ipv6 static-libs
 
-[x11-libs/libXp:0]
-package.use : x11-libs/libXp:0 static-libs
-
 [x11-libs/libXpm:0]
 package.use : x11-libs/libXpm:0 static-libs
 
@@ -1650,14 +1667,11 @@ package.use : x11-libs/libXxf86misc:0 static-libs
 package.use : x11-libs/libXxf86vm:0 static-libs
 
 [x11-libs/libdrm:0]
-package.use : x11-libs/libdrm:0 -libkms -valgrind -video_cards_amdgpu -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vc4 -video_cards_vivante -video_cards_vmware static-libs video_cards_intel video_cards_nouveau video_cards_radeon
+package.use : x11-libs/libdrm:0 -libkms -valgrind -video_cards_amdgpu -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vc4 -video_cards_vivante -video_cards_vmware video_cards_intel video_cards_nouveau video_cards_radeon
 
 [x11-libs/libfontenc:0]
 package.use : x11-libs/libfontenc:0 static-libs
 
-[x11-libs/libgksu:2]
-package.use : x11-libs/libgksu:2 -nls static-libs
-
 [x11-libs/libnotify:0]
 package.use : x11-libs/libnotify:0 -test introspection
 
@@ -1671,7 +1685,7 @@ package.use : x11-libs/libva-intel-driver:0 -wayland X drm
 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_fglrx -video_cards_i965 -video_cards_nvidia -wayland X drm opengl video_cards_intel video_cards_nouveau
+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
@@ -1692,7 +1706,7 @@ package.use : x11-libs/libxkbcommon:0 -doc -static-libs -test X
 package.use : x11-libs/libxkbfile:0 static-libs
 
 [x11-libs/libxklavier:0]
-package.use : x11-libs/libxklavier:0 -doc introspection
+package.use : x11-libs/libxklavier:0 -vala introspection
 
 [x11-libs/libxshmfence:0]
 package.use : x11-libs/libxshmfence:0 static-libs
@@ -1701,13 +1715,13 @@ 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 -iwmmxt -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 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 crypt introspection vala
+package.use : x11-libs/vte:2.91 -debug -glade -vanilla crypt introspection vala
 
 [x11-libs/xcb-util-cursor:0]
 package.use : x11-libs/xcb-util-cursor:0 -doc -test static-libs
@@ -1727,9 +1741,6 @@ package.use : x11-libs/xcb-util-wm:0 -doc -test static-libs
 [x11-libs/xcb-util:0]
 package.use : x11-libs/xcb-util:0 -doc -test static-libs
 
-[x11-libs/xpyb:0]
-package.use : x11-libs/xpyb:0 -selinux static-libs
-
 [x11-libs/xtrans:0]
 package.use : x11-libs/xtrans:0 -doc
 
@@ -1742,26 +1753,8 @@ package.use : x11-misc/slim:0 -branding -consolekit -pam
 [x11-misc/xscreensaver:0]
 package.use : x11-misc/xscreensaver:0 -gdm -new-login -offensive -pam -selinux jpeg opengl perl suid xinerama
 
-[x11-proto/bigreqsproto:0]
-package.use : x11-proto/bigreqsproto:0 -doc
-
-[x11-proto/fontsproto:0]
-package.use : x11-proto/fontsproto:0 -doc
-
-[x11-proto/recordproto:0]
-package.use : x11-proto/recordproto:0 -doc
-
-[x11-proto/scrnsaverproto:0]
-package.use : x11-proto/scrnsaverproto:0 -doc
-
-[x11-proto/xcmiscproto:0]
-package.use : x11-proto/xcmiscproto:0 -doc
-
-[x11-proto/xextproto:0]
-package.use : x11-proto/xextproto:0 -doc
-
-[x11-proto/xproto:0]
-package.use : x11-proto/xproto:0 -doc
+[x11-terms/xfce4-terminal:0]
+package.use : x11-terms/xfce4-terminal:0 -utempter
 
 [x11-terms/xterm:0]
 package.use : x11-terms/xterm:0 -toolbar -truetype -xinerama Xaw3d openpty unicode
@@ -1769,51 +1762,33 @@ package.use : x11-terms/xterm:0 -toolbar -truetype -xinerama Xaw3d openpty unico
 [x11-themes/adwaita-icon-theme:0]
 package.use : x11-themes/adwaita-icon-theme:0 -branding
 
-[x11-themes/gtk-engines-xfce:0]
-package.use : x11-themes/gtk-engines-xfce:0 -debug
-
-[xfce-base/exo:0]
-package.use : xfce-base/exo:0 -debug
-
 [xfce-base/garcon:0]
-package.use : xfce-base/garcon:0 -debug
+package.use : xfce-base/garcon:0 gtk2
 
 [xfce-base/libxfce4ui:0]
-package.use : xfce-base/libxfce4ui:0 -debug -glade startup-notification
+package.use : xfce-base/libxfce4ui:0 -debug -glade -introspection -vala startup-notification
 
 [xfce-base/libxfce4util:0]
-package.use : xfce-base/libxfce4util:0 -debug
+package.use : xfce-base/libxfce4util:0 -introspection -vala
 
 [xfce-base/thunar:0]
-package.use : xfce-base/thunar:0 -debug -test -udisks dbus exif libnotify pcre xfce_plugins_trash
-
-[xfce-base/xfce4-appfinder:0]
-package.use : xfce-base/xfce4-appfinder:0 -debug
+package.use : xfce-base/thunar:0 -test -udisks dbus exif libnotify pcre trash-panel-plugin
 
 [xfce-base/xfce4-meta:0]
 package.use : xfce-base/xfce4-meta:0 -minimal svg
 
-[xfce-base/xfce4-panel:0]
-package.use : xfce-base/xfce4-panel:0 -debug
-
 [xfce-base/xfce4-session:0]
-package.use : xfce-base/xfce4-session:0 -debug -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 -debug -libcanberra -upower input_devices_libinput libnotify xklavier
+package.use : xfce-base/xfce4-settings:0 -libcanberra -upower input_devices_libinput libnotify xklavier
 
 [xfce-base/xfconf:0]
-package.use : xfce-base/xfconf:0 -debug perl
+package.use : xfce-base/xfconf:0 -debug -test perl
 
 [xfce-base/xfdesktop:0]
 package.use : xfce-base/xfdesktop:0 -debug libnotify thunar
 
 [xfce-base/xfwm4:0]
-package.use : xfce-base/xfwm4:0 -debug dri startup-notification xcomposite
-
-[xfce-extra/thunar-archive-plugin:0]
-package.use : xfce-extra/thunar-archive-plugin:0 -debug
-
-[xfce-extra/thunar-shares-plugin:0]
-package.use : xfce-extra/thunar-shares-plugin:0 -debug
+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 c22bfed..a4b33ca 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 f614bc5..9589e5d 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
@@ -45,6 +45,8 @@ sys-apps/gradm
 sys-apps/less
 sys-apps/paxctl
 sys-apps/pciutils
+sys-block/parted
+sys-boot/grub
 sys-boot/lilo
 sys-devel/gdb
 sys-fs/cryptsetup
@@ -57,7 +59,6 @@ sys-process/fcron
 sys-process/lsof
 www-client/midori
 x11-base/xorg-server
-x11-libs/gksu
 x11-misc/slim
 x11-terms/xfce4-terminal
 x11-terms/xterm

diff --git a/core/var/lib/portage/world.CYCLE.4 b/core/var/lib/portage/world.CYCLE.4
index a891066..9589e5d 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
@@ -59,7 +59,6 @@ sys-process/fcron
 sys-process/lsof
 www-client/midori
 x11-base/xorg-server
-x11-libs/gksu
 x11-misc/slim
 x11-terms/xfce4-terminal
 x11-terms/xterm