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

[Anthony G. Basile]

commit:     009dee855ca0e09c8d774206f2f48d04d59646b3
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 20:16:42 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 20:16:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=009dee85

Update world.conf

 core/etc/grs/world.conf | 596 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 455 insertions(+), 141 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 377e50b..8efb57b 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -122,7 +122,7 @@ package.use : app-admin/xstow:0 ncurses
 package.use : app-admin/yaala:0 -gd -storable
 
 [app-antivirus/clamav:0]
-package.use : app-antivirus/clamav:0 -clamdtop -metadata-analysis-api -milter -selinux bzip2 iconv ipv6 static-libs uclibc
+package.use : app-antivirus/clamav:0 -clamdtop -metadata-analysis-api -milter -selinux -uclibc bzip2 iconv ipv6 static-libs
 
 [app-arch/bzip2:0]
 package.use : app-arch/bzip2:0 -static static-libs
@@ -136,6 +136,9 @@ package.use : app-arch/dpkg:0 -nls -selinux -test bzip2 lzma unicode update-alte
 [app-arch/file-roller:0]
 package.use : app-arch/file-roller:0 -nautilus -packagekit
 
+[app-arch/gcab:0]
+package.use : app-arch/gcab:0 -vala introspection
+
 [app-arch/gtk-splitter:0]
 package.use : app-arch/gtk-splitter:0 crypt
 
@@ -200,7 +203,7 @@ package.use : app-backup/fsarchiver:0 -debug -static lzma lzo
 package.use : app-backup/luckybackup:0 -debug
 
 [app-backup/rdiff-backup:0]
-package.use : app-backup/rdiff-backup:0 acl xattr
+package.use : app-backup/rdiff-backup:0 -examples
 
 [app-backup/spideroak-bin:0]
 package.use : app-backup/spideroak-bin:0 X dbus
@@ -254,8 +257,8 @@ package.use : app-crypt/bcwipe:0 -doc
 package.use : app-crypt/gcr:0 -debug -test gtk introspection vala
 
 [app-crypt/gnupg:0]
-package.use : app-crypt/gnupg:0 -doc -mta -nls -selinux -static -tools -usb bzip2 ldap readline smartcard
-package.accept_keywords : >=app-crypt/gnupg-2.1.6 ~amd64
+package.use : app-crypt/gnupg:0 -doc -nls -selinux -static -tools -usb bzip2 gnutls ldap readline smartcard
+package.accept_keywords : =app-crypt/gnupg-2.1.8 ~amd64
 
 [app-crypt/gpa:0]
 package.use : app-crypt/gpa:0 -nls
@@ -284,7 +287,7 @@ package.use : app-crypt/mit-krb5:0 -doc -openldap -selinux -test keyutils pkinit
 package.use : app-crypt/p11-kit:0 -debug asn1 libffi trust
 
 [app-crypt/pinentry:0]
-package.use : app-crypt/pinentry:0 -static caps gnome-keyring gtk ncurses qt4
+package.use : app-crypt/pinentry:0 -clipboard -emacs -static caps gnome-keyring gtk ncurses qt4
 
 [app-crypt/ssh-multiadd:0]
 package.use : app-crypt/ssh-multiadd:0 X
@@ -304,6 +307,9 @@ package.use : app-dicts/migemo-dict:0 unicode
 [app-dicts/myspell-pt:0]
 package.use : app-dicts/myspell-pt:0 preao
 
+[app-dicts/prime-dict:0]
+package.use : app-dicts/prime-dict:0 ruby_targets_ruby19 ruby_targets_ruby20
+
 [app-dicts/stardict-freedict-eng-deu:0]
 package.use : app-dicts/stardict-freedict-eng-deu:0 -gzip
 
@@ -386,11 +392,14 @@ package.use : app-editors/gvim:0 -aqua -debug -gnome -luajit -motif -neXt -netbe
 package.use : app-editors/juffed:0 -debug
 
 [app-editors/latexila:0]
-package.use : app-editors/latexila:0 -rubber latexmk
+package.use : app-editors/latexila:0 -rubber introspection latexmk
 
 [app-editors/leafpad:0]
 package.use : app-editors/leafpad:0 -emacs
 
+[app-editors/leo:0]
+package.use : app-editors/leo:0 -doc
+
 [app-editors/mousepad:0]
 package.use : app-editors/mousepad:0 -debug -gtk3 dbus
 
@@ -473,7 +482,7 @@ package.use : app-emulation/spectemu:0 -svga X readline
 package.use : app-emulation/spim:0 -doc X
 
 [app-emulation/vice:0]
-package.use : app-emulation/vice:0 -ethernet -ffmpeg -gnome -memmap -nls -pulseaudio -xrandr X Xaw3d alsa dga gif ipv6 jpeg lame oss png readline sdl xv zlib
+package.use : app-emulation/vice:0 -ethernet -ffmpeg -fullscreen -nls -pulseaudio -sdl -threads -vte Xaw3d alsa gtk2 ipv6 lame oss png sdlsound zlib
 
 [app-emulation/x48:0]
 package.use : app-emulation/x48:0 readline
@@ -598,6 +607,9 @@ package.use : app-misc/anki:0 latex recording sound
 [app-misc/astrolog:0]
 package.use : app-misc/astrolog:0 X
 
+[app-misc/beep:0]
+package.use : app-misc/beep:0 -suid
+
 [app-misc/ca-certificates:0]
 package.use : app-misc/ca-certificates:0 cacert
 
@@ -650,7 +662,7 @@ package.use : app-misc/gramps:0 -gnome -reports spell webkit
 package.use : app-misc/gtypist:0 -emacs -nls -xemacs
 
 [app-misc/hivex:0]
-package.use : app-misc/hivex:0 -ocaml -test perl python readline ruby static-libs
+package.use : app-misc/hivex:0 -ocaml -test perl python readline ruby ruby_targets_ruby20 static-libs
 
 [app-misc/ignuit:0]
 package.use : app-misc/ignuit:0 -examples
@@ -770,7 +782,7 @@ package.use : app-mobilephone/gnome-phone-manager:0 -debug
 package.use : app-mobilephone/lightblue:0 -examples
 
 [app-mobilephone/obexftp:0]
-package.use : app-mobilephone/obexftp:0 -debug bluetooth perl python ruby tcl
+package.use : app-mobilephone/obexftp:0 -debug -ruby bluetooth perl python tcl
 
 [app-mobilephone/wammu:0]
 package.use : app-mobilephone/wammu:0 -gnome bluetooth
@@ -967,6 +979,9 @@ package.use : app-text/evince:0 -debug -djvu -dvi -gnome -libsecret -nautilus -n
 [app-text/ghostscript-gpl:0]
 package.use : app-text/ghostscript-gpl:0 -djvu X cups dbus gtk idn static-libs
 
+[app-text/glark:0]
+package.use : app-text/glark:0 -doc -test -zip ruby_targets_ruby19 ruby_targets_ruby20
+
 [app-text/gtkspell:3]
 package.use : app-text/gtkspell:3 introspection vala
 
@@ -985,6 +1000,9 @@ package.use : app-text/hunspell:0 -nls ncurses readline static-libs
 [app-text/info2html:2.0]
 package.use : app-text/info2html:2.0 -vhosts
 
+[app-text/jist:0]
+package.use : app-text/jist:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
 [app-text/kchmviewer:0]
 package.use : app-text/kchmviewer:0 -aqua -debug -kde
 
@@ -1079,7 +1097,7 @@ package.use : app-text/stardict:0 -espeak -gucharmap -pronounce -qqwry -tools sp
 package.use : app-text/sword:0 -debug -doc curl icu static-libs
 
 [app-text/tesseract:0]
-package.use : app-text/tesseract:0 -doc -examples -osd jpeg png scrollview static-libs tiff webp
+package.use : app-text/tesseract:0 -doc -examples -opencl -osd -training jpeg png scrollview static-libs tiff webp
 
 [app-text/texi2html:0]
 package.use : app-text/texi2html:0 unicode
@@ -1304,7 +1322,7 @@ package.use : dev-lang/nasm:0 -doc
 package.use : dev-lang/nqc:0 -usb
 
 [dev-lang/orc:0]
-package.use : dev-lang/orc:0 -examples static-libs
+package.use : dev-lang/orc:0 -examples hardened static-libs
 
 [dev-lang/perl:0]
 package.use : dev-lang/perl:0 -debug -doc -ithreads berkdb gdbm
@@ -1312,9 +1330,6 @@ 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 -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk wide-unicode xml
 
-[dev-lang/python:3.3]
-package.use : dev-lang/python:3.3 -build -doc -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk xml
-
 [dev-lang/python:3.4]
 package.use : dev-lang/python:3.4 -build -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk xml
 
@@ -1324,6 +1339,9 @@ package.use : dev-lang/ruby:1.9 -debug -doc -examples -rubytests -socks5 -xemacs
 [dev-lang/ruby:2.0]
 package.use : dev-lang/ruby:2.0 -debug -doc -examples -rubytests -socks5 -xemacs berkdb cpu_flags_x86_sse2 gdbm ipv6 ncurses rdoc readline ssl
 
+[dev-lang/ruby:2.1]
+package.use : dev-lang/ruby:2.1 -berkdb -debug -doc -examples -gdbm -rubytests -socks5 -xemacs ipv6 ncurses rdoc readline ssl
+
 [dev-lang/spidermonkey:0]
 package.use : dev-lang/spidermonkey:0 -debug -minimal -test static-libs
 
@@ -1342,8 +1360,8 @@ package.use : dev-lang/tcl:0 -debug threads
 [dev-lang/tk:0]
 package.use : dev-lang/tk:0 -aqua -debug -test -truetype threads xscreensaver
 
