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

[Anthony G. Basile]

commit:     b236519fca5426b664f63bcfe713d07cb1f2d0d3
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 10:56:59 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May 26 10:56:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=b236519f

Bring in better line with desktop-amd64-musl-hardened

 core/etc/grs/world.conf            | 79 +++++++++++++++-----------------------
 core/var/lib/portage/world.CYCLE.2 |  3 +-
 core/var/lib/portage/world.CYCLE.3 |  2 +-
 core/var/lib/portage/world.CYCLE.4 |  9 +----
 4 files changed, 36 insertions(+), 57 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 4c8da1e..f121648 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -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 -pch -rar -static -wxwidgets
+package.use : app-arch/p7zip:0 -doc -kde -rar -static -wxwidgets pch
 
 [app-arch/sharutils:0]
 package.use : app-arch/sharutils:0 -nls
@@ -237,7 +237,7 @@ package.use : app-benchmarks/stress:0 -static
 package.use : app-benchmarks/sysbench:0 -aio -mysql
 
 [app-cdr/cdrtools:0]
-package.use : app-cdr/cdrtools:0 -caps acl filecaps nls unicode
+package.use : app-cdr/cdrtools:0 -acl -caps filecaps nls unicode
 
 [app-cdr/dvdisaster:0]
 package.use : app-cdr/dvdisaster:0 -debug -nls
@@ -492,9 +492,6 @@ package.use : app-forensics/aide:0 -audit -mhash -nls -postgres -prelink -selinu
 [app-forensics/air:0]
 package.use : app-forensics/air:0 crypt
 
-[app-forensics/sleuthkit:0]
-package.use : app-forensics/sleuthkit:0 -aff -ewf static-libs
-
 [app-i18n/anthy:0]
 package.use : app-i18n/anthy:0 -canna-2ch -emacs static-libs
 
@@ -1188,9 +1185,6 @@ package.use : dev-db/couchdb:0 -selinux -test
 [dev-db/dbmodel:0]
 package.use : dev-db/dbmodel:0 -debug
 
-[dev-db/gigabase:0]
-package.use : dev-db/gigabase:0 -doc static-libs
-
 [dev-db/libdbi-drivers:0]
 package.use : dev-db/libdbi-drivers:0 -doc -firebird -mysql -oci8 -postgres sqlite static-libs
 
@@ -1201,7 +1195,7 @@ package.use : dev-db/libdbi:0 -doc static-libs
 package.use : dev-db/libiodbc:0 gtk
 
 [dev-db/libzdb:0]
-package.use : dev-db/libzdb:0 -debug -doc -mysql -postgres -static-libs sqlite ssl
+package.use : dev-db/libzdb:0 -debug -doc -mysql -postgres sqlite ssl static-libs
 
 [dev-db/maatkit:0]
 package.use : dev-db/maatkit:0 -udf
@@ -1327,7 +1321,7 @@ package.use : dev-lang/python:3.4 -build -examples -wininst gdbm hardened ipv6 n
 package.use : dev-lang/ruby:2.0 -debug -doc -examples -rubytests -socks5 -xemacs berkdb cpu_flags_x86_sse2 gdbm ipv6 ncurses rdoc readline ssl
 
 [dev-lang/ruby:2.1]
-package.use : dev-lang/ruby:2.1 -debug -doc -examples -rubytests -socks5 -xemacs berkdb gdbm ipv6 ncurses rdoc readline ssl
+package.use : dev-lang/ruby:2.1 -berkdb -debug -doc -examples -gdbm -rubytests -socks5 -xemacs ipv6 ncurses rdoc readline ssl
 
 [dev-lang/spidermonkey:0]
 package.use : dev-lang/spidermonkey:0 -debug -minimal -test static-libs
@@ -1404,9 +1398,6 @@ package.use : dev-libs/check:0 -subunit static-libs
 [dev-libs/chmlib:0]
 package.use : dev-libs/chmlib:0 examples static-libs
 
-[dev-libs/cloog:0]
-package.use : dev-libs/cloog:0 static-libs
-
 [dev-libs/confuse:0]
 package.use : dev-libs/confuse:0 -nls static-libs
 
