diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 144ec48..07a45c7 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -37,6 +37,9 @@ package.use : app-arch/gzip:0 -static pic
 [app-arch/libarchive:0]
 package.use : app-arch/libarchive:0 -expat -libressl -lz4 -nettle acl bzip2 e2fsprogs iconv lzma lzo static-libs threads xattr zlib
 
+[app-arch/lz4:0]
+package.use : app-arch/lz4:0 -static-libs
+
 [app-arch/tar:0]
 package.use : app-arch/tar:0 -minimal -nls -selinux -static acl xattr
 
@@ -50,10 +53,12 @@ package.use : app-arch/xz-utils:0 -nls extra-filters static-libs threads
 package.use : app-crypt/gcr:0 -debug -test gtk introspection vala
 
 [app-crypt/gnupg:0]
-package.use : app-crypt/gnupg:0 -doc -nls -selinux -tofu -tools -usb -user-socket -wks-server bzip2 ldap readline smartcard ssl
+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
 
 [app-crypt/libsecret:0]
 package.use : app-crypt/libsecret:0 -test crypt introspection vala
@@ -101,8 +106,7 @@ 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 -debug -eds -grammar -map -ots -redland calendar cups goffice introspection latex math plugins readline spell thesaurus wmf wordperfect
-package.accept_keywords : =app-office/abiword-3.0.2-r2 ~amd64
+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
 
 [app-office/gnumeric:0]
 package.use : app-office/gnumeric:0 -libgda -perl -python introspection
@@ -123,7 +127,7 @@ package.use : app-portage/gemato:0 -lzma -sha3 -test -tools blake2 bzip2 gpg
 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 -subversion -sync-plugin-portage -test git
+package.use : app-portage/layman:0 -bazaar -cvs -darcs -g-sorcery -gpg -mercurial -sqlite -squashfs -sync-plugin-portage -test git subversion
 
 [app-portage/portage-utils:0]
 package.use : app-portage/portage-utils:0 -nls -static
@@ -224,12 +228,12 @@ 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/nasm:0]
-package.use : dev-lang/nasm:0 -doc
-
 [dev-lang/perl:0]
 package.use : dev-lang/perl:0 -debug -doc -ithreads berkdb gdbm
 