-[dev-lang/vala:0.26]
-package.use : dev-lang/vala:0.26 -test
+[dev-lang/vala:0.28]
+package.use : dev-lang/vala:0.28 -test
 
 [dev-lang/xsb:0]
 package.use : dev-lang/xsb:0 -debug -examples -java -mysql curl iodbc odbc pcre threads xml
@@ -1355,7 +1373,7 @@ package.use : dev-lang/yap:0 -debug -doc -examples -java -mpi -mysql -static gmp
 package.use : dev-lang/yasm:0 -nls python
 
 [dev-libs/DirectFB:0]
-package.use : dev-libs/DirectFB:0 -X -debug -doc -gif -input_devices_dynapro -input_devices_elo2300 -input_devices_lirc -sdl -static-libs -v4l -video_cards_nsc -video_cards_nvidia -video_cards_via -video_cards_vmware cpu_flags_x86_mmx cpu_flags_x86_sse 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_savage video_cards_sis video_cards_tdfx zlib
+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/ace:0]
 package.use : dev-libs/ace:0 -ciao -tao X ipv6
@@ -1523,8 +1541,8 @@ package.use : dev-libs/libcdio-paranoia:0 -test cxx static-libs
 package.use : dev-libs/libcdio:0 -minimal -test cddb cxx static-libs
 
 [dev-libs/libcgroup:0]
-package.use : dev-libs/libcgroup:0 -debug -pam daemon static-libs tools
-package.accept_keywords : >=dev-libs/libcgroup-0.41-r1
+package.use : dev-libs/libcgroup:0 -pam daemon static-libs tools
+package.accept_keywords : =dev-libs/libcgroup-0.41-r2 ~amd64
 
 [dev-libs/libconfig:0]
 package.use : dev-libs/libconfig:0 -examples cxx static-libs
@@ -1569,7 +1587,7 @@ package.use : dev-libs/libg15render:0 -truetype
 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 static-libs threads
 
 [dev-libs/libgdata:0]
 package.use : dev-libs/libgdata:0 -debug -gnome -test introspection static-libs vala
@@ -1584,7 +1602,7 @@ package.use : dev-libs/libgee:0.8 introspection
 package.use : dev-libs/libgit2-glib:0 python ssh vala
 
 [dev-libs/libgit2:0]
-package.use : dev-libs/libgit2:0 -examples -test -trace ssh threads
+package.use : dev-libs/libgit2:0 -examples -gssapi -test -trace ssh threads
 
 [dev-libs/libgpg-error:0]
 package.use : dev-libs/libgpg-error:0 -common-lisp -nls static-libs
@@ -1598,9 +1616,6 @@ package.use : dev-libs/libhash:0 -doc
 [dev-libs/libical:0]
 package.use : dev-libs/libical:0 -doc -examples -introspection static-libs
 
-[dev-libs/libiconv:0]
-package.use : dev-libs/libiconv:0 static-libs
-
 [dev-libs/libisofs:0]
 package.use : dev-libs/libisofs:0 -debug -verbose-debug acl static-libs xattr zlib
 
@@ -1650,7 +1665,7 @@ package.use : dev-libs/libp11:0 -doc
 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 -test gtk python
+package.use : dev-libs/libpeas:0 -glade -jit -lua -test gtk python
 
 [dev-libs/libpipeline:0]
 package.use : dev-libs/libpipeline:0 -test static-libs
@@ -1747,7 +1762,7 @@ package.use : dev-libs/nettle:0 -doc -neon -test gmp static-libs
 
 [dev-libs/npth:0]
 package.use : dev-libs/npth:0 static-libs
-package.accept_keywords : >=dev-libs/npth-1.1 ~amd64
+package.accept_keywords : =dev-libs/npth-1.2 ~amd64
 
 [dev-libs/nspr:0]
 package.use : dev-libs/nspr:0 -debug
@@ -1762,7 +1777,7 @@ package.use : dev-libs/openobex:0 -debug -irda -usb bluetooth syslog
 package.use : dev-libs/opensc:0 -doc -libtool -openct pcsc-lite readline ssl zlib
 
 [dev-libs/openssl:0]
-package.use : dev-libs/openssl:0 -kerberos -rfc3779 -test -vanilla bindist cpu_flags_x86_sse2 gmp static-libs tls-heartbeat zlib
+package.use : dev-libs/openssl:0 -kerberos -rfc3779 -sctp -test -vanilla asm bindist cpu_flags_x86_sse2 gmp static-libs tls-heartbeat zlib
 
 [dev-libs/ossp-uuid:0]
 package.use : dev-libs/ossp-uuid:0 -php -php_targets_php5-4 cxx perl php_targets_php5-5 static-libs
@@ -1785,9 +1800,6 @@ package.use : dev-libs/pslib:0 -debug jpeg png tiff
 [dev-libs/ptexenc:0]
 package.use : dev-libs/ptexenc:0 iconv static-libs
 
-[dev-libs/pth:0]
-package.use : dev-libs/pth:0 -debug static-libs
-
 [dev-libs/ptypes:0]
 package.use : dev-libs/ptypes:0 -debug
 
@@ -1948,7 +1960,7 @@ package.use : dev-perl/Curses:0 unicode
 package.use : dev-perl/DBD-SQLite:0 -test
 
 [dev-perl/DBD-mysql:0]
-package.use : dev-perl/DBD-mysql:0 -embedded
+package.use : dev-perl/DBD-mysql:0 -embedded -test
 
 [dev-perl/DBI:0]
 package.use : dev-perl/DBI:0 -test
@@ -2091,6 +2103,9 @@ package.use : dev-perl/Lingua-EN-NameParse:0 -test
 [dev-perl/List-AllUtils:0]
 package.use : dev-perl/List-AllUtils:0 -test
 
+[dev-perl/Locale-Maketext-Lexicon:0]
+package.use : dev-perl/Locale-Maketext-Lexicon:0 -test
+
 [dev-perl/Log-Log4perl:0]
 package.use : dev-perl/Log-Log4perl:0 -test
 
@@ -2316,9 +2331,6 @@ package.use : dev-perl/dbix-searchbuilder:0 -test
 [dev-perl/libwww-perl:0]
 package.use : dev-perl/libwww-perl:0 ssl
 
-[dev-perl/Locale-Maketext-Lexicon:0]
-package.use : dev-perl/Locale-Maketext-Lexicon:0 -test
-
 [dev-perl/module-info:0]
 package.use : dev-perl/module-info:0 -test
 
@@ -2497,7 +2509,7 @@ package.use : dev-python/django-recaptcha:0 -test
 package.use : dev-python/django-social-auth:0 -doc -examples
 
 [dev-python/django-tastypie:0]
-package.use : dev-python/django-tastypie:0 -bip -digest -doc -lxml -oauth -test -yaml
+package.use : dev-python/django-tastypie:0 -bip -digest -doc -lxml -test -yaml
 
 [dev-python/django-xslt:0]
 package.use : dev-python/django-xslt:0 -test
@@ -2541,6 +2553,9 @@ package.use : dev-python/enaml:0 -examples -test
 [dev-python/encore:0]
 package.use : dev-python/encore:0 -test
 
+[dev-python/enum34:0]
+package.use : dev-python/enum34:0 -doc
+
 [dev-python/epsilon:0]
 package.use : dev-python/epsilon:0 -test
 
@@ -2655,6 +2670,9 @@ package.use : dev-python/hgdistver:0 -test
 [dev-python/hgtools:0]
 package.use : dev-python/hgtools:0 -test
 
+[dev-python/html2text:0]
+package.use : dev-python/html2text:0 -test
+
 [dev-python/html5lib:0]
 package.use : dev-python/html5lib:0 -test
 
@@ -2685,18 +2703,12 @@ package.use : dev-python/joblib:0 -doc -test
 [dev-python/jonpy:0]
 package.use : dev-python/jonpy:0 -doc -examples
 
-[dev-python/jsmin:0]
-package.use : dev-python/jsmin:0 -doc
-
 [dev-python/json-rpc:0]
 package.use : dev-python/json-rpc:0 -test
 
 [dev-python/json-tools:0]
 package.use : dev-python/json-tools:0 -test
 
-[dev-python/jsonpickle:0]
-package.use : dev-python/jsonpickle:0 -doc -test
-
 [dev-python/jsonschema:0]
 package.use : dev-python/jsonschema:0 -test
 
@@ -2769,6 +2781,9 @@ package.use : dev-python/mako:0 -doc -test
 [dev-python/markdown:0]
 package.use : dev-python/markdown:0 -doc -pygments -test
 
+[dev-python/mechanize:0]
+package.use : dev-python/mechanize:0 -doc
+
 [dev-python/mock:0]
 package.use : dev-python/mock:0 -doc -test
 
@@ -2964,6 +2979,9 @@ package.use : dev-python/pyparsing:0 -doc -examples
 [dev-python/pypax:0]
 package.use : dev-python/pypax:0 -ptpax xtpax
 
+[dev-python/pypgsql:0]
+package.use : dev-python/pypgsql:0 -examples
+
 [dev-python/pyqwt:5]
 package.use : dev-python/pyqwt:5 -debug -doc -examples svg
 
@@ -2998,7 +3016,7 @@ package.use : dev-python/python-dateutil:0 -examples
 package.use : dev-python/python-gtkmvc:0 -doc -examples
 
 [dev-python/python-ldap:0]
-package.use : dev-python/python-ldap:0 -examples sasl ssl
+package.use : dev-python/python-ldap:0 -doc -examples sasl ssl
 
 [dev-python/python-mpd:0]
 package.use : dev-python/python-mpd:0 -test