@@ -1479,9 +1470,6 @@ package.use : dev-libs/icu:0 -debug -doc -examples static-libs
 [dev-libs/iniparser:0]
 package.use : dev-libs/iniparser:0 -doc -examples static-libs
 
-[dev-libs/isl:0]
-package.use : dev-libs/isl:0 static-libs
-
 [dev-libs/json-c:0]
 package.use : dev-libs/json-c:0 -doc static-libs
 
@@ -4887,7 +4875,7 @@ package.use : media-gfx/gimmage:0 -debug
 package.use : media-gfx/gimp:2 -altivec -aqua -debug -doc -gnome -test -udev aalib alsa bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse curl dbus exif jpeg jpeg2k lcms mng pdf png postscript python smp svg tiff webkit wmf xpm
 
 [media-gfx/gliv:0]
-package.use : media-gfx/gliv:0 nls
+package.use : media-gfx/gliv:0 -nls
 
 [media-gfx/gphoto2:0]
 package.use : media-gfx/gphoto2:0 -nls aalib exif ncurses readline
@@ -5166,7 +5154,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 -cpu_flags_x86_mmx -doc -nls X bzip2 gif jpeg mp3 png static-libs tiff zlib
+package.use : media-libs/imlib2:0 -doc -nls X bzip2 cpu_flags_x86_mmx gif jpeg mp3 png static-libs tiff zlib
 
 [media-libs/imlib:0]
 package.use : media-libs/imlib:0 -doc static-libs
@@ -5253,7 +5241,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 -3dfx -debug -svga -vis X aalib cpu_flags_x86_mmx directfb fbcon
+package.use : media-libs/libggi:0 -debug -svga -vis 3dfx X aalib cpu_flags_x86_mmx directfb fbcon
 
 [media-libs/libggimisc:0]
 package.use : media-libs/libggimisc:0 -svga fbcon
@@ -5307,7 +5295,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 -cpu_flags_x86_sse2 -debug -pulseaudio alsa nas openal oss static-libs threads
+package.use : media-libs/libmikmod:0 -altivec -coreaudio -debug -pulseaudio alsa cpu_flags_x86_sse2 nas openal oss static-libs threads
 
 [media-libs/libmms:0]
 package.use : media-libs/libmms:0 static-libs
@@ -5484,7 +5472,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 -cpu_flags_x86_mmx -doc static-libs
+package.use : media-libs/sdl-gfx:0 -doc cpu_flags_x86_mmx static-libs
 
 [media-libs/sdl-image:0]
 package.use : media-libs/sdl-image:0 gif jpeg png static-libs tiff webp
@@ -5517,7 +5505,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 -cpu_flags_x86_mmx -debug X opengl static-libs
+package.use : media-libs/smpeg:0 -debug X cpu_flags_x86_mmx opengl static-libs
 
 [media-libs/soxr:0]
 package.use : media-libs/soxr:0 -examples
@@ -5553,7 +5541,7 @@ package.use : media-libs/vo-amrwbenc:0 -examples static-libs
 package.use : media-libs/x264:0 -10bit -opencl cpu_flags_x86_sse interlaced pic static-libs threads
 
 [media-libs/x265:0]
-package.use : media-libs/x265:0 -12bit -numa -pic -test 10bit
+package.use : media-libs/x265:0 -12bit -numa -test 10bit pic
 
 [media-libs/xvid:0]
 package.use : media-libs/xvid:0 -examples pic threads
@@ -5766,7 +5754,7 @@ package.use : media-sound/jack-rack:0 -gnome -lash alsa xml
 package.use : media-sound/jokosher:0 -gnome
 
 [media-sound/lame:0]
-package.use : media-sound/lame:0 -cpu_flags_x86_mmx -debug -mp3rtp -sndfile frontend static-libs
+package.use : media-sound/lame:0 -debug -mp3rtp -sndfile cpu_flags_x86_mmx frontend static-libs
 
 [media-sound/lastfmplayer:0]
 package.use : media-sound/lastfmplayer:0 -ipod dbus
@@ -5802,7 +5790,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 -cpu_flags_x86_mmx -int-quality -pulseaudio alsa 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 -int-quality -pulseaudio alsa cpu_flags_x86_mmx cpu_flags_x86_sse ipv6 jack nas oss portaudio sdl
 
 [media-sound/mserv:0]
 package.use : media-sound/mserv:0 -vhosts vorbis
