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

[Anthony G. Basile]

commit:     cbcbc7233a2d760ae9117f843d759457d6325a3c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 02:14:52 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 02:14:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=cbcbc723

world.conf: update use flags

 core/etc/grs/world.conf | 248 ++++++++++++++++++++++++------------------------
 1 file changed, 126 insertions(+), 122 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index d75c770..b6164dc 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -104,7 +104,7 @@ package.use : app-admin/testdisk:0 -ewf -ntfs -reiserfs -static jpeg qt4
 package.use : app-admin/tmpwatch:0 -selinux
 
 [app-admin/tripwire:0]
-package.use : app-admin/tripwire:0 -static ssl tools
+package.use : app-admin/tripwire:0 -libressl -static ssl tools
 
 [app-admin/ulogd:0]
 package.use : app-admin/ulogd:0 -doc -json -mysql -nfacct -pcap -postgres -ulog dbi nfct nflog sqlite
@@ -261,7 +261,7 @@ package.use : app-crypt/gcr:0 -debug -test gtk introspection vala
 
 [app-crypt/gnupg:0]
 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.9 ~amd64
+package.accept_keywords : =app-crypt/gnupg-2.1.9-r1 ~amd64
 
 [app-crypt/gpa:0]
 package.use : app-crypt/gpa:0 -nls
@@ -381,13 +381,13 @@ package.use : app-editors/focuswriter:0 -debug
 package.use : app-editors/fte:0 -gpm X slang
 
 [app-editors/gedit-plugins:0]
-package.use : app-editors/gedit-plugins:0 -charmap -terminal -zeitgeist git python
+package.use : app-editors/gedit-plugins:0 -charmap -terminal -vala -zeitgeist git python
 
 [app-editors/gedit:0]
 package.use : app-editors/gedit:0 -test introspection python spell vala
 
 [app-editors/gobby:0]
-package.use : app-editors/gobby:0 -gnome avahi
+package.use : app-editors/gobby:0 -gnome -zeroconf
 
 [app-editors/gvim:0]
 package.use : app-editors/gvim:0 -aqua -debug -gnome -luajit -motif -neXt -netbeans -nls -racket -selinux acl cscope gtk lua perl python ruby session tcl
@@ -464,9 +464,6 @@ package.use : app-emacs/wanderlust:0 -bbdb ssl
 [app-emacs/wikipedia-mode:0]
 package.use : app-emacs/wikipedia-mode:0 -outline-magic
 
-[app-emulation/aranym:0]
-package.use : app-emulation/aranym:0 -usbhost X fullmmu lilo opengl
-
 [app-emulation/cloud-init:0]
 package.use : app-emulation/cloud-init:0 -test
 
@@ -657,7 +654,7 @@ package.use : app-misc/gcstar:0 -gnome -stats -tellico cddb mp3 spell vorbis
 package.use : app-misc/gentoo:0 -nls
 
 [app-misc/geoclue:2.0]
-package.use : app-misc/geoclue:2.0 modemmanager
+package.use : app-misc/geoclue:2.0 -zeroconf introspection modemmanager
 
 [app-misc/gourmet:0]
 package.use : app-misc/gourmet:0 -i18n -ipython -print -sound -web pdf spell
@@ -683,15 +680,9 @@ package.use : app-misc/jq:0 -test
 [app-misc/klavaro:0]
 package.use : app-misc/klavaro:0 static-libs
 
-[app-misc/lcd-stuff:0]
-package.use : app-misc/lcd-stuff:0 -imap -mpd -rss mp3 xml
-
 [app-misc/lcd4linux:0]
 package.use : app-misc/lcd4linux:0 -lcd_devices_X -lcd_devices_beckmannegle -lcd_devices_bwct -lcd_devices_cwlinux -lcd_devices_ea232 -lcd_devices_g15 -lcd_devices_hd44780i2c -lcd_devices_lcd2usb -lcd_devices_lcdlinux -lcd_devices_lcdterm -lcd_devices_ledmatrix -lcd_devices_lph7508 -lcd_devices_luise -lcd_devices_m50530 -lcd_devices_milfordbpk -lcd_devices_noritake -lcd_devices_null -lcd_devices_picolcd -lcd_devices_png -lcd_devices_ppm -lcd_devices_routerboard -lcd_devices_serdisplib -lcd_devices_simplelcd -lcd_devices_t6963 -lcd_devices_trefon -lcd_devices_usbhub -lcd_devices_usblcd -lcd_devices_wincor -mpd -mysql iconv lcd_devices_cfontz lcd_devices_hd44780 lcd_devices_mtxorb lcd_devices_ncurses python
 
-[app-misc/lcdproc:0]
-package.use : app-misc/lcdproc:0 -debug -doc -irman -lcd_devices_cfontzpacket -lcd_devices_cwlinux -lcd_devices_ea65 -lcd_devices_eyeboxone -lcd_devices_g15 -lcd_devices_graphlcd -lcd_devices_icpa106 -lcd_devices_imon -lcd_devices_iowarrior -lcd_devices_lcterm -lcd_devices_md8800 -lcd_devices_ms6931 -lcd_devices_mtcs16209x -lcd_devices_noritakevfd -lcd_devices_picolcd -lcd_devices_pyramid -lcd_devices_sed1330 -lcd_devices_sed1520 -lcd_devices_serialpos -lcd_devices_serialvfd -lcd_devices_sli -lcd_devices_stv5730 -lcd_devices_svga -lcd_devices_t6963 -lcd_devices_tyan -lcd_devices_ula200 -lcd_devices_xosd -lirc -nfs -seamless-hbars -usb joystick lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontz633 lcd_devices_glk lcd_devices_hd44780 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_mtxorb lcd_devices_ncurses lcd_devices_text samba
-
 [app-misc/muttprint:0]
 package.use : app-misc/muttprint:0 -doc
 
@@ -818,15 +809,9 @@ package.use : app-office/ical:0 -test
 [app-office/ledger:0]
 package.use : app-office/ledger:0 -debug -emacs -gnuplot -ofx static-libs vim-syntax xml
 