@@ -3025,7 +3043,7 @@ package.use : dev-python/python-sqlparse:0 -doc -examples -test
 package.use : dev-python/python3-openid:0 -examples -test
 
 [dev-python/pythondialog:0]
-package.use : dev-python/pythondialog:0 -examples
+package.use : dev-python/pythondialog:0 -doc -examples
 
 [dev-python/pyudev:0]
 package.use : dev-python/pyudev:0 -pygobject -pyqt4 -pyside -test
@@ -3060,6 +3078,9 @@ package.use : dev-python/queuelib:0 -test
 [dev-python/quixote:0]
 package.use : dev-python/quixote:0 -doc -test
 
+[dev-python/redis-py:0]
+package.use : dev-python/redis-py:0 -test
+
 [dev-python/reportlab:0]
 package.use : dev-python/reportlab:0 -doc -examples
 
@@ -3118,7 +3139,7 @@ package.use : dev-python/stomper:0 -examples
 package.use : dev-python/subvertpy:0 -test
 
 [dev-python/suds:0]
-package.use : dev-python/suds:0 -doc
+package.use : dev-python/suds:0 -doc -test
 
 [dev-python/sudsds:0]
 package.use : dev-python/sudsds:0 -doc
@@ -3216,6 +3237,9 @@ package.use : dev-qt/qtchooser:0 -qt5 -test
 [dev-qt/qtcore:4]
 package.use : dev-qt/qtcore:4 -aqua -debug -pch exceptions glib iconv icu qt3support ssl
 
+[dev-qt/qtcore:5]
+package.use : dev-qt/qtcore:5 -debug -icu -systemd -test
+
 [dev-qt/qtdbus:4]
 package.use : dev-qt/qtdbus:4 -aqua -debug -pch exceptions
 
@@ -3225,11 +3249,14 @@ package.use : dev-qt/qtdeclarative:4 -aqua -debug -pch accessibility exceptions
 [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 -gtkstyle -ibus -jpeg -test gif harfbuzz png udev xcb
+
 [dev-qt/qthelp:4]
 package.use : dev-qt/qthelp:4 -aqua -compat -debug -doc -pch exceptions
 
 [dev-qt/qtlockedfile:0]
-package.use : dev-qt/qtlockedfile:0 -doc
+package.use : dev-qt/qtlockedfile:0 -doc -qt5 qt4
 
 [dev-qt/qtmultimedia:4]
 package.use : dev-qt/qtmultimedia:4 -aqua -debug -pch alsa exceptions
@@ -3244,7 +3271,7 @@ package.use : dev-qt/qtphonon:4 -aqua -debug -pch dbus exceptions qt3support
 package.use : dev-qt/qtscript:4 -aqua -debug -jit -pch exceptions
 
 [dev-qt/qtsingleapplication:0]
-package.use : dev-qt/qtsingleapplication:0 -doc X
+package.use : dev-qt/qtsingleapplication:0 -doc -qt5 X qt4
 
 [dev-qt/qtsql:4]
 package.use : dev-qt/qtsql:4 -aqua -debug -freetds -mysql -oci8 -pch -postgres exceptions odbc qt3support sqlite
@@ -3261,11 +3288,281 @@ package.use : dev-qt/qtwebkit:4 -aqua -debug -jit -pch exceptions gstreamer icu
 [dev-qt/qtxmlpatterns:4]
 package.use : dev-qt/qtxmlpatterns:4 -aqua -debug -pch
 
+[dev-ruby/GeoRuby:0]
+package.use : dev-ruby/GeoRuby:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/RubyInline:0]
+package.use : dev-ruby/RubyInline:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/archive-tar-minitar:0]
+package.use : dev-ruby/archive-tar-minitar:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/cmdparse:0]
+package.use : dev-ruby/cmdparse:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/color:0]
+package.use : dev-ruby/color:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/daemons:0]
+package.use : dev-ruby/daemons:0 -doc -examples -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/dbf:0]
+package.use : dev-ruby/dbf:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/deprecated:3]
+package.use : dev-ruby/deprecated:3 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/domain_name:0]
+package.use : dev-ruby/domain_name:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/eventmachine:0]
+package.use : dev-ruby/eventmachine:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/hoe:0]
+package.use : dev-ruby/hoe:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/htmlentities:0]
+package.use : dev-ruby/htmlentities:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/http-cookie:0]
+package.use : dev-ruby/http-cookie:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/imagesize:0]
+package.use : dev-ruby/imagesize:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/json:0]
+package.use : dev-ruby/json:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+
+[dev-ruby/kirbybase:0]
+package.use : dev-ruby/kirbybase:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/libxml:0]
+package.use : dev-ruby/libxml:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/logue:0]
+package.use : dev-ruby/logue:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/matchy:0]
+package.use : dev-ruby/matchy:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/mecab-ruby:0]
+package.use : dev-ruby/mecab-ruby:0 ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/mechanize:0]
+package.use : dev-ruby/mechanize:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/memcache-client:0]
+package.use : dev-ruby/memcache-client:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/mime-types:2]
+package.use : dev-ruby/mime-types:2 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/multi_xml:0]
+package.use : dev-ruby/multi_xml:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/narray:0]
+package.use : dev-ruby/narray:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/net-http-digest_auth:0]
+package.use : dev-ruby/net-http-digest_auth:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/net-http-persistent:0]
+package.use : dev-ruby/net-http-persistent:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/netrc:0]
+package.use : dev-ruby/netrc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/nokogiri:0]
+package.use : dev-ruby/nokogiri:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ntlm-http:0]
+package.use : dev-ruby/ntlm-http:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/pkg-config:0]
+package.use : dev-ruby/pkg-config:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/racc:0]
+package.use : dev-ruby/racc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+
+[dev-ruby/ragol:0]
+package.use : dev-ruby/ragol:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/rainbow:2]
+package.use : dev-ruby/rainbow:2 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/rake-compiler:0]
+package.use : dev-ruby/rake-compiler:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/rake:0]
+package.use : dev-ruby/rake:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+
+[dev-ruby/rcairo:0]
+package.use : dev-ruby/rcairo:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/rdoc:0]
+package.use : dev-ruby/rdoc:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+
+[dev-ruby/rdtool:0]
+package.use : dev-ruby/rdtool:0 -doc -emacs -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/rest-client:0]
+package.use : dev-ruby/rest-client:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/rexical:0]
+package.use : dev-ruby/rexical:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/riel:0]
+package.use : dev-ruby/riel:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/rrdtool-bindings:0]
+package.use : dev-ruby/rrdtool-bindings:0 ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-atk:0]
+package.use : dev-ruby/ruby-atk:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-cairo-gobject:0]
+package.use : dev-ruby/ruby-cairo-gobject:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-clutter-gstreamer:0]
+package.use : dev-ruby/ruby-clutter-gstreamer:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-clutter-gtk:0]
+package.use : dev-ruby/ruby-clutter-gtk:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-clutter:0]
+package.use : dev-ruby/ruby-clutter:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-dict:0]
+package.use : dev-ruby/ruby-dict:0 ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gdk3:0]
+package.use : dev-ruby/ruby-gdk3:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gdkpixbuf2:0]
+package.use : dev-ruby/ruby-gdkpixbuf2:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gio2:0]
+package.use : dev-ruby/ruby-gio2:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-glib2:0]
+package.use : dev-ruby/ruby-glib2:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gnome2:0]
+package.use : dev-ruby/ruby-gnome2:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gobject-introspection:0]
+package.use : dev-ruby/ruby-gobject-introspection:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gstreamer:0]
+package.use : dev-ruby/ruby-gstreamer:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gtk2:0]
+package.use : dev-ruby/ruby-gtk2:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gtk3:0]
+package.use : dev-ruby/ruby-gtk3:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gtksourceview3:0]
+package.use : dev-ruby/ruby-gtksourceview3:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-gtksourceview:0]
+package.use : dev-ruby/ruby-gtksourceview:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-odbc:0]
+package.use : dev-ruby/ruby-odbc:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-openid:0]
+package.use : dev-ruby/ruby-openid:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-pango:0]
+package.use : dev-ruby/ruby-pango:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-poppler:0]
+package.use : dev-ruby/ruby-poppler:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-progressbar:0]
+package.use : dev-ruby/ruby-progressbar:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
 [dev-ruby/ruby-rsvg:0]
-package.use : dev-ruby/ruby-rsvg:0 -test cairo
+package.use : dev-ruby/ruby-rsvg:0 -test cairo ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-ruby/ruby-sdl:0]
-package.use : dev-ruby/ruby-sdl:0 -image -mixer -sge -truetype mpeg
+package.use : dev-ruby/ruby-sdl:0 -image -mixer -sge -truetype mpeg ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-tcpwrap:0]
+package.use : dev-ruby/ruby-tcpwrap:0 ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-termios:0]
+package.use : dev-ruby/ruby-termios:0 ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-vte3:0]
+package.use : dev-ruby/ruby-vte3:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-vte:0]
+package.use : dev-ruby/ruby-vte:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-webkit-gtk2:0]
+package.use : dev-ruby/ruby-webkit-gtk2:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-webkit-gtk:0]
+package.use : dev-ruby/ruby-webkit-gtk:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/ruby-xslt:0]
+package.use : dev-ruby/ruby-xslt:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/rubygems:0]
+package.use : dev-ruby/rubygems:0 -server -test ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+
+[dev-ruby/rubypants:0]
+package.use : dev-ruby/rubypants:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/serialport:0]
+package.use : dev-ruby/serialport:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/shorturl:0]
+package.use : dev-ruby/shorturl:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/simple-rss:0]
+package.use : dev-ruby/simple-rss:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/snmplib:0]
+package.use : dev-ruby/snmplib:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/systemu:0]
+package.use : dev-ruby/systemu:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/text-hyphen:0]
+package.use : dev-ruby/text-hyphen:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/tins:0]
+package.use : dev-ruby/tins:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/transaction-simple:0]
+package.use : dev-ruby/transaction-simple:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/tzinfo:0]
+package.use : dev-ruby/tzinfo:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/unf:0]
+package.use : dev-ruby/unf:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/unf_ext:0]
+package.use : dev-ruby/unf_ext:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/uuidtools:0]
+package.use : dev-ruby/uuidtools:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/webrobots:0]
+package.use : dev-ruby/webrobots:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/wirble:0]
+package.use : dev-ruby/wirble:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/xml-simple:0]
+package.use : dev-ruby/xml-simple:0 -test ruby_targets_ruby19 ruby_targets_ruby20
+
+[dev-ruby/zentest:0]
+package.use : dev-ruby/zentest:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
 
 [dev-scheme/chicken:0]
 package.use : dev-scheme/chicken:0 -doc -emacs -parallel-build