@@ -5850,7 +5838,7 @@ package.use : media-sound/qsynth:0 -debug -jack -pulseaudio alsa
 package.use : media-sound/qtscrobbler:0 cli qt4
 
 [media-sound/rezound:0]
-package.use : media-sound/rezound:0 -16bittmp -alsa -flac -jack -oss -portaudio -soundtouch -vorbis nls
+package.use : media-sound/rezound:0 -16bittmp -nls -soundtouch alsa flac jack oss portaudio vorbis
 
 [media-sound/rhythmbox:0]
 package.use : media-sound/rhythmbox:0 -cdr -daap -gnome-keyring -ipod -lirc -nsplugin -test -upnp-av -visualizer -zeitgeist dbus libnotify mtp python udev
@@ -6144,7 +6132,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
 
 [net-dns/c-ares:0]
 package.use : net-dns/c-ares:0 static-libs
@@ -6180,7 +6168,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 -conntrack -netlink ipv6 static-libs
+package.use : net-firewall/iptables:0 -netlink ipv6 static-libs
 
 [net-firewall/ufw:0]
 package.use : net-firewall/ufw:0 -examples ipv6
@@ -6324,7 +6312,7 @@ package.use : net-libs/gsnmp:0 static-libs
 package.use : net-libs/gssdp:0 gtk introspection
 
 [net-libs/gtk-vnc:0]
-package.use : net-libs/gtk-vnc:0 -examples -pulseaudio gtk3 introspection python sasl vala
+package.use : net-libs/gtk-vnc:0 -examples -pulseaudio -python gtk3 introspection sasl vala
 
 [net-libs/gupnp-av:0]
 package.use : net-libs/gupnp-av:0 introspection
@@ -6489,7 +6477,7 @@ package.use : net-mail/automx:0 -memcached -sql ldap tools
 package.use : net-mail/cyrus-imap-admin:0 -kerberos berkdb ssl
 
 [net-mail/dbmail:0]
-package.use : net-mail/dbmail:0 -ldap -sieve -static sqlite ssl
+package.use : net-mail/dbmail:0 -sieve -static ldap sqlite ssl
 
 [net-mail/dovecot:0]
 package.use : net-mail/dovecot:0 -cydir -doc -imapc -kerberos -libressl -lucene -lz4 -managesieve -mdbox -mysql -pam -pop3c -postgres -sdbox -selinux -sieve -solr -vpopmail bzip2 caps ipv6 ldap lzma maildir mbox sqlite ssl static-libs suid tcpd zlib
@@ -6528,7 +6516,7 @@ package.use : net-mail/notmuch:0 -debug -doc -emacs -mutt -nmbug -test crypt pyt
 package.use : net-mail/offlineimap:0 -doc sqlite ssl
 
 [net-mail/qpopper:0]
-package.use : net-mail/qpopper:0 -apop -debug -drac -mailbox -pam -xinetd gdbm ssl
+package.use : net-mail/qpopper:0 -apop -debug -drac -mailbox -pam gdbm ssl xinetd
 
 [net-mail/sendEmail:0]
 package.use : net-mail/sendEmail:0 ssl
@@ -6606,7 +6594,7 @@ package.use : net-misc/knock:0 server
 package.use : net-misc/linux-identd:0 xinetd
 
 [net-misc/lldpd:0]
-package.use : net-misc/lldpd:0 -cdp -doc -edp -fdp -graph -jansson -json-c -snmp -sonmp -zsh-completion dot1 dot3 lldpmed readline seccomp static-libs xml
+package.use : net-misc/lldpd:0 -cdp -doc -edp -fdp -graph -jansson -json-c -seccomp -snmp -sonmp -zsh-completion dot1 dot3 lldpmed readline static-libs xml
 
 [net-misc/mediatomb:0]
 package.use : net-misc/mediatomb:0 -debug -id3tag -lastfm -libextractor -mysql -thumbnail curl exif ffmpeg flac inotify javascript magic mp4 sqlite taglib zlib
@@ -6629,15 +6617,15 @@ package.use : net-misc/netfleet:0 -debug
 [net-misc/netkit-talk:0]
 package.use : net-misc/netkit-talk:0 ipv6
 
+[net-misc/ntp:0]
+package.use : net-misc/ntp:0 -caps -debug -libressl -openntpd -parse-clocks -samba -selinux -snmp -vim-syntax -zeroconf ipv6 readline ssl threads
+
 [net-misc/olsrd:0]
 package.use : net-misc/olsrd:0 gtk
 
 [net-misc/omniORB:0]
 package.use : net-misc/omniORB:0 -doc ssl static-libs
 
-[net-misc/openntpd:0]
-package.use : net-misc/openntpd:0 -selinux
-
 [net-misc/openssh:0]
 package.use : net-misc/openssh:0 -X509 -bindist -debug -hpn -kerberos -ldns -libedit -libressl -pam -sctp -selinux -ssh1 -static X ldap pie skey ssl
 
@@ -6702,7 +6690,7 @@ package.use : net-misc/suite3270:0 -cjk -doc X ncurses ssl tcl
 package.use : net-misc/tightvnc:0 -java server tcpd
 
 [net-misc/tor:0]
-package.use : net-misc/tor:0 -bufferevents -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
 
 [net-misc/vinagre:0]
 package.use : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
@@ -6777,7 +6765,7 @@ package.use : net-p2p/torrentinfo:0 -test
 package.use : net-p2p/transmission-remote-gtk:0 -ayatana -debug -libproxy geoip libnotify
 
 [net-p2p/transmission:0]
-package.use : net-p2p/transmission:0 -ayatana -lightweight -qt5 -systemd -xfs gtk qt4
+package.use : net-p2p/transmission:0 -ayatana -lightweight -systemd -xfs gtk qt4
 
 [net-print/cups-filters:0]
 package.use : net-print/cups-filters:0 -ldap dbus foomatic jpeg perl png static-libs tiff zeroconf
@@ -7235,9 +7223,6 @@ package.use : sys-apps/lm_sensors:0 -sensord static-libs
 [sys-apps/man-db:0]
 package.use : sys-apps/man-db:0 -nls -selinux berkdb gdbm manpager static-libs zlib
 
-[sys-apps/man-pages:0]
-package.use : sys-apps/man-pages:0 nls
-
 [sys-apps/miscfiles:0]
 package.use : sys-apps/miscfiles:0 -minimal
 
@@ -7393,7 +7378,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
+package.use : sys-devel/gdb:0 -expat -multitarget -nls -test -vanilla client lzma python server zlib
 
 [sys-devel/gettext:0]
 package.use : sys-devel/gettext:0 -cvs -doc -emacs -java -nls acl cxx git ncurses openmp static-libs
@@ -7603,7 +7588,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 unicode
+package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test ncurses static-libs
 
 [sys-process/psmisc:0]
 package.use : sys-process/psmisc:0 -nls -selinux X ipv6
@@ -7700,7 +7685,7 @@ package.use : www-client/lynx:0 -cjk -nls bzip2 gnutls idn ipv6 ssl unicode
 
 [www-client/midori:0]
 package.use : www-client/midori:0 -deprecated -doc -granite -introspection -jit -zeitgeist webkit2
-package.accept_keywords : =www-client/midori-0.5.10 ~amd64
+package.accept_keywords : =www-client/midori-0.5.10-r99 ~amd64
 
 [www-client/opera:0]
 package.use : www-client/opera:0 -kde -multilib gstreamer gtk
@@ -7766,7 +7751,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_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_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_card
 s_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
@@ -7808,7 +7793,7 @@ package.use : x11-drivers/xf86-video-savage:0 dri
 package.use : x11-drivers/xf86-video-tdfx:0 dri
 
 [x11-libs/c++-gtk-utils:3]
-package.use : x11-libs/c++-gtk-utils:3 -static-libs gtk nls
+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
@@ -8126,7 +8111,7 @@ package.use : x11-misc/dzen:2 -minimal -xft xinerama xpm
 package.use : x11-misc/e16menuedit2:0 -debug
 
 [x11-misc/efax-gtk:0]
