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

[Anthony G. Basile]

commit:     515934476768cb19786cc006556a94c3d904650f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 12:22:12 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May 26 12:23:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=51593447

Bring in better line with desktop-amd64-hardened

 core/etc/grs/world.conf            | 59 ++++++++++++--------------------------
 core/var/lib/portage/world.CYCLE.2 |  2 +-
 core/var/lib/portage/world.CYCLE.3 |  2 +-
 core/var/lib/portage/world.CYCLE.4 | 10 ++-----
 4 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 811b4b9..fab2aa0 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -240,8 +240,8 @@ package.use : app-benchmarks/stress:0 -static
 [app-benchmarks/sysbench:0]
 package.use : app-benchmarks/sysbench:0 -aio -mysql
 
-[app-cdr/cdrkit:0]
-package.use : app-cdr/cdrkit:0 -debug -hfs unicode
+[app-cdr/cdrtools:0]
+package.use : app-cdr/cdrtools:0 -acl -caps -nls filecaps unicode
 
 [app-cdr/dvdisaster:0]
 package.use : app-cdr/dvdisaster:0 -debug -nls
@@ -504,9 +504,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
 
@@ -1220,9 +1217,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
 
@@ -1444,9 +1438,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
 
@@ -1516,9 +1507,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
 
@@ -1592,9 +1580,6 @@ package.use : dev-libs/libdnet:0 -test ipv6 python static-libs
 [dev-libs/libdshconfig:0]
 package.use : dev-libs/libdshconfig:0 static-libs
 
-[dev-libs/libelf:0]
-package.use : dev-libs/libelf:0 -debug -nls
-
 [dev-libs/libev:0]
 package.use : dev-libs/libev:0 static-libs
 
@@ -4530,7 +4515,7 @@ package.use : gnome-base/orbit:2 -debug -test pic static-libs
 package.use : gnome-extra/assogiate:0 -debug
 
 [gnome-extra/evolution-data-server:0]
-package.use : gnome-extra/evolution-data-server:0 -api-doc-extras -berkdb -kerberos -test gnome-online-accounts gtk introspection ipv6 ldap vala weather
+package.use : gnome-extra/evolution-data-server:0 -api-doc-extras -kerberos -test berkdb gnome-online-accounts gtk introspection ipv6 ldap vala weather
 
 [gnome-extra/evolution-ews:0]
 package.use : gnome-extra/evolution-ews:0 -test
@@ -6088,7 +6073,7 @@ package.use : media-video/rtmpdump:0 -libressl -polarssl gnutls ssl
 package.use : media-video/smplayer:0 -autoshutdown -debug -mpris -qt5 -streaming bidi qt4
 
 [media-video/subtitleeditor:0]
-package.use : media-video/subtitleeditor:0 -debug nls
+package.use : media-video/subtitleeditor:0 -debug -nls
 
 [media-video/transcode:0]
 package.use : media-video/transcode:0 -altivec -cpu_flags_x86_3dnow -imagemagick -mjpeg -nuv -pic -truetype -x264 X a52 aac alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dv dvd iconv jpeg lzo mp3 mpeg ogg oss postproc quicktime sdl theora v4l vorbis xml xvid
@@ -6289,7 +6274,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
@@ -6433,7 +6418,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
@@ -6641,7 +6626,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
@@ -6719,7 +6704,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
@@ -6742,15 +6727,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
 
@@ -7505,7 +7490,7 @@ package.use : sys-devel/autogen:0 -libopts static-libs
 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 -static-libs -test -vanilla cxx nls zlib
+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
@@ -7520,7 +7505,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
@@ -7616,7 +7601,7 @@ package.use : sys-kernel/gentoo-sources:4.4.6 -build -experimental -kdbus -symli
 package.use : sys-kernel/linux-firmware:0 -savedconfig
 
 [sys-libs/binutils-libs:0]
-package.use : sys-libs/binutils-libs:0 -64-bit-bfd -multitarget -static-libs nls zlib
+package.use : sys-libs/binutils-libs:0 -64-bit-bfd -multitarget -nls -static-libs zlib
 
 [sys-libs/cracklib:0]
 package.use : sys-libs/cracklib:0 -nls -test python static-libs zlib
@@ -7659,9 +7644,6 @@ 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
 
@@ -7699,7 +7681,7 @@ package.use : sys-libs/tevent:0 python
 package.use : sys-libs/timezone-data:0 -leaps_timezone -nls
 
 [sys-libs/uclibc:0]
-package.use : sys-libs/uclibc:0 -debug -hardened -iconv -ipv6 -nptl -rpc -ssp -uclibc-compat -wordexp savedconfig
+package.use : sys-libs/uclibc:0 -* -wordexp savedconfig
 package.accept_keywords : =sys-libs/uclibc-9999 **
 
 [sys-libs/uid_wrapper:0]
@@ -7739,7 +7721,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
@@ -7793,9 +7775,6 @@ package.use : virtual/ssh:0 -minimal
 [virtual/udev:0]
 package.use : virtual/udev:0 -systemd
 
-[virtual/w3m:0]
-package.mask : virtual/w3m
-
 [www-apache/mod_extract_forwarded:0]
 package.use : www-apache/mod_extract_forwarded:0 -mod_proxy
 
@@ -7845,7 +7824,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
@@ -8168,7 +8147,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_nouveau -video_cards_nvidia -wayland X drm opengl video_cards_intel
+package.use : x11-libs/libva:0 -egl -vdpau -video_cards_dummy -video_cards_fglrx -video_cards_nvidia -wayland X drm opengl video_cards_intel video_cards_nouveau
 
 [x11-libs/libvdpau:0]
 package.use : x11-libs/libvdpau:0 -doc -test dri
@@ -8589,7 +8568,7 @@ package.use : x11-wm/dwm:0 -savedconfig xinerama
 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 -vim-syntax -xinerama imlib nls slit systray toolbar truetype
+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

diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2
index ef81a9a..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

diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.3
index f02351e..a4e49ff 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 8902d0f..64f6e5e 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
@@ -2690,6 +2683,7 @@ net-misc/wakeonlan
 net-misc/whatmask
 net-misc/wol
 net-misc/wput
+net-misc/x2goserver
 net-misc/yandex-disk
 net-misc/youtube-viewer
 net-misc/ytalk