@@ -3426,11 +3723,8 @@ package.use : dev-texlive/texlive-latexrecommended:0 -doc -source
 [dev-texlive/texlive-pictures:0]
 package.use : dev-texlive/texlive-pictures:0 -doc -source
 
-[dev-texlive/texlive-pstricks:0]
-package.use : dev-texlive/texlive-pstricks:0 -doc -source
-
-[dev-texlive/texlive-texinfo:0]
-package.use : dev-texlive/texlive-texinfo:0 -doc -source
+[dev-texlive/texlive-plainextra:0]
+package.use : dev-texlive/texlive-plainextra:0 -doc -source
 
 [dev-util/astyle:0]
 package.use : dev-util/astyle:0 -doc -java static-libs
@@ -3441,12 +3735,6 @@ package.use : dev-util/bam:0 -doc -test
 [dev-util/boost-build:0]
 package.use : dev-util/boost-build:0 -examples -test python
 
-[dev-util/buildbot-slave:0]
-package.use : dev-util/buildbot-slave:0 -test
-
-[dev-util/buildbot:0]
-package.use : dev-util/buildbot:0 -doc -examples -irc -mail -manhole -test
-
 [dev-util/cdecl:0]
 package.use : dev-util/cdecl:0 readline
 
@@ -3494,7 +3782,7 @@ package.use : dev-util/duma:0 -examples
 package.use : dev-util/elfkickers:0 -doc
 
 [dev-util/geany-plugins:0]
-package.use : dev-util/geany-plugins:0 -debugger -devhelp -enchant -gpg -gtkspell -markdown -multiterm -nls -scope -soup commander lua webkit
+package.use : dev-util/geany-plugins:0 -debugger -devhelp -enchant -gpg -gtkspell -markdown -multiterm -nls -python -scope -soup autoclose commander defineformat lua webkit
 
 [dev-util/geany:0]
 package.use : dev-util/geany:0 vte
@@ -3517,6 +3805,9 @@ package.use : dev-util/min-cscope:0 -debug
 [dev-util/nemiver:0]
 package.use : dev-util/nemiver:0 -debug -memoryview
 
+[dev-util/ninja:0]
+package.use : dev-util/ninja:0 -doc -emacs -test -vim-syntax -zsh-completion
+
 [dev-util/patchutils:0]
 package.use : dev-util/patchutils:0 -test
 
@@ -3538,9 +3829,6 @@ package.use : dev-util/reswrap:0 -debug -doc -profile
 [dev-util/scons:0]
 package.use : dev-util/scons:0 -doc
 
-[dev-util/shflags:0]
-package.use : dev-util/shflags:0 -examples
-
 [dev-util/strace:0]
 package.use : dev-util/strace:0 -aio -static perl
 
@@ -3578,7 +3866,7 @@ package.use : dev-vcs/giggle:0 -eds
 package.use : dev-vcs/git-cola:0 -doc -test
 
 [dev-vcs/git:0]
-package.use : dev-vcs/git:0 -cvs -doc -emacs -highlight -iconv -mediawiki -nls -ppcsha1 -test blksha1 cgi curl gnome-keyring gpg gtk pcre perl python subversion threads tk webdav xinetd
+package.use : dev-vcs/git:0 -cvs -doc -emacs -gpg -highlight -iconv -mediawiki -nls -ppcsha1 -test blksha1 cgi curl gnome-keyring gtk pcre perl python subversion threads tk webdav xinetd
 
 [dev-vcs/gitg:0]
 package.use : dev-vcs/gitg:0 -debug -glade python
@@ -3790,9 +4078,6 @@ package.use : games-emulation/yabause:0 -qt5 openal opengl pic sdl
 [games-engines/odamex:0]
 package.use : games-engines/odamex:0 -dedicated -master -portmidi -server odalaunch
 
-[games-engines/renpy:6.17]
-package.use : games-engines/renpy:6.17 -development -doc -examples
-
 [games-engines/scummvm-tools:0]
 package.use : games-engines/scummvm-tools:0 flac iconv mad png vorbis
 
@@ -3850,9 +4135,6 @@ package.use : games-misc/gBhed:0 gtk
 [games-misc/ggencoder:0]
 package.use : games-misc/ggencoder:0 -doc
 
-[games-misc/katawa-shoujo:0]
-package.use : games-misc/katawa-shoujo:0 -doc system-renpy
-
 [games-misc/typespeed:0]
 package.use : games-misc/typespeed:0 -nls
 
@@ -4058,7 +4340,7 @@ package.use : games-util/higan-purify:0 qt4
 package.use : games-util/joystick:0 -udev sdl
 
 [gnome-base/dconf:0]
-package.use : gnome-base/dconf:0 -test X
+package.use : gnome-base/dconf:0 -test
 
 [gnome-base/gconf:2]
 package.use : gnome-base/gconf:2 -debug -policykit introspection ldap
@@ -4092,7 +4374,7 @@ package.use : gnome-base/gnome-vfs:2 -doc -kerberos -test acl avahi fam gnutls i
 package.use : gnome-base/gsettings-desktop-schemas:0 introspection
 
 [gnome-base/gvfs:0]
-package.use : gnome-base/gvfs:0 -afp -archive -bluray -fuse -gnome-online-accounts -gphoto2 -libsecret -systemd -test -udisks cdda gtk http ios mtp samba udev zeroconf
+package.use : gnome-base/gvfs:0 -afp -archive -bluray -fuse -gnome-online-accounts -gphoto2 -libsecret -nfs -systemd -test -udisks cdda gtk http ios mtp samba udev zeroconf
 
 [gnome-base/libbonobo:0]
 package.use : gnome-base/libbonobo:0 -debug -examples -test
@@ -4130,6 +4412,9 @@ package.use : gnome-extra/assogiate:0 -debug
 [gnome-extra/evolution-data-server:0]
 package.use : gnome-extra/evolution-data-server:0 -api-doc-extras -kerberos -test gnome-online-accounts gtk introspection ipv6 ldap vala weather
 
+[gnome-extra/evolution-ews:0]
+package.use : gnome-extra/evolution-ews:0 -test
+
 [gnome-extra/gdesklets-core:0]
 package.use : gnome-extra/gdesklets-core:0 dbus
 
@@ -4152,7 +4437,7 @@ package.use : gnome-extra/gucharmap:0 -cjk -debug -doc introspection
 package.use : gnome-extra/gucharmap:2.90 -cjk -debug -test introspection vala
 
 [gnome-extra/libgda:5]
-package.use : gnome-extra/libgda:5 -canvas -debug -firebird -graphviz -http -java -json -libsecret -mdb -mysql -oci8 -postgres -reports -sourceview berkdb gtk introspection ldap ssl
+package.use : gnome-extra/libgda:5 -canvas -debug -firebird -gnome-keyring -graphviz -http -java -json -mdb -mysql -oci8 -postgres -reports -sourceview -vala berkdb gtk introspection ldap ssl
 
 [gnome-extra/libgsf:0]
 package.use : gnome-extra/libgsf:0 bzip2 gtk introspection
@@ -4167,7 +4452,7 @@ package.use : kde-misc/kdiff3:4 -aqua -debug -kde handbook
 package.use : lxde-base/lxdm:0 -consolekit -debug -nls -pam gtk3
 
 [mail-client/balsa:0]
-package.use : mail-client/balsa:0 -gnome -kerberos -networkmanager -rubrica crypt gtkspell ldap libnotify sqlite ssl webkit xface
+package.use : mail-client/balsa:0 -gnome -gnome-keyring -gtkhtml -kerberos -rubrica crypt gtkspell ldap libnotify sqlite ssl webkit xface
 
 [mail-client/claws-mail:0]
 package.use : mail-client/claws-mail:0 -bogofilter -dillo -doc -pda -smime -spamassassin crypt dbus imap ipv6 ldap nntp session spell ssl startup-notification xface
@@ -4187,6 +4472,9 @@ package.use : mail-client/mail-notification:0 -sylpheed gnome-keyring sasl sound
 [mail-client/mutt:0]
 package.use : mail-client/mutt:0 -debug -doc -gpg -imap -kerberos -nls -pop -qdbm -selinux -sidebar -smime -smtp -tokyocabinet berkdb crypt gdbm gnutls idn mbox nntp sasl slang ssl
 
+[mail-client/nail:0]
+package.use : mail-client/nail:0 -kerberos -net ssl
+
 [mail-client/trojita:0]
 package.use : mail-client/trojita:0 -debug -test zlib
 
@@ -4338,7 +4626,7 @@ package.use : media-fonts/font-bitstream-100dpi:0 -nls X
 package.use : media-fonts/font-cursor-misc:0 -nls X
 
 [media-fonts/font-misc-misc:0]