-package.use : x11-misc/efax-gtk:0 nls
+package.use : x11-misc/efax-gtk:0 -nls
 
 [x11-misc/fbpager:0]
 package.use : x11-misc/fbpager:0 xrender
@@ -8336,7 +8321,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 -cpu_flags_x86_mmx -escreen -minimal cpu_flags_x86_sse2 unicode
+package.use : x11-terms/eterm:0 -escreen -minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode
 
 [x11-terms/evilvte:0]
 package.use : x11-terms/evilvte:0 -savedconfig

diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2
index b143a0d..6ccfb25 100644
--- a/core/var/lib/portage/world.CYCLE.2
+++ b/core/var/lib/portage/world.CYCLE.2
@@ -30,7 +30,7 @@ net-fs/samba
 net-ftp/lftp
 net-irc/hexchat
 net-mail/dovecot
-net-misc/openntpd
+net-misc/ntp
 net-misc/rdate
 net-misc/tor
 net-misc/vinagre
@@ -47,6 +47,7 @@ sys-devel/gdb
 sys-fs/cryptsetup
 sys-kernel/genkernel
 sys-kernel/linux-firmware
+sys-libs/argp-standalone
 sys-libs/cracklib
 sys-libs/db
 sys-libs/gdbm

diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.3
index 5d0dbb0..7962af8 100644
--- a/core/var/lib/portage/world.CYCLE.3
+++ b/core/var/lib/portage/world.CYCLE.3
@@ -31,7 +31,7 @@ net-fs/samba
 net-ftp/lftp
 net-irc/hexchat
 net-mail/dovecot
-net-misc/openntpd
+net-misc/ntp
 net-misc/rdate
 net-misc/tor
 net-misc/vinagre

diff --git a/core/var/lib/portage/world.CYCLE.4 b/core/var/lib/portage/world.CYCLE.4
index 40ea18e..c1b9bd6 100644
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
@@ -401,7 +401,6 @@ app-eselect/eselect-sh
 app-eselect/eselect-unison
 app-forensics/aide
 app-forensics/air
-app-forensics/autopsy
 app-forensics/cmospwd
 app-forensics/examiner
 app-forensics/foremost
@@ -810,7 +809,6 @@ app-vim/zoomwin
 dev-cpp/mm-common
 dev-db/couchdb
 dev-db/dbmodel
-dev-db/gigabase
 dev-db/maatkit
 dev-db/mysql++
 dev-db/mysql-super-smack
@@ -1329,7 +1327,6 @@ dev-tcltk/tkpiechart
 dev-tcltk/vtcl
 dev-tex/aastex
 dev-tex/catdvi
-dev-tex/cpp2latex
 dev-tex/csindex
 dev-tex/curve
 dev-tex/foiltex
@@ -1445,7 +1442,6 @@ games-action/bzflag
 games-action/chickens
 games-action/chromium-bsu
 games-action/clanbomber
-games-action/deathchase3d
 games-action/extreme-tuxracer
 games-action/formido
 games-action/garden
@@ -1493,7 +1489,6 @@ games-arcade/burgerspace
 games-arcade/cavezofphear
 games-arcade/cdogs-sdl
 games-arcade/circuslinux
-games-arcade/cob
 games-arcade/commandergenius
 games-arcade/conveysdl
 games-arcade/cosmosmash
@@ -1571,7 +1566,6 @@ games-arcade/xrick
 games-arcade/xscavenger
 games-arcade/xsfcave
 games-arcade/xtux
-games-arcade/yarsrevenge
 games-board/ace
 games-board/ascal
 games-board/atakks
@@ -2284,7 +2278,6 @@ media-sound/timidity-eawpatches
 media-sound/tudor-volumed
 media-sound/umix
 media-sound/umurmur
-media-sound/vbrfixc
 media-sound/vimpc
 media-sound/vkeybd
 media-sound/vlevel
@@ -2640,10 +2633,10 @@ net-misc/netpipes
 net-misc/netsed
 net-misc/netstat-nat
 net-misc/nstx
+net-misc/ntp
 net-misc/ntpclient
 net-misc/olsrd
 net-misc/omniORB
-net-misc/openntpd
 net-misc/openrdate
 net-misc/openssh-blacklist
 net-misc/orbited