-[app-office/magicpoint:0]
-package.use : app-office/magicpoint:0 -cjk -doc -emacs -examples -m17n-lib -nls -truetype gif imlib mng
-
 [app-office/orage:0]
 package.use : app-office/orage:0 -debug -xfce_plugins_clock berkdb dbus libnotify
 
-[app-office/passepartout:0]
-package.use : app-office/passepartout:0 -debug -gnome
-
 [app-office/pinpoint:0]
 package.use : app-office/pinpoint:0 gstreamer pdf
 
@@ -981,14 +966,17 @@ package.use : app-text/dvipsk:0 -doc -source
 package.use : app-text/enchant:0 -aspell -zemberek hunspell static-libs
 
 [app-text/evince:0]
-package.use : app-text/evince:0 -debug -djvu -dvi -gnome -libsecret -nautilus -nsplugin -t1lib -xps introspection postscript tiff
+package.use : app-text/evince:0 -debug -djvu -dvi -gnome -gnome-keyring -gstreamer -nautilus -nsplugin -t1lib -xps introspection postscript tiff
 
 [app-text/ghostscript-gpl:0]
-package.use : app-text/ghostscript-gpl:0 -djvu X cups dbus gtk idn static-libs
+package.use : app-text/ghostscript-gpl:0 -djvu -tiff X cups dbus gtk idn static-libs
 
 [app-text/glark:0]
 package.use : app-text/glark:0 -doc -ruby_targets_ruby19 -test -zip ruby_targets_ruby20
 
+[app-text/gspell:0]
+package.use : app-text/gspell:0 -vala introspection
+
 [app-text/gtkspell:3]
 package.use : app-text/gtkspell:3 introspection vala
 
@@ -1149,7 +1137,7 @@ package.use : app-vim/gentoo-syntax:0 -ignore-glep31
 package.use : dev-cpp/atkmm:0 -doc
 
 [dev-cpp/cairomm:0]
-package.use : dev-cpp/cairomm:0 -doc svg
+package.use : dev-cpp/cairomm:0 -aqua -doc X svg
 
 [dev-cpp/clucene:1]
 package.use : dev-cpp/clucene:1 -debug -doc static-libs
@@ -1163,11 +1151,8 @@ package.use : dev-cpp/glibmm:2 -debug -doc -examples -test
 [dev-cpp/gnome-vfsmm:1.1]
 package.use : dev-cpp/gnome-vfsmm:1.1 -doc -examples
 
-[dev-cpp/gstreamermm:0.10]
-package.use : dev-cpp/gstreamermm:0.10 -debug -test
-
-[dev-cpp/gtkglextmm:1.0]
-package.use : dev-cpp/gtkglextmm:1.0 -debug -doc
+[dev-cpp/gstreamermm:1.0]
+package.use : dev-cpp/gstreamermm:1.0 -debug -doc -examples -test
 
 [dev-cpp/gtkmm:2.4]
 package.use : dev-cpp/gtkmm:2.4 -doc -examples -test
@@ -1230,7 +1215,7 @@ package.use : dev-db/libzdb:0 -debug -doc -mysql -postgres -static-libs sqlite s
 package.use : dev-db/maatkit:0 -udf
 
 [dev-db/mariadb:0]
-package.use : dev-db/mariadb:0 -debug -embedded -extraengine -jemalloc -latin1 -libressl -minimal -oqgraph -pam -profiling -selinux -sphinx -static -systemtap -tcmalloc -test -tokudb -yassl bindist odbc openssl perl static-libs xml
+package.use : dev-db/mariadb:0 -debug -embedded -extraengine -jemalloc -latin1 -libressl -oqgraph -pam -profiling -selinux -sphinx -static -systemtap -tcmalloc -test -tokudb -yassl bindist odbc openssl perl server static-libs xml
 
 [dev-db/mysql-super-smack:0]
 package.use : dev-db/mysql-super-smack:0 -postgres mysql
@@ -1241,9 +1226,6 @@ package.use : dev-db/pgadmin3:0 -debug databasedesigner
 [dev-db/postgresql:9.2]
 package.use : dev-db/postgresql:9.2 -doc -kerberos -libressl -nls -pam -pg_legacytimestamp -selinux ldap perl python readline server ssl static-libs tcl threads uuid xml zlib
 
-[dev-db/postgresql:9.4]
-package.use : dev-db/postgresql:9.4 -doc -kerberos -libressl -nls -pam -pg_legacytimestamp -selinux ldap perl python readline server ssl static-libs tcl threads uuid xml zlib
-
 [dev-db/postgresql:9.5]
 package.use : dev-db/postgresql:9.5 -doc -kerberos -libressl -nls -pam -pg_legacytimestamp -selinux ldap perl python readline server ssl static-libs tcl threads uuid xml zlib
 
@@ -1407,7 +1389,7 @@ package.use : dev-libs/bitset:0 -jemalloc -tcmalloc static-libs
 package.use : dev-libs/boost:0 -context -debug -doc -mpi -nls -tools icu python static-libs threads
 
 [dev-libs/botan:0]
-package.use : dev-libs/botan:0 -doc -bindist bzip2 gmp python ssl static-libs threads zlib
+package.use : dev-libs/botan:0 -bindist -doc bzip2 gmp python ssl static-libs threads zlib
 
 [dev-libs/cdk:0]
 package.use : dev-libs/cdk:0 -examples static-libs unicode
@@ -1493,6 +1475,9 @@ package.use : dev-libs/hashit:0 -debug
 [dev-libs/hiredis:0]
 package.use : dev-libs/hiredis:0 static-libs
 
+[dev-libs/hyphen:0]
+package.use : dev-libs/hyphen:0 -static-libs
+
 [dev-libs/icu:0]
 package.use : dev-libs/icu:0 -debug -doc -examples static-libs
 
@@ -1596,7 +1581,7 @@ package.use : dev-libs/libgamin:0 -debug python 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
+package.use : dev-libs/libgdata:0 -debug -gnome-online-accounts -test crypt introspection static-libs vala
 
 [dev-libs/libgee:0]
 package.use : dev-libs/libgee:0 introspection
@@ -1608,7 +1593,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 -gssapi -test -trace ssh threads
+package.use : dev-libs/libgit2:0 -examples -gssapi -libressl -test -trace ssh threads
 
 [dev-libs/libgpg-error:0]
 package.use : dev-libs/libgpg-error:0 -common-lisp -nls static-libs