-package.use : media-fonts/font-misc-misc:0 nls X
+package.use : media-fonts/font-misc-misc:0 X nls
 
 [media-fonts/font-schumacher-misc:0]
 package.use : media-fonts/font-schumacher-misc:0 -nls X
@@ -4548,7 +4836,7 @@ package.use : media-gfx/exiv2:0 -contrib -doc -examples -nls static-libs xmp zli
 package.use : media-gfx/feh:0 -debug -test curl exif xinerama
 
 [media-gfx/fontforge:0]
-package.use : media-gfx/fontforge:0 -cjk -debug -doc -nls -pango -pasteafter -tilepath -truetype -truetype-debugger -type3 X cairo gif jpeg png python svg tiff unicode
+package.use : media-gfx/fontforge:0 -gtk -truetype-debugger X cairo gif jpeg png python readline svg tiff unicode
 
 [media-gfx/fotowall:0]
 package.use : media-gfx/fotowall:0 -debug -webcam opengl
@@ -4566,7 +4854,7 @@ package.use : media-gfx/gimageview:0 -mplayer -nls mng svg wmf
 package.use : media-gfx/gimmage:0 -debug
 
 [media-gfx/gimp:2]
-package.use : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -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 webkit 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 webkit wmf xpm
 
 [media-gfx/gliv:0]
 package.use : media-gfx/gliv:0 -nls
@@ -4578,7 +4866,7 @@ package.use : media-gfx/gphoto2:0 -nls aalib exif ncurses readline
 package.use : media-gfx/graphite2:0 -test perl
 
 [media-gfx/gthumb:0]
-package.use : media-gfx/gthumb:0 -cdr -debug -gstreamer -http -json -libsecret -slideshow -test exif jpeg raw svg tiff webkit webp
+package.use : media-gfx/gthumb:0 -cdr -debug -gnome-keyring -gstreamer -http -json -lcms -slideshow -test exif jpeg raw svg tiff webkit webp
 
 [media-gfx/gtkam:0]
 package.use : media-gfx/gtkam:0 -debug -gimp -gnome -nls
@@ -4605,7 +4893,7 @@ package.use : media-gfx/openclipart:0 -gzip png svg
 package.use : media-gfx/openexr_viewers:0 -cg opengl
 
 [media-gfx/openmesh:0]
-package.use : media-gfx/openmesh:0 qt4 static-libs
+package.use : media-gfx/openmesh:0 -qt5 qt4 static-libs
 
 [media-gfx/peps:0]
 package.use : media-gfx/peps:0 X
@@ -4698,7 +4986,7 @@ package.use : media-libs/alure:0 -dumb -examples -fluidsynth -sndfile flac mp3 s
 package.use : media-libs/audiofile:0 -test flac static-libs
 
 [media-libs/babl:0]
-package.use : media-libs/babl:0 -altivec cpu_flags_x86_mmx cpu_flags_x86_sse
+package.use : media-libs/babl:0 -altivec cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
 
 [media-libs/blib:0]
 package.use : media-libs/blib:0 aalib directfb gtk
@@ -4709,6 +4997,9 @@ package.use : media-libs/celt:0 ogg static-libs
 [media-libs/clutter-gst:2.0]
 package.use : media-libs/clutter-gst:2.0 -debug -examples introspection
 
+[media-libs/clutter-gst:3.0]
+package.use : media-libs/clutter-gst:3.0 -debug -examples introspection
+
 [media-libs/clutter-gtk:1.0]
 package.use : media-libs/clutter-gtk:1.0 -debug -examples introspection
 
@@ -4778,6 +5069,9 @@ package.use : media-libs/giflib:0 -rle X static-libs
 [media-libs/glew:0]
 package.use : media-libs/glew:0 -doc static-libs
 
+[media-libs/glpng:0]
+package.use : media-libs/glpng:0 -static-libs
+
 [media-libs/glu:0]
 package.use : media-libs/glu:0 static-libs
 
@@ -4790,6 +5084,9 @@ package.use : media-libs/gnonlin:0.10 -doc -test
 [media-libs/gnonlin:1.0]
 package.use : media-libs/gnonlin:1.0 -nls -test
 
+[media-libs/gsound:0]
+package.use : media-libs/gsound:0 introspection
+
 [media-libs/gst-plugins-bad:0.10]
 package.use : media-libs/gst-plugins-bad:0.10 -nls -orc
 
@@ -4830,7 +5127,7 @@ package.use : media-libs/gstreamer:1.0 -nls -orc -test introspection
 package.use : media-libs/guilib:0 static-libs
 
 [media-libs/harfbuzz:0]
-package.use : media-libs/harfbuzz:0 -test cairo glib graphite icu introspection static-libs truetype
+package.use : media-libs/harfbuzz:0 -fontconfig -test cairo glib graphite icu introspection static-libs truetype
 
 [media-libs/id3lib:0]
 package.use : media-libs/id3lib:0 -doc static-libs
@@ -4910,6 +5207,9 @@ package.use : media-libs/libdvdnav:0 static-libs
 [media-libs/libdvdread:0]
 package.use : media-libs/libdvdread:0 css static-libs
 
+[media-libs/libepoxy:0]
+package.use : media-libs/libepoxy:0 -test
+
 [media-libs/libexif-gtk:0]
 package.use : media-libs/libexif-gtk:0 -nls static-libs
 
@@ -4940,7 +5240,7 @@ package.env : media-libs/libgii:0 media-libs_libgii_0
 env : CPPFLAGS=-D_POSIX_SOURCE
 
 [media-libs/libgphoto2:0]
-package.use : media-libs/libgphoto2:0 -cameras_adc65 -cameras_agfa_cl20 -cameras_aox -cameras_ax203 -cameras_barbie -cameras_canon -cameras_casio_qv -cameras_clicksmart310 -cameras_digigr8 -cameras_digita -cameras_dimagev -cameras_dimera3500 -cameras_directory -cameras_enigma13 -cameras_fuji -cameras_gsmart300 -cameras_hp215 -cameras_iclick -cameras_jamcam -cameras_jd11 -cameras_jl2005a -cameras_jl2005c -cameras_kodak_dc120 -cameras_kodak_dc210 -cameras_kodak_dc240 -cameras_kodak_dc3200 -cameras_kodak_ez200 -cameras_konica -cameras_konica_qm150 -cameras_largan -cameras_lg_gsm -cameras_mars -cameras_mustek -cameras_panasonic_coolshot -cameras_panasonic_dc1000 -cameras_panasonic_dc1580 -cameras_panasonic_l859 -cameras_pccam300 -cameras_pccam600 -cameras_pentax -cameras_polaroid_pdc320 -cameras_polaroid_pdc640 -cameras_polaroid_pdc700 -cameras_ricoh -cameras_ricoh_g3 -cameras_samsung -cameras_sierra -cameras_sipix_blink2 -cameras_sipix_web2 -cameras_smal -cameras_sonix -cameras_sony_ds
 cf1 -cameras_sony_dscf55 -cameras_soundvision -cameras_spca50x -cameras_sq905 -cameras_st2205 -cameras_stv0674 -cameras_stv0680 -cameras_sx330z -cameras_topfield -cameras_toshiba_pdrm11 -cameras_tp6801 -doc -examples -gd -nls -serial cameras_ptp2 exif jpeg zeroconf
+package.use : media-libs/libgphoto2:0 -cameras_adc65 -cameras_agfa_cl20 -cameras_aox -cameras_ax203 -cameras_barbie -cameras_canon -cameras_casio_qv -cameras_clicksmart310 -cameras_digigr8 -cameras_digita -cameras_dimagev -cameras_dimera3500 -cameras_directory -cameras_enigma13 -cameras_fuji -cameras_gsmart300 -cameras_hp215 -cameras_iclick -cameras_jamcam -cameras_jd11 -cameras_jl2005a -cameras_jl2005c -cameras_kodak_dc120 -cameras_kodak_dc210 -cameras_kodak_dc240 -cameras_kodak_dc3200 -cameras_kodak_ez200 -cameras_konica -cameras_konica_qm150 -cameras_largan -cameras_lg_gsm -cameras_mars -cameras_mustek -cameras_panasonic_coolshot -cameras_panasonic_dc1000 -cameras_panasonic_dc1580 -cameras_panasonic_l859 -cameras_pccam300 -cameras_pccam600 -cameras_pentax -cameras_polaroid_pdc320 -cameras_polaroid_pdc640 -cameras_polaroid_pdc700 -cameras_ricoh -cameras_ricoh_g3 -cameras_samsung -cameras_sierra -cameras_sipix_blink2 -cameras_sipix_web2 -cameras_smal -cameras_sonix -cameras_sony_ds
 cf1 -cameras_sony_dscf55 -cameras_soundvision -cameras_spca50x -cameras_sq905 -cameras_st2205 -cameras_stv0674 -cameras_stv0680 -cameras_sx330z -cameras_topfield -cameras_toshiba_pdrm11 -cameras_tp6801 -doc -examples -gd -nls -serial cameras_ptp2 exif jpeg
 
 [media-libs/libharu:0]
 package.use : media-libs/libharu:0 png static-libs zlib
@@ -5035,6 +5335,9 @@ package.use : media-libs/libquvi:0 -examples -nls static-libs
 [media-libs/libquvi:0.4]
 package.use : media-libs/libquvi:0.4 -examples static-libs
 
+[media-libs/libraw:0]
+package.use : media-libs/libraw:0 -demosaic -examples -jpeg -jpeg2k lcms openmp
+
 [media-libs/libsamplerate:0]
 package.use : media-libs/libsamplerate:0 -sndfile static-libs
 
@@ -5188,6 +5491,9 @@ package.use : media-libs/sdl2-ttf:0 X static-libs
 [media-libs/smpeg:0]
 package.use : media-libs/smpeg:0 -debug X cpu_flags_x86_mmx opengl static-libs
 