@@ -248,8 +252,8 @@ 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.40]
-package.use : dev-lang/vala:0.40 -test -valadoc
+[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
@@ -257,6 +261,12 @@ package.use : dev-lang/yasm:0 -nls python
 [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
+
+[dev-libs/apr:1]
+package.use : dev-libs/apr:1 -doc -older-kernels-compatibility -selinux static-libs urandom
+
 [dev-libs/atk:0]
 package.use : dev-libs/atk:0 -nls -test introspection
 
@@ -278,9 +288,6 @@ package.use : dev-libs/dbus-glib:0 -debug -test static-libs
 [dev-libs/double-conversion:0]
 package.use : dev-libs/double-conversion:0 -static-libs -test
 
-[dev-libs/elfutils:0]
-package.use : dev-libs/elfutils:0 -lzma -static-libs -test -threads bzip2 nls utils
-
 [dev-libs/ell:0]
 package.use : dev-libs/ell:0 -glib pie
 
@@ -294,7 +301,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 -gtk-doc -selinux -systemtap -test dbus mime static-libs utils xattr
+package.use : dev-libs/glib:2 -debug -fam -selinux -systemtap -test dbus mime static-libs utils xattr
 
 [dev-libs/gmp:0]
 package.use : dev-libs/gmp:0 -doc asm cxx static-libs
@@ -347,6 +354,9 @@ package.use : dev-libs/libdaemon:0 -doc -examples static-libs
 [dev-libs/libdbusmenu:0]
 package.use : dev-libs/libdbusmenu:0 -debug -gtk -test gtk3 introspection
 
+[dev-libs/libelf:0]
+package.use : dev-libs/libelf:0 -debug nls
+
 [dev-libs/libev:0]
 package.use : dev-libs/libev:0 static-libs
 
@@ -378,7 +388,7 @@ package.use : dev-libs/libical:0 -berkdb -doc -examples -test static-libs
 package.use : dev-libs/libindicate:3 gtk introspection
 
 [dev-libs/libinput:0]
-package.use : dev-libs/libinput:0 -doc -input_devices_wacom
+package.use : dev-libs/libinput:0 -doc input_devices_wacom
 
 [dev-libs/libksba:0]
 package.use : dev-libs/libksba:0 static-libs
@@ -518,12 +528,18 @@ 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
 
 [dev-perl/Sub-Name:0]
 package.use : dev-perl/Sub-Name:0 -suggested -test
 
+[dev-perl/TermReadKey:0]
+package.use : dev-perl/TermReadKey:0 -examples
+
 [dev-perl/Try-Tiny:0]
 package.use : dev-perl/Try-Tiny:0 -minimal -test
 
@@ -563,9 +579,6 @@ 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
 
@@ -617,9 +630,6 @@ 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
 
@@ -758,17 +768,25 @@ package.use : dev-util/pkgconf:0 -test pkg-config
 [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 -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 -pcre-jit -ppcsha1 -subversion -test -tk blksha1 cgi curl gnome-keyring pcre perl python threads webdav xinetd
+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
 
 [gnome-base/dconf:0]
 package.use : gnome-base/dconf:0 -test
 
 [gnome-base/gnome-desktop:3]
 package.use : gnome-base/gnome-desktop:3 -debug -test -udev introspection
+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
@@ -782,11 +800,14 @@ package.use : gnome-base/gvfs:0 -afp -archive -bluray -elogind -fuse -gnome-keyr
 [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 introspection tools vala
+package.use : gnome-base/librsvg:2 -tools introspection vala
 
 [gnome-extra/gnome-system-monitor:0]
 package.use : gnome-extra/gnome-system-monitor:0 -systemd X
@@ -797,6 +818,12 @@ package.use : gnome-extra/libgsf:0 bzip2 gtk introspection
 [mail-client/claws-mail:0]
 package.use : mail-client/claws-mail:0 -archive -bogofilter -calendar -clamav -debug -dillo -doc -gdata -networkmanager -pda -pdf -perl -python -rss -sieve -smime -spam-report -spamassassin -svg -valgrind dbus gnutls imap ipv6 ldap libcanberra libindicate libnotify nls nntp notification pgp session spell startup-notification xface
 
+[mail-client/nail:0]
+package.use : mail-client/nail:0 -kerberos -libressl -net ssl
+
+[mail-mta/nullmailer:0]
+package.use : mail-mta/nullmailer:0 ssl
+
 [mail-mta/postfix:0]
 package.use : mail-mta/postfix:0 -dovecot-sasl -ldap-bind -libressl -lmdb -memcached -mysql -nis -pam -postgres -selinux berkdb cdb eai hardened ldap mbox sasl sqlite ssl
 
@@ -815,11 +842,8 @@ 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
 
-[media-gfx/exiv2:0]
-package.use : media-gfx/exiv2:0 -doc -examples -webready nls png xmp
-
 [media-gfx/gimp:2]
-package.use : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -heif -openexr -test -udev -unwind -vector-icons -webp aalib alsa cpu_flags_x86_mmx cpu_flags_x86_sse jpeg2k mng postscript python wmf xpm
+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
 
 [media-gfx/graphite2:0]
 package.use : media-gfx/graphite2:0 -test perl
@@ -840,7 +864,7 @@ package.use : media-libs/alsa-lib:0 -alisp -debug -doc python thread-safety
 package.use : media-libs/audiofile:0 -test flac static-libs
 
 [media-libs/babl:0]
-package.use : media-libs/babl:0 -altivec -cpu_flags_x86_f16c -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
+package.use : media-libs/babl:0 -altivec -cpu_flags_x86_f16c -cpu_flags_x86_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
@@ -860,14 +884,8 @@ package.use : media-libs/freeglut:0 -debug static-libs
 [media-libs/freetype:2]
 package.use : media-libs/freetype:2 -debug -doc -fontforge -harfbuzz -infinality X adobe-cff bindist bzip2 cleartype_hinting png static-libs utils
 
-[media-libs/gegl:0.3]
-package.use : media-libs/gegl:0.3 cairo -debug -ffmpeg -jpeg2k -lcms -lensfun -openexr -raw -sdl -svg -test -tiff -umfpack -v4l -vala -webp cpu_flags_x86_mmx cpu_flags_x86_sse introspection
-
-[media-libs/gegl:0.4]
-package.use : media-libs/gegl:0.4 cairo -debug -ffmpeg -jpeg2k -lcms -lensfun -libav -openexr -pdf -raw -sdl -svg -test -tiff -umfpack -v4l -vala -webp cpu_flags_x86_mmx cpu_flags_x86_sse introspection zlib
-
-[media-libs/gexiv2:0]
-package.use : media-libs/gexiv2:0 -gtk-doc -python -static-libs -test introspection vala
+[media-libs/gegl:0]
+package.use : media-libs/gegl:0 -debug -libav -umfpack cairo cpu_flags_x86_mmx cpu_flags_x86_sse ffmpeg jpeg jpeg2k lensfun openexr png raw sdl svg
 
 [media-libs/giflib:0]
 package.use : media-libs/giflib:0 -doc static-libs
@@ -879,7 +897,7 @@ package.use : media-libs/glu:0 static-libs
 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
+package.use : media-libs/gst-plugins-bad:1.0 -X -gles2 -gtk -orc -test -vcd -vnc -wayland bzip2 egl introspection nls opengl
 
 [media-libs/gst-plugins-base:1.0]
 package.use : media-libs/gst-plugins-base:1.0 -alsa -gbm -gles2 -ivorbis -orc -theora -wayland X egl introspection nls ogg opengl pango vorbis
@@ -890,6 +908,9 @@ 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
 
@@ -905,6 +926,9 @@ 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
 
@@ -954,6 +978,8 @@ 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
@@ -976,12 +1002,12 @@ 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/libmypaint:0]
-package.use : media-libs/libmypaint:0 -introspection gegl nls openmp
-
 [media-libs/libogg:0]
 package.use : media-libs/libogg:0 static-libs
 
+[media-libs/libopenraw:0]
+package.use : media-libs/libopenraw:0 -test gtk static-libs
+
 [media-libs/libpng:0]
 package.use : media-libs/libpng:0 -neon apng cpu_flags_x86_sse static-libs
 
@@ -1010,7 +1036,7 @@ package.use : media-libs/libvorbis:0 static-libs
 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_sse4_1 -neon -swap-16bit-csp cpu_flags_x86_sse2 gif jpeg opengl png static-libs tiff
+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
@@ -1025,16 +1051,19 @@ package.use : media-libs/nas:0 -doc static-libs
 package.use : media-libs/netpbm:0 -doc -postscript -rle -svga X cpu_flags_x86_sse2 jbig jpeg jpeg2k png static-libs tiff xml zlib
 
 [media-libs/openal:0]
-package.use : media-libs/openal:0 -coreaudio -cpu_flags_x86_sse4_1 -debug -jack -pulseaudio -qt5 -sdl alsa cpu_flags_x86_sse cpu_flags_x86_sse2 oss portaudio
+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 -custom-modes -doc cpu_flags_x86_sse static-libs
+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
@@ -1046,7 +1075,7 @@ package.use : media-libs/speex:0 -utils cpu_flags_x86_sse static-libs vbr
 package.use : media-libs/t1lib:5 -doc X static-libs
 
 [media-libs/tiff:0]
-package.use : media-libs/tiff:0 -test -webp -zstd cxx jbig jpeg lzma static-libs zlib
+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
@@ -1076,7 +1105,7 @@ package.use : media-sound/wavpack:0 static-libs
 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 ieee1394 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 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
+package.use : media-video/mplayer:0 -altivec -aqua -bluray -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_ssse3 -cpudetection -debug -doc -faad -lirc -live -pulseaudio -rar -rtc -selinux -toolame -tremor -vcd -vdpau -video_cards_tdfx -vidix -x264 -yuv4mpeg X a52 aalib alsa bidi bl bs2b cddb cdio cdparanoia cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 dga dts dv dvb dvd dvdnav enca encode faac fbcon ftp ggi gif gsm iconv ipv6 jack joystick jpeg ladspa libass libcaca libmpeg2 lzo mad md5sum mng mp3 nas network nut openal opengl osdmenu oss png pnm pvr radio rtmp samba sdl shm speex tga theora truetype twolame unicode v4l video_cards_mga vorbis xinerama xscreensaver xv xvid zoran
 
 [media-video/rtmpdump:0]
 package.use : media-video/rtmpdump:0 -libressl gnutls ssl
@@ -1112,7 +1141,7 @@ package.use : net-firewall/iptables:0 -conntrack -netlink -nftables -pcap ipv6 s
 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 -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.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
 
 [net-ftp/lftp:0]
@@ -1125,10 +1154,10 @@ package.use : net-im/telepathy-mission-control:0 -debug -networkmanager
 package.use : net-irc/hexchat:0 -debug -libcanberra -libproxy -libressl -lua -nls -plugin-checksum -plugin-fishlim -plugin-sysinfo dbus gtk libnotify perl python spell ssl
 
 [net-libs/glib-networking:0]
-package.use : net-libs/glib-networking:0 -libproxy -test gnome ssl
+package.use : net-libs/glib-networking:0 -libproxy -test gnome smartcard ssl
 
 [net-libs/gnutls:0]
-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
+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
 
 [net-libs/gtk-vnc:0]
 package.use : net-libs/gtk-vnc:0 -examples -pulseaudio introspection sasl vala
@@ -1163,11 +1192,14 @@ 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
+
 [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 -jpeg2k -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 -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
@@ -1182,10 +1214,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 -traceroute6 caps filecaps ipv6 ssl
+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
 
 [net-misc/modemmanager:0]
-package.use : net-misc/modemmanager:0 -elogind -mbim -policykit -systemd -vala introspection qmi udev
+package.use : net-misc/modemmanager:0 -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
@@ -1199,9 +1231,6 @@ package.use : net-misc/rdate:0 ipv6
 [net-misc/rsync:0]
 package.use : net-misc/rsync:0 -examples -static -stunnel acl iconv ipv6 xattr
 
-[net-misc/tigervnc:0]
-package.use : net-misc/tigervnc:0 -dri3 -gnutls -java -libressl -xinerama drm nls opengl pam server xorgmodule
-
 [net-misc/vinagre:0]
 package.use : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
 
@@ -1218,13 +1247,13 @@ package.use : net-p2p/transmission:0 -ayatana -libressl -lightweight -qt5 -syste
 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
+package.use : net-print/cups:0 -X -dbus -debug -java -kerberos -lprng-compat -python -selinux -static-libs -systemd -usb -xinetd -zeroconf acl pam ssl threads
 
 [net-vpn/tor:0]
 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 -btpclient -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 -cups -debug -deprecated -doc -experimental -extra-tools -selinux -systemd -test -test-programs -user-session btpclient mesh obex readline udev
 
 [net-wireless/crda:0]
 package.use : net-wireless/crda:0 -gcrypt -libressl
@@ -1266,7 +1295,7 @@ package.use : sys-apps/file:0 -python static-libs zlib
 package.use : sys-apps/findutils:0 -nls -selinux -static -test
 
 [sys-apps/gawk:0]
-package.use : sys-apps/gawk:0 -forced-sandbox -mpfr -nls readline
+package.use : sys-apps/gawk:0 -mpfr -nls readline
 
 [sys-apps/gradm:0]
 package.use : sys-apps/gradm:0 -pam
@@ -1301,9 +1330,6 @@ 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
 
@@ -1349,12 +1375,6 @@ package.use : sys-auth/pambase:0 -consolekit -debug -elogind -minimal -mktemp -p
 [sys-auth/skey:0]
 package.use : sys-auth/skey:0 static-libs
 
-[sys-block/parted:0]
-package.use : sys-block/parted:0 -device-mapper -selinux -static-libs debug nls readline
-
-[sys-boot/grub:2]
-package.use : sys-boot/grub:2 -debug -device-mapper -doc -efiemu -grub_platforms_coreboot -grub_platforms_efi-32 -grub_platforms_emu -grub_platforms_ieee1275 -grub_platforms_loongson -grub_platforms_multiboot -grub_platforms_qemu -grub_platforms_qemu-mips -grub_platforms_uboot -grub_platforms_xen -grub_platforms_xen-32 -libzfs -mount -multislot -sdl -static -test -truetype fonts grub_platforms_efi-64 grub_platforms_pc nls themes
-
 [sys-boot/lilo:0]
 package.use : sys-boot/lilo:0 -device-mapper -minimal -pxeserial -static
 
@@ -1370,8 +1390,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.31]
-package.use : sys-devel/binutils:2.31 -default-gold -doc -multitarget -static-libs -test cxx gold nls plugins
+[sys-devel/binutils:2.30]
+package.use : sys-devel/binutils:2.30 -doc -multitarget -static-libs -test cxx nls
 
 [sys-devel/bison:0]
 package.use : sys-devel/bison:0 -examples -nls -static -test
@@ -1380,7 +1400,7 @@ package.use : sys-devel/bison:0 -examples -nls -static -test
 package.use : sys-devel/flex:0 -nls -static -test
 
 [sys-devel/gcc:8.2.0]
-package.use : sys-devel/gcc:8.2.0 -altivec -debug -doc -fixed-point -fortran -go -graphite -jit -libssp -mpx -multilib -objc -objc++ -objc-gc -pch -pgo -regression-test -systemtap -vanilla cxx hardened nls nptl openmp pie sanitize ssp vtv
+package.use : sys-devel/gcc:8.2.0 -altivec -debug -doc -fixed-point -fortran -go -graphite -jit -libssp -mpx -multilib -objc -objc++ -objc-gc -pch -pgo -regression-test -sanitize -systemtap -vanilla -vtv cxx hardened nls nptl openmp pie ssp
 
 [sys-devel/gdb:0]
 package.use : sys-devel/gdb:0 -multitarget -nls -test -vanilla -xml client lzma python server
@@ -1410,7 +1430,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 -lvm2create_initrd -sanlock -selinux -static -systemd -thin readline static-libs udev
+package.use : sys-fs/lvm2:0 -device-mapper-only -lvm1 -lvm2create_initrd -selinux -static -systemd -thin readline static-libs udev
 
 [sys-kernel/genkernel:0]
 package.use : sys-kernel/genkernel:0 -cryptsetup -ibm -selinux firmware
@@ -1421,6 +1441,9 @@ package.use : sys-kernel/linux-firmware:0 -savedconfig
 [sys-kernel/linux-headers:0]
 package.use : sys-kernel/linux-headers:0 -headers-only
 
+[sys-libs/argp-standalone:0]
+package.use : sys-libs/argp-standalone:0 -static-libs
+
 [sys-libs/binutils-libs:0]
 package.use : sys-libs/binutils-libs:0 -64-bit-bfd -multitarget -nls -static-libs
 
@@ -1436,9 +1459,6 @@ package.use : sys-libs/e2fsprogs-libs:0 static-libs
 [sys-libs/gdbm:0]
 package.use : sys-libs/gdbm:0 -exporter -nls berkdb readline static-libs
 
-[sys-libs/glibc:2.2]
-package.use : sys-libs/glibc:2.2 -audit -caps -cet -compile-locales -doc -gd -headers-only -multilib -nscd -profile -selinux -suid -systemtap -test -vanilla multiarch ssp
-
 [sys-libs/ldb:0]
 package.use : sys-libs/ldb:0 -doc ldap python
 
@@ -1460,11 +1480,14 @@ package.use : sys-libs/libutempter:0 static-libs
 [sys-libs/mtdev:0]
 package.use : sys-libs/mtdev:0 static-libs
 
+[sys-libs/musl:0]
+package.use : sys-libs/musl:0 -headers-only
+
 [sys-libs/ncurses:0]
 package.use : sys-libs/ncurses:0 -ada -debug -doc -gpm -minimal -profile -test -threads -tinfo -trace cxx static-libs unicode
 
 [sys-libs/pam:0]
-package.use : sys-libs/pam:0 -audit -berkdb -debug -nis -selinux -test -vim-syntax cracklib filecaps nls pie
+package.use : sys-libs/pam:0 -audit -berkdb -debug -filecaps -nis -selinux -test -vim-syntax cracklib nls pie
 
 [sys-libs/readline:0]
 package.use : sys-libs/readline:0 static-libs utils
@@ -1529,6 +1552,9 @@ 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
 
@@ -1539,7 +1565,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_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
+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
 
 [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
@@ -1547,11 +1573,16 @@ package.use : x11-base/xorg-server:0 -debug -dmx -doc -kdrive -libressl -minimal
 [x11-drivers/xf86-input-wacom:0]
 package.use : x11-drivers/xf86-input-wacom:0 -debug
 
+[x11-drivers/xf86-video-amdgpu:0]
+package.use : x11-drivers/xf86-video-amdgpu:0 -udev
+
 [x11-drivers/xf86-video-ati:0]
 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
+package.env : x11-drivers/xf86-video-intel:0 x11-drivers_xf86-video-intel_0
+env : CPPFLAGS=-D_GNU_SOURCE
 
 [x11-drivers/xf86-video-mga:0]
 package.use : x11-drivers/xf86-video-mga:0 dri
@@ -1565,9 +1596,6 @@ package.use : x11-drivers/xf86-video-r128:0 dri
 [x11-libs/cairo:0]
 package.use : x11-libs/cairo:0 -aqua -debug -gles2 -utils -valgrind X glib opengl static-libs svg xcb
 
-[x11-libs/fltk:1]
-package.use : x11-libs/fltk:1 -cairo -debug -doc -examples -games -static-libs opengl threads xft xinerama
-
 [x11-libs/gdk-pixbuf:2]
 package.use : x11-libs/gdk-pixbuf:2 -debug -test X introspection jpeg jpeg2k tiff
 
@@ -1575,10 +1603,10 @@ package.use : x11-libs/gdk-pixbuf:2 -debug -test X introspection jpeg jpeg2k tif
 package.use : x11-libs/goffice:0.10 introspection
 
 [x11-libs/gtk+:2]
-package.use : x11-libs/gtk+:2 -aqua -examples -test cups introspection vim-syntax xinerama
+package.use : x11-libs/gtk+:2 -aqua -cups -examples -test introspection vim-syntax xinerama
 
 [x11-libs/gtk+:3]
-package.use : x11-libs/gtk+:3 -aqua -broadway -cloudprint -colord -examples -gtk-doc -test -wayland X cups introspection vim-syntax xinerama
+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
@@ -1674,7 +1702,7 @@ 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 video_cards_intel video_cards_nouveau video_cards_radeon
+package.use : x11-libs/libdrm:0 -libkms -valgrind -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vc4 -video_cards_vivante -video_cards_vmware video_cards_amdgpu video_cards_intel video_cards_nouveau video_cards_radeon
 
 [x11-libs/libfontenc:0]
 package.use : x11-libs/libfontenc:0 static-libs
@@ -1785,7 +1813,7 @@ package.use : xfce-base/thunar:0 -test -udisks dbus exif libnotify pcre trash-pa
 package.use : xfce-base/xfce4-meta:0 -minimal svg
 
 [xfce-base/xfce4-session:0]
-package.use : xfce-base/xfce4-session:0 -elogind -nls -policykit -systemd -upower xscreensaver
+package.use : xfce-base/xfce4-session:0 -nls -policykit -systemd -upower xscreensaver
 
 [xfce-base/xfce4-settings:0]
 package.use : xfce-base/xfce4-settings:0 -libcanberra -upower input_devices_libinput libnotify xklavier