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

[Anthony G. Basile]

commit:     c04c1862e830312739b04d7a530bc33ed52c14c5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 23:00:00 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 23:00:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=c04c1862

world.conf: update

 core/etc/grs/world.conf | 921 +++---------------------------------------------
 1 file changed, 49 insertions(+), 872 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index d4bb482..4508490 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -7377,26 +7377,17 @@ package.use : sys-apps/acl:0 -nls static-libs
 [sys-apps/attr:0]
 package.use : sys-apps/attr:0 -nls static-libs
 
-[sys-apps/audio-entropyd:0]
-package.use : sys-apps/audio-entropyd:0 -selinux
-
-[sys-apps/bar:0]
-package.use : sys-apps/bar:0 -doc
-
 [sys-apps/baselayout:0]
 package.use : sys-apps/baselayout:0 -build
 
-[sys-apps/bleachbit:0]
-package.use : sys-apps/bleachbit:0 -nls gtk
-
 [sys-apps/busybox:0]
 package.use : sys-apps/busybox:0 -debug -livecd -make-symlinks -mdev -pam -savedconfig -selinux -sep-usr -static -systemd ipv6 math syslog
 
 [sys-apps/coreutils:0]
-package.use : sys-apps/coreutils:0 -multicall -nls -selinux -static -vanilla acl caps gmp xattr
+package.use : sys-apps/coreutils:0 -hostname -kill -multicall -nls -selinux -static -vanilla acl caps gmp xattr
 
 [sys-apps/dbus:0]
-package.use : sys-apps/dbus:0 -debug -doc -selinux -systemd -test -user-session X static-libs
+package.use : sys-apps/dbus:0 -debug -doc -elogind -selinux -systemd -test -user-session X static-libs
 
 [sys-apps/debianutils:0]
 package.use : sys-apps/debianutils:0 -static
@@ -7404,41 +7395,17 @@ package.use : sys-apps/debianutils:0 -static
 [sys-apps/diffutils:0]
 package.use : sys-apps/diffutils:0 -nls -static
 
-[sys-apps/dmidecode:0]
-package.use : sys-apps/dmidecode:0 -selinux
-
-[sys-apps/dnotify:0]
-package.use : sys-apps/dnotify:0 -nls
-
-[sys-apps/dstat:0]
-package.use : sys-apps/dstat:0 -wifi
-
-[sys-apps/edac-utils:0]
-package.use : sys-apps/edac-utils:0 -debug
-
 [sys-apps/elfix:0]
 package.use : sys-apps/elfix:0 -ptpax xtpax
 
-[sys-apps/etckeeper:0]
-package.use : sys-apps/etckeeper:0 -bazaar -cron
-
-[sys-apps/fbset:0]
-package.use : sys-apps/fbset:0 -static
-
 [sys-apps/file:0]
 package.use : sys-apps/file:0 -python static-libs zlib
 
 [sys-apps/findutils:0]
-package.use : sys-apps/findutils:0 -debug -nls -selinux -static -test
-
-[sys-apps/flashrom:0]
-package.use : sys-apps/flashrom:0 -atahpt -ft2232_spi -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv -static -tools -usbblaster bitbang_spi buspirate_spi dediprog drkaiser dummy gfxnvidia internal linux_spi nicintel nicintel_spi ogp_spi pony_spi satasii serprog wiki
+package.use : sys-apps/findutils:0 -nls -selinux -static -test
 
 [sys-apps/gawk:0]
-package.use : sys-apps/gawk:0 -nls readline
-
-[sys-apps/gptfdisk:0]
-package.use : sys-apps/gptfdisk:0 -static ncurses
+package.use : sys-apps/gawk:0 -mpfr -nls readline
 
 [sys-apps/gradm:0]
 package.use : sys-apps/gradm:0 -pam
@@ -7564,9 +7531,6 @@ package.use : sys-apps/sed:0 -nls -selinux -static acl
 [sys-apps/shadow:0]
 package.use : sys-apps/shadow:0 -audit -nls -pam -selinux acl cracklib skey xattr
 
-[sys-apps/smartmontools:0]
-package.use : sys-apps/smartmontools:0 -minimal -selinux -static caps
-
 [sys-apps/sysvinit:0]
 package.use : sys-apps/sysvinit:0 -ibm -selinux -static
 
@@ -7576,80 +7540,26 @@ package.use : sys-apps/tcp-wrappers:0 -netgroups ipv6 static-libs
 [sys-apps/texinfo:0]
 package.use : sys-apps/texinfo:0 -nls -static
 
-[sys-apps/the_silver_searcher:0]
-package.use : sys-apps/the_silver_searcher:0 lzma zlib
-
-[sys-apps/timer_entropyd:0]
-package.use : sys-apps/timer_entropyd:0 -debug -selinux
-
-[sys-apps/tuxonice-userui:0]
-package.use : sys-apps/tuxonice-userui:0 -fbsplash
-
-[sys-apps/ucspi-tcp:0]
-package.use : sys-apps/ucspi-tcp:0 -qmail-spp -selinux
-
-[sys-apps/usb_modeswitch:0]
-package.use : sys-apps/usb_modeswitch:0 -jimtcl
-
-[sys-apps/usbutils:0]
-package.use : sys-apps/usbutils:0 python
-
-[sys-apps/usermode-utilities:0]
-package.use : sys-apps/usermode-utilities:0 -fuse
-
 [sys-apps/util-linux:0]
-package.use : sys-apps/util-linux:0 -build -fdformat -nls -pam -selinux -systemd -test -tty-helpers -udev caps cramfs ncurses python slang static-libs suid unicode
-
-[sys-apps/watchdog:0]
-package.use : sys-apps/watchdog:0 -nfs
+package.use : sys-apps/util-linux:0 -build -fdformat -kill -nls -pam -selinux -systemd -test -tty-helpers -udev caps cramfs ncurses python readline slang static-libs suid unicode
 
 [sys-apps/xinetd:0]
 package.use : sys-apps/xinetd:0 -rpc perl tcpd
 
-[sys-apps/xmbmon:0]
-package.use : sys-apps/xmbmon:0 X
-
 [sys-auth/skey:0]
 package.use : sys-auth/skey:0 static-libs
 
-[sys-block/fio:0]
-package.use : sys-block/fio:0 -aio -glusterfs -gnuplot -gtk -numa -rbd -rdma -static zlib
-
-[sys-block/mbuffer:0]
-package.use : sys-block/mbuffer:0 -debug ssl
-
-[sys-block/nbd:0]
-package.use : sys-block/nbd:0 -debug zlib
-
 [sys-boot/lilo:0]
 package.use : sys-boot/lilo:0 -device-mapper -minimal -pxeserial -static
 
-[sys-boot/mbr:0]
-package.use : sys-boot/mbr:0 -test
-
-[sys-boot/syslinux:0]
-package.use : sys-boot/syslinux:0 -custom-cflags
-
-[sys-cluster/csync2:0]
-package.use : sys-cluster/csync2:0 mysql postgres sqlite ssl xinetd
-
-[sys-cluster/ipvsadm:0]
-package.use : sys-cluster/ipvsadm:0 static-libs
-
-[sys-cluster/keepalived:0]
-package.use : sys-cluster/keepalived:0 -debug -snmp ipv6
-
 [sys-devel/autoconf:2.5]
 package.use : sys-devel/autoconf:2.5 -emacs
 
-[sys-devel/autogen:0]
-package.use : sys-devel/autogen:0 -libopts static-libs
-
 [sys-devel/bc:0]
 package.use : sys-devel/bc:0 -libedit -static readline
 
-[sys-devel/binutils:2.25.1]
-package.use : sys-devel/binutils:2.25.1 -multislot -multitarget -nls -static-libs -test -vanilla cxx zlib
+[sys-devel/binutils:2.28.1]
+package.use : sys-devel/binutils:2.28.1 -multitarget -static-libs -test -vanilla cxx nls
 
 [sys-devel/bison:0]
 package.use : sys-devel/bison:0 -examples -nls -static -test
@@ -7657,11 +7567,11 @@ package.use : sys-devel/bison:0 -examples -nls -static -test
 [sys-devel/flex:0]
 package.use : sys-devel/flex:0 -nls -static -test
 
-[sys-devel/gcc:4.9.3]
-package.use : sys-devel/gcc:4.9.3 -altivec -awt -cilk -debug -doc -fixed-point -go -libssp -multilib -multislot -nls -nopie -nossp -regression-test -sanitize -vanilla -vtv cxx fortran gcj graphite hardened nptl objc objc++ objc-gc openmp
+[sys-devel/gcc:5.4.0]
+package.use : sys-devel/gcc:5.4.0 -altivec -awt -cilk -debug -doc -fixed-point -fortran -gcj -go -graphite -jit -libssp -mpx -multilib -nopie -nossp -objc -objc++ -objc-gc -pgo -regression-test -sanitize -vanilla cxx hardened nls nptl openmp vtv
 
 [sys-devel/gdb:0]
-package.use : sys-devel/gdb:0 -expat -multitarget -nls -test -vanilla client lzma python server
+package.use : sys-devel/gdb:0 -multitarget -nls -test -vanilla -xml 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
@@ -7678,104 +7588,47 @@ package.use : sys-devel/make:0 -nls -static guile
 [sys-devel/patch:0]
 package.use : sys-devel/patch:0 -static -test xattr
 
-[sys-devel/remake:0]
-package.use : sys-devel/remake:0 readline
-
-[sys-devel/sparse:0]
-package.use : sys-devel/sparse:0 -test gtk xml
-
-[sys-firmware/atmel-firmware:0]
-package.use : sys-firmware/atmel-firmware:0 -pcmcia -usb
-
-[sys-fs/cachefilesd:0]
-package.use : sys-fs/cachefilesd:0 -doc -selinux
-
 [sys-fs/cryptsetup:0]
-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 -cpu_flags_x86_avx2 -cpu_flags_x86_sse4_2 -lzo -static xattr
-
-[sys-fs/ddrescue:0]
-package.use : sys-fs/ddrescue:0 -static
+package.use : sys-fs/cryptsetup:0 -libressl -nettle -nls -openssl -pwquality -reencrypt -static -udev -urandom gcrypt python static-libs
 
 [sys-fs/e2fsprogs:0]
-package.use : sys-fs/e2fsprogs:0 -nls static-libs
-
-[sys-fs/encfs:0]
-package.use : sys-fs/encfs:0 -nls xattr
+package.use : sys-fs/e2fsprogs:0 -fuse -nls static-libs
 
 [sys-fs/eudev:0]
 package.use : sys-fs/eudev:0 -introspection -rule-generator -selinux -test hwdb kmod static-libs
 
-[sys-fs/ext4magic:0]
-package.use : sys-fs/ext4magic:0 -debug -expert-mode -file-attr
-
-[sys-fs/fuse:0]
-package.use : sys-fs/fuse:0 -examples static-libs
-
 [sys-fs/lvm2:0]
-package.use : sys-fs/lvm2:0 -clvm -cman -device-mapper-only -lvm1 -lvm2create_initrd -selinux -static -systemd -thin readline static-libs udev
-
-[sys-fs/mhddfs:0]
-package.use : sys-fs/mhddfs:0 suid
-
-[sys-fs/mtd-utils:0]
-package.use : sys-fs/mtd-utils:0 xattr
-
-[sys-fs/mtools:0]
-package.use : sys-fs/mtools:0 X
-
-[sys-fs/mtpfs:0]
-package.use : sys-fs/mtpfs:0 -debug
-
-[sys-fs/pysize:0]
-package.use : sys-fs/pysize:0 gtk ncurses
-
-[sys-fs/safecopy:0]
-package.use : sys-fs/safecopy:0 -test
+package.use : sys-fs/lvm2:0 -clvm -cman -corosync -device-mapper-only -lvm1 -lvm2create_initrd -openais -selinux -static -systemd -thin readline static-libs udev
 
 [sys-fs/squashfs-tools:0]
-package.use : sys-fs/squashfs-tools:0 -lz4 -lzma -lzo xattr xz
-
-[sys-fs/sysfsutils:0]
-package.use : sys-fs/sysfsutils:0 static-libs
+package.use : sys-fs/squashfs-tools:0 -debug -lz4 -lzma -lzo -static xattr xz
 
 [sys-kernel/genkernel:0]
 package.use : sys-kernel/genkernel:0 -cryptsetup -ibm -selinux
 
-[sys-kernel/gentoo-sources:4.4.6]
-package.use : sys-kernel/gentoo-sources:4.4.6 -build -experimental -kdbus -symlink
-
 [sys-kernel/linux-firmware:0]
 package.use : sys-kernel/linux-firmware:0 -savedconfig
 
 [sys-libs/binutils-libs:0]
-package.use : sys-libs/binutils-libs:0 -64-bit-bfd -multitarget -nls -static-libs zlib
+package.use : sys-libs/binutils-libs:0 -64-bit-bfd -multitarget -nls -static-libs
 
 [sys-libs/cracklib:0]
-package.use : sys-libs/cracklib:0 -nls -test python static-libs zlib
+package.use : sys-libs/cracklib:0 -nls python static-libs zlib
 
-[sys-libs/db:4.8]
-package.use : sys-libs/db:4.8 -doc -examples -java -test cxx tcl
+[sys-libs/db:5.3]
+package.use : sys-libs/db:5.3 -doc -examples -java -tcl -test cxx
 
 [sys-libs/e2fsprogs-libs:0]
 package.use : sys-libs/e2fsprogs-libs:0 -nls static-libs
 
-[sys-libs/freeipmi:0]
-package.use : sys-libs/freeipmi:0 -debug -nagios
-
 [sys-libs/gdbm:0]
 package.use : sys-libs/gdbm:0 -exporter -nls berkdb static-libs
 
 [sys-libs/glibc:2.2]
-package.use : sys-libs/glibc:2.2 -debug -gd -multilib -nscd -profile -selinux -suid -systemtap -vanilla hardened
-
-[sys-libs/gpm:0]
-package.use : sys-libs/gpm:0 -selinux static-libs
+package.use : sys-libs/glibc:2.2 -audit -caps -debug -gd -multilib -nscd -profile -selinux -suid -systemtap -vanilla hardened rpc
 
 [sys-libs/ldb:0]
-package.use : sys-libs/ldb:0 -doc
+package.use : sys-libs/ldb:0 -doc ldap python
 
 [sys-libs/libavc1394:0]
 package.use : sys-libs/libavc1394:0 static-libs
@@ -7788,15 +7641,12 @@ package.use : sys-libs/libcap-ng:0 python static-libs
 [sys-libs/libcap:0]
 package.use : sys-libs/libcap:0 -pam -static-libs
 
-[sys-libs/libieee1284:0]
-package.use : sys-libs/libieee1284:0 -doc python static-libs
-
-[sys-libs/libkudzu:0]
-package.use : sys-libs/libkudzu:0 zlib
-
 [sys-libs/libraw1394:0]
 package.use : sys-libs/libraw1394:0 static-libs
 
+[sys-libs/libseccomp:0]
+package.use : sys-libs/libseccomp:0 -static-libs
+
 [sys-libs/libutempter:0]
 package.use : sys-libs/libutempter:0 static-libs
 
@@ -7804,16 +7654,7 @@ package.use : sys-libs/libutempter:0 static-libs
 package.use : sys-libs/mtdev:0 static-libs
 
 [sys-libs/ncurses:0]
-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 -gpm -tinfo cxx static-libs unicode
-
-[sys-libs/nss_wrapper:0]
-package.use : sys-libs/nss_wrapper:0 -test
-
-[sys-libs/ntdb:0]
-package.use : sys-libs/ntdb:0 python
+package.use : sys-libs/ncurses:0 -ada -debug -doc -gpm -minimal -profile -test -threads -tinfo -trace cxx static-libs unicode
 
 [sys-libs/readline:0]
 package.use : sys-libs/readline:0 static-libs utils
@@ -7833,62 +7674,26 @@ package.use : sys-libs/tevent:0 python
 [sys-libs/timezone-data:0]
 package.use : sys-libs/timezone-data:0 -leaps_timezone -nls
 
-[sys-libs/uid_wrapper:0]
-package.use : sys-libs/uid_wrapper:0 -test
-
 [sys-libs/zlib:0]
 package.use : sys-libs/zlib:0 minizip static-libs
 
-[sys-power/hibernate-script:0]
-package.use : sys-power/hibernate-script:0 vim-syntax
-
-[sys-power/iasl:0]
-package.use : sys-power/iasl:0 -test
-
-[sys-power/nvclock:0]
-package.use : sys-power/nvclock:0 -nvcontrol gtk
-
-[sys-power/pmtools:0]
-package.use : sys-power/pmtools:0 -doc
-
-[sys-power/upower:0]
-package.use : sys-power/upower:0 -doc -selinux introspection ios
-
-[sys-process/at:0]
-package.use : sys-process/at:0 -pam -selinux
-
-[sys-process/daemontools:0]
-package.use : sys-process/daemontools:0 -selinux -static
-
 [sys-process/fcron:0]
-package.use : sys-process/fcron:0 -debug -pam -selinux mta readline system-crontab
-
-[sys-process/htop:0]
-package.use : sys-process/htop:0 -oom -openvz -vserver unicode
-
-[sys-process/latencytop:0]
-package.use : sys-process/latencytop:0 gtk unicode
+package.use : sys-process/fcron:0 -audit -debug -l10n_fr -pam -selinux mta readline system-crontab
 
 [sys-process/lsof:0]
 package.use : sys-process/lsof:0 -examples -rpc -selinux -static ipv6
 
 [sys-process/procps:0]
-package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test ncurses static-libs unicode
+package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test kill ncurses static-libs unicode
 
 [sys-process/psmisc:0]
 package.use : sys-process/psmisc:0 -nls -selinux X ipv6
 
-[sys-process/supervise-scripts:0]
-package.use : sys-process/supervise-scripts:0 -doc
-
 [virtual/acl:0]
 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/imagemagick-tools:0]
+package.use : virtual/imagemagick-tools:0 -jpeg -perl -png -svg -tiff
 
 [virtual/jpeg:0]
 package.use : virtual/jpeg:0 static-libs
@@ -7896,23 +7701,17 @@ package.use : virtual/jpeg:0 static-libs
 [virtual/libgudev:0]
 package.use : virtual/libgudev:0 -introspection static-libs
 
-[virtual/libmysqlclient:0]
-package.use : virtual/libmysqlclient:0 static-libs
-
 [virtual/libudev:0]
 package.use : virtual/libudev:0 -systemd static-libs
 
 [virtual/libusb:1]
 package.use : virtual/libusb:1 -udev
 
-[virtual/linux-sources:0]
-package.use : virtual/linux-sources:0 -firmware
-
-[virtual/mysql:0]
-package.use : virtual/mysql:0 -embedded -static static-libs
-
 [virtual/notification-daemon:0]
-package.use : virtual/notification-daemon:0 -gnome
+package.use : virtual/notification-daemon:0 -gnome -kde
+
+[virtual/rubygems:0]
+package.use : virtual/rubygems:0 -ruby_targets_rbx -ruby_targets_ruby23 ruby_targets_ruby22
 
 [virtual/service-manager:0]
 package.use : virtual/service-manager:0 -prefix
@@ -7923,129 +7722,20 @@ package.use : virtual/ssh:0 -minimal
 [virtual/udev:0]
 package.use : virtual/udev:0 -systemd
 
-[www-apache/mod_extract_forwarded:0]
-package.use : www-apache/mod_extract_forwarded:0 -mod_proxy
-
-[www-apache/mod_gnutls:0]
-package.use : www-apache/mod_gnutls:0 -test
-
-[www-apache/mod_jk:0]
-package.use : www-apache/mod_jk:0 -java
-
-[www-apache/mod_ldap_userdir:0]
-package.use : www-apache/mod_ldap_userdir:0 ssl
-
-[www-apache/mod_log_sql:0]
-package.use : www-apache/mod_log_sql:0 dbi ssl
-
-[www-apache/mod_python:0]
-package.use : www-apache/mod_python:0 -doc -test
-
-[www-apache/mod_security:0]
-package.use : www-apache/mod_security:0 -jit curl geoip lua
-
-[www-apache/modsecurity-crs:0]
-package.use : www-apache/modsecurity-crs:0 geoip lua
-
-[www-apps/collectd-web:0.4.0]
-package.use : www-apps/collectd-web:0.4.0 -vhosts
-
-[www-apps/moinmoin:0]
-package.use : www-apps/moinmoin:0 -vhosts
-
-[www-apps/nikola:0]
-package.use : www-apps/nikola:0 -assets -charts -hyphenation -ipython -jinja -markdown
-
-[www-apps/trac:0]
-package.use : www-apps/trac:0 -fastcgi -i18n -mysql -postgres -test -vhosts cgi highlight restructuredtext sqlite subversion
-
-[www-apps/viewvc:0]
-package.use : www-apps/viewvc:0 -cvs -cvsgraph -mod_wsgi -mysql -pygments -vhosts subversion
-
-[www-client/httrack:0]
-package.use : www-client/httrack:0 static-libs
-
-[www-client/links:2]
-package.use : www-client/links:2 -livecd -suid -svga X bzip2 directfb fbcon gpm ipv6 jpeg lzma ssl tiff unicode zlib
-
-[www-client/lynx:0]
-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 -xscreensaver -zeitgeist webkit2
-package.accept_keywords : =www-client/midori-0.5.11-r1 ~amd64
-
-[www-client/opera:0]
-package.use : www-client/opera:0 -kde -multilib gstreamer gtk
-
-[www-client/pybugz:0]
-package.use : www-client/pybugz:0 -zsh-completion
-
-[www-client/qupzilla:0]
-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
-
-[www-client/uget:0]
-package.use : www-client/uget:0 -aria2 -gstreamer -hide-temp-files -nls curl libnotify
-
-[www-client/vimb:0]
-package.use : www-client/vimb:0 gtk3
-
-[www-misc/awstats:0]
-package.use : www-misc/awstats:0 geoip ipv6
-
-[www-misc/gurlchecker:0]
-package.use : www-misc/gurlchecker:0 -clamav -json -tidy sqlite ssl
-
-[www-misc/profile-sync-daemon:0]
-package.use : www-misc/profile-sync-daemon:0 -systemd
-
-[www-plugins/gecko-mediaplayer:0]
-package.use : www-plugins/gecko-mediaplayer:0 curl
-
-[www-servers/apache:2]
-package.use : www-servers/apache:2 -apache2_modules_access_compat -apache2_modules_asis -apache2_modules_auth_digest -apache2_modules_authn_dbd -apache2_modules_authz_dbd -apache2_modules_cache_disk -apache2_modules_cern_meta -apache2_modules_charset_lite -apache2_modules_dbd -apache2_modules_dumpio -apache2_modules_http2 -apache2_modules_ident -apache2_modules_imagemap -apache2_modules_lbmethod_bybusyness -apache2_modules_lbmethod_byrequests -apache2_modules_lbmethod_bytraffic -apache2_modules_lbmethod_heartbeat -apache2_modules_log_forensic -apache2_modules_macro -apache2_modules_proxy -apache2_modules_proxy_ajp -apache2_modules_proxy_balancer -apache2_modules_proxy_connect -apache2_modules_proxy_fcgi -apache2_modules_proxy_ftp -apache2_modules_proxy_html -apache2_modules_proxy_http -apache2_modules_proxy_scgi -apache2_modules_proxy_wstunnel -apache2_modules_ratelimit -apache2_modules_remoteip -apache2_modules_reqtimeout -apache2_modules_slotmem_shm -apache2_modules_substitute -ap
 ache2_modules_version -apache2_mpms_event -apache2_mpms_peruser -apache2_mpms_prefork -apache2_mpms_worker -debug -doc -libressl -selinux -static -suexec apache2_modules_actions apache2_modules_alias apache2_modules_auth_basic apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_deflate apache2_modules_dir apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_logio apache2_modules_mime apache2
 _modules_mime_magic apache2_modules_negotiation apache2_modules_rewrite apache2_modules_setenvif apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_unique_id apache2_modules_unixd apache2_modules_userdir apache2_modules_usertrack apache2_modules_vhost_alias ldap ssl threads
-
-[www-servers/gunicorn:0]
-package.use : www-servers/gunicorn:0 -doc -examples -test
-
-[www-servers/spawn-fcgi:0]
-package.use : www-servers/spawn-fcgi:0 ipv6
-
-[www-servers/varnish:0]
-package.use : www-servers/varnish:0 -jemalloc -jit static-libs
+[www-client/w3m:0]
+package.use : www-client/w3m:0 -X -fbcon -gpm -gtk -imlib -l10n_ja -libressl -lynxkeymap -nntp -xface nls ssl unicode
 
 [x11-apps/xauth:0]
-package.use : x11-apps/xauth:0 ipv6
-
-[x11-apps/xdm:0]
-package.use : x11-apps/xdm:0 -consolekit -pam -xdm-auth ipv6
-
-[x11-apps/xdpyinfo:0]
-package.use : x11-apps/xdpyinfo:0 -dmx dga xinerama
-
-[x11-apps/xhost:0]
-package.use : x11-apps/xhost:0 ipv6
+package.use : x11-apps/xauth:0 -test ipv6
 
 [x11-apps/xinit:0]
 package.use : x11-apps/xinit:0 -systemd minimal
 
-[x11-apps/xinput_calibrator:0]
-package.use : x11-apps/xinput_calibrator:0 gtk
-
-[x11-apps/xsm:0]
-package.use : x11-apps/xsm:0 -rsh
-
 [x11-base/xorg-drivers:0]
-package.use : x11-base/xorg-drivers:0 -input_devices_libinput -input_devices_vmmouse -video_cards_amdgpu -video_cards_dummy -video_cards_fglrx -video_cards_freedreno -video_cards_geode -video_cards_i740 -video_cards_nvidia -video_cards_omap -video_cards_omapfb -video_cards_radeonsi -video_cards_sunbw2 -video_cards_suncg14 -video_cards_suncg3 -video_cards_suncg6 -video_cards_sunffb -video_cards_sunleo -video_cards_suntcx -video_cards_tegra -video_cards_via -video_cards_virtualbox -video_cards_vmware -video_cards_voodoo input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_synaptics input_devices_tslib input_devices_void input_devices_wacom video_cards_apm video_cards_ast video_cards_chips video_cards_cirrus video_cards_epson video_cards_fbdev video_cards_glint video_cards_i128 video_car
 ds_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa
+package.use : x11-base/xorg-drivers:0 -input_devices_libinput -input_devices_vmmouse -video_cards_amdgpu -video_cards_ark -video_cards_dummy -video_cards_fglrx -video_cards_freedreno -video_cards_geode -video_cards_i740 -video_cards_i915 -video_cards_i965 -video_cards_newport -video_cards_nvidia -video_cards_omap -video_cards_radeonsi -video_cards_sis -video_cards_sunbw2 -video_cards_suncg14 -video_cards_suncg3 -video_cards_suncg6 -video_cards_sunffb -video_cards_sunleo -video_cards_suntcx -video_cards_tegra -video_cards_vc4 -video_cards_via -video_cards_virtualbox -video_cards_vmware -video_cards_voodoo input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_synaptics input_devices_tslib input_devices_void input_devices_wacom video_cards_apm video_cards_ast video_cards_chips video_cards
 _cirrus video_cards_epson video_cards_fbdev video_cards_glint video_cards_i128 video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa
 
 [x11-base/xorg-server:0]
-package.use : x11-base/xorg-server:0 -dmx -doc -kdrive -libressl -minimal -selinux -systemd -tslib -unwind -wayland -xephyr -xnest -xvfb glamor ipv6 nptl static-libs suid udev xorg
-
-[x11-drivers/xf86-input-mtrack:0]
-package.use : x11-drivers/xf86-input-mtrack:0 -debug
+package.use : x11-base/xorg-server:0 -debug -dmx -doc -kdrive -libressl -minimal -selinux -systemd -tslib -unwind -wayland -xcsecurity -xephyr -xnest -xvfb glamor ipv6 static-libs suid udev xorg
 
 [x11-drivers/xf86-input-wacom:0]
 package.use : x11-drivers/xf86-input-wacom:0 -debug
@@ -8064,12 +7754,6 @@ package.use : x11-drivers/xf86-video-mach64:0 dri
 [x11-drivers/xf86-video-mga:0]
 package.use : x11-drivers/xf86-video-mga:0 dri
 
-[x11-drivers/xf86-video-nouveau:0]
-package.use : x11-drivers/xf86-video-nouveau:0 glamor
-
-[x11-drivers/xf86-video-openchrome:0]
-package.use : x11-drivers/xf86-video-openchrome:0 -debug -viaregtool
-
 [x11-drivers/xf86-video-qxl:0]
 package.use : x11-drivers/xf86-video-qxl:0 -xspice
 
@@ -8082,20 +7766,8 @@ package.use : x11-drivers/xf86-video-savage:0 dri
 [x11-drivers/xf86-video-tdfx:0]
 package.use : x11-drivers/xf86-video-tdfx:0 dri
 
-[x11-libs/c++-gtk-utils:3]
-package.use : x11-libs/c++-gtk-utils:3 -nls gtk static-libs
-
 [x11-libs/cairo:0]
-package.use : x11-libs/cairo:0 -aqua -debug -directfb -gles2 -valgrind -xlib-xcb X glib opengl static-libs svg xcb
-
-[x11-libs/fltk:1]
-package.use : x11-libs/fltk:1 -debug -doc -examples -games -xft cairo opengl static-libs threads xinerama
-
-[x11-libs/fox:1.6]
-package.use : x11-libs/fox:1.6 -debug -doc -profile bzip2 jpeg opengl png tiff truetype zlib
-
-[x11-libs/fox:1.7]
-package.use : x11-libs/fox:1.7 -debug -doc -profile bzip2 jpeg opengl png tiff truetype zlib
+package.use : x11-libs/cairo:0 -aqua -debug -directfb -gles2 -valgrind X glib opengl static-libs svg xcb
 
 [x11-libs/gdk-pixbuf:2]
 package.use : x11-libs/gdk-pixbuf:2 -debug -test X introspection jpeg jpeg2k tiff
@@ -8168,18 +7840,12 @@ package.use : x11-libs/libX11:0 -doc -test ipv6 static-libs
 [x11-libs/libXScrnSaver:0]
 package.use : x11-libs/libXScrnSaver:0 static-libs
 
-[x11-libs/libXTrap:0]
-package.use : x11-libs/libXTrap:0 static-libs
-
 [x11-libs/libXau:0]
 package.use : x11-libs/libXau:0 static-libs
 
 [x11-libs/libXaw3d:0]
 package.use : x11-libs/libXaw3d:0 static-libs unicode
 
-[x11-libs/libXaw3dXft:0]
-package.use : x11-libs/libXaw3dXft:0 static-libs unicode xpm
-
 [x11-libs/libXaw:0]
 package.use : x11-libs/libXaw:0 -deprecated -doc static-libs
 
@@ -8201,12 +7867,12 @@ package.use : x11-libs/libXext:0 -doc static-libs
 [x11-libs/libXfixes:0]
 package.use : x11-libs/libXfixes:0 static-libs
 
+[x11-libs/libXfont2:0]
+package.use : x11-libs/libXfont2:0 -doc -static-libs -truetype bzip2 ipv6
+
 [x11-libs/libXfont:0]
 package.use : x11-libs/libXfont:0 -doc -truetype bzip2 ipv6 static-libs
 
-[x11-libs/libXfontcache:0]
-package.use : x11-libs/libXfontcache:0 static-libs
-
 [x11-libs/libXft:0]
 package.use : x11-libs/libXft:0 static-libs
 
@@ -8235,7 +7901,7 @@ package.use : x11-libs/libXrender:0 static-libs
 package.use : x11-libs/libXres:0 static-libs
 
 [x11-libs/libXt:0]
-package.use : x11-libs/libXt:0 static-libs
+package.use : x11-libs/libXt:0 -test static-libs
 
 [x11-libs/libXtst:0]
 package.use : x11-libs/libXtst:0 -doc static-libs
@@ -8255,20 +7921,8 @@ package.use : x11-libs/libXxf86misc:0 static-libs
 [x11-libs/libXxf86vm:0]
 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
-
-[x11-libs/libdockapp:0]
-package.use : x11-libs/libdockapp:0 X
-
 [x11-libs/libdrm:0]
-package.use : x11-libs/libdrm:0 -libkms -valgrind -video_cards_amdgpu -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vmware static-libs video_cards_intel video_cards_nouveau video_cards_radeon
+package.use : x11-libs/libdrm:0 -libkms -valgrind -video_cards_amdgpu -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vc4 -video_cards_vivante -video_cards_vmware static-libs video_cards_intel video_cards_nouveau video_cards_radeon
 
 [x11-libs/libfontenc:0]
 package.use : x11-libs/libfontenc:0 static-libs
@@ -8289,7 +7943,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 video_cards_nouveau
+package.use : x11-libs/libva:0 -egl -vdpau -video_cards_dummy -video_cards_fglrx -video_cards_i965 -video_cards_nvidia -wayland X drm opengl video_cards_intel video_cards_nouveau
 
 [x11-libs/libvdpau:0]
 package.use : x11-libs/libvdpau:0 -doc -test dri
@@ -8303,60 +7957,27 @@ package.use : x11-libs/libwnck:3 -tools introspection startup-notification
 [x11-libs/libxcb:0]
 package.use : x11-libs/libxcb:0 -doc -selinux -test static-libs xkb
 
-[x11-libs/libxkbcommon:0]
-package.use : x11-libs/libxkbcommon:0 -doc -static-libs -test X
-
 [x11-libs/libxkbfile:0]
 package.use : x11-libs/libxkbfile:0 static-libs
 
-[x11-libs/libxkbui:0]
-package.use : x11-libs/libxkbui:0 static-libs
-
 [x11-libs/libxklavier:0]
 package.use : x11-libs/libxklavier:0 -doc introspection
 
 [x11-libs/libxshmfence:0]
 package.use : x11-libs/libxshmfence:0 static-libs
 
-[x11-libs/motif:0]
-package.use : x11-libs/motif:0 -examples -xft jpeg motif22-compatibility png static-libs unicode
-
 [x11-libs/pango:0]
-package.use : x11-libs/pango:0 -debug -test X introspection
+package.use : x11-libs/pango:0 -test X introspection
 
 [x11-libs/pixman:0]
 package.use : x11-libs/pixman:0 -altivec -cpu_flags_x86_ssse3 -iwmmxt -loongson2f -neon cpu_flags_x86_mmxext cpu_flags_x86_sse2 static-libs
 
-[x11-libs/qscintilla:0]
-package.use : x11-libs/qscintilla:0 -designer -doc
-
-[x11-libs/qwt:5]
-package.use : x11-libs/qwt:5 -doc -examples static-libs svg
-
-[x11-libs/qwt:6]
-package.use : x11-libs/qwt:6 -doc -examples -mathml static-libs svg
-
-[x11-libs/qwtplot3d:0]
-package.use : x11-libs/qwtplot3d:0 -doc -examples
-
 [x11-libs/startup-notification:0]
 package.use : x11-libs/startup-notification:0 static-libs
 
-[x11-libs/vte:0]
-package.use : x11-libs/vte:0 -debug -python introspection
-
-[x11-libs/vte:2.90]
-package.use : x11-libs/vte:2.90 -debug -glade introspection
-
 [x11-libs/vte:2.91]
 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
-
-[x11-libs/wxGTK:3.0]
-package.use : x11-libs/wxGTK:3.0 -aqua -debug -doc -gstreamer -libnotify -webkit X opengl sdl tiff
-
 [x11-libs/xcb-util-cursor:0]
 package.use : x11-libs/xcb-util-cursor:0 -doc -test static-libs
 
@@ -8375,221 +7996,23 @@ package.use : x11-libs/xcb-util-wm:0 -doc -test static-libs
 [x11-libs/xcb-util:0]
 package.use : x11-libs/xcb-util:0 -doc -test static-libs
 
-[x11-libs/xforms:0]
-package.use : x11-libs/xforms:0 -doc opengl static-libs
-
-[x11-libs/xosd:0]
-package.use : x11-libs/xosd:0 xinerama
-
 [x11-libs/xpyb:0]
 package.use : x11-libs/xpyb:0 -selinux static-libs
 
 [x11-libs/xtrans:0]
 package.use : x11-libs/xtrans:0 -doc
 
-[x11-misc/compton:0]
-package.use : x11-misc/compton:0 dbus drm opengl pcre xinerama
-
-[x11-misc/devilspie2:0]
-package.use : x11-misc/devilspie2:0 -debug
-
-[x11-misc/dmenu:0]
-package.use : x11-misc/dmenu:0 xinerama
-
-[x11-misc/dockmanager:0]
-package.use : x11-misc/dockmanager:0 -debug
-
-[x11-misc/dzen:2]
-package.use : x11-misc/dzen:2 -minimal -xft xinerama xpm
-
-[x11-misc/e16menuedit2:0]
-package.use : x11-misc/e16menuedit2:0 -debug
-
-[x11-misc/efax-gtk:0]
-package.use : x11-misc/efax-gtk:0 -nls
-
-[x11-misc/fbpager:0]
-package.use : x11-misc/fbpager:0 xrender
-
-[x11-misc/gccmakedep:0]
-package.use : x11-misc/gccmakedep:0 static-libs
-
-[x11-misc/grsync:0]
-package.use : x11-misc/grsync:0 -debug
-
-[x11-misc/grun:0]
-package.use : x11-misc/grun:0 -nls
-
-[x11-misc/lineak-defaultplugin:0]
-package.use : x11-misc/lineak-defaultplugin:0 -debug
-
-[x11-misc/lineak-xosdplugin:0]
-package.use : x11-misc/lineak-xosdplugin:0 -debug
-
-[x11-misc/lineakd:0]
-package.use : x11-misc/lineakd:0 -debug
-
-[x11-misc/menumaker:0]
-package.use : x11-misc/menumaker:0 -doc
-
-[x11-misc/nitrogen:0]
-package.use : x11-misc/nitrogen:0 -nls xinerama
-
-[x11-misc/openbox-menu:0]
-package.use : x11-misc/openbox-menu:0 icons svg
-
-[x11-misc/parcellite:0]
-package.use : x11-misc/parcellite:0 -nls
-
-[x11-misc/pathfinder:0]
-package.use : x11-misc/pathfinder:0 -debug -doc -profile jpeg png tiff
-
-[x11-misc/qcomicbook:0]
-package.use : x11-misc/qcomicbook:0 -debug
-
-[x11-misc/rednotebook:0]
-package.use : x11-misc/rednotebook:0 -libyaml spell
-
-[x11-misc/redshift:0]
-package.use : x11-misc/redshift:0 -appindicator -geoclue -nls gtk
-
-[x11-misc/rodent:0]
-package.use : x11-misc/rodent:0 -experimental
-
 [x11-misc/shared-mime-info:0]
 package.use : x11-misc/shared-mime-info:0 -test
 
 [x11-misc/slim:0]
 package.use : x11-misc/slim:0 -branding -consolekit -pam
 
-[x11-misc/spacefm:0]
-package.use : x11-misc/spacefm:0 -gtk2 gtk3 startup-notification video-thumbnails
-
-[x11-misc/synergy:0]
-package.use : x11-misc/synergy:0 -test qt4
-
-[x11-misc/touchfreeze:0]
-package.use : x11-misc/touchfreeze:0 -debug
-
-[x11-misc/wbar:0]
-package.use : x11-misc/wbar:0 gtk
-
-[x11-misc/x2vnc:0]
-package.use : x11-misc/x2vnc:0 tk
-
-[x11-misc/xcalendar:0]
-package.use : x11-misc/xcalendar:0 -motif
-
-[x11-misc/xcb:0]
-package.use : x11-misc/xcb:0 -motif
-
-[x11-misc/xdg-user-dirs:0]
-package.use : x11-misc/xdg-user-dirs:0 gtk
-
 [x11-misc/xdg-utils:0]
 package.use : x11-misc/xdg-utils:0 -doc perl
 
-[x11-misc/xdialog:0]
-package.use : x11-misc/xdialog:0 -doc -examples -nls
-
-[x11-misc/xdotool:0]
-package.use : x11-misc/xdotool:0 -examples
-
-[x11-misc/xkbd:0]
-package.use : x11-misc/xkbd:0 -debug -doc
-
-[x11-misc/xnee:0]
-package.use : x11-misc/xnee:0 -gnome -xosd static-libs
-
-[x11-misc/xnots:0]
-package.use : x11-misc/xnots:0 vim-syntax
-
-[x11-misc/xosview:0]
-package.use : x11-misc/xosview:0 suid
-
 [x11-misc/xscreensaver:0]
-package.use : x11-misc/xscreensaver:0 -gdm -new-login -pam -selinux jpeg opengl perl suid xinerama
-
-[x11-misc/xxkb:0]
-package.use : x11-misc/xxkb:0 svg
-
-[x11-plugins/ascpu:0]
-package.use : x11-plugins/ascpu:0 jpeg
-
-[x11-plugins/asmem:0]
-package.use : x11-plugins/asmem:0 jpeg
-
-[x11-plugins/astime:0]
-package.use : x11-plugins/astime:0 jpeg
-
-[x11-plugins/bfm:0]
-package.use : x11-plugins/bfm:0 -gkrellm
-
-[x11-plugins/gkrellm-volume:2]
-package.use : x11-plugins/gkrellm-volume:2 alsa
-
-[x11-plugins/gkrellmss:0]
-package.use : x11-plugins/gkrellmss:0 -nls
-
-[x11-plugins/gkrellsun:1]
-package.use : x11-plugins/gkrellsun:1 -nls
-
-[x11-plugins/gkrelltop:0]
-package.use : x11-plugins/gkrelltop:0 X
-
-[x11-plugins/guifications:0]
-package.use : x11-plugins/guifications:0 -debug -nls
-
-[x11-plugins/hexchat-javascript:0]
-package.use : x11-plugins/hexchat-javascript:0 -examples
-
-[x11-plugins/pidgin-birthday-reminder:0]
-package.use : x11-plugins/pidgin-birthday-reminder:0 static-libs
-
-[x11-plugins/pidgin-encryption:0]
-package.use : x11-plugins/pidgin-encryption:0 -nls
-
-[x11-plugins/pidgin-libnotify:0]
-package.use : x11-plugins/pidgin-libnotify:0 -debug -nls
-
-[x11-plugins/pidgin-mbpurple:0]
-package.use : x11-plugins/pidgin-mbpurple:0 twitgin
-
-[x11-plugins/pidgin-musictracker:0]
-package.use : x11-plugins/pidgin-musictracker:0 -debug
-
-[x11-plugins/purple-plugin_pack:0]
-package.use : x11-plugins/purple-plugin_pack:0 -debug -talkfilters gtk ncurses spell
-
-[x11-plugins/wmDownload:0]
-package.accept_keywords : =x11-plugins/wmDownload-0.1.2a-r2 ~amd64
-
-[x11-plugins/wmail:0]
-package.accept_keywords : =x11-plugins/wmail-2.0-r4 ~amd64
-
-[x11-plugins/wmbattery:0]
-package.use : x11-plugins/wmbattery:0 -apm -upower
-
-[x11-plugins/wmbutton:0]
-package.use : x11-plugins/wmbutton:0 -branding
-
-[x11-plugins/wmcms:0]
-package.accept_keywords : =x11-plugins/wmcms-0.3.5-r2 ~amd64
-
-[x11-plugins/wmdate:0]
-package.accept_keywords : =x11-plugins/wmdate-0.7-r1 ~amd64
-
-[x11-plugins/wmfire:0]
-package.use : x11-plugins/wmfire:0 session
-
-[x11-plugins/wmnd:0]
-package.use : x11-plugins/wmnd:0 -snmp
-
-[x11-plugins/wmnetload:0]
-package.accept_keywords : =x11-plugins/wmnetload-1.3-r4 ~amd64
-
-[x11-plugins/wmsysmon:0]
-package.use : x11-plugins/wmsysmon:0 -high-ints
+package.use : x11-misc/xscreensaver:0 -gdm -new-login -offensive -pam -selinux jpeg opengl perl suid xinerama
 
 [x11-proto/bigreqsproto:0]
 package.use : x11-proto/bigreqsproto:0 -doc