@@ -1652,9 +1637,6 @@ package.use : dev-libs/libmix:0 static-libs
 [dev-libs/libnatspec:0]
 package.use : dev-libs/libnatspec:0 -doc python
 
-[dev-libs/libnl:1.1]
-package.use : dev-libs/libnl:1.1 -doc static-libs
-
 [dev-libs/libnl:3]
 package.use : dev-libs/libnl:3 python static-libs utils
 
@@ -1786,7 +1768,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 -sctp -test -vanilla asm -bindist cpu_flags_x86_sse2 gmp static-libs tls-heartbeat zlib
+package.use : dev-libs/openssl:0 -bindist -kerberos -rfc3779 -sctp -test -vanilla asm 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
@@ -1986,9 +1968,6 @@ package.use : dev-perl/Crypt-OpenSSL-Random:0 -libressl
 [dev-perl/Crypt-Rijndael:0]
 package.use : dev-perl/Crypt-Rijndael:0 -test
 
-[dev-perl/Crypt-SSLeay:0]
-package.use : dev-perl/Crypt-SSLeay:0 -libressl -test
-
 [dev-perl/Crypt-Simple:0]
 package.use : dev-perl/Crypt-Simple:0 -test
 
@@ -2040,12 +2019,18 @@ package.use : dev-perl/DateTime-TimeZone:0 -test
 [dev-perl/DateTime:0]
 package.use : dev-perl/DateTime:0 -test
 
+[dev-perl/Devel-OverloadInfo:0]
+package.use : dev-perl/Devel-OverloadInfo:0 -test
+
 [dev-perl/Devel-Size:0]
 package.use : dev-perl/Devel-Size:0 -test
 
 [dev-perl/Devel-StackTrace:0]
 package.use : dev-perl/Devel-StackTrace:0 -test
 
+[dev-perl/Devel-Symdump:0]
+package.use : dev-perl/Devel-Symdump:0 -test
+
 [dev-perl/Dist-CheckConflicts:0]
 package.use : dev-perl/Dist-CheckConflicts:0 -test
 
@@ -2061,6 +2046,9 @@ package.use : dev-perl/Email-Send-Gmail:0 -test
 [dev-perl/Email-Send:0]
 package.use : dev-perl/Email-Send:0 -test
 
+[dev-perl/Email-Sender:0]
+package.use : dev-perl/Email-Sender:0 -test
+
 [dev-perl/Email-Simple:0]
 package.use : dev-perl/Email-Simple:0 -test
 
@@ -2073,6 +2061,9 @@ package.use : dev-perl/Error:0 -test
 [dev-perl/Eval-Closure:0]
 package.use : dev-perl/Eval-Closure:0 -minimal -test
 
+[dev-perl/Exception-Class:0]
+package.use : dev-perl/Exception-Class:0 -test
+
 [dev-perl/Exporter-Tiny:0]
 package.use : dev-perl/Exporter-Tiny:0 -test
 
@@ -2109,15 +2100,36 @@ package.use : dev-perl/File-Next:0 -test
 [dev-perl/File-Which:0]
 package.use : dev-perl/File-Which:0 -test
 
+[dev-perl/File-chdir:0]
+package.use : dev-perl/File-chdir:0 -test
+
+[dev-perl/File-chmod:0]
+package.use : dev-perl/File-chmod:0 -test
+
+[dev-perl/FileHandle-Unget:0]
+package.use : dev-perl/FileHandle-Unget:0 -test
+
+[dev-perl/Finance-Quote:0]
+package.use : dev-perl/Finance-Quote:0 -test
+
 [dev-perl/GD:0]
 package.use : dev-perl/GD:0 -animgif -truetype gif jpeg png xpm
 
+[dev-perl/Getopt-Long-Descriptive:0]
+package.use : dev-perl/Getopt-Long-Descriptive:0 -test
+
+[dev-perl/Getopt-Mixed:0]
+package.use : dev-perl/Getopt-Mixed:0 -test
+
 [dev-perl/Gtk2-Ex-PrintDialog:0]
 package.use : dev-perl/Gtk2-Ex-PrintDialog:0 cups
 
 [dev-perl/Gtk2-Notify:0]
 package.use : dev-perl/Gtk2-Notify:0 -test
 
+[dev-perl/HTML-FillInForm:0]
+package.use : dev-perl/HTML-FillInForm:0 -test
+
 [dev-perl/HTML-Format:0]
 package.use : dev-perl/HTML-Format:0 -test
 
@@ -2211,6 +2223,9 @@ package.use : dev-perl/Module-Install:0 -test
 [dev-perl/Module-Manifest:0]
 package.use : dev-perl/Module-Manifest:0 -test
 
+[dev-perl/Module-Runtime-Conflicts:0]
+package.use : dev-perl/Module-Runtime-Conflicts:0 -test
+
 [dev-perl/Module-Runtime:0]
 package.use : dev-perl/Module-Runtime:0 -test
 
@@ -2226,6 +2241,9 @@ package.use : dev-perl/Module-Starter:0 -test
 [dev-perl/Moo:0]
 package.use : dev-perl/Moo:0 -test
 
+[dev-perl/MooX-Types-MooseLike:0]
+package.use : dev-perl/MooX-Types-MooseLike:0 -test
+
 [dev-perl/Moose:0]
 package.use : dev-perl/Moose:0 -test
 
@@ -2304,6 +2322,9 @@ package.use : dev-perl/Spreadsheet-ParseExcel:0 -cjk -test unicode
 [dev-perl/Statistics-Descriptive:0]
 package.use : dev-perl/Statistics-Descriptive:0 -test
 
+[dev-perl/Sub-Identify:0]
+package.use : dev-perl/Sub-Identify:0 -test
+
 [dev-perl/Sub-Install:0]
 package.use : dev-perl/Sub-Install:0 -test
 
@@ -2736,6 +2757,9 @@ package.use : dev-python/greenlet:0 -doc
 [dev-python/gst-python:0.10]
 package.use : dev-python/gst-python:0.10 -examples -test
 