+[media-libs/soxr:0]
+package.use : media-libs/soxr:0 -examples
+
 [media-libs/speex:0]
 package.use : media-libs/speex:0 cpu_flags_x86_sse ogg static-libs
 
@@ -5354,7 +5660,7 @@ package.use : media-sound/ario:0 -audioscrobbler -debug -nls dbus idle libnotify
 package.use : media-sound/asunder:0 flac mp3 vorbis wavpack
 
 [media-sound/audacity:0]
-package.use : media-sound/audacity:0 -ffmpeg -id3tag -libsamplerate -midi -sbsms -soundtouch -vamp alsa flac jack ladspa mp3 twolame vorbis
+package.use : media-sound/audacity:0 -ffmpeg -id3tag -libsamplerate -midi -sbsms -soundtouch -vamp alsa flac jack ladspa libsoxr mp3 twolame vorbis
 
 [media-sound/aylet:0]
 package.use : media-sound/aylet:0 gtk
@@ -5507,7 +5813,7 @@ package.use : media-sound/positron:0 vorbis
 package.use : media-sound/pragha:0 -debug -grilo -lastfm -libnotify -mtp -rygel -soup glyr keybinder peas playlist udev
 
 [media-sound/pulseaudio:0]
-package.use : media-sound/pulseaudio:0 -bluetooth -dbus -doc -equalizer -gnome -gtk -jack -libsamplerate -lirc -neon -orc -oss -qt4 -realtime -system-wide -systemd -test -webrtc-aec -xen -zeroconf X alsa alsa-plugin asyncns caps gdbm glib ipv6 ssl tcpd udev
+package.use : media-sound/pulseaudio:0 -bluetooth -dbus -doc -equalizer -gnome -gtk -jack -libsamplerate -lirc -native-headset -neon -ofono-headset -orc -oss -qt4 -realtime -selinux -system-wide -systemd -test -webrtc-aec -xen -zeroconf X alsa alsa-plugin asyncns caps gdbm glib ipv6 ssl tcpd udev
 
 [media-sound/qjackctl:0]
 package.use : media-sound/qjackctl:0 -debug alsa dbus portaudio
@@ -5546,7 +5852,7 @@ package.use : media-sound/sonata:0 -lyrics dbus taglib trayicon
 package.use : media-sound/soundconverter:0 aac flac mp3 opus vorbis
 
 [media-sound/sox:0]
-package.use : media-sound/sox:0 -ao -debug -id3tag -pulseaudio -sndfile alsa amr encode ffmpeg flac ladspa mad ogg openmp oss png static-libs twolame wavpack
+package.use : media-sound/sox:0 -ao -debug -id3tag -opus -pulseaudio -sndfile alsa amr encode flac ladspa mad ogg openmp oss png static-libs twolame wavpack
 
 [media-sound/streamripper:0]
 package.use : media-sound/streamripper:0 vorbis
@@ -5618,7 +5924,7 @@ package.use : media-video/dvgrab:0 jpeg quicktime
 package.use : media-video/ffdiaporama:0 -libav -openclipart -texturemate
 
 [media-video/ffmpeg:0]
-package.use : media-video/ffmpeg:0 -altivec -amrenc -armv5te -armv6 -armv6t2 -armvfp -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -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 -examples -fdk -flite -frei0r -fribidi -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -neon -openssl -pulseaudio -ssh -test -truetype -vdpau -x264 -zvbi X aac aacplus 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 faac fftools_aviocat fftools_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper fftools_qt-faststart fftools_trasher fontconfig gme gnutls gpl gsm hardcoded-tables iconv iec61883 ieee1394 jack jpeg2k ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss pic postproc quvi rtmp 
 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 -armv5te -armv6 -armv6t2 -armvfp -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -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 -examples -fdk -flite -frei0r -fribidi -librtmp -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -neon -openssl -pulseaudio -ssh -test -truetype -vdpau -x264 -zvbi X aac aacplus 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 faac fftools_aviocat fftools_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper fftools_qt-faststart fftools_trasher fontconfig gme gnutls gpl gsm hardcoded-tables iconv iec61883 ieee1394 jack jpeg2k ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss pic postproc q
 uvi samba schroedinger sdl speex static-libs theora threads twolame v4l vaapi vorbis vpx wavpack webp x265 xcb xvid zlib
 
 [media-video/ffmpegthumbnailer:0]
 package.use : media-video/ffmpegthumbnailer:0 -gnome gtk jpeg png
@@ -5722,13 +6028,6 @@ package.use : net-analyzer/mrtg:0 -selinux
 [net-analyzer/munin:0]
 package.use : net-analyzer/munin:0 -apache -asterisk -dhcpd -doc -http -ipmi -irc -java -memcached -minimal -mysql -postgres -test cgi ipv6 ssl syslog
 
-[net-analyzer/nagios-core:0]
-package.use : net-analyzer/nagios-core:0 -apache2 -debug -lighttpd perl vim-syntax web
-
-[net-analyzer/nagios-plugins:0]
-package.use : net-analyzer/nagios-plugins:0 -mysql -nagios-dns -nagios-game -nagios-ntp -nagios-ping -nagios-ssh -postgres -radius -smart -snmp -sudo -ups -xmpp gnutls ipv6 ldap samba ssl suid
-package.mask : >net-analyzer/nagios-plugins-1.4.16-r2
-
 [net-analyzer/nagstamon:0]
 package.use : net-analyzer/nagstamon:0 -gnome -sound
 
@@ -5753,12 +6052,6 @@ package.use : net-analyzer/ngrep:0 ipv6
 [net-analyzer/nmap:0]
 package.use : net-analyzer/nmap:0 -ncat -ndiff -nls -nmap-update -nping -system-lua -zenmap ipv6 lua ssl
 
-[net-analyzer/nrpe:0]
-package.use : net-analyzer/nrpe:0 -command-args -minimal ssl tcpd
-
-[net-analyzer/nsca:0]
-package.use : net-analyzer/nsca:0 -minimal crypt tcpd
-
 [net-analyzer/oinkmaster:0]
 package.use : net-analyzer/oinkmaster:0 X
 
@@ -5813,6 +6106,9 @@ package.use : net-dialup/freeradius:0 -debug -firebird -kerberos -mysql -oracle
 [net-dialup/globespan-adsl:0]
 package.use : net-dialup/globespan-adsl:0 tk
 
+[net-dialup/linux-atm:0]
+package.use : net-dialup/linux-atm:0 -static-libs
+
 [net-dialup/lrzsz:0]
 package.use : net-dialup/lrzsz:0 -nls
 
@@ -5832,7 +6128,7 @@ package.use : net-dialup/pptpd:0 -gre-extreme-debug tcpd
 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 utils
 
 [net-dns/bind-tools:0]
-package.use : net-dns/bind-tools:0 -doc -gost -gssapi -urandom idn ipv6 readline ssl xml
+package.use : net-dns/bind-tools:0 -doc -gost -gssapi -urandom idn ipv6 readline seccomp ssl xml
 
 [net-dns/c-ares:0]
 package.use : net-dns/c-ares:0 static-libs
@@ -5886,7 +6182,7 @@ package.use : net-ftp/frox:0 -clamav -transparent ssl
 package.use : net-ftp/ftpbase:0 -pam
 
 [net-ftp/lftp:0]
-package.use : net-ftp/lftp:0 -convert-mozilla-cookies -nls -openssl -socks5 -verify-file gnutls idn ssl
+package.use : net-ftp/lftp:0 -convert-mozilla-cookies -nls -openssl -socks5 -verify-file gnutls idn ipv6 ssl
 
 [net-ftp/ncftp:0]
 package.use : net-ftp/ncftp:0 -pch ipv6
@@ -5985,7 +6281,7 @@ package.use : net-irc/shadowircd:0 -debug -largenet ipv6 ssl zlib
 package.use : net-irc/weechat:0 -doc -nls -test alias charset exec fifo guile irc logger lua perl python relay ruby scripts spell ssl tcl trigger xfer
 
 [net-irc/znc:0]
-package.use : net-irc/znc:0 -daemon -debug -python_single_target_python3_3 ipv6 perl python sasl ssl tcl python_single_target_python3_4
+package.use : net-irc/znc:0 -daemon -debug ipv6 perl python sasl ssl tcl
 
 [net-libs/daq:0]
 package.use : net-libs/daq:0 -ipq -nfq afpacket dump ipv6 pcap static-libs
@@ -6116,6 +6412,9 @@ package.use : net-libs/libsoup-gnome:2.4 -debug introspection
 [net-libs/libsoup:2.4]
 package.use : net-libs/libsoup:2.4 -debug -test introspection samba ssl
 
+[net-libs/libssh2:0]
+package.use : net-libs/libssh2:0 -gcrypt -static-libs -test zlib
+
 [net-libs/libtorrent:0]
 package.use : net-libs/libtorrent:0 -debug ipv6 ssl
 
@@ -6144,7 +6443,7 @@ package.use : net-libs/rest:0.7 -test gnome introspection
 package.use : net-libs/serf:1 -kerberos
 
 [net-libs/socket++:0]
-package.use : net-libs/socket++:0 -debug -doc
+package.use : net-libs/socket++:0 -debug -static-libs
 
 [net-libs/sofia-sip:0]
 package.use : net-libs/sofia-sip:0 ssl static-libs
@@ -6158,8 +6457,11 @@ package.use : net-libs/webkit-gtk:2 -aqua -coverage -debug -gles2 -jit -libsecre
 [net-libs/webkit-gtk:3]
 package.use : net-libs/webkit-gtk:3 -aqua -coverage -debug -gles2 -jit -libsecret -test -wayland X egl geoloc gstreamer introspection opengl spell webgl
 