@@ -8612,141 +8035,15 @@ package.use : x11-proto/xextproto:0 -doc
 [x11-proto/xproto:0]
 package.use : x11-proto/xproto:0 -doc
 
-[x11-terms/aterm:0]
-package.use : x11-terms/aterm:0 -background -cjk -xgetdefault
-
-[x11-terms/eterm:0]
-package.use : x11-terms/eterm:0 -cpu_flags_x86_mmx -escreen -minimal cpu_flags_x86_sse2 unicode
-
-[x11-terms/evilvte:0]
-package.use : x11-terms/evilvte:0 -savedconfig
-
-[x11-terms/mlterm:0]
-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
-
-[x11-terms/root-tail:0]
-package.use : x11-terms/root-tail:0 -debug -kde
-
-[x11-terms/rxvt-unicode:0]
-package.use : x11-terms/rxvt-unicode:0 -256-color -alt-font-width -blink -buffer-on-clear -fading-colors -iso14755 -pixbuf -secondary-wheel -unicode3 -wcwidth -xft focused-urgency font-styles mousewheel perl startup-notification vanilla
-
-[x11-terms/rxvt:0]
-package.use : x11-terms/rxvt:0 -cjk -linuxkeys -motif -xgetdefault
-
-[x11-terms/valaterm:0]
-package.use : x11-terms/valaterm:0 -nls
-
-[x11-terms/xfce4-terminal:0]
-package.use : x11-terms/xfce4-terminal:0 -debug
-
 [x11-terms/xterm:0]
-package.use : x11-terms/xterm:0 -toolbar -truetype Xaw3d openpty unicode
+package.use : x11-terms/xterm:0 -toolbar -truetype -xinerama Xaw3d openpty unicode
 
 [x11-themes/adwaita-icon-theme:0]
 package.use : x11-themes/adwaita-icon-theme:0 -branding
 
-[x11-themes/comix-xcursors:0]
-package.use : x11-themes/comix-xcursors:0 -lefthanded -opaque
-
-[x11-themes/fvwm-themes:0]
-package.use : x11-themes/fvwm-themes:0 -gnome
-
-[x11-themes/gentoo-artwork:0]
-package.use : x11-themes/gentoo-artwork:0 -kde -lilo -offensive grub icons pixmaps
-
-[x11-themes/gnome-colors-common:0]
-package.use : x11-themes/gnome-colors-common:0 branding
-
-[x11-themes/gnome-icon-theme:0]
-package.use : x11-themes/gnome-icon-theme:0 -branding
-
-[x11-themes/greybird:0]
-package.use : x11-themes/greybird:0 -ayatana -gnome
-
-[x11-themes/gtk-engines-murrine:0]
-package.use : x11-themes/gtk-engines-murrine:0 -animation-rtl themes
-
 [x11-themes/gtk-engines-xfce:0]
 package.use : x11-themes/gtk-engines-xfce:0 -debug
 
-[x11-themes/gtk-engines:2]
-package.use : x11-themes/gtk-engines:2 -accessibility lua
-
-[x11-themes/light-themes:0]
-package.use : x11-themes/light-themes:0 gtk3
-
-[x11-themes/mate-icon-theme-faenza:0]
-package.use : x11-themes/mate-icon-theme-faenza:0 -debug -minimal
-
-[x11-themes/nimbus:0]
-package.use : x11-themes/nimbus:0 -minimal gtk
-
-[x11-themes/redhat-artwork:0]
-package.use : x11-themes/redhat-artwork:0 -audacious -cursors -gdm -icons -kdm -nautilus
-
-[x11-themes/tangerine-icon-theme:0]
-package.use : x11-themes/tangerine-icon-theme:0 -minimal
-
-[x11-themes/windowmaker-themes:0]
-package.use : x11-themes/windowmaker-themes:0 -offensive
-
-[x11-wm/blackbox:0]
-package.use : x11-wm/blackbox:0 -debug -nls -truetype
-
-[x11-wm/dwm:0]
-package.use : x11-wm/dwm:0 -savedconfig xinerama
-
-[x11-wm/enlightenment:0]
-package.use : x11-wm/enlightenment:0 -doc -nls -pango -pulseaudio -xcomposite -xrandr dbus xinerama
-
-[x11-wm/fluxbox:0]
-package.use : x11-wm/fluxbox:0 -bidi -nls -vim-syntax -xinerama imlib slit systray toolbar truetype
-
-[x11-wm/fvwm:0]
-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 -uclibc bidi xinerama
-
-[x11-wm/jwm:0]
-package.use : x11-wm/jwm:0 -debug -truetype bidi jpeg png xinerama xpm
-
-[x11-wm/lumina:0]
-package.accept_keywords : =x11-wm/lumina-0.8.8_p1 ~amd64
-
-[x11-wm/musca:0]
-package.use : x11-wm/musca:0 -apis -savedconfig -xlisten
-
-[x11-wm/openbox:3]
-package.use : x11-wm/openbox:3 -branding -debug -nls -xdg imlib session startup-notification static-libs svg
-
-[x11-wm/oroborus:0]
-package.use : x11-wm/oroborus:0 -gnome
-
-[x11-wm/pekwm:0]
-package.use : x11-wm/pekwm:0 -contrib -debug -themes -truetype xinerama
-
-[x11-wm/ratpoison:0]
-package.use : x11-wm/ratpoison:0 -debug -emacs -sloppy history xft
-
-[x11-wm/sawfish:0]
-package.use : x11-wm/sawfish:0 -emacs -nls xinerama
-
-[x11-wm/selectwm:2]
-package.use : x11-wm/selectwm:2 -nls
-
-[x11-wm/windowlab:0]
-package.use : x11-wm/windowlab:0 -truetype
-
-[x11-wm/windowmaker:0]
-package.use : x11-wm/windowmaker:0 -imagemagick -modelock -nls -webp -xrandr gif jpeg png tiff xinerama xpm
-
-[x11-wm/xpra:0]
-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
 
@@ -8754,14 +8051,11 @@ package.use : xfce-base/exo:0 -debug
 package.use : xfce-base/garcon:0 -debug
 
 [xfce-base/libxfce4ui:0]
-package.use : xfce-base/libxfce4ui:0 -debug gtk3 startup-notification
+package.use : xfce-base/libxfce4ui:0 -debug -glade startup-notification
 
 [xfce-base/libxfce4util:0]
 package.use : xfce-base/libxfce4util:0 -debug
 
-[xfce-base/libxfcegui4:0]
-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
 
@@ -8778,7 +8072,7 @@ package.use : xfce-base/xfce4-panel:0 -debug
 package.use : xfce-base/xfce4-session:0 -debug -nls -policykit -systemd -upower xscreensaver
 
 [xfce-base/xfce4-settings:0]
-package.use : xfce-base/xfce4-settings:0 -debug -libcanberra -libinput -upower libnotify xklavier
+package.use : xfce-base/xfce4-settings:0 -debug -libcanberra -upower input_devices_libinput libnotify xklavier
 
 [xfce-base/xfconf:0]
 package.use : xfce-base/xfconf:0 -debug perl
@@ -8792,123 +8086,6 @@ package.use : xfce-base/xfwm4:0 -debug dri startup-notification xcomposite
 [xfce-extra/thunar-archive-plugin:0]
 package.use : xfce-extra/thunar-archive-plugin:0 -debug
 
-[xfce-extra/thunar-media-tags-plugin:0]
-package.use : xfce-extra/thunar-media-tags-plugin:0 -debug
-
 [xfce-extra/thunar-shares-plugin:0]
 package.use : xfce-extra/thunar-shares-plugin:0 -debug
 
-[xfce-extra/thunar-vcs-plugin:0]
-package.use : xfce-extra/thunar-vcs-plugin:0 -debug git subversion
-
-[xfce-extra/tumbler:0]
-package.use : xfce-extra/tumbler:0 -debug -gstreamer -odf curl ffmpeg jpeg pdf raw
-
-[xfce-extra/xfce4-battery-plugin:0]
-package.use : xfce-extra/xfce4-battery-plugin:0 -debug
-
-[xfce-extra/xfce4-cellmodem-plugin:0]
-package.use : xfce-extra/xfce4-cellmodem-plugin:0 -debug
-
-[xfce-extra/xfce4-clipman-plugin:0]
-package.use : xfce-extra/xfce4-clipman-plugin:0 -debug -qrcode
-
-[xfce-extra/xfce4-cpufreq-plugin:0]
-package.use : xfce-extra/xfce4-cpufreq-plugin:0 -debug
-
-[xfce-extra/xfce4-cpugraph-plugin:0]
-package.use : xfce-extra/xfce4-cpugraph-plugin:0 -debug
-
-[xfce-extra/xfce4-datetime-plugin:0]
-package.use : xfce-extra/xfce4-datetime-plugin:0 -debug
-
-[xfce-extra/xfce4-diskperf-plugin:0]
-package.use : xfce-extra/xfce4-diskperf-plugin:0 -debug
-
-[xfce-extra/xfce4-embed-plugin:0]
-package.use : xfce-extra/xfce4-embed-plugin:0 -debug
-
-[xfce-extra/xfce4-equake-plugin:0]
-package.use : xfce-extra/xfce4-equake-plugin:0 -debug
-
-[xfce-extra/xfce4-eyes-plugin:0]
-package.use : xfce-extra/xfce4-eyes-plugin:0 -debug
-
-[xfce-extra/xfce4-fsguard-plugin:0]
-package.use : xfce-extra/xfce4-fsguard-plugin:0 -debug
-
-[xfce-extra/xfce4-genmon-plugin:0]
-package.use : xfce-extra/xfce4-genmon-plugin:0 -debug
-
-[xfce-extra/xfce4-kbdleds-plugin:0]
-package.use : xfce-extra/xfce4-kbdleds-plugin:0 -debug
-
-[xfce-extra/xfce4-mailwatch-plugin:0]
-package.use : xfce-extra/xfce4-mailwatch-plugin:0 -debug ipv6 ssl
-
-[xfce-extra/xfce4-mixer:0]
-package.use : xfce-extra/xfce4-mixer:0 -debug alsa keybinder oss
-
-[xfce-extra/xfce4-modemlights-plugin:0]
-package.use : xfce-extra/xfce4-modemlights-plugin:0 -debug
-
-[xfce-extra/xfce4-mpc-plugin:0]
-package.use : xfce-extra/xfce4-mpc-plugin:0 -debug -libmpd
-
-[xfce-extra/xfce4-netload-plugin:0]
-package.use : xfce-extra/xfce4-netload-plugin:0 -debug
-
-[xfce-extra/xfce4-places-plugin:0]
-package.use : xfce-extra/xfce4-places-plugin:0 -debug libnotify
-
-[xfce-extra/xfce4-playercontrol-plugin:0]
-package.use : xfce-extra/xfce4-playercontrol-plugin:0 -audacious -mpd
-
-[xfce-extra/xfce4-quicklauncher-plugin:0]
-package.use : xfce-extra/xfce4-quicklauncher-plugin:0 -debug
-
-[xfce-extra/xfce4-screenshooter:0]
-package.use : xfce-extra/xfce4-screenshooter:0 -debug
-
-[xfce-extra/xfce4-sensors-plugin:0]
-package.use : xfce-extra/xfce4-sensors-plugin:0 -debug -hddtemp -lm_sensors -video_cards_nvidia acpi libnotify
-
-[xfce-extra/xfce4-smartbookmark-plugin:0]
-package.use : xfce-extra/xfce4-smartbookmark-plugin:0 -debug
-
-[xfce-extra/xfce4-soundmenu-plugin:0]
-package.use : xfce-extra/xfce4-soundmenu-plugin:0 -debug -lastfm glyr keybinder
-
-[xfce-extra/xfce4-systemload-plugin:0]
-package.use : xfce-extra/xfce4-systemload-plugin:0 -debug -upower
-
-[xfce-extra/xfce4-taskmanager:0]
-package.use : xfce-extra/xfce4-taskmanager:0 -debug -gksu -gtk3
-
-[xfce-extra/xfce4-time-out-plugin:0]
-package.use : xfce-extra/xfce4-time-out-plugin:0 -debug
-
-[xfce-extra/xfce4-verve-plugin:0]
-package.use : xfce-extra/xfce4-verve-plugin:0 dbus
-
-[xfce-extra/xfce4-volumed:0]
-package.use : xfce-extra/xfce4-volumed:0 -debug alsa libnotify oss
-
-[xfce-extra/xfce4-wavelan-plugin:0]
-package.use : xfce-extra/xfce4-wavelan-plugin:0 -debug
-
-[xfce-extra/xfce4-weather-plugin:0]
-package.use : xfce-extra/xfce4-weather-plugin:0 -debug -upower
-
-[xfce-extra/xfce4-windowck-plugin:0]
-package.use : xfce-extra/xfce4-windowck-plugin:0 -debug
-
-[xfce-extra/xfce4-wmdock-plugin:0]
-package.use : xfce-extra/xfce4-wmdock-plugin:0 -debug
-
-[xfce-extra/xfce4-xkb-plugin:0]
-package.use : xfce-extra/xfce4-xkb-plugin:0 -debug
-
-[xfce-extra/xfdashboard:0]
-package.use : xfce-extra/xfdashboard:0 -debug
-