+[dev-python/gst-python:1.0]
+package.use : dev-python/gst-python:1.0 -test
+
 [dev-python/gtkspell-python:0]
 package.use : dev-python/gtkspell-python:0 -doc -examples
 
@@ -2835,6 +2859,9 @@ package.use : dev-python/librsvg-python:0 -examples
 [dev-python/libwnck-python:0]
 package.use : dev-python/libwnck-python:0 -examples
 
+[dev-python/linecache2:0]
+package.use : dev-python/linecache2:0 -test
+
 [dev-python/lockfile:0]
 package.use : dev-python/lockfile:0 -doc -test
 
@@ -2897,7 +2924,6 @@ package.use : dev-python/oauth2:0 -test
 
 [dev-python/oauth2client:0]
 package.use : dev-python/oauth2client:0 -test
-package.accept_keywords : =dev-python/oauth2client-1.5.1 ~amd64
 
 [dev-python/oauthlib:0]
 package.use : dev-python/oauthlib:0 -test
@@ -2995,6 +3021,9 @@ package.use : dev-python/pydns:3 -examples
 [dev-python/pyelftools:0]
 package.use : dev-python/pyelftools:0 -examples
 
+[dev-python/pyenchant:0]
+package.use : dev-python/pyenchant:0 -test
+
 [dev-python/pygame:0]
 package.use : dev-python/pygame:0 -doc -examples -test X
 
@@ -3329,7 +3358,7 @@ package.use : dev-qt/qt3support:4 -aqua -debug -pch accessibility exceptions
 package.use : dev-qt/qtbearer:4 -aqua -connman -debug -networkmanager -pch exceptions
 
 [dev-qt/qtchooser:0]
-package.use : dev-qt/qtchooser:0 -qt5 -test
+package.use : dev-qt/qtchooser:0 -test
 
 [dev-qt/qtconcurrent:5]
 package.use : dev-qt/qtconcurrent:5 -debug -test
@@ -3368,7 +3397,7 @@ package.use : dev-qt/qtlockedfile:0 -doc -qt5 qt4
 package.use : dev-qt/qtmultimedia:4 -aqua -debug -pch alsa exceptions
 
 [dev-qt/qtnetwork:5]
-package.use : dev-qt/qtnetwork:5 -connman -debug -networkmanager -test -bindist ssl
+package.use : dev-qt/qtnetwork:5 -bindist -connman -debug -networkmanager -test ssl
 
 [dev-qt/qtopengl:4]
 package.use : dev-qt/qtopengl:4 -aqua -debug -egl -pch exceptions qt3support
@@ -3554,7 +3583,7 @@ package.use : dev-ruby/rdtool:0 -doc -emacs -ruby_targets_ruby19 -test ruby_targ
 package.use : dev-ruby/rest-client:0 -doc -ruby_targets_ruby19 -test ruby_targets_ruby20
 
 [dev-ruby/rexical:0]
-package.use : dev-ruby/rexical:0 -doc -ruby_targets_ruby19 -ruby_targets_ruby22 -test ruby_targets_ruby20 ruby_targets_ruby21
+package.use : dev-ruby/rexical:0 -doc -ruby_targets_ruby22 -ruby_targets_ruby23 -test ruby_targets_ruby20 ruby_targets_ruby21
 
 [dev-ruby/riel:0]
 package.use : dev-ruby/riel:0 -doc -ruby_targets_ruby19 -test ruby_targets_ruby20
@@ -3787,6 +3816,9 @@ package.use : dev-tex/pgf:0 -doc -source
 [dev-tex/style-check:0]
 package.use : dev-tex/style-check:0 -test
 
+[dev-tex/xcolor:0]
+package.use : dev-tex/xcolor:0 -doc
+
 [dev-texlive/texlive-basic:0]
 package.use : dev-texlive/texlive-basic:0 -doc -source
 
@@ -3871,6 +3903,9 @@ package.use : dev-texlive/texlive-pictures:0 -doc -source
 [dev-texlive/texlive-plainextra:0]
 package.use : dev-texlive/texlive-plainextra:0 -doc -source
 
+[dev-texlive/texlive-publishers:0]
+package.use : dev-texlive/texlive-publishers:0 -doc -source
+
 [dev-util/astyle:0]
 package.use : dev-util/astyle:0 -doc -java static-libs
 
@@ -3881,8 +3916,8 @@ package.use : dev-util/bam:0 -doc -test
 package.use : dev-util/boost-build:0 -examples -test python
 
 [dev-util/cccc:0]
-package.use : dev-util/cccc:0 -doc
-package.accept_keywords : dev-util/cccc ~amd64
+package.use : dev-util/cccc:0 -apidoc -debug -doc -mfc
+package.accept_keywords : =dev-util/cccc-3.1.5 ~amd64
 
 [dev-util/cdecl:0]
 package.use : dev-util/cdecl:0 readline
@@ -3999,7 +4034,7 @@ package.use : dev-util/valgrind:0 -mpi
 package.use : dev-util/wiggle:0 -test
 
 [dev-util/xxdiff:0]
-package.accept_keywords : >=dev-util/xxdiff-4.0_beta1_p20110426-r1 ~amd64
+package.accept_keywords : =dev-util/xxdiff-4.0_beta1_p20110426-r1 ~amd64
 
 [dev-vcs/cssc:0]
 package.use : dev-vcs/cssc:0 -test -valgrind
@@ -4107,7 +4142,7 @@ package.use : games-arcade/monkey-bubble:0 -debug
 package.use : games-arcade/slimevolley:0 -net
 
 [games-arcade/supertux:0]
-package.use : games-arcade/supertux:0 opengl
+package.use : games-arcade/supertux:0 -debug
 
 [games-arcade/xbill:0]
 package.use : games-arcade/xbill:0 gtk
@@ -4197,7 +4232,7 @@ package.use : games-emulation/dosbox:0 -debug alsa hardened opengl
 package.use : games-emulation/fakenes:0 openal opengl zlib
 
 [games-emulation/fceux:0]
-package.use : games-emulation/fceux:0 gtk lua opengl
+package.use : games-emulation/fceux:0 -logo gtk lua opengl
 
 [games-emulation/gambatte:0]
 package.use : games-emulation/gambatte:0 qt4 sdl
@@ -4239,7 +4274,7 @@ package.use : games-engines/scummvm:0 -debug -fluidsynth -mpeg2 -truetype -unsup
 package.use : games-engines/solarus:0 -doc -luajit
 
 [games-fps/alienarena:0]
-package.use : games-fps/alienarena:0 -dedicated dga vidmode
+package.use : games-fps/alienarena:0 -dedicated dga vidmode zlib
 
 [games-fps/doom-data:0]
 package.use : games-fps/doom-data:0 -doomsday
@@ -4389,7 +4424,7 @@ package.use : games-rpg/drascula:0 sound
 package.use : games-rpg/dreamweb:0 -doc
 
 [games-rpg/freedroidrpg:0]
-package.use : games-rpg/freedroidrpg:0 opengl vorbis
+package.use : games-rpg/freedroidrpg:0 -sound nls opengl
 
 [games-rpg/kqlives:0]
 package.use : games-rpg/kqlives:0 -cheats -nls
@@ -4521,7 +4556,7 @@ package.use : gnome-base/gnome-vfs:2 -kerberos -libressl -test -zeroconf acl gnu
 package.use : gnome-base/gsettings-desktop-schemas:0 introspection
 
 [gnome-base/gvfs:0]
-package.use : gnome-base/gvfs:0 -afp -archive -bluray -fuse -gnome-keyring -gnome-online-accounts -gphoto2 -nfs -systemd -test -udisks cdda gtk http ios mtp samba udev zeroconf
+package.use : gnome-base/gvfs:0 -afp -archive -bluray -fuse -gnome-keyring -gnome-online-accounts -google -gphoto2 -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
@@ -4557,14 +4592,11 @@ package.use : gnome-base/orbit:2 -debug -test pic static-libs
 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
+package.use : gnome-extra/evolution-data-server:0 -api-doc-extras -kerberos -test berkdb 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
-
 [gnome-extra/gnome-commander:0]
 package.use : gnome-extra/gnome-commander:0 -chm -debug -doc -gsf exif pdf python taglib
 
@@ -4617,7 +4649,7 @@ package.use : mail-client/geary:0 -nls
 package.use : mail-client/mail-notification:0 -sylpheed gnome-keyring sasl sound ssl
 
 [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
+package.use : mail-client/mutt:0 -debug -doc -gnutls -gpg -imap -kerberos -libressl -nls -pop -qdbm -selinux -sidebar -smime -smtp -tokyocabinet berkdb crypt gdbm idn mbox nntp sasl slang ssl
 
 [mail-client/nail:0]
 package.use : mail-client/nail:0 -kerberos -net ssl
@@ -4668,7 +4700,7 @@ package.use : mail-filter/spamprobe:0 berkdb gif jpeg png
 package.use : mail-filter/sqlgrey:0 -mysql -postgres sqlite
 
 [mail-mta/postfix:0]
-package.use : mail-mta/postfix:0 -doc -dovecot-sasl -ldap-bind -lmdb -memcached -mysql -nis -pam -postgres -selinux -vda berkdb cdb eai hardened ldap mbox sasl sqlite ssl
+package.use : mail-mta/postfix:0 -doc -dovecot-sasl -ldap-bind -libressl -lmdb -memcached -mysql -nis -pam -postgres -selinux -vda berkdb cdb eai hardened ldap mbox sasl sqlite ssl
 
 [mate-base/mate-desktop:0]
 package.use : mate-base/mate-desktop:0 -debug X startup-notification
@@ -4974,7 +5006,7 @@ package.use : media-gfx/eog-plugins:0 -map exif flickr picasa python
 package.use : media-gfx/eog:1 -debug exif introspection jpeg lcms svg tiff xmp
 
 [media-gfx/exiv2:0]
-package.use : media-gfx/exiv2:0 -contrib -doc -examples -nls static-libs xmp zlib
+package.use : media-gfx/exiv2:0 -doc -examples -nls -png -webready xmp
 
 [media-gfx/feh:0]
 package.use : media-gfx/feh:0 -debug -test curl exif xinerama
@@ -5138,20 +5170,17 @@ package.use : media-libs/blib:0 aalib directfb gtk
 [media-libs/celt:0]
 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
+package.use : media-libs/clutter-gst:3.0 -debug -examples -udev X introspection
 
 [media-libs/clutter-gtk:1.0]
-package.use : media-libs/clutter-gtk:1.0 -debug -examples introspection
+package.use : media-libs/clutter-gtk:1.0 -debug -examples -wayland X gtk introspection
 
 [media-libs/clutter:1.0]
 package.use : media-libs/clutter:1.0 -aqua -debug -doc -egl -test -wayland X gtk introspection
 
 [media-libs/cogl:1.0]
-package.use : media-libs/cogl:1.0 -debug -examples -gles2 -gstreamer -test -wayland introspection kms opengl pango
+package.use : media-libs/cogl:1.0 -debug -examples -gles2 -gstreamer -test -video_cards_fglrx -wayland introspection kms opengl pango
 
 [media-libs/ctl:0]
 package.use : media-libs/ctl:0 static-libs
@@ -5202,7 +5231,7 @@ package.use : media-libs/freeverb3:0 -audacious -cpu_flags_x86_3dnow -cpu_flags_
 package.use : media-libs/ftgl:0 static-libs
 
 [media-libs/gd:2]
-package.use : media-libs/gd:2 -truetype -webp fontconfig jpeg png static-libs xpm zlib
+package.use : media-libs/gd:2 -tiff -truetype -webp fontconfig jpeg png static-libs xpm zlib
 
 [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
@@ -5235,7 +5264,7 @@ package.use : media-libs/gsound:0 introspection
 package.use : media-libs/gst-plugins-bad:0.10 -nls -orc
 
 [media-libs/gst-plugins-bad:1.0]
-package.use : media-libs/gst-plugins-bad:1.0 -egl -gles2 -nls -orc -vnc -wayland X introspection opengl
+package.use : media-libs/gst-plugins-bad:1.0 -egl -gles2 -gtk -nls -orc -test -vcd -vnc -wayland X introspection opengl
 
 [media-libs/gst-plugins-base:0.10]
 package.use : media-libs/gst-plugins-base:0.10 -nls -orc introspection
@@ -5255,8 +5284,8 @@ package.use : media-libs/gst-plugins-ugly:0.10 -nls -orc
 [media-libs/gst-plugins-ugly:1.0]
 package.use : media-libs/gst-plugins-ugly:1.0 -nls -orc
 
-[media-libs/gst-rtsp-server:0.10]
-package.use : media-libs/gst-rtsp-server:0.10 -examples -nls -test introspection python static-libs vala
+[media-libs/gst-rtsp-server:1.0]
+package.use : media-libs/gst-rtsp-server:1.0 -examples -static-libs -test introspection nls
 
 [media-libs/gstreamer-editing-services:1.0]
 package.use : media-libs/gstreamer-editing-services:1.0 introspection
@@ -5265,7 +5294,7 @@ package.use : media-libs/gstreamer-editing-services:1.0 introspection
 package.use : media-libs/gstreamer:0.10 -nls -orc -test introspection
 
 [media-libs/gstreamer:1.0]
-package.use : media-libs/gstreamer:1.0 -nls -orc -test introspection
+package.use : media-libs/gstreamer:1.0 -nls -orc -test caps introspection
 
 [media-libs/guilib:0]
 package.use : media-libs/guilib:0 static-libs
@@ -5655,7 +5684,7 @@ package.use : media-libs/tiff:0 -test cxx jbig jpeg lzma static-libs zlib
 package.use : media-libs/tse3:0 alsa oss
 
 [media-libs/vamp-plugin-sdk:0]
-package.use : media-libs/vamp-plugin-sdk:0 -doc
+package.use : media-libs/vamp-plugin-sdk:0 -doc -static-libs
 
 [media-libs/vo-aacenc:0]
 package.use : media-libs/vo-aacenc:0 -examples -neon static-libs
@@ -5667,7 +5696,7 @@ package.use : media-libs/vo-amrwbenc:0 -examples static-libs
 package.use : media-libs/x264:0 -10bit -opencl cpu_flags_x86_sse interlaced pic static-libs threads
 
 [media-libs/x265:0]
-package.use : media-libs/x265:0 -test 10bit
+package.use : media-libs/x265:0 -12bit -numa -pic -test 10bit
 
 [media-libs/xvid:0]
 package.use : media-libs/xvid:0 -examples pic threads
@@ -5742,7 +5771,7 @@ package.use : media-plugins/gst-plugins-libav:1.0 -libav -orc
 package.use : media-plugins/gst-plugins-meta:0.10 -http -pulseaudio -x264 X a52 aac alsa cdda dts dv dvb dvd ffmpeg flac jack lame libass libvisual mms modplug mp3 mpeg musepack ogg opus oss taglib theora v4l vcd vorbis vpx wavpack xv xvid
 
 [media-plugins/gst-plugins-meta:1.0]
-package.use : media-plugins/gst-plugins-meta:1.0 -http -pulseaudio -x264 X a52 aac alsa cdda dts dv dvb dvd ffmpeg flac jack lame libass libvisual mms mp3 mpeg ogg opus oss taglib theora v4l vcd vorbis vpx wavpack
+package.use : media-plugins/gst-plugins-meta:1.0 -http -modplug -pulseaudio -vaapi -x264 X a52 aac alsa cdda dts dv dvb dvd ffmpeg flac jack lame libass libvisual mms mp3 mpeg ogg opus oss taglib theora v4l vcd vorbis vpx wavpack
 
 [media-plugins/gst-plugins-v4l2:0.10]
 package.use : media-plugins/gst-plugins-v4l2:0.10 -udev
@@ -5855,9 +5884,6 @@ package.use : media-sound/gnaural:0 -nls
 [media-sound/gnomad:0]
 package.use : media-sound/gnomad:0 -nls
 
-[media-sound/gnomoradio:0]
-package.use : media-sound/gnomoradio:0 vorbis
-
 [media-sound/gnump3d:0]
 package.use : media-sound/gnump3d:0 -sox
 
@@ -5883,7 +5909,7 @@ package.use : media-sound/jack-rack:0 -gnome -lash alsa xml
 package.use : media-sound/jokosher:0 -gnome
 
 [media-sound/lame:0]
-package.use : media-sound/lame:0 -cpu_flags_x86_mmx -debug -mp3rtp -sndfile static-libs
+package.use : media-sound/lame:0 -cpu_flags_x86_mmx -debug -mp3rtp -sndfile frontend static-libs
 
 [media-sound/lastfmplayer:0]
 package.use : media-sound/lastfmplayer:0 -ipod dbus
@@ -5897,9 +5923,6 @@ package.use : media-sound/mangler:0 -espeak -g15 -pulseaudio alsa gsm opus oss s
 [media-sound/mhwaveedit:0]
 package.use : media-sound/mhwaveedit:0 -libsamplerate -nls -pulseaudio -sndfile -sox alsa jack ladspa oss sdl
 
-[media-sound/miniaudicle:0]
-package.use : media-sound/miniaudicle:0 alsa jack oss
-
 [media-sound/mixxx:0]
 package.use : media-sound/mixxx:0 -debug -doc -pulseaudio -shout aac mp3 wavpack
 
@@ -5973,7 +5996,7 @@ package.use : media-sound/qtscrobbler:0 cli qt4
 package.use : media-sound/rezound:0 -16bittmp -alsa -flac -jack -oss -portaudio -soundtouch -vorbis nls
 
 [media-sound/rhythmbox:0]
-package.use : media-sound/rhythmbox:0 -cdr -daap -html -ipod -lirc -nsplugin -test -upnp-av -visualizer -zeitgeist dbus libnotify libsecret mtp python udev webkit
+package.use : media-sound/rhythmbox:0 -cdr -daap -gnome-keyring -ipod -lirc -nsplugin -test -upnp-av -visualizer -zeitgeist dbus libnotify mtp python udev
 
 [media-sound/ripperx:0]
 package.use : media-sound/ripperx:0 -nls
@@ -6063,7 +6086,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 -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
+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 -libressl -librtmp -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -neon -openssl -pulseaudio -snappy -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_sidxindex fftools_trasher fontconfig gme gnutls gpl gsm hardcoded-tables iconv iec61883 ieee1394 jack jpeg2k ladspa libass libcaca libv4l lzma modplug mp3 network o
 penal opengl opus oss pic postproc quvi 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
@@ -6105,7 +6128,7 @@ package.use : media-video/rtmpdump:0 -polarssl gnutls ssl
 package.use : media-video/smplayer:0 -autoshutdown -debug bidi
 
 [media-video/subtitleeditor:0]
-package.use : media-video/subtitleeditor:0 -debug -nls opengl
+package.use : media-video/subtitleeditor:0 -debug -nls
 
 [media-video/transcode:0]
 package.use : media-video/transcode:0 -altivec -cpu_flags_x86_3dnow -imagemagick -mjpeg -nuv -pic -truetype -x264 X a52 aac alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dv dvd iconv jpeg lzo mp3 mpeg ogg oss postproc quicktime sdl theora v4l vorbis xml xvid
@@ -6417,7 +6440,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 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
@@ -6546,7 +6569,7 @@ package.use : net-libs/librsync:0 static-libs
 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
+package.use : net-libs/libsoup:2.4 -debug -test -vala introspection samba ssl
 
 [net-libs/libssh2:0]
 package.use : net-libs/libssh2:0 -gcrypt -static-libs -test zlib
@@ -6570,7 +6593,7 @@ package.use : net-libs/neon:0 -doc -expat -kerberos -libproxy -nls gnutls pkcs11
 package.use : net-libs/net6:0 -nls static-libs
 
 [net-libs/obby:0]
-package.use : net-libs/obby:0 -nls avahi ipv6 static-libs
+package.use : net-libs/obby:0 -nls -zeroconf ipv6 static-libs
 
 [net-libs/rest:0.7]
 package.use : net-libs/rest:0.7 -test gnome introspection
@@ -6594,7 +6617,7 @@ package.use : net-libs/webkit-gtk:2 -aqua -coverage -debug -gles2 -jit -libsecre
 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
+package.use : net-libs/webkit-gtk:4 -aqua -coverage -doc -gles2 -gnome-keyring -jit -nsplugin -spell -test -wayland X egl geoloc gstreamer introspection opengl webgl
 
 [net-libs/wt:0]
 package.use : net-libs/wt:0 -doc -fcgi -graphicsmagick -mysql -postgres -resources -test extjs pdf server sqlite ssl zlib
@@ -6759,7 +6782,7 @@ package.use : net-misc/omniORB:0 -doc ssl static-libs
 package.use : net-misc/openntpd:0 -selinux
 
 [net-misc/openssh:0]
-package.use : net-misc/openssh:0 -X509 -debug -kerberos -ldns -libedit -libressl -pam -sctp -selinux -ssh1 -static X -bindist hpn ldap pie skey ssl
+package.use : net-misc/openssh:0 -X509 -bindist -debug -kerberos -ldns -libedit -libressl -pam -sctp -selinux -ssh1 -static X hpn ldap pie skey ssl
 
 [net-misc/pen:0]
 package.use : net-misc/pen:0 geoip ssl
@@ -6798,7 +6821,7 @@ package.use : net-misc/siproxd:0 -doc -examples -static
 package.use : net-misc/sitecopy:0 -expat -nls -rsh -webdav ssl xml zlib
 
 [net-misc/sobby:0]
-package.use : net-misc/sobby:0 avahi
+package.use : net-misc/sobby:0 -zeroconf
 
 [net-misc/sslh:0]
 package.use : net-misc/sslh:0 -caps tcpd
@@ -6822,7 +6845,7 @@ package.use : net-misc/suite3270:0 -cjk -doc X ncurses ssl tcl
 package.use : net-misc/tightvnc:0 -java server tcpd
 
 [net-misc/tor:0]
-package.use : net-misc/tor:0 -bufferevents -nat-pmp -scrypt -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web seccomp upnp
+package.use : net-misc/tor:0 -bufferevents -libressl -scrypt -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web seccomp
 
 [net-misc/vinagre:0]
 package.use : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
@@ -6932,9 +6955,6 @@ package.use : net-proxy/bfilter:0 -debug X
 [net-proxy/c-icap:0]
 package.use : net-proxy/c-icap:0 berkdb ipv6 ldap
 
-[net-proxy/dansguardian:0]
-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 -pcre-jit -tools crypt pcre ssl vim-syntax zlib
 
@@ -6966,7 +6986,7 @@ package.use : net-voip/homer:0 -pulseaudio
 package.use : net-wireless/aircrack-ng:0 airdrop-ng airgraph-ng netlink pcre sqlite unstable
 
 [net-wireless/bluez:0]
-package.use : net-wireless/bluez:0 -debug -selinux -systemd -test cups obex readline udev
+package.use : net-wireless/bluez:0 -debug -doc -extra-tools -selinux -systemd -test -test-programs cups obex readline udev
 
 [net-wireless/gnome-bluetooth:2]
 package.use : net-wireless/gnome-bluetooth:2 -debug introspection
@@ -6990,7 +7010,7 @@ package.use : net-wireless/wepattack:0 -john
 package.use : net-wireless/wireless-tools:0 -multicall
 
 [net-wireless/wpa_supplicant:0]
-package.use : net-wireless/wpa_supplicant:0 -fasteap -ps3 -selinux ap dbus eap-sim gnutls hs2-0 p2p qt4 readline smartcard ssl tdls uncommon-eap-types wimax wps
+package.use : net-wireless/wpa_supplicant:0 -fasteap -libressl -ps3 -qt5 -selinux -wimax ap dbus eap-sim gnutls hs2-0 p2p qt4 readline smartcard ssl tdls uncommon-eap-types wps
 
 [perl-core/libnet:0]
 package.use : perl-core/libnet:0 sasl
@@ -7117,7 +7137,6 @@ package.use : sci-electronics/geda:0 -debug -doc -examples -nls -stroke threads
 
 [sci-electronics/gtkwave:0]
 package.use : sci-electronics/gtkwave:0 -doc -examples -fasttree -fatlines -judy -packed lzma tcl
-package.accept_keywords : =sci-electronics/gtkwave-3.3.68 ??
 
 [sci-electronics/iverilog:0]
 package.use : sci-electronics/iverilog:0 -examples
@@ -7360,7 +7379,7 @@ package.use : sys-apps/less:0 pcre unicode
 package.use : sys-apps/lm_sensors:0 -sensord static-libs
 
 [sys-apps/man-db:0]
-package.use : sys-apps/man-db:0 -nls -selinux berkdb gdbm static-libs zlib
+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 nls
@@ -7511,7 +7530,7 @@ package.use : sys-devel/bc:0 -libedit -static readline
 package.use : sys-devel/binutils:0 -multislot -multitarget -nls -test -vanilla cxx static-libs zlib
 
 [sys-devel/bison:0]
-package.use : sys-devel/bison:0 -nls -static
+package.use : sys-devel/bison:0 -examples -nls -static -test
 
 [sys-devel/flex:0]
 package.use : sys-devel/flex:0 -nls -static -test
@@ -7520,7 +7539,7 @@ package.use : sys-devel/flex:0 -nls -static -test
 package.use : sys-devel/gcc:4.9 -altivec -awt -cilk -debug -doc -fixed-point -go -libssp -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
+package.use : sys-devel/gdb:0 -expat -multitarget -nls -test -vanilla client lzma python server
 
 [sys-devel/gettext:0]
 package.use : sys-devel/gettext:0 -cvs -doc -emacs -java -nls acl cxx git ncurses openmp static-libs
@@ -7603,8 +7622,8 @@ package.use : sys-fs/sysfsutils:0 static-libs
 [sys-kernel/genkernel:0]
 package.use : sys-kernel/genkernel:0 -cryptsetup -ibm -selinux
 
-[sys-kernel/gentoo-sources:4.1.12]
-package.use : sys-kernel/gentoo-sources:4.1.12 -build -experimental -kdbus -symlink
+[sys-kernel/gentoo-sources:4.1.15-r1]
+package.use : sys-kernel/gentoo-sources:4.1.15-r1 -build -experimental -kdbus -symlink
 
 [sys-kernel/linux-firmware:0]
 package.use : sys-kernel/linux-firmware:0 -savedconfig
@@ -7645,9 +7664,6 @@ package.use : sys-libs/libieee1284:0 -doc python static-libs
 [sys-libs/libkudzu:0]
 package.use : sys-libs/libkudzu:0 zlib
 
-[sys-libs/libmath++:1]
-package.use : sys-libs/libmath++:1 -doc static-libs
-
 [sys-libs/libraw1394:0]
 package.use : sys-libs/libraw1394:0 static-libs
 
@@ -7723,9 +7739,6 @@ package.use : sys-process/latencytop:0 gtk unicode
 [sys-process/lsof:0]
 package.use : sys-process/lsof:0 -examples -rpc -selinux -static ipv6
 
-[sys-process/numactl:0]
-package.use : sys-process/numactl:0 static-libs
-
 [sys-process/procps:0]
 package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test ncurses static-libs unicode
 
@@ -7836,7 +7849,7 @@ package.use : www-client/opera:0 -kde -multilib gstreamer gtk
 package.use : www-client/pybugz:0 -zsh-completion
 
 [www-client/qupzilla:0]
-package.use : www-client/qupzilla:0 -debug -kde -nonblockdialogs -qt5 dbus gnome-keyring qt4
+package.use : www-client/qupzilla:0 -debug -kde -libressl -nonblockdialogs -qt5 dbus gnome-keyring qt4
 
 [www-client/surf:0]
 package.use : www-client/surf:0 -savedconfig
@@ -7844,9 +7857,6 @@ package.use : www-client/surf:0 -savedconfig
 [www-client/uget:0]
 package.use : www-client/uget:0 -aria2 -gstreamer -hide-temp-files -nls curl libnotify
 
-[www-client/uzbl:0]
-package.use : www-client/uzbl:0 -helpers browser gtk3 tabbed vim-syntax
-
 [www-client/vimb:0]
 package.use : www-client/vimb:0 gtk3
 
@@ -8129,9 +8139,6 @@ package.use : x11-libs/libnotify:0 -test introspection
 [x11-libs/libpciaccess:0]
 package.use : x11-libs/libpciaccess:0 static-libs zlib
 
-[x11-libs/libsexy:0]
-package.use : x11-libs/libsexy:0 -doc static-libs
-
 [x11-libs/libva-intel-driver:0]
 package.use : x11-libs/libva-intel-driver:0 -wayland X drm
 
@@ -8139,7 +8146,7 @@ package.use : x11-libs/libva-intel-driver:0 -wayland X drm
 package.use : x11-libs/libva-vdpau-driver:0 -debug opengl
 
 [x11-libs/libva:0]
-package.use : x11-libs/libva:0 -egl -vdpau -video_cards_dummy -video_cards_fglrx -video_cards_nvidia -wayland X drm opengl video_cards_intel
+package.use : x11-libs/libva:0 -egl -vdpau -video_cards_dummy -video_cards_fglrx -video_cards_nvidia -wayland X drm opengl video_cards_intel video_cards_nouveau
 
 [x11-libs/libvdpau:0]
 package.use : x11-libs/libvdpau:0 -doc -test dri
@@ -8240,9 +8247,6 @@ package.use : x11-libs/xpyb:0 -selinux static-libs
 [x11-libs/xtrans:0]
 package.use : x11-libs/xtrans:0 -doc
 
-[x11-misc/bmpanel:0]
-package.use : x11-misc/bmpanel:0 -debug -libev -libevent
-
 [x11-misc/compton:0]
 package.use : x11-misc/compton:0 dbus drm opengl pcre xinerama
 
@@ -8583,7 +8587,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 -cups -dec_av2 -libav -pulseaudio -server -sound -x264 -x265 client clipboard opengl 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
@@ -8598,7 +8602,7 @@ package.use : xfce-base/libxfce4ui:0 -debug gtk3 startup-notification
 package.use : xfce-base/libxfce4util:0 -debug
 
 [xfce-base/libxfcegui4:0]
-package.use : xfce-base/libxfcegui4:0 -glade startup-notification
+package.use : xfce-base/libxfcegui4:0 startup-notification
 
 [xfce-base/thunar:0]
 package.use : xfce-base/thunar:0 -debug -test -udisks dbus exif libnotify pcre xfce_plugins_trash