world: drop many pkgs masked/dropped in tree

2 files changed, 100 insertions, 131 deletions

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 50fd12f..35436d2 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -68,7 +68,7 @@ package.use : app-admin/lsat:0 -minimal
 package.use : app-admin/mcelog:0 -selinux
 
 [app-admin/monit:0]
-package.use : app-admin/monit:0 -pam ssl
+package.use : app-admin/monit:0 -libressl -pam ssl
 
 [app-admin/pwgen:0]
 package.use : app-admin/pwgen:0 -livecd
@@ -95,7 +95,7 @@ package.use : app-admin/supervisor:0 -doc -test
 package.use : app-admin/syslog-ng:0 -amqp -json -libressl -mongodb -pacct -python -redis -smtp -spoof-source -systemd caps dbi geoip ipv6 tcpd
 
 [app-admin/sysstat:0]
-package.use : app-admin/sysstat:0 -cron -debug -isag -lm_sensors -nls -selinux doc
+package.use : app-admin/sysstat:0 -debug -isag -lm_sensors -nls -selinux -static doc
 
 [app-admin/testdisk:0]
 package.use : app-admin/testdisk:0 -ewf -ntfs -reiserfs -static jpeg qt4
@@ -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 -libressl -metadata-analysis-api -milter -selinux -uclibc bzip2 iconv ipv6 static-libs
 
 [app-arch/bzip2:0]
 package.use : app-arch/bzip2:0 -static static-libs
@@ -149,7 +149,7 @@ package.use : app-arch/gzip:0 -static pic
 package.use : app-arch/libarchive:0 -expat -libressl -nettle acl bzip2 e2fsprogs iconv lzma lzo static-libs xattr zlib
 
 [app-arch/p7zip:0]
-package.use : app-arch/p7zip:0 -doc -kde -rar -static -wxwidgets pch
+package.use : app-arch/p7zip:0 -doc -kde -pch -rar -static -wxwidgets
 
 [app-arch/sharutils:0]
 package.use : app-arch/sharutils:0 -nls
@@ -262,8 +262,7 @@ 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 -nls -selinux -static -tools -usb bzip2 gnutls ldap readline smartcard
-package.accept_keywords : =app-crypt/gnupg-2.1.12 ~amd64
+package.use : app-crypt/gnupg:0 -doc -nls -selinux -tofu -tools -usb bzip2 gnutls ldap readline smartcard
 package.env : app-crypt/gnupg:0 app-crypt_gnupg_0
 env : LDFLAGS="-lintl"
 
@@ -391,9 +390,6 @@ package.use : app-editors/gedit-plugins:0 -charmap -terminal -vala -zeitgeist gi
 [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 -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
 
@@ -842,9 +838,6 @@ package.use : app-office/texmaker:0 -qt5 qt4
 [app-office/texstudio:0]
 package.use : app-office/texstudio:0 -qt5 -video qt4
 
-[app-pda/coldsync:0]
-package.use : app-pda/coldsync:0 -nls perl
-
 [app-pda/gnupod:0]
 package.use : app-pda/gnupod:0 aac ffmpeg flac mp3 ogg
 
@@ -864,7 +857,7 @@ package.use : app-portage/cfg-update:0 X
 package.use : app-portage/conf-update:0 -colordiff -libressl
 
 [app-portage/eix:0]
-package.use : app-portage/eix:0 -debug -doc -nls -optimization -security -strong-optimization -strong-security -swap-remote -tools dep sqlite
+package.use : app-portage/eix:0 -debug -doc -nls -optimization -security -strong-optimization -strong-security -swap-remote -tools dep required-use sqlite
 
 [app-portage/etc-proposals:0]
 package.use : app-portage/etc-proposals:0 gtk qt4
@@ -987,10 +980,6 @@ package.use : app-text/ghostscript-gpl:0 -djvu -tiff X cups dbus gtk idn static-
 [app-text/glark:0]
 package.use : app-text/glark:0 -doc -test -zip
 
-[app-text/gnome-doc-utils:0]
-package.env : app-text/gnome-doc-utils:0 app-text_gnome-doc-utils_0
-env : MAKEOPTS="-j1"
-
 [app-text/gspell:0]
 package.use : app-text/gspell:0 -vala introspection
 
@@ -1030,9 +1019,6 @@ package.use : app-text/libwpd:0.9 -doc -test tools
 [app-text/libwpg:0.2]
 package.use : app-text/libwpg:0.2 -doc static-libs
 
-[app-text/lodgeit:0]
-package.use : app-text/lodgeit:0 -vim
-
 [app-text/mathtex:0]
 package.use : app-text/mathtex:0 png
 
@@ -1349,13 +1335,9 @@ 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
-package.env : dev-lang/python:2.7 dev-lang_python_2.7
-env : MAKEOPTS="-j1"
 
 [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
-package.env : dev-lang/python:3.4 dev-lang_python_3.4
-env : MAKEOPTS="-j1"
 
 [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
@@ -1951,9 +1933,6 @@ package.use : dev-perl/Carp-Assert:0 -test
 [dev-perl/Carp-Clan:0]
 package.use : dev-perl/Carp-Clan:0 -test
 
-[dev-perl/Class-Accessor-Grouped:0]
-package.use : dev-perl/Class-Accessor-Grouped:0 -test
-
 [dev-perl/Class-C3:0]
 package.use : dev-perl/Class-C3:0 -test
 
@@ -2152,9 +2131,6 @@ 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
 
@@ -2381,12 +2357,24 @@ package.use : dev-perl/Net-Server:0 ipv6
 [dev-perl/NetPacket:0]
 package.use : dev-perl/NetPacket:0 -test
 
+[dev-perl/PAR:0]
+package.use : dev-perl/PAR:0 -minimal
+
+[dev-perl/PDF-API2:0]
+package.use : dev-perl/PDF-API2:0 -examples
+
+[dev-perl/PDF-Create:0]
+package.use : dev-perl/PDF-Create:0 -examples -test
+
 [dev-perl/POE:0]
 package.use : dev-perl/POE:0 -libwww -test ipv6 ncurses tk
 
 [dev-perl/PPI:0]
 package.use : dev-perl/PPI:0 -test
 
+[dev-perl/PPIx-Regexp:0]
+package.use : dev-perl/PPIx-Regexp:0 -examples -test
+
 [dev-perl/PPIx-Utilities:0]
 package.use : dev-perl/PPIx-Utilities:0 -test
 
@@ -2397,22 +2385,37 @@ package.use : dev-perl/Package-DeprecationManager:0 -test
 package.use : dev-perl/Package-Stash-XS:0 -test
 
 [dev-perl/Package-Stash:0]
-package.use : dev-perl/Package-Stash:0 -test
+package.use : dev-perl/Package-Stash:0 -minimal -test
+
+[dev-perl/Pango:0]
+package.use : dev-perl/Pango:0 -examples -minimal -test
+
+[dev-perl/Parallel-ForkManager:0]
+package.use : dev-perl/Parallel-ForkManager:0 -examples -minimal -test
 
 [dev-perl/Params-Validate:0]
 package.use : dev-perl/Params-Validate:0 -test
 
 [dev-perl/Parse-RecDescent:0]
-package.use : dev-perl/Parse-RecDescent:0 -test
+package.use : dev-perl/Parse-RecDescent:0 -examples -test
 
 [dev-perl/Path-Class:0]
 package.use : dev-perl/Path-Class:0 -test
 
+[dev-perl/Path-Tiny:0]
+package.use : dev-perl/Path-Tiny:0 -test
+
 [dev-perl/Perl-Critic:0]
 package.use : dev-perl/Perl-Critic:0 -test
 
 [dev-perl/Perl-Tags:0]
-package.use : dev-perl/Perl-Tags:0 -test
+package.use : dev-perl/Perl-Tags:0 -minimal -test
+
+[dev-perl/Perl-Tidy:0]
+package.use : dev-perl/Perl-Tidy:0 -examples
+
+[dev-perl/Plucene:0]
+package.use : dev-perl/Plucene:0 -test
 
 [dev-perl/Pod-Coverage:0]
 package.use : dev-perl/Pod-Coverage:0 -test
@@ -2420,8 +2423,17 @@ package.use : dev-perl/Pod-Coverage:0 -test
 [dev-perl/PortageXS:0]
 package.use : dev-perl/PortageXS:0 -minimal
 
+[dev-perl/PostScript-Simple:0]
+package.use : dev-perl/PostScript-Simple:0 -examples -test
+
 [dev-perl/Proc-Daemon:0]
-package.use : dev-perl/Proc-Daemon:0 -test
+package.use : dev-perl/Proc-Daemon:0 -minimal
+
+[dev-perl/Proc-ProcessTable:0]
+package.use : dev-perl/Proc-ProcessTable:0 -examples
+
+[dev-perl/Readonly:0]
+package.use : dev-perl/Readonly:0 -test
 
 [dev-perl/Role-Tiny:0]
 package.use : dev-perl/Role-Tiny:0 -test
@@ -2441,11 +2453,17 @@ package.use : dev-perl/Scope-Guard:0 -test
 [dev-perl/Search-Xapian:0]
 package.use : dev-perl/Search-Xapian:0 -examples
 
+[dev-perl/Set-Object:0]
+package.use : dev-perl/Set-Object:0 -test
+
+[dev-perl/Sort-Versions:0]
+package.use : dev-perl/Sort-Versions:0 -test
+
 [dev-perl/Spreadsheet-ParseExcel:0]
 package.use : dev-perl/Spreadsheet-ParseExcel:0 -cjk -test unicode
 
 [dev-perl/Statistics-Descriptive:0]
-package.use : dev-perl/Statistics-Descriptive:0 -test
+package.use : dev-perl/Statistics-Descriptive:0 -examples -test
 
 [dev-perl/Sub-Identify:0]
 package.use : dev-perl/Sub-Identify:0 -test
@@ -2519,6 +2537,9 @@ package.use : dev-perl/Try-Tiny:0 -test
 [dev-perl/UNIVERSAL-moniker:0]
 package.use : dev-perl/UNIVERSAL-moniker:0 -test
 
+[dev-perl/Unicode-UTF8:0]
+package.use : dev-perl/Unicode-UTF8:0 -test
+
 [dev-perl/Validate-Net:0]
 package.use : dev-perl/Validate-Net:0 -test
 
@@ -2555,9 +2576,6 @@ package.use : dev-perl/strictures:0 -test
 [dev-python/Babel:0]
 package.use : dev-python/Babel:0 -doc -test
 
-[dev-python/CacheControl:0]
-package.use : dev-python/CacheControl:0 -test
-
 [dev-python/PyQt4:0]
 package.use : dev-python/PyQt4:0 -debug -declarative -designer -doc -examples -help -kde -multimedia -phonon -script -scripttools -sql -xmlpatterns X dbus opengl svg webkit
 
@@ -3098,8 +3116,6 @@ package.use : dev-python/py-notify:0 -examples -test
 
 [dev-python/py:0]
 package.use : dev-python/py:0 -doc -test
-package.env : dev-python/py:0 dev-python_py_0
-env : MAKEOPTS="-j1"
 
 [dev-python/pyalsaaudio:0]
 package.use : dev-python/pyalsaaudio:0 -doc
@@ -3148,13 +3164,9 @@ package.use : dev-python/pygments:0 -doc -test
 
 [dev-python/pygobject:2]
 package.use : dev-python/pygobject:2 -examples -test libffi
-package.env : dev-python/pygobject:2 dev-python_pygobject_2
-env : MAKEOPTS="-j1"
 
 [dev-python/pygobject:3]
 package.use : dev-python/pygobject:3 -examples -test cairo threads
-package.env : dev-python/pygobject:3 dev-python_pygobject_3
-env : MAKEOPTS="-j1"
 
 [dev-python/pygoocanvas:0]
 package.use : dev-python/pygoocanvas:0 -doc -examples
@@ -3622,23 +3634,29 @@ package.use : dev-ruby/GeoRuby:0 -doc -test
 [dev-ruby/RubyInline:0]
 package.use : dev-ruby/RubyInline:0 -doc -test
 
+[dev-ruby/archive-tar-minitar:0]
+package.use : dev-ruby/archive-tar-minitar:0 -test
+
 [dev-ruby/cmdparse:0]
-package.use : dev-ruby/cmdparse:0 -doc
+package.use : dev-ruby/cmdparse:0 -doc -test
 
 [dev-ruby/color:0]
-package.use : dev-ruby/color:0 -doc
+package.use : dev-ruby/color:0 -doc -test
 
 [dev-ruby/daemons:0]
-package.use : dev-ruby/daemons:0 -doc -examples
+package.use : dev-ruby/daemons:0 -doc -examples -test
 
 [dev-ruby/dbf:0]
 package.use : dev-ruby/dbf:0 -doc -test
 
-[dev-ruby/eventmachine:0]
-package.use : dev-ruby/eventmachine:0 -doc
+[dev-ruby/deprecated:3]
+package.use : dev-ruby/deprecated:3 -test
 
-[dev-ruby/ruby-sdl:0]
-package.use : dev-ruby/ruby-sdl:0 -image -mixer -sge -truetype mpeg
+[dev-ruby/domain_name:0]
+package.use : dev-ruby/domain_name:0 -test
+
+[dev-ruby/eventmachine:0]
+package.use : dev-ruby/eventmachine:0 -doc -test
 
 [dev-ruby/rrdtool-bindings:0]
 package.use : dev-ruby/rrdtool-bindings:0 -test graph
@@ -3647,7 +3665,7 @@ package.use : dev-ruby/rrdtool-bindings:0 -test graph
 package.use : dev-scheme/chicken:0 -doc -emacs
 
 [dev-scheme/guile:12]
-package.use : dev-scheme/guile:12 -debug -debug-freelist -debug-malloc -discouraged -emacs -nls deprecated networking regex threads
+package.use : dev-scheme/guile:12 -debug -debug-freelist -debug-malloc -discouraged -emacs -nls deprecated networking readline regex threads
 
 [dev-scheme/tinyscheme:0]
 package.use : dev-scheme/tinyscheme:0 static-libs
@@ -3958,9 +3976,6 @@ package.use : dev-vcs/gitg:0 -debug -glade python
 [dev-vcs/guilt:0]
 package.use : dev-vcs/guilt:0 -doc
 
-[dev-vcs/hg-git:0]
-package.accept_keywords : =dev-vcs/hg-git-0.8.2 ~amd64
-
 [dev-vcs/hgsubversion:0]
 package.use : dev-vcs/hgsubversion:0 -test
 
@@ -3987,7 +4002,6 @@ package.use : dev-vcs/tig:0 unicode
 
 [dev-vcs/tortoisehg:0]
 package.use : dev-vcs/tortoisehg:0 -doc
-package.accept_keywords : =dev-vcs/tortoisehg-3.7.3 ~amd64
 
 [games-action/0verkill:0]
 package.use : games-action/0verkill:0 X
@@ -4292,7 +4306,7 @@ package.use : games-puzzle/pathological:0 -doc
 package.use : games-puzzle/pingus:0 -music opengl
 
 [games-puzzle/sgt-puzzles:0]
-package.use : games-puzzle/sgt-puzzles:0 -doc
+package.use : games-puzzle/sgt-puzzles:0 -doc -gtk3 -icons
 
 [games-puzzle/skoosh:0]
 package.use : games-puzzle/skoosh:0 -debug -nls
@@ -4532,6 +4546,9 @@ package.use : gnome-extra/libgsf:0 bzip2 gtk introspection
 [kde-frameworks/extra-cmake-modules:5]
 package.use : kde-frameworks/extra-cmake-modules:5 -doc -test
 
+[kde-frameworks/oxygen-icons:5]
+package.use : kde-frameworks/oxygen-icons:5 -test
+
 [kde-misc/kdiff3:4]
 package.use : kde-misc/kdiff3:4 -aqua -debug -kde -qt5 handbook qt4
 
@@ -4804,7 +4821,7 @@ package.use : media-fonts/mplus-fonts:0 X
 package.use : media-fonts/nepali-fonts:0 X
 
 [media-fonts/noto:0]
-package.use : media-fonts/noto:0 X
+package.use : media-fonts/noto:0 -cjk X
 
 [media-fonts/oldstandard:0]
 package.use : media-fonts/oldstandard:0 X
@@ -5129,9 +5146,6 @@ package.use : media-libs/flac:0 -altivec -debug cpu_flags_x86_sse cxx ogg static
 [media-libs/flickcurl:0]
 package.use : media-libs/flickcurl:0 -doc -raptor static-libs
 
-[media-libs/fmod:1]
-package.use : media-libs/fmod:1 -examples
-
 [media-libs/fontconfig:1.0]
 package.use : media-libs/fontconfig:1.0 -doc static-libs
 
@@ -5231,7 +5245,7 @@ package.use : media-libs/id3lib:0 -doc static-libs
 package.use : media-libs/ilmbase:0 static-libs
 
 [media-libs/imlib2:0]
-package.use : media-libs/imlib2:0 -doc -nls X bzip2 cpu_flags_x86_mmx gif jpeg mp3 png static-libs tiff zlib
+package.use : media-libs/imlib2:0 -cpu_flags_x86_mmx -doc -nls X bzip2 cpu_flags_x86_sse2 gif jpeg mp3 png static-libs tiff zlib
 
 [media-libs/imlib:0]
 package.use : media-libs/imlib:0 -doc static-libs
@@ -5318,7 +5332,7 @@ package.use : media-libs/libextractor:0 -gsf -midi -mp4 -tidy archive bzip2 ffmp
 package.use : media-libs/libfishsound:0 flac speex
 
 [media-libs/libggi:0]
-package.use : media-libs/libggi:0 -debug -svga -vis 3dfx X aalib cpu_flags_x86_mmx directfb fbcon
+package.use : media-libs/libggi:0 -3dfx -debug -svga -vis X aalib cpu_flags_x86_mmx directfb fbcon
 
 [media-libs/libggimisc:0]
 package.use : media-libs/libggimisc:0 -svga fbcon
@@ -5372,7 +5386,7 @@ package.use : media-libs/libmad:0 -debug static-libs
 package.use : media-libs/libmediainfo:0 -doc curl mms static-libs
 
 [media-libs/libmikmod:0]
-package.use : media-libs/libmikmod:0 -altivec -coreaudio -debug -pulseaudio alsa cpu_flags_x86_sse2 nas openal oss static-libs threads
+package.use : media-libs/libmikmod:0 -altivec -coreaudio -cpu_flags_x86_sse2 -debug -pulseaudio alsa nas openal oss static-libs threads
 
 [media-libs/libmms:0]
 package.use : media-libs/libmms:0 static-libs
@@ -5551,7 +5565,7 @@ package.use : media-libs/schroedinger:0 static-libs
 package.use : media-libs/sdif:0 -debug -doc -ftruncate threads
 
 [media-libs/sdl-gfx:0]
-package.use : media-libs/sdl-gfx:0 -doc cpu_flags_x86_mmx static-libs
+package.use : media-libs/sdl-gfx:0 -cpu_flags_x86_mmx -doc static-libs
 
 [media-libs/sdl-image:0]
 package.use : media-libs/sdl-image:0 gif jpeg png static-libs tiff webp
@@ -5584,7 +5598,7 @@ package.use : media-libs/sdl2-mixer:0 -fluidsynth -midi -mikmod -playtools -smpe
 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
+package.use : media-libs/smpeg:0 -cpu_flags_x86_mmx -debug X opengl static-libs
 
 [media-libs/soxr:0]
 package.use : media-libs/soxr:0 -examples
@@ -5667,9 +5681,6 @@ package.use : media-plugins/gmpc-shout:0 -nls
 [media-plugins/gmpc-tagedit:0]
 package.use : media-plugins/gmpc-tagedit:0 -nls
 
-[media-plugins/gmpc-wikipedia:0]
-package.use : media-plugins/gmpc-wikipedia:0 -nls
-
 [media-plugins/gst-plugins-a52dec:0.10]
 package.use : media-plugins/gst-plugins-a52dec:0.10 -orc
 
@@ -5802,9 +5813,6 @@ package.use : media-sound/glurp:0 -debug
 [media-sound/gmpc:0]
 package.use : media-sound/gmpc:0 -nls -xspf unique
 
-[media-sound/gnaural:0]
-package.use : media-sound/gnaural:0 -nls
-
 [media-sound/gnomad:0]
 package.use : media-sound/gnomad:0 -nls
 
@@ -5833,7 +5841,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 -debug -mp3rtp -sndfile cpu_flags_x86_mmx frontend 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
@@ -5869,7 +5877,7 @@ package.use : media-sound/mpd:0 -adplug -ao -audiofile -debug -faad -fluidsynth
 package.use : media-sound/mpdscribble:0 curl
 
 [media-sound/mpg123:0]
-package.use : media-sound/mpg123:0 -altivec -coreaudio -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -int-quality -pulseaudio alsa cpu_flags_x86_mmx cpu_flags_x86_sse ipv6 jack nas oss portaudio sdl
+package.use : media-sound/mpg123:0 -altivec -coreaudio -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_mmx -int-quality -pulseaudio alsa cpu_flags_x86_sse ipv6 jack nas oss portaudio sdl
 
 [media-sound/mserv:0]
 package.use : media-sound/mserv:0 -vhosts vorbis
@@ -5998,9 +6006,6 @@ package.use : media-tv/dvbtune:0 xml
 [media-video/acidrip:0]
 package.use : media-video/acidrip:0 encode
 
-[media-video/arista:0]
-package.use : media-video/arista:0 -kde -nautilus -x264 faac xvid
-
 [media-video/camorama:0]
 package.use : media-video/camorama:0 -debug
 
@@ -6066,10 +6071,6 @@ package.use : media-video/ushare:0 -dlna -nls
 [media-video/x264-encoder:0]
 package.use : media-video/x264-encoder:0 -10bit -avs -custom-cflags -ffmpegsource -mp4 ffmpeg interlaced threads
 
-[media-video/xanim:0]
-package.env : media-video/xanim:0 media-video_xanim_0
-env : LDFLAGS="-ldl"
-
 [net-analyzer/amap:0]
 package.use : net-analyzer/amap:0 ssl
 
@@ -6218,7 +6219,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 -libressl -urandom idn ipv6 readline seccomp ssl xml
+package.use : net-dns/bind-tools:0 -doc -gost -gssapi -libressl -seccomp -urandom idn ipv6 readline ssl xml
 package.env : net-dns/bind-tools:0 net-dns_bind-tools_0
 env : LDFLAGS="-liconv"
 
@@ -6256,7 +6257,7 @@ package.use : net-firewall/conntrack-tools:0 -doc
 package.use : net-firewall/firehol:0 -doc
 
 [net-firewall/iptables:0]
-package.use : net-firewall/iptables:0 -netlink ipv6 static-libs
+package.use : net-firewall/iptables:0 -conntrack -netlink ipv6 static-libs
 
 [net-firewall/ufw:0]
 package.use : net-firewall/ufw:0 -examples ipv6
@@ -6492,9 +6493,6 @@ package.use : net-libs/librouteros:0 -debug static-libs
 [net-libs/librsync:0]
 package.accept_keywords : =net-libs/librsync-2.0.0-r1 ~amd64
 
-[net-libs/libsoup-gnome:2.4]
-package.use : net-libs/libsoup-gnome:2.4 -debug introspection
-
 [net-libs/libsoup:2.4]
 package.use : net-libs/libsoup:2.4 -debug -test -vala introspection samba ssl
 
@@ -6549,9 +6547,6 @@ package.use : net-libs/webkit-gtk:3 -aqua -coverage -debug -gles2 -gnome-keyring
 [net-libs/webkit-gtk:4]
 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
-
 [net-libs/zeromq:0]
 package.use : net-libs/zeromq:0 -pgm -test static-libs
 
@@ -6638,7 +6633,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_libressl -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
+package.use : net-misc/curl:0 -adns -curl_ssl_axtls -curl_ssl_gnutls -curl_ssl_libressl -curl_ssl_mbedtls -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
@@ -6652,9 +6647,6 @@ package.use : net-misc/dnetstats:0 -policykit
 [net-misc/dropbox:0]
 package.use : net-misc/dropbox:0 X librsync-bundled
 
-[net-misc/gogoc:0]
-package.use : net-misc/gogoc:0 -debug
-
 [net-misc/gwget:0]
 package.use : net-misc/gwget:0 -epiphany libnotify
 
@@ -6673,9 +6665,6 @@ package.use : net-misc/iputils:0 -SECURITY_HAZARD -doc -static caps filecaps gnu
 [net-misc/ipv6calc:0]
 package.use : net-misc/ipv6calc:0 -test geoip
 
-[net-misc/jigdo:0]
-package.use : net-misc/jigdo:0 -nls berkdb gtk
-
 [net-misc/knock:0]
 package.use : net-misc/knock:0 server
 
@@ -6775,11 +6764,8 @@ package.use : net-misc/stunnel:0 -libressl -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
-
 [net-misc/tor:0]
-package.use : net-misc/tor:0 -bufferevents -libressl -scrypt -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web seccomp
+package.use : net-misc/tor:0 -bufferevents -libressl -scrypt -seccomp -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web
 package.env : net-misc/tor:0 net-misc_tor_0
 env : LDFLAGS="-liconv"
 
@@ -6798,6 +6784,9 @@ package.use : net-misc/wol:0 -nls
 [net-misc/wput:0]
 package.use : net-misc/wput:0 -debug -nls ssl
 
+[net-misc/x2goserver:0]
+package.use : net-misc/x2goserver:0 -postgres fuse sqlite
+
 [net-misc/youtube-dl:0]
 package.use : net-misc/youtube-dl:0 -offensive -test
 
@@ -6859,13 +6848,9 @@ env : LDFLAGS="-lintl"
 
 [net-print/cups-filters:0]
 package.use : net-print/cups-filters:0 -ldap dbus foomatic jpeg perl png static-libs tiff zeroconf
-package.env : net-print/cups-filters:0 net-print_cups-filters_0
-env : MAKEOPTS="-j1"
 
 [net-print/cups:0]
 package.use : net-print/cups:0 -debug -java -kerberos -lprng-compat -pam -selinux -systemd -usb X acl dbus python ssl static-libs threads xinetd zeroconf
-package.env : net-print/cups:0 net-print_cups_0
-env : MAKEOPTS="-j1"
 
 [net-print/gtklp:0]
 package.use : net-print/gtklp:0 -nls ssl
@@ -6925,7 +6910,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 -doc -extra-tools -selinux -systemd -test -test-programs cups obex readline udev
+package.use : net-wireless/bluez:0 -debug -deprecated -doc -experimental -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
@@ -6975,6 +6960,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
+
 [sci-biology/bowtie:2]
 package.use : sci-biology/bowtie:2 -examples cpu_flags_x86_sse2 tbb
 
@@ -7126,7 +7114,7 @@ package.use : sci-libs/fftw:3.0 -altivec -cpu_flags_x86_avx -cpu_flags_x86_fma3
 package.use : sci-libs/flann:0 -cuda -doc -examples -mpi -octave -test openmp static-libs
 
 [sci-libs/gsl:0]
-package.use : sci-libs/gsl:0 -cblas-external
+package.use : sci-libs/gsl:0 -cblas-external -static-libs
 
 [sci-libs/itpp:0]
 package.use : sci-libs/itpp:0 -doc
@@ -7303,7 +7291,7 @@ package.use : sys-apps/iproute2:0 -minimal -selinux atm berkdb iptables ipv6
 package.use : sys-apps/irqbalance:0 caps numa
 
 [sys-apps/kbd:0]
-package.use : sys-apps/kbd:0 -nls -pam
+package.use : sys-apps/kbd:0 -nls -pam -test
 
 [sys-apps/kexec-tools:0]
 package.use : sys-apps/kexec-tools:0 -booke -xen lzma zlib
@@ -7471,9 +7459,6 @@ 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-config:0]
-package.unmask : =sys-devel/binutils-config-5-r2
-
 [sys-devel/bison:0]
 package.use : sys-devel/bison:0 -examples -nls -static -test
 
@@ -7484,7 +7469,7 @@ package.use : sys-devel/flex:0 -nls -static -test
 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/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
@@ -7659,10 +7644,6 @@ package.use : sys-libs/tevent:0 python
 [sys-libs/timezone-data:0]
 package.use : sys-libs/timezone-data:0 -leaps_timezone -nls
 
-[sys-libs/uclibc:0]
-package.use : sys-libs/uclibc:0 -* -wordexp savedconfig
-package.accept_keywords : =sys-libs/uclibc-9999 **
-
 [sys-libs/uid_wrapper:0]
 package.use : sys-libs/uid_wrapper:0 -test
 
@@ -7700,7 +7681,7 @@ package.use : sys-process/latencytop:0 gtk unicode
 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
+package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test ncurses static-libs unicode
 
 [sys-process/psmisc:0]
 package.use : sys-process/psmisc:0 -nls -selinux X ipv6
@@ -7801,10 +7782,6 @@ package.use : www-client/links:2 -livecd -suid -svga X bzip2 directfb fbcon gpm
 [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 -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
 
@@ -7873,7 +7850,7 @@ package.use : x11-apps/xinput_calibrator:0 gtk
 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_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_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa
+package.use : x11-base/xorg-drivers:0 -input_devices_libinput -input_devices_vmmouse -video_cards_amdgpu -video_cards_dummy -video_cards_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_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 -glamor -kdrive -libressl -minimal -selinux -systemd -tslib -unwind -wayland -xephyr -xnest -xvfb ipv6 nptl static-libs suid udev xorg
@@ -7937,8 +7914,6 @@ package.use : x11-libs/fox:1.7 -debug -doc -profile bzip2 jpeg opengl png tiff t
 
 [x11-libs/gdk-pixbuf:2]
 package.use : x11-libs/gdk-pixbuf:2 -debug -test X introspection jpeg jpeg2k tiff
-package.env : x11-libs/gdk-pixbuf:2 x11-libs_gdk-pixbuf_2
-env : MAKEOPTS="-j1"
 
 [x11-libs/gksu:0]
 package.use : x11-libs/gksu:0 -doc -gnome
@@ -8457,7 +8432,7 @@ package.use : x11-proto/xproto:0 -doc
 package.use : x11-terms/aterm:0 -background -cjk -xgetdefault
 
 [x11-terms/eterm:0]
-package.use : x11-terms/eterm:0 -escreen -minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode
+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
@@ -8534,9 +8509,6 @@ package.use : x11-themes/tangerine-icon-theme:0 -minimal
 [x11-themes/windowmaker-themes:0]
 package.use : x11-themes/windowmaker-themes:0 -offensive
 
-[x11-themes/xcursor-neutral:0]
-package.use : x11-themes/xcursor-neutral:0 -examples
-
 [x11-wm/blackbox:0]
 package.use : x11-wm/blackbox:0 -debug -nls -truetype
 
@@ -8553,7 +8525,7 @@ package.use : x11-wm/fluxbox:0 -bidi -nls -vim-syntax -xinerama imlib slit systr
 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
diff --git a/core/var/lib/portage/world.CYCLE.4 b/core/var/lib/portage/world.CYCLE.4
index cf8419f..a10becf 100644
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
@@ -1270,7 +1270,6 @@ dev-ruby/eventmachine
 dev-ruby/htmlentities
 dev-ruby/imagesize
 dev-ruby/kirbybase
-dev-ruby/matchy
 dev-ruby/mecab-ruby
 dev-ruby/mechanize
 dev-ruby/memcache-client
@@ -2096,7 +2095,6 @@ media-plugins/gmpc-mmkeys
 media-plugins/gmpc-playlistsort
 media-plugins/gmpc-shout
 media-plugins/gmpc-tagedit
-media-plugins/gmpc-wikipedia
 media-plugins/gst-plugins-amr
 media-plugins/gst-plugins-annodex
 media-plugins/gst-plugins-dash
@@ -2562,7 +2560,6 @@ net-misc/gcap
 net-misc/geoipupdate
 net-misc/getdate
 net-misc/gofish
-net-misc/gogoc
 net-misc/grdesktop
 net-misc/gupnp-tools
 net-misc/gwget