+[net-libs/webkit-gtk:4]
+package.use : net-libs/webkit-gtk:4 -coverage -doc -gles2 -jit -libsecret -spell -test -wayland X egl geoloc gstreamer introspection opengl webgl
+
 [net-libs/wt:0]
-package.use : net-libs/wt:0 -doc -fcgi -graphicsmagick -postgres -resources -test extjs pdf server sqlite ssl zlib
+package.use : net-libs/wt:0 -doc -fcgi -graphicsmagick -mysql -postgres -resources -test extjs pdf server sqlite ssl zlib
 
 [net-libs/zeromq:0]
 package.use : net-libs/zeromq:0 -pgm -test static-libs
@@ -6243,7 +6545,7 @@ package.use : net-misc/clockspeed:0 -selinux -static
 package.use : net-misc/clusterssh:0 -test
 
 [net-misc/curl:0]
-package.use : net-misc/curl:0 -adns -curl_ssl_axtls -curl_ssl_gnutls -curl_ssl_openssl -curl_ssl_polarssl -curl_ssl_winssl -kerberos -metalink -ssh -test curl_ssl_nss idn ipv6 ldap rtmp samba ssl static-libs threads
+package.use : net-misc/curl:0 -adns -curl_ssl_axtls -curl_ssl_gnutls -curl_ssl_openssl -curl_ssl_polarssl -curl_ssl_winssl -http2 -kerberos -metalink -ssh -test curl_ssl_nss idn ipv6 ldap rtmp samba ssl static-libs threads
 
 [net-misc/dhcpcd:0]
 package.use : net-misc/dhcpcd:0 embedded ipv6 udev
@@ -6311,17 +6613,17 @@ package.use : net-misc/netfleet:0 -debug
 [net-misc/netkit-talk:0]
 package.use : net-misc/netkit-talk:0 ipv6
 
+[net-misc/ntp:0]
+package.use : net-misc/ntp:0 -caps -debug -openntpd -parse-clocks -samba -selinux -snmp -vim-syntax -zeroconf ipv6 readline ssl threads
+
 [net-misc/olsrd:0]
 package.use : net-misc/olsrd:0 gtk
 
 [net-misc/omniORB:0]
 package.use : net-misc/omniORB:0 -doc ssl static-libs
 
-[net-misc/openntpd:0]
-package.use : net-misc/openntpd:0 -selinux ssl
-
 [net-misc/openssh:0]
-package.use : net-misc/openssh:0 -X509 -kerberos -ldns -libedit -pam -sctp -selinux -static X bindist hpn ldap pie skey
+package.use : net-misc/openssh:0 -X509 -debug -kerberos -ldns -libedit -pam -sctp -selinux -ssh1 -static X bindist hpn ldap pie skey ssl
 
 [net-misc/pen:0]
 package.use : net-misc/pen:0 geoip ssl
@@ -6375,13 +6677,13 @@ package.use : net-misc/stone:0 ssl
 package.use : net-misc/streamtuner:0 python shout xiph
 
 [net-misc/stunnel:0]
-package.use : net-misc/stunnel:0 -selinux ipv6 ssl tcpd
+package.use : net-misc/stunnel:0 -selinux -stunnel3 ipv6 ssl tcpd
 
 [net-misc/suite3270:0]
 package.use : net-misc/suite3270:0 -cjk -doc X ncurses ssl tcl
 
 [net-misc/tightvnc:0]
-package.use: net-misc/tightvnc:0 -java server tcpd
+package.use : net-misc/tightvnc:0 -java server tcpd
 
 [net-misc/tor:0]
 package.use : net-misc/tor:0 -bufferevents -nat-pmp -scrypt -seccomp -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web upnp
@@ -6513,7 +6815,7 @@ package.use : net-proxy/c-icap:0 berkdb ipv6 ldap
 package.use : net-proxy/dansguardian:0 -avast -backtrace -clamav -commandline -debug -email -icap -kaspersky -logrotate -ntlm -orig-ip -trickledm fancydm lfs pcre static-libs
 
 [net-proxy/haproxy:0]
-package.use : net-proxy/haproxy:0 -examples -tools crypt pcre ssl vim-syntax zlib
+package.use : net-proxy/haproxy:0 -examples -pcre-jit -tools crypt pcre ssl vim-syntax zlib
 
 [net-proxy/havp:0]
 package.use : net-proxy/havp:0 -clamav ssl
@@ -6547,7 +6849,7 @@ package.use : net-wireless/bluez:0 -debug -selinux -systemd -test cups obex read
 
 [net-wireless/crda:0]
 package.use : net-wireless/crda:0 gcrypt
-package.accept_keywords : >=net-wireless/crda-3.18 ~amd64
+package.accept_keywords : =net-wireless/crda-3.18 ~amd64
 
 [net-wireless/gnome-bluetooth:2]
 package.use : net-wireless/gnome-bluetooth:2 -debug introspection
@@ -6556,7 +6858,7 @@ package.use : net-wireless/gnome-bluetooth:2 -debug introspection
 package.use : net-wireless/kismet:0 -plugin-dot15d4 -selinux -speech client pcre plugin-autowep plugin-btscan plugin-ptw plugin-spectools plugin-syslog ruby suid
 
 [net-wireless/lorcon:0]
-package.use : net-wireless/lorcon:0 python ruby
+package.use : net-wireless/lorcon:0 python ruby ruby_targets_ruby19 ruby_targets_ruby20
 
 [net-wireless/spectools:0]
 package.use : net-wireless/spectools:0 gtk ncurses
@@ -6594,6 +6896,9 @@ package.use : sci-biology/amos:0 qt4
 [sci-biology/augustus:0]
 package.use : sci-biology/augustus:0 -examples
 
+[sci-biology/bioruby:0]
+package.use : sci-biology/bioruby:0 -doc -test ruby_targets_ruby19 ruby_targets_ruby20
+
 [sci-biology/cutg:0]
 package.use : sci-biology/cutg:0 -emboss -minimal
 
@@ -6612,6 +6917,9 @@ package.use : sci-biology/infernal:0 -mpi
 [sci-biology/iqpnni:0]
 package.use : sci-biology/iqpnni:0 -doc
 
+[sci-biology/mothur:0]
+package.use : sci-biology/mothur:0 -mpi readline
+
 [sci-biology/mrbayes:0]
 package.use : sci-biology/mrbayes:0 -debug -mpi readline
 
@@ -6639,6 +6947,9 @@ package.use : sci-biology/snpfile:0 static-libs
 [sci-biology/transfac:3]
 package.use : sci-biology/transfac:3 -emboss -minimal
 
+[sci-biology/uchime:0]
+package.use : sci-biology/uchime:0 -debug
+
 [sci-biology/velvet:0]
 package.use : sci-biology/velvet:0 -doc
 
@@ -6814,7 +7125,7 @@ package.use : sys-apps/bleachbit:0 -nls gtk
 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 -nls -selinux -static -vanilla acl caps gmp xattr
+package.use : sys-apps/coreutils:0 -multicall -nls -selinux -static -vanilla acl caps gmp xattr
 
 [sys-apps/dbus:0]
 package.use : sys-apps/dbus:0 -debug -doc -selinux -systemd -test X static-libs
@@ -6937,7 +7248,7 @@ package.use : sys-apps/netplug:0 -debug -doc
 package.use : sys-apps/openrc:0 -audit -debug -newnet -pam -prefix -selinux -tools ncurses netifrc static-libs unicode
 
 [sys-apps/pciutils:0]
-package.use : sys-apps/pciutils:0 kmod static-libs zlib
+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 -selinux udev
@@ -6994,7 +7305,7 @@ package.use : sys-apps/texinfo:0 -nls -static
 package.use : sys-apps/the_silver_searcher:0 lzma zlib
 
 [sys-apps/timer_entropyd:0]
-package.use : sys-apps/timer_entropyd:0 -debug
+package.use : sys-apps/timer_entropyd:0 -debug -selinux
 
 [sys-apps/tuxonice-userui:0]
 package.use : sys-apps/tuxonice-userui:0 -fbsplash
@@ -7012,7 +7323,7 @@ package.use : sys-apps/usbutils:0 python
 package.use : sys-apps/usermode-utilities:0 -fuse
 
 [sys-apps/util-linux:0]
-package.use : sys-apps/util-linux:0 -fdformat -nls -pam -selinux -systemd -test -tty-helpers -udev caps cramfs ncurses python slang static-libs suid unicode
+package.use : sys-apps/util-linux:0 -fdformat -nls -pam -selinux -test -tty-helpers -udev caps cramfs ncurses python slang static-libs suid unicode
 
 [sys-apps/watchdog:0]
 package.use : sys-apps/watchdog:0 -nfs
@@ -7033,9 +7344,6 @@ package.use : sys-block/mbuffer:0 -debug ssl
 [sys-block/nbd:0]
 package.use : sys-block/nbd:0 -debug zlib
 
-[sys-block/thin-provisioning-tools:0]
-package.use : sys-block/thin-provisioning-tools:0 -test
-
 [sys-boot/lilo:0]
 package.use : sys-boot/lilo:0 -device-mapper -minimal -pxeserial -static
 
@@ -7074,7 +7382,7 @@ package.use : sys-devel/bison:0 -nls -static
 package.use : sys-devel/flex:0 -nls -static -test
 
 [sys-devel/gcc:4.8]
-package.use : sys-devel/gcc:4.8 -altivec -debug -doc -fixed-point -go -libssp -mudflap -multilib -multislot -nls -nopie -nossp -regression-test -sanitize -vanilla awt cxx fortran gcj graphite hardened nptl objc objc++ objc-gc openmp
+package.use : sys-devel/gcc:4.8 -altivec -awt -debug -doc -fixed-point -go -libssp -mudflap -multilib -multislot -nls -nopie -nossp -regression-test -sanitize -vanilla cxx fortran gcj graphite hardened nptl objc objc++ objc-gc openmp
 
 [sys-devel/gdb:0]
 package.use : sys-devel/gdb:0 -expat -multitarget -nls -test -vanilla client lzma python server zlib
@@ -7110,7 +7418,7 @@ package.use : sys-fs/cachefilesd:0 -doc -selinux
 package.use : sys-fs/cryptsetup:0 -nettle -nls -openssl -pwquality -reencrypt -static -udev -urandom gcrypt python static-libs
 
 [sys-fs/dd-rescue:0]
-package.use : sys-fs/dd-rescue:0 -static
+package.use : sys-fs/dd-rescue:0 -cpu_flags_x86_avx2 -cpu_flags_x86_sse4_2 -lzo -static xattr
 
 [sys-fs/ddrescue:0]
 package.use : sys-fs/ddrescue:0 -static
@@ -7119,10 +7427,10 @@ package.use : sys-fs/ddrescue:0 -static
 package.use : sys-fs/e2fsprogs:0 -nls static-libs
 
 [sys-fs/encfs:0]
-package.use : sys-fs/encfs:0 xattr
+package.use : sys-fs/encfs:0 nls xattr
 
 [sys-fs/eudev:0]
-package.use : sys-fs/eudev:0 -doc -introspection -selinux -test gudev hwdb keymap kmod modutils openrc rule-generator static-libs
+package.use : sys-fs/eudev:0 -doc -introspection -selinux -test gudev hwdb kmod static-libs
 
 [sys-fs/ext4magic:0]
 package.use : sys-fs/ext4magic:0 -debug -expert-mode -file-attr
@@ -7190,7 +7498,7 @@ env : LDFLAGS=-largp
 package.use : sys-libs/libcap-ng:0 python static-libs
 
 [sys-libs/libcap:0]
-package.use : sys-libs/libcap:0 -pam
+package.use : sys-libs/libcap:0 -pam -static-libs
 
 [sys-libs/libieee1284:0]
 package.use : sys-libs/libieee1284:0 -doc python static-libs
@@ -7217,7 +7525,7 @@ package.use : sys-libs/mtdev:0 static-libs
 package.use : sys-libs/ncurses:0 -ada -debug -doc -gpm -minimal -profile -tinfo -trace cxx static-libs unicode
 
 [sys-libs/ncurses:5]
-package.use : sys-libs/ncurses:5 -ada -debug -doc -gpm -minimal -profile -tinfo -trace cxx static-libs unicode
+package.use : sys-libs/ncurses:5 -ada -gpm -tinfo cxx static-libs unicode
 
 [sys-libs/readline:0]
 package.use : sys-libs/readline:0 static-libs utils
@@ -7235,7 +7543,7 @@ package.use : sys-libs/tdb:0 python
 package.use : sys-libs/tevent:0 python
 
 [sys-libs/timezone-data:0]
-package.use : sys-libs/timezone-data:0 -nls -right_timezone
+package.use : sys-libs/timezone-data:0 -leaps_timezone -nls
 
 [sys-libs/zlib:0]
 package.use : sys-libs/zlib:0 minizip static-libs
@@ -7280,7 +7588,7 @@ package.use : sys-process/lsof:0 -examples -rpc -selinux -static ipv6
 package.use : sys-process/numactl:0 static-libs
 
 [sys-process/procps:0]
-package.use : sys-process/procps:0 -nls -selinux -systemd -test ncurses static-libs unicode
+package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test ncurses static-libs
 
 [sys-process/psmisc:0]
 package.use : sys-process/psmisc:0 -nls -selinux X ipv6
@@ -7294,15 +7602,18 @@ package.use : virtual/acl:0 static-libs
 [virtual/ffmpeg:0]
 package.use : virtual/ffmpeg:0 -libav -truetype -vdpau -x264 X encode gsm jpeg2k mp3 opus sdl speex theora threads vaapi
 
+[virtual/fortran:0]
+package.use : virtual/fortran:0 openmp
+
 [virtual/jpeg:0]
 package.use : virtual/jpeg:0 static-libs
 
-[virtual/libmysqlclient:0]
-package.use : virtual/libmysqlclient:0 static-libs
-
 [virtual/libgudev:0]
 package.use : virtual/libgudev:0 -introspection -systemd static-libs
 
+[virtual/libmysqlclient:0]
+package.use : virtual/libmysqlclient:0 static-libs
+
 [virtual/libudev:0]
 package.use : virtual/libudev:0 -systemd static-libs
 
@@ -7313,7 +7624,7 @@ package.use : virtual/libusb:1 -udev
 package.use : virtual/linux-sources:0 -firmware
 
 [virtual/mysql:0]
-package.use : virtual/mysql:0 -embedded -minimal -static static-libs
+package.use : virtual/mysql:0 -embedded -static static-libs
 
 [virtual/notification-daemon:0]
 package.use : virtual/notification-daemon:0 -gnome
@@ -7321,6 +7632,9 @@ package.use : virtual/notification-daemon:0 -gnome
 [virtual/python-imaging:0]
 package.use : virtual/python-imaging:0 jpeg tk
 
+[virtual/rubygems:0]
+package.use : virtual/rubygems:0 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+
 [virtual/service-manager:0]
 package.use : virtual/service-manager:0 -prefix
 
@@ -7377,7 +7691,7 @@ package.use : www-client/lynx:0 -cjk -nls bzip2 gnutls idn ipv6 ssl unicode
 
 [www-client/midori:0]
 package.use : www-client/midori:0 -deprecated -doc -granite -introspection -jit -zeitgeist webkit2
-package.accept_keywords : >=www-client/midori-0.5.8-r1 ~amd64
+package.accept_keywords : =www-client/midori-0.5.10-r99 ~amd64
 
 [www-client/opera:0]
 package.use : www-client/opera:0 -kde -multilib gstreamer gtk
@@ -7602,9 +7916,6 @@ package.use : x11-libs/libXdamage:0 static-libs
 [x11-libs/libXdmcp:0]
 package.use : x11-libs/libXdmcp:0 -doc static-libs
 
-[x11-libs/libXevie:0]
-package.use : x11-libs/libXevie:0 static-libs
-
 [x11-libs/libXext:0]
 package.use : x11-libs/libXext:0 -doc static-libs
 
@@ -7668,6 +7979,9 @@ package.use : x11-libs/libXxf86vm:0 static-libs
 [x11-libs/libast:0]
 package.use : x11-libs/libast:0 cpu_flags_x86_mmx imlib pcre
 
+[x11-libs/libcryptui:0]
+package.use : x11-libs/libcryptui:0 -debug -libnotify introspection
+
 [x11-libs/libdesktop-agnostic:0]
 package.use : x11-libs/libdesktop-agnostic:0 -debug -glade -gnome gconf introspection
 
@@ -7759,7 +8073,7 @@ package.use : x11-libs/vte:0 -debug -python introspection
 package.use : x11-libs/vte:2.90 -debug -glade introspection
 
 [x11-libs/vte:2.91]
-package.use : x11-libs/vte:2.91 -debug -glade introspection vala
+package.use : x11-libs/vte:2.91 -debug -glade crypt introspection vala
 
 [x11-libs/wxGTK:2.8]
 package.use : x11-libs/wxGTK:2.8 -aqua -debug -doc -gnome -gstreamer -pch X odbc opengl sdl tiff
@@ -8020,7 +8334,7 @@ package.use : x11-terms/eterm:0 -escreen -minimal cpu_flags_x86_mmx cpu_flags_x8
 package.use : x11-terms/evilvte:0 -savedconfig
 
 [x11-terms/mlterm:0]
-package.use : x11-terms/mlterm:0 -debug -ibus -libssh2 -m17n-lib -nls -scim -uim -xft bidi gtk static-libs
+package.use : x11-terms/mlterm:0 -cairo -debug -fcitx -ibus -libssh2 -m17n-lib -nls -regis -scim -uim -utempter -xft bidi gtk static-libs
 
 [x11-terms/mrxvt:0]
 package.use : x11-terms/mrxvt:0 -debug -menubar -truetype -utempter jpeg png session xpm
@@ -8107,7 +8421,7 @@ package.use : x11-wm/enlightenment:0 -doc -nls -pango -pulseaudio -xcomposite -x
 package.use : x11-wm/fvwm:0 -debug -doc -gtk2-perl -lock -netpbm -nls -rplay -stroke -truetype bidi perl png readline svg tk vanilla xinerama
 
 [x11-wm/icewm:0]
-package.use : x11-wm/icewm:0 -debug -gnome -minimal -nls -truetype bidi uclibc xinerama
+package.use : x11-wm/icewm:0 -debug -gnome -minimal -nls -truetype -uclibc bidi xinerama
 
 [x11-wm/jwm:0]
 package.use : x11-wm/jwm:0 -debug -truetype bidi jpeg png xinerama xpm
@@ -8140,7 +8454,7 @@ package.use : x11-wm/windowlab:0 -truetype
 package.use : x11-wm/windowmaker:0 -modelock -nls -xrandr gif jpeg png tiff xinerama
 
 [x11-wm/xpra:0]
-package.use : x11-wm/xpra:0 -csc -dec_av -dec_av2 -pulseaudio -server -sound -x264 client clipboard opengl rencode vpx webp
+package.use : x11-wm/xpra:0 -csc -dec_av -dec_av2 -libav -pulseaudio -server -sound -x264 -x265 client clipboard opengl rencode vpx webp
 
 [xfce-base/exo:0]
 package.use : xfce-base/exo:0 -debug