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

[Anthony G. Basile]

commit:     b19c2fe0f76c1550368cdef4fed6d10657bdea7b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 22:41:54 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 22:41:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=b19c2fe0

world: add www-client/midori

 core/etc/grs/world.conf            | 130 ++++++++++++++++++++-----------------
 core/var/lib/portage/world.CYCLE.3 |   1 +
 2 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index b62463a..65ffaca 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -59,13 +59,13 @@ package.use : app-crypt/gpgme:1 -common-lisp -python -qt5 cxx static-libs
 package.use : app-crypt/libsecret:0 -debug -test crypt introspection vala
 
 [app-crypt/mit-krb5:0]
-package.use : app-crypt/mit-krb5:0 -doc -libressl -openldap -selinux -test keyutils pkinit threads xinetd
+package.use : app-crypt/mit-krb5:0 -doc -libressl -openldap -selinux -test keyutils nls pkinit threads xinetd
 
 [app-crypt/p11-kit:0]
 package.use : app-crypt/p11-kit:0 -debug asn1 libffi trust
 
 [app-crypt/pinentry:0]
-package.use : app-crypt/pinentry:0 -emacs -qt5 -static caps gnome-keyring gtk ncurses qt4
+package.use : app-crypt/pinentry:0 -emacs -qt5 -static caps gnome-keyring gtk ncurses
 
 [app-crypt/rhash:0]
 package.use : app-crypt/rhash:0 -debug -openssl -static-libs nls
@@ -88,6 +88,9 @@ package.use : app-i18n/enca:0 -doc -static-libs iconv recode
 [app-misc/ca-certificates:0]
 package.use : app-misc/ca-certificates:0 -insecure_certs cacert
 
+[app-misc/geoclue:2.0]
+package.use : app-misc/geoclue:2.0 -zeroconf introspection modemmanager
+
 [app-misc/pax-utils:0]
 package.use : app-misc/pax-utils:0 -debug caps python seccomp
 
@@ -98,7 +101,7 @@ package.use : app-misc/tmux:0 -debug -selinux -utempter vim-syntax
 package.use : app-office/abiword:2 -collab -debug -eds -grammar -map -ots -redland calendar cups goffice introspection latex math plugins readline spell thesaurus wmf wordperfect
 
 [app-office/gnumeric:0]
-package.use : app-office/gnumeric:0 -libgda introspection perl python
+package.use : app-office/gnumeric:0 -libgda -perl -python introspection
 
 [app-pda/libimobiledevice:0]
 package.use : app-pda/libimobiledevice:0 gnutls python static-libs
@@ -158,7 +161,7 @@ package.use : app-text/libwpg:0.3 -doc -static-libs
 package.use : app-text/poppler:0 -cjk -debug -doc -nss -qt5 cairo curl cxx introspection jpeg jpeg2k lcms png qt4 tiff utils
 
 [app-text/qpdf:0]
-package.use : app-text/qpdf:0 -doc -examples -perl -test static-libs
+package.use : app-text/qpdf:0 -doc -examples -perl -static-libs -test
 
 [app-text/recode:0]
 package.use : app-text/recode:0 -nls static-libs
@@ -167,7 +170,7 @@ package.use : app-text/recode:0 -nls static-libs
 package.use : app-text/teckit:0 -static-libs
 
 [app-text/texlive-core:0]
-package.use : app-text/texlive-core:0 -doc -source X cjk luajittex tk xetex
+package.use : app-text/texlive-core:0 -doc -source -tk X cjk luajittex xetex
 
 [app-text/wv:0]
 package.use : app-text/wv:0 -tools wmf
@@ -224,13 +227,16 @@ package.use : dev-lang/orc:0 -examples pax_kernel static-libs
 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 -libressl -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk wide-unicode xml
+package.use : dev-lang/python:2.7 -berkdb -build -doc -examples -libressl -tk -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads wide-unicode xml
 
 [dev-lang/python:3.4]
-package.use : dev-lang/python:3.4 -build -examples -libressl -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk xml
+package.use : dev-lang/python:3.4 -build -examples -libressl -tk -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads xml
+
+[dev-lang/python:3.5]
+package.use : dev-lang/python:3.5 -build -examples -gdbm -libressl -sqlite -tk -wininst hardened ipv6 ncurses readline ssl threads xml
 
 [dev-lang/ruby:2.2]
-package.use : dev-lang/ruby:2.2 -debug -doc -examples -jemalloc -libressl -rubytests -socks5 -tk -xemacs berkdb gdbm ipv6 ncurses rdoc readline ssl
+package.use : dev-lang/ruby:2.2 -berkdb -debug -doc -examples -gdbm -jemalloc -libressl -rubytests -socks5 -tk -xemacs ipv6 ncurses rdoc readline ssl
 
 [dev-lang/swig:0]
 package.use : dev-lang/swig:0 -ccache -doc pcre
@@ -238,9 +244,6 @@ package.use : dev-lang/swig:0 -ccache -doc pcre
 [dev-lang/tcl:0]
 package.use : dev-lang/tcl:0 -debug threads
 
-[dev-lang/tk:0]
-package.use : dev-lang/tk:0 -aqua -debug -test -truetype threads xscreensaver
-
 [dev-lang/vala:0.34]
 package.use : dev-lang/vala:0.34 -test
 
@@ -277,9 +280,6 @@ package.use : dev-libs/cyrus-sasl:2 -authdaemond -java -kerberos -ldapdb -mysql
 [dev-libs/dbus-glib:0]
 package.use : dev-libs/dbus-glib:0 -debug -test static-libs
 
-[dev-libs/elfutils:0]
-package.use : dev-libs/elfutils:0 -lzma -static-libs -test -threads bzip2 nls utils
-
 [dev-libs/eventlog:0]
 package.use : dev-libs/eventlog:0 static-libs
 
@@ -301,6 +301,9 @@ package.use : dev-libs/gmp:0 -doc -pgo asm cxx static-libs
 [dev-libs/gobject-introspection:0]
 package.use : dev-libs/gobject-introspection:0 -doctool -test cairo
 
+[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
 
@@ -343,6 +346,9 @@ package.use : dev-libs/libdaemon:0 -doc -examples static-libs
 [dev-libs/libdbusmenu:0]
 package.use : dev-libs/libdbusmenu:0 -debug -gtk gtk3 introspection
 
+[dev-libs/libelf:0]
+package.use : dev-libs/libelf:0 -debug nls
+
 [dev-libs/libev:0]
 package.use : dev-libs/libev:0 static-libs
 
@@ -389,7 +395,7 @@ package.use : dev-libs/libnatspec:0 -doc python
 package.use : dev-libs/libnl:3 python static-libs utils
 
 [dev-libs/libpcre2:0]
-package.use : dev-libs/libpcre2:0 -jit -libedit -pcre16 -pcre32 -static-libs bzip2 readline recursion-limit unicode zlib
+package.use : dev-libs/libpcre2:0 -bzip2 -jit -libedit -pcre16 -pcre32 -static-libs readline recursion-limit unicode zlib
 
 [dev-libs/libpcre:3]
 package.use : dev-libs/libpcre:3 -jit -libedit -pcre32 bzip2 cxx pcre16 readline recursion-limit static-libs unicode zlib
@@ -475,15 +481,6 @@ package.use : dev-perl/CGI:0 -test
 [dev-perl/Error:0]
 package.use : dev-perl/Error:0 -test
 
-[dev-perl/File-BaseDir:0]
-package.use : dev-perl/File-BaseDir:0 -test
-
-[dev-perl/File-DesktopEntry:0]
-package.use : dev-perl/File-DesktopEntry:0 -test
-
-[dev-perl/File-MimeInfo:0]
-package.use : dev-perl/File-MimeInfo:0 -test
-
 [dev-perl/HTML-Parser:0]
 package.use : dev-perl/HTML-Parser:0 -test
 
@@ -494,7 +491,7 @@ package.use : dev-perl/HTTP-Message:0 -test
 package.use : dev-perl/IO-HTML:0 -test
 
 [dev-perl/IO-Socket-SSL:0]
-package.use : dev-perl/IO-Socket-SSL:0 idn
+package.use : dev-perl/IO-Socket-SSL:0 -examples idn
 
 [dev-perl/Locale-Maketext-Lexicon:0]
 package.use : dev-perl/Locale-Maketext-Lexicon:0 -test
@@ -566,7 +563,7 @@ package.use : dev-python/ply:0 -examples
 package.use : dev-python/pyasn1:0 -doc
 
 [dev-python/pycairo:0]
-package.use : dev-python/pycairo:0 -doc -examples -test svg xcb
+package.use : dev-python/pycairo:0 -doc -examples -test xcb
 
 [dev-python/pycparser:0]
 package.use : dev-python/pycparser:0 -test
@@ -667,9 +664,6 @@ package.use : dev-ruby/test-unit:2 -doc -ruby_targets_ruby23 -test ruby_targets_
 [dev-scheme/guile:12]
 package.use : dev-scheme/guile:12 -debug -debug-freelist -debug-malloc -discouraged -emacs -nls deprecated networking readline regex threads
 
-[dev-tcltk/blt:0]
-package.use : dev-tcltk/blt:0 X jpeg static-libs
-
 [dev-tex/bibtexu:0]
 package.use : dev-tex/bibtexu:0 -doc -source
 
@@ -709,6 +703,9 @@ package.use : dev-util/ctags:0 -json -xml -yaml
 [dev-util/desktop-file-utils:0]
 package.use : dev-util/desktop-file-utils:0 -emacs
 
+[dev-util/ninja:0]
+package.use : dev-util/ninja:0 -doc -emacs -test -vim-syntax -zsh-completion
+
 [dev-util/pkgconfig:0]
 package.use : dev-util/pkgconfig:0 -internal-glib hardened
 
@@ -722,7 +719,7 @@ package.use : dev-util/scons:0 -doc
 package.use : dev-util/strace:0 -aio -static -unwind perl
 
 [dev-vcs/git:0]
-package.use : dev-vcs/git:0 -cvs -doc -emacs -highlight -libressl -mediawiki -mediawiki-experimental -nls -ppcsha1 -test blksha1 cgi curl gnome-keyring gpg iconv pcre perl python subversion threads tk webdav xinetd
+package.use : dev-vcs/git:0 -cvs -doc -emacs -gpg -highlight -iconv -libressl -mediawiki -mediawiki-experimental -nls -ppcsha1 -test -tk blksha1 cgi curl gnome-keyring pcre perl python subversion threads webdav xinetd
 
 [dev-vcs/subversion:0]
 package.use : dev-vcs/subversion:0 -apache2 -ctypes-python -debug -doc -dso -java -kwallet -nls -test berkdb extras gnome-keyring http perl python ruby sasl vim-syntax
@@ -776,7 +773,7 @@ package.use : mail-client/nail:0 -kerberos -net ssl
 package.use : mail-mta/postfix:0 -doc -dovecot-sasl -ldap-bind -libressl -lmdb -memcached -mysql -nis -pam -postgres -selinux berkdb cdb eai hardened ldap mbox sasl sqlite ssl
 
 [media-fonts/dejavu:0]
-package.use : media-fonts/dejavu:0 X fontforge
+package.use : media-fonts/dejavu:0 -fontforge X
 
 [media-fonts/font-misc-misc:0]
 package.use : media-fonts/font-misc-misc:0 -X nls
@@ -787,9 +784,6 @@ package.use : media-fonts/urw-fonts:0 X
 [media-gfx/eog:1]
 package.use : media-gfx/eog:1 -debug exif introspection jpeg lcms svg tiff xmp
 
-[media-gfx/fontforge:0]
-package.use : media-gfx/fontforge:0 -gtk -test -truetype-debugger X cairo gif jpeg png python readline svg tiff unicode
-
 [media-gfx/gimp:2]
 package.use : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -test -udev aalib alsa bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse curl dbus exif jpeg jpeg2k lcms mng pdf png postscript python smp svg tiff wmf xpm
 
@@ -833,7 +827,7 @@ package.use : media-libs/fontconfig:1.0 -doc static-libs
 package.use : media-libs/freeglut:0 -debug static-libs
 
 [media-libs/freetype:2]
-package.use : media-libs/freetype:2 -debug -doc -harfbuzz -infinality X adobe-cff bindist bzip2 cleartype_hinting fontforge png static-libs utils
+package.use : media-libs/freetype:2 -debug -doc -fontforge -harfbuzz -infinality X adobe-cff bindist bzip2 cleartype_hinting png static-libs utils
 
 [media-libs/gegl:0]
 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
@@ -844,6 +838,12 @@ package.use : media-libs/giflib:0 -doc static-libs
 [media-libs/glu:0]
 package.use : media-libs/glu:0 static-libs
 
+[media-libs/gst-plugins-base:1.0]
+package.use : media-libs/gst-plugins-base:1.0 -X -alsa -ivorbis -orc -theora introspection nls ogg pango vorbis
+
+[media-libs/gstreamer:1.0]
+package.use : media-libs/gstreamer:1.0 -orc -test -unwind caps introspection nls
+
 [media-libs/harfbuzz:0]
 package.use : media-libs/harfbuzz:0 -debug -fontconfig -test cairo glib graphite icu introspection static-libs truetype
 
@@ -919,9 +919,6 @@ package.use : media-libs/libgii:0 X
 [media-libs/libid3tag:0]
 package.use : media-libs/libid3tag:0 -debug static-libs
 
-[media-libs/libiec61883:0]
-package.use : media-libs/libiec61883:0 -examples static-libs
-
 [media-libs/libjpeg-turbo:0]
 package.use : media-libs/libjpeg-turbo:0 -java static-libs
 
@@ -983,7 +980,7 @@ package.use : media-libs/libwebp:0 -cpu_flags_x86_avx2 -cpu_flags_x86_sse4_1 -ex
 package.use : media-libs/libwmf:0 -debug -doc -expat X xml
 
 [media-libs/mesa:0]
-package.use : media-libs/mesa:0 -d3d9 -debug -gallium -gles1 -gles2 -llvm -opencl -openmax -osmesa -selinux -vaapi -valgrind -vdpau -video_cards_freedreno -video_cards_i915 -video_cards_i965 -video_cards_imx -video_cards_r100 -video_cards_r200 -video_cards_r300 -video_cards_r600 -video_cards_radeonsi -video_cards_vc4 -video_cards_vivante -video_cards_vmware -vulkan -wayland -xa bindist classic dri3 egl gbm nptl pax_kernel pic video_cards_intel video_cards_nouveau video_cards_radeon xvmc
+package.use : media-libs/mesa:0 -d3d9 -debug -gallium -gles1 -gles2 -llvm -nptl -opencl -openmax -osmesa -selinux -vaapi -valgrind -vdpau -video_cards_freedreno -video_cards_i915 -video_cards_i965 -video_cards_imx -video_cards_r100 -video_cards_r200 -video_cards_r300 -video_cards_r600 -video_cards_radeonsi -video_cards_vc4 -video_cards_vivante -video_cards_vmware -vulkan -wayland -xa bindist classic dri3 egl gbm pax_kernel pic video_cards_intel video_cards_nouveau video_cards_radeon xvmc
 
 [media-libs/nas:0]
 package.use : media-libs/nas:0 -doc static-libs
@@ -1046,13 +1043,13 @@ package.use : media-sound/twolame:0 static-libs
 package.use : media-sound/wavpack:0 static-libs
 
 [media-video/ffmpeg:0]
-package.use : media-video/ffmpeg:0 -altivec -amrenc -chromaprint -chromium -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_aes -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_fma3 -cpu_flags_x86_fma4 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_sse4_2 -cpu_flags_x86_ssse3 -cpu_flags_x86_xop -debug -doc -fdk -flite -frei0r -fribidi -gcrypt -gmp -kvazaar -libilbc -librtmp -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -mmal -nvenc -openh264 -openssl -pulseaudio -rubberband -snappy -sofalizer -ssh -test -truetype -vdpau -x264 -zeromq -zimg -zvbi X 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 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 jpeg2
 k ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss pic postproc 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 -chromaprint -chromium -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_aes -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_fma3 -cpu_flags_x86_fma4 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_sse4_2 -cpu_flags_x86_ssse3 -cpu_flags_x86_xop -debug -doc -fdk -flite -frei0r -fribidi -gcrypt -gmp -iec61883 -kvazaar -libilbc -librtmp -libsoxr -mipsdspr1 -mipsdspr2 -mipsfpu -mmal -nvenc -openh264 -openssl -pulseaudio -rubberband -snappy -sofalizer -ssh -test -truetype -vdpau -x264 -zeromq -zimg -zvbi X 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 fftools_aviocat fftools_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper fftools_qt-faststart fftools_sidxindex fftools_trasher fontconfig gme gnutls gpl gsm hardcoded-tables iconv ieee1394 jack jpeg
 2k ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss pic postproc samba schroedinger sdl speex static-libs theora threads twolame v4l vaapi vorbis vpx wavpack webp x265 xcb xvid zlib
 
 [media-video/mplayer:0]
 package.use : media-video/mplayer:0 -altivec -aqua -bluray -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_ssse3 -cpudetection -debug -doc -faad -lirc -live -pulseaudio -rar -rtc -selinux -toolame -tremor -vcd -vdpau -vidix -x264 -yuv4mpeg X a52 aalib alsa bidi bl bs2b cddb cdio cdparanoia cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 dga directfb dts dv dvb dvd dvdnav enca encode faac fbcon ftp ggi gif gsm iconv ipv6 jack joystick jpeg ladspa libass libcaca libmpeg2 lzo mad md5sum mng mp3 nas network nut openal opengl osdmenu oss png pnm pvr radio rtmp samba sdl shm speex tga theora truetype twolame unicode v4l video_cards_mga video_cards_s3virge video_cards_tdfx vorbis xinerama xscreensaver xv xvid xvmc zoran
 
 [media-video/rtmpdump:0]
-package.use : media-video/rtmpdump:0 -libressl -polarssl gnutls ssl
+package.use : media-video/rtmpdump:0 -libressl gnutls ssl
 
 [media-video/smplayer:0]
 package.use : media-video/smplayer:0 -autoshutdown -debug -mpris -qt5 -streaming bidi
@@ -1060,6 +1057,9 @@ package.use : media-video/smplayer:0 -autoshutdown -debug -mpris -qt5 -streaming
 [net-analyzer/tcpdump:0]
 package.use : net-analyzer/tcpdump:0 -libressl -smi -test drop-root samba ssl suid
 
+[net-dialup/linux-atm:0]
+package.use : net-dialup/linux-atm:0 -static-libs
+
 [net-dns/avahi:0]
 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
 
@@ -1083,6 +1083,7 @@ package.use : net-fs/cifs-utils:0 -creds acl ads caps caps-ng
 
 [net-fs/samba:0]
 package.use : net-fs/samba:0 -addc -addns -cluster -dmapi -gpg -iprint -pam -quota -selinux -system-heimdal -systemd -test -zeroconf acl ads client cups fam gnutls ldap syslog system-mitkrb5 winbind
+package.unmask : =net-fs/samba-4.3.9-r99
 
 [net-ftp/lftp:0]
 package.use : net-ftp/lftp:0 -convert-mozilla-cookies -libressl -nls -socks5 -verify-file gnutls idn ipv6 ssl
@@ -1105,6 +1106,9 @@ package.use : net-libs/gtk-vnc:0 -examples -pulseaudio -python gtk3 introspectio
 [net-libs/libetpan:0]
 package.use : net-libs/libetpan:0 -debug -liblockfile -libressl berkdb gnutls ipv6 sasl ssl static-libs
 
+[net-libs/libmbim:0]
+package.use : net-libs/libmbim:0 -static-libs -udev
+
 [net-libs/libmnl:0]
 package.use : net-libs/libmnl:0 -examples static-libs
 
@@ -1114,6 +1118,9 @@ package.use : net-libs/libnatpmp:0 static-libs
 [net-libs/libpcap:0]
 package.use : net-libs/libpcap:0 -netlink -usb bluetooth dbus static-libs
 
+[net-libs/libqmi:0]
+package.use : net-libs/libqmi:0 -doc -static-libs mbim
+
 [net-libs/libsoup:2.4]
 package.use : net-libs/libsoup:2.4 -debug -gssapi -test -vala introspection samba ssl
 
@@ -1129,6 +1136,9 @@ package.use : net-libs/serf:1 -kerberos
 [net-libs/telepathy-glib:0]
 package.use : net-libs/telepathy-glib:0 -debug -test introspection vala
 
+[net-libs/webkit-gtk:4]
+package.use : net-libs/webkit-gtk:4 -aqua -coverage -doc -gles2 -gnome-keyring -jit -libnotify -nsplugin -spell -test -wayland X egl geolocation gstreamer introspection opengl webgl
+
 [net-mail/dovecot:0]
 package.use : net-mail/dovecot:0 -doc -kerberos -libressl -lucene -lz4 -managesieve -mysql -pam -postgres -selinux -sieve -solr -textcat -vpopmail bzip2 caps ipv6 ldap lzma sqlite ssl static-libs suid tcpd zlib
 
@@ -1139,7 +1149,10 @@ package.use : net-mail/mailbase:0 -pam
 package.use : net-misc/curl:0 -adns -curl_ssl_axtls -curl_ssl_gnutls -curl_ssl_libressl -curl_ssl_mbedtls -curl_ssl_openssl -curl_ssl_winssl -http2 -kerberos -metalink -ssh -test curl_ssl_nss idn ipv6 ldap rtmp samba ssl static-libs threads
 
 [net-misc/iputils:0]
-package.use : net-misc/iputils:0 -SECURITY_HAZARD -clockdiff -doc -gcrypt -libressl -rarpd -rdisc -static -tftpd -tracepath -traceroute arping caps filecaps idn ipv6 ssl
+package.use : net-misc/iputils:0 -SECURITY_HAZARD -arping -clockdiff -doc -gcrypt -idn -libressl -rarpd -rdisc -static -tftpd -tracepath -traceroute caps filecaps ipv6 ssl
+
+[net-misc/modemmanager:0]
+package.use : net-misc/modemmanager:0 -mbim -policykit -systemd -vala introspection qmi
 
 [net-misc/ntp:0]
 package.use : net-misc/ntp:0 -caps -debug -libressl -openntpd -parse-clocks -samba -selinux -snmp -vim-syntax -zeroconf ipv6 readline ssl threads
@@ -1166,10 +1179,10 @@ package.use : net-nds/openldap:0 -debug -experimental -kerberos -kinit -libressl
 package.use : net-p2p/transmission:0 -ayatana -libressl -lightweight -qt5 -systemd -xfs gtk
 
 [net-print/cups-filters:0]
-package.use : net-print/cups-filters:0 -ipp_autosetup -ldap -pdf -test dbus foomatic jpeg perl png postscript static-libs tiff zeroconf
+package.use : net-print/cups-filters:0 -dbus -ipp_autosetup -jpeg -ldap -pdf -perl -png -static-libs -test -tiff -zeroconf foomatic postscript
 
 [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.use : net-print/cups:0 -X -acl -dbus -debug -java -kerberos -lprng-compat -python -selinux -static-libs -systemd -usb -xinetd -zeroconf pam ssl threads
 
 [net-vpn/tor:0]
 package.use : net-vpn/tor:0 -libressl -lzma -scrypt -selinux -systemd -test -tor-hardening -web -zstd seccomp
@@ -1252,9 +1265,6 @@ package.use : sys-apps/less:0 pcre unicode
 [sys-apps/man-db:0]
 package.use : sys-apps/man-db:0 -nls -selinux berkdb gdbm manpager static-libs zlib
 
-[sys-apps/man-pages:0]
-package.use : sys-apps/man-pages:0 -l10n_da -l10n_de -l10n_fr -l10n_it -l10n_ja -l10n_nl -l10n_pl -l10n_ro -l10n_ru -l10n_zh-CN nls
-
 [sys-apps/net-tools:0]
 package.use : sys-apps/net-tools:0 -nis -nls -plipconfig -selinux -slattach -static arp hostname ipv6
 
@@ -1294,6 +1304,9 @@ package.use : sys-apps/util-linux:0 -build -fdformat -kill -nls -pam -selinux -s
 [sys-apps/xinetd:0]
 package.use : sys-apps/xinetd:0 -rpc perl tcpd
 
+[sys-auth/pambase:0]
+package.use : sys-auth/pambase:0 -consolekit -debug -gnome-keyring -minimal -mktemp -pam_krb5 -pam_ssh -passwdqc -securetty -selinux -systemd cracklib nullok sha512
+
 [sys-auth/skey:0]
 package.use : sys-auth/skey:0 static-libs
 
@@ -1316,7 +1329,7 @@ package.use : sys-devel/bison:0 -examples -nls -static -test
 package.use : sys-devel/flex:0 -nls -static -test
 
 [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
+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 -regression-test -sanitize -vanilla -vtv cxx hardened nls nptl openmp
 
 [sys-devel/gdb:0]
 package.use : sys-devel/gdb:0 -multitarget -nls -test -vanilla -xml client lzma python server
@@ -1372,15 +1385,9 @@ package.use : sys-libs/e2fsprogs-libs:0 -nls static-libs
 [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 -audit -caps -debug -gd -multilib -nscd -profile -selinux -suid -systemtap -vanilla hardened rpc
-
 [sys-libs/ldb:0]
 package.use : sys-libs/ldb:0 -doc ldap python
 
-[sys-libs/libavc1394:0]
-package.use : sys-libs/libavc1394:0 static-libs
-
 [sys-libs/libcap-ng:0]
 package.use : sys-libs/libcap-ng:0 python static-libs
 
@@ -1402,6 +1409,9 @@ package.use : sys-libs/mtdev:0 static-libs
 [sys-libs/ncurses:0]
 package.use : sys-libs/ncurses:0 -ada -debug -doc -gpm -minimal -profile -test -threads -tinfo -trace cxx static-libs unicode
 
+[sys-libs/pam:0]
+package.use : sys-libs/pam:0 -audit -berkdb -debug -nis -selinux -test -vim-syntax cracklib nls pie
+
 [sys-libs/readline:0]
 package.use : sys-libs/readline:0 static-libs utils
 
@@ -1417,14 +1427,11 @@ package.use : sys-libs/tdb:0 python
 [sys-libs/tevent:0]
 package.use : sys-libs/tevent:0 python
 
-[sys-libs/timezone-data:0]
-package.use : sys-libs/timezone-data:0 -leaps_timezone -nls
-
 [sys-libs/zlib:0]
 package.use : sys-libs/zlib:0 minizip static-libs
 
 [sys-process/fcron:0]
-package.use : sys-process/fcron:0 -audit -debug -l10n_fr -pam -selinux mta readline system-crontab
+package.use : sys-process/fcron:0 -audit -debug -l10n_fr -selinux mta pam readline system-crontab
 
 [sys-process/lsof:0]
 package.use : sys-process/lsof:0 -examples -rpc -selinux -static ipv6
@@ -1468,6 +1475,10 @@ package.use : virtual/ssh:0 -minimal
 [virtual/udev:0]
 package.use : virtual/udev:0 -systemd
 
+[www-client/midori:0]
+package.use : www-client/midori:0 -doc -granite -jit -xscreensaver -zeitgeist
+package.accept_keywords : =www-client/midori-0.5.11-r2 ~amd64
+
 [www-client/w3m:0]
 package.use : www-client/w3m:0 -X -fbcon -gpm -gtk -imlib -l10n_ja -libressl -lynxkeymap -nntp -xface nls ssl unicode
 
@@ -1714,9 +1725,6 @@ package.use : x11-misc/shared-mime-info:0 -test
 [x11-misc/slim:0]
 package.use : x11-misc/slim:0 -branding -consolekit -pam
 
-[x11-misc/xdg-utils:0]
-package.use : x11-misc/xdg-utils:0 -doc perl
-
 [x11-misc/xscreensaver:0]
 package.use : x11-misc/xscreensaver:0 -gdm -new-login -offensive -pam -selinux jpeg opengl perl suid xinerama
 

diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.3
index b495d89..983bfe8 100644
--- a/core/var/lib/portage/world.CYCLE.3
+++ b/core/var/lib/portage/world.CYCLE.3
@@ -54,6 +54,7 @@ sys-libs/db
 sys-libs/gdbm
 sys-process/fcron
 sys-process/lsof
+www-client/midori
 x11-base/xorg-server
 x11-libs/gksu
 x11-misc/slim