Move from uclibc to glibc.

2015-07-04 17:40:23 -04:00 · 2015-07-04 17:40:23 -04:00 · e0e78c4a48
commit e0e78c4a48
parent f4e881c9c1
20 changed files with 3594 additions and 3860 deletions
--- a/11
+++ b/11
@ -14,13 +14,6 @@ log stamp
 populate 2
 runscript cycle.2.sh

-log stamp
-log CYCLE_3
-log stamp
-
-populate 3
-runscript cycle.3.sh
-
 log stamp
 log Configure+Cleanup+Kernel
 log stamp
@ -48,8 +41,8 @@ hashit
 +log stamp
 +
 +mount
-+populate 4
-+runscript cycle.3.sh
+populate 3
+runscript cycle.2.sh
 +unmount
 +
 +log stamp
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@ -180,8 +180,6 @@ package.use/app-backup_backup-manager_0 : app-backup/backup-manager:0 -doc

 [app-backup/bacula:0]
 package.use/app-backup_bacula_0 : app-backup/bacula:0 -bacula-clientonly -bacula-nodir -bacula-nosd -examples -logwatch -mysql -postgres -static X acl ipv6 qt4 readline sqlite ssl tcpd vim-syntax
-+package.env : app-backup/bacula:0 app-backup_bacula_0
-env/app-backup_bacula_0 : LDFLAGS="-lintl"

 [app-backup/boxbackup:0]
 package.use/app-backup_boxbackup_0 : app-backup/boxbackup:0 -client-only
@ -191,8 +189,6 @@ package.use/app-backup_ccollect_0 : app-backup/ccollect:0 -doc -examples

 [app-backup/dar:0]
 package.use/app-backup_dar_0 : app-backup/dar:0 -dar32 -dar64 -doc -gcrypt -nls -static acl lzo static-libs
-+package.env : app-backup/dar:0 app-backup_dar_0
-env/app-backup_dar_0 : LDFLAGS="-liconv"

 [app-backup/duplicity:0]
 package.use/app-backup_duplicity_0 : app-backup/duplicity:0 -s3
@ -260,16 +256,12 @@ package.use/app-crypt_gcr_0 : app-crypt/gcr:0 -debug -test gtk introspection val
 [app-crypt/gnupg:0]
 package.use/app-crypt_gnupg_0 : app-crypt/gnupg:0 -doc -mta -nls -selinux -static -tools -usb bzip2 ldap readline smartcard
 package.accept_keywords/app-crypt_gnupg_0 : >=app-crypt/gnupg-2.1.6 ~amd64
-+package.env : app-crypt/gnupg:0 app-crypt_gnupg_0
-env/app-crypt_gnupg_0 : LDFLAGS="-lintl"

 [app-crypt/gpa:0]
 package.use/app-crypt_gpa_0 : app-crypt/gpa:0 -nls

 [app-crypt/gpgme:1]
 package.use/app-crypt_gpgme_1 : app-crypt/gpgme:1 -common-lisp static-libs
-+package.env : app-crypt/gpgme:1 app-crypt_gpgme_1
-env/app-crypt_gpgme_1 : LDFLAGS=-largp

 [app-crypt/keynote:0]
 package.use/app-crypt_keynote_0 : app-crypt/keynote:0 ssl
@ -291,8 +283,6 @@ package.use/app-crypt_p11-kit_0 : app-crypt/p11-kit:0 -debug asn1 libffi trust

 [app-crypt/pinentry:0]
 package.use/app-crypt_pinentry_0 : app-crypt/pinentry:0 -static caps gtk ncurses qt4
-+package.env : app-crypt/pinentry:0 app-crypt_pinentry_0
-env/app-crypt_pinentry_0 : LDFLAGS="-liconv -lpthread"

 [app-crypt/ssh-multiadd:0]
 package.use/app-crypt_ssh-multiadd_0 : app-crypt/ssh-multiadd:0 X
@ -425,8 +415,6 @@ package.use/app-editors_vim-core_0 : app-editors/vim-core:0 -minimal -nls acl

 [app-editors/vim:0]
 package.use/app-editors_vim_0 : app-editors/vim:0 -debug -gpm -luajit -minimal -nls -racket -selinux -vim-pager X acl cscope lua perl python ruby tcl
-+package.env : app-editors/vim:0 app-editors_vim_0
-env/app-editors_vim_0 : LDFLAGS="-liconv"

 [app-editors/xvile:0]
 package.use/app-editors_xvile_0 : app-editors/xvile:0 perl
@ -617,10 +605,6 @@ package.use/app-misc_astrolog_0 : app-misc/astrolog:0 X
 [app-misc/ca-certificates:0]
 package.use/app-misc_ca-certificates_0 : app-misc/ca-certificates:0 cacert

-[app-misc/calendar:0]
-+package.env : app-misc/calendar:0 app-misc_calendar_0
-env/app-misc_calendar_0 : LDFLAGS="-liconv"
-
 [app-misc/cdargs:0]
 package.use/app-misc_cdargs_0 : app-misc/cdargs:0 -emacs

@ -650,8 +634,6 @@ package.use/app-misc_g15daemon_0 : app-misc/g15daemon:0 perl python static-libs

 [app-misc/gcal:0]
 package.use/app-misc_gcal_0 : app-misc/gcal:0 -nls ncurses unicode
-+package.env : app-misc/gcal:0 app-misc_gcal_0
-env/app-misc_gcal_0 : LDFLAGS="-liconv"

 [app-misc/gcstar:0]
 package.use/app-misc_gcstar_0 : app-misc/gcstar:0 -gnome -stats -tellico cddb mp3 spell vorbis
@ -727,8 +709,6 @@ package.use/app-misc_screenfetch_0 : app-misc/screenfetch:0 X

 [app-misc/sl:0]
 package.use/app-misc_sl_0 : app-misc/sl:0 -debug -vanilla
-+package.env : app-misc/sl:0 app-misc_sl_0
-env/app-misc_sl_0 : LDFLAGS="-lpthread"

 [app-misc/socnetv:0]
 package.use/app-misc_socnetv_0 : app-misc/socnetv:0 -doc
@ -940,10 +920,6 @@ package.use/app-shells_zsh_0 : app-shells/zsh:0 -debug -doc -examples -maildir -
 [app-text/aiksaurus:0]
 package.use/app-text_aiksaurus_0 : app-text/aiksaurus:0 gtk

-[app-text/an:0]
-+package.env : app-text/an:0 app-text_an_0
-env/app-text_an_0 : LDFLAGS="-lintl"
-
 [app-text/apvlv:0]
 package.use/app-text_apvlv_0 : app-text/apvlv:0 -debug -djvu

@ -1002,10 +978,6 @@ package.use/app-text_ghostscript-gpl_0 : app-text/ghostscript-gpl:0 -djvu X cups
 [app-text/glark:0]
 package.use/app-text_glark_0 : app-text/glark:0 -doc -test -zip ruby_targets_ruby19 ruby_targets_ruby20

-[app-text/gnome-doc-utils:0]
-+package.env : app-text/gnome-doc-utils:0 app-text_gnome-doc-utils_0
-env/app-text_gnome-doc-utils_0 : MAKEOPTS="-j1"
-
 [app-text/gtkspell:3]
 package.use/app-text_gtkspell_3 : app-text/gtkspell:3 introspection vala

@ -1164,10 +1136,6 @@ package.use/app-text_zathura-meta_0 : app-text/zathura-meta:0 -cb -djvu pdf post
 [app-text/zathura:0]
 package.use/app-text_zathura_0 : app-text/zathura:0 -test magic sqlite

-[app-vim/calendar:0]
-+package.env : app-vim/calendar:0 app-vim_calendar_0
-env/app-vim_calendar_0 : LDFLAGS="-liconv"
-
 [app-vim/gentoo-syntax:0]
 package.use/app-vim_gentoo-syntax_0 : app-vim/gentoo-syntax:0 -ignore-glep31

@ -1329,8 +1297,6 @@ package.use/dev-games_hawknl_0 : dev-games/hawknl:0 -doc

 [dev-games/ode:0]
 package.use/dev-games_ode_0 : dev-games/ode:0 -debug -doc -double-precision -examples -gyroscopic static-libs
-+package.env : dev-games/ode:0 dev-games_ode_0
-env/dev-games_ode_0 : LDFLAGS="-liconv"

 [dev-games/physfs:0]
 package.use/dev-games_physfs_0 : dev-games/physfs:0 -doc -grp -hog -mvl -qpak -wad static-libs zip
@ -1344,10 +1310,6 @@ package.use/dev-lang_bff_0 : dev-lang/bff:0 -test
 [dev-lang/erlang:0]
 package.use/dev-lang_erlang_0 : dev-lang/erlang:0 -compat-ethread -doc -emacs -halfword -hipe -java -kpoll -sctp -systemd -wxwidgets odbc smp ssl tk

-[dev-lang/go:0]
-+package.env : dev-lang/go:0 dev-lang_go_0
-env/dev-lang_go_0 : MAKEOPTS="-j1"
-
 [dev-lang/gprolog:0]
 package.use/dev-lang_gprolog_0 : dev-lang/gprolog:0 -debug -doc -examples

@ -1371,18 +1333,12 @@ package.use/dev-lang_perl_0 : dev-lang/perl:0 -debug -doc -ithreads berkdb gdbm

 [dev-lang/python:2.7]
 package.use/dev-lang_python_2.7 : 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/dev-lang_python_2.7 : MAKEOPTS="-j1"

 [dev-lang/python:3.3]
 package.use/dev-lang_python_3.3 : dev-lang/python:3.3 -build -doc -examples -wininst gdbm hardened ipv6 ncurses readline sqlite ssl threads tk xml
-+package.env : dev-lang/python:3.3 dev-lang_python_3.3
-env/dev-lang_python_3.3 : MAKEOPTS="-j1"

 [dev-lang/python:3.4]
 package.use/dev-lang_python_3.4 : 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/dev-lang_python_3.4 : MAKEOPTS="-j1"

 [dev-lang/ruby:1.9]
 package.use/dev-lang_ruby_1.9 : dev-lang/ruby:1.9 -debug -doc -examples -rubytests -socks5 -xemacs berkdb gdbm ipv6 ncurses rdoc readline ssl yaml
@ -1837,8 +1793,6 @@ package.use/dev-libs_ossp-uuid_0 : dev-libs/ossp-uuid:0 -php -php_targets_php5-4

 [dev-libs/pakchois:0]
 package.use/dev-libs_pakchois_0 : dev-libs/pakchois:0 -nls
-+package.env : dev-libs/pakchois:0 dev-libs_pakchois_0
-env/dev-libs_pakchois_0 : LDFLAGS="-lintl"

 [dev-libs/popt:0]
 package.use/dev-libs_popt_0 : dev-libs/popt:0 -nls static-libs
@ -2738,10 +2692,6 @@ package.use/dev-python_html5lib_0 : dev-python/html5lib:0 -test
 [dev-python/htmlgen:0]
 package.use/dev-python_htmlgen_0 : dev-python/htmlgen:0 -doc

-[dev-python/iconvcodec:0]
-+package.env : dev-python/iconvcodec:0 dev-python_iconvcodec_0
-env/dev-python_iconvcodec_0 : LDFLAGS="-liconv"
-
 [dev-python/imapclient:0]
 package.use/dev-python_imapclient_0 : dev-python/imapclient:0 -doc -examples -test

@ -2942,8 +2892,6 @@ package.use/dev-python_py-notify_0 : dev-python/py-notify:0 -examples -test

 [dev-python/py:0]
 package.use/dev-python_py_0 : dev-python/py:0 -doc -test
-+package.env : dev-python/py:0 dev-python_py_0
-env/dev-python_py_0 : MAKEOPTS="-j1"

 [dev-python/pyalsaaudio:0]
 package.use/dev-python_pyalsaaudio_0 : dev-python/pyalsaaudio:0 -doc
@ -2989,13 +2937,9 @@ package.use/dev-python_pygments_0 : dev-python/pygments:0 -doc -test

 [dev-python/pygobject:2]
 package.use/dev-python_pygobject_2 : dev-python/pygobject:2 -examples -test libffi
-+package.env : dev-python/pygobject:2 dev-python_pygobject_2
-env/dev-python_pygobject_2 : MAKEOPTS="-j1"

 [dev-python/pygobject:3]
 package.use/dev-python_pygobject_3 : dev-python/pygobject:3 -examples -test cairo threads
-+package.env : dev-python/pygobject:3 dev-python_pygobject_3
-env/dev-python_pygobject_3 : MAKEOPTS="-j1"

 [dev-python/pygoocanvas:0]
 package.use/dev-python_pygoocanvas_0 : dev-python/pygoocanvas:0 -doc -examples
@ -3302,8 +3246,6 @@ package.use/dev-qt_qtchooser_0 : dev-qt/qtchooser:0 -qt5 -test

 [dev-qt/qtcore:4]
 package.use/dev-qt_qtcore_4 : dev-qt/qtcore:4 -aqua -debug -pch exceptions glib iconv icu qt3support ssl
-+package.env : dev-qt/qtcore:4 dev-qt_qtcore_4
-env/dev-qt_qtcore_4 : LDFLAGS="-liconv"

 [dev-qt/qtdbus:4]
 package.use/dev-qt_qtdbus_4 : dev-qt/qtdbus:4 -aqua -debug -pch exceptions
@ -3816,8 +3758,6 @@ package.use/dev-util_cdecl_0 : dev-util/cdecl:0 readline

 [dev-util/cmake:0]
 package.use/dev-util_cmake_0 : dev-util/cmake:0 -doc -emacs -qt5 -system-jsoncpp -test ncurses qt4
-+package.env : dev-util/cmake:0 dev-util_cmake_0
-env/dev-util_cmake_0 : LDFLAGS="-lpthread"

 [dev-util/cppi:0]
 package.use/dev-util_cppi_0 : dev-util/cppi:0 -nls
@ -3867,10 +3807,6 @@ package.use/dev-util_geany_0 : dev-util/geany:0 vte
 [dev-util/global:0]
 package.use/dev-util_global_0 : dev-util/global:0 -doc -emacs -vim

-[dev-util/gob:2]
-+package.env : dev-util/gob:2 dev-util_gob_2
-env/dev-util_gob_2 : MAKEOPTS="-j1"
-
 [dev-util/jay:0]
 package.use/dev-util_jay_0 : dev-util/jay:0 -java -mono

@ -3948,8 +3884,6 @@ package.use/dev-vcs_git-cola_0 : dev-vcs/git-cola:0 -doc -test

 [dev-vcs/git:0]
 package.use/dev-vcs_git_0 : dev-vcs/git:0 -cvs -doc -emacs -highlight -mediawiki -nls -ppcsha1 -test blksha1 cgi curl gnome-keyring gpg gtk iconv pcre perl python subversion threads tk webdav xinetd
-+package.env : dev-vcs/git:0 dev-vcs_git_0
-env/dev-vcs_git_0 : LDFLAGS="-liconv"

 [dev-vcs/gitg:0]
 package.use/dev-vcs_gitg_0 : dev-vcs/gitg:0 -debug -glade python
@ -4241,8 +4175,6 @@ package.use/games-mud_lyntin_0 : games-mud/lyntin:0 tk

 [games-mud/tf:0]
 package.use/games-mud_tf_0 : games-mud/tf:0 -debug -doc atcp gmcp ipv6 option102 ssl
-+package.env : games-mud/tf:0 games-mud_tf_0
-env/games-mud_tf_0 : LDFLAGS="-lintl"

 [games-puzzle/atomix:0]
 package.use/games-puzzle_atomix_0 : games-puzzle/atomix:0 -debug
@ -4441,13 +4373,9 @@ package.use/gnome-base_gnome-common_3 : gnome-base/gnome-common:3 autoconf-archi

 [gnome-base/gnome-desktop:2]
 package.use/gnome-base_gnome-desktop_2 : gnome-base/gnome-desktop:2 -debug -license-docs
-+package.env : gnome-base/gnome-desktop:2 gnome-base_gnome-desktop_2
-env/gnome-base_gnome-desktop_2 : CPPFLAGS="-D_GNU_SOURCE"

 [gnome-base/gnome-desktop:3]
 package.use/gnome-base_gnome-desktop_3 : gnome-base/gnome-desktop:3 -debug -test introspection
-+package.env : gnome-base/gnome-desktop:3 gnome-base_gnome-desktop_3
-env/gnome-base_gnome-desktop_3 : CPPFLAGS="-D_GNU_SOURCE"

 [gnome-base/gnome-keyring:0]
 package.use/gnome-base_gnome-keyring_0 : gnome-base/gnome-keyring:0 -debug -pam -selinux -test caps filecaps ssh-agent
@ -4922,8 +4850,6 @@ package.use/media-gfx_feh_0 : media-gfx/feh:0 -debug -test curl exif xinerama

 [media-gfx/fontforge:0]
 package.use/media-gfx_fontforge_0 : media-gfx/fontforge:0 -cjk -debug -doc -nls -pango -pasteafter -tilepath -truetype -truetype-debugger -type3 X cairo gif jpeg png python svg tiff unicode
-+package.env : media-gfx/fontforge:0 media-gfx_fontforge_0
-env/media-gfx_fontforge_0 : LDFLAGS="-lintl"

 [media-gfx/fotowall:0]
 package.use/media-gfx_fotowall_0 : media-gfx/fotowall:0 -debug -webcam opengl
@ -5143,8 +5069,6 @@ package.use/media-libs_ftgl_0 : media-libs/ftgl:0 static-libs

 [media-libs/gd:2]
 package.use/media-libs_gd_2 : media-libs/gd:2 -truetype fontconfig jpeg png static-libs xpm zlib
-+package.env : media-libs/gd:2 media-libs_gd_2
-env/media-libs_gd_2 : MAKEOPTS="-j1"

 [media-libs/gegl:0]
 package.use/media-libs_gegl_0 : 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
@ -5397,8 +5321,6 @@ package.use/media-libs_libpng_0 : media-libs/libpng:0 -neon apng static-libs

 [media-libs/libquicktime:0]
 package.use/media-libs_libquicktime_0 : media-libs/libquicktime:0 -doc -x264 X aac alsa cpu_flags_x86_mmx dv encode ffmpeg gtk jpeg lame opengl png schroedinger static-libs vorbis
-+package.env : media-libs/libquicktime:0 media-libs_libquicktime_0
-env/media-libs_libquicktime_0 : LDFLAGS="-lintl"

 [media-libs/libquvi-scripts:0]
 package.use/media-libs_libquvi-scripts_0 : media-libs/libquvi-scripts:0 -offensive
@ -5967,8 +5889,6 @@ package.use/media-sound_wavbreaker_0 : media-sound/wavbreaker:0 -nls -pulseaudio

 [media-sound/wavpack:0]
 package.use/media-sound_wavpack_0 : media-sound/wavpack:0 cpu_flags_x86_mmx static-libs
-+package.env : media-sound/wavpack:0 media-sound_wavpack_0
-env/media-sound_wavpack_0 : LDFLAGS="-liconv"

 [media-sound/xfmpc:0]
 package.use/media-sound_xfmpc_0 : media-sound/xfmpc:0 -debug
@ -6029,8 +5949,6 @@ package.use/media-video_motion_0 : media-video/motion:0 -libav -mysql -postgres

 [media-video/mplayer:0]
 package.use/media-video_mplayer_0 : 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 -vdpau -vidix -x264 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 jpeg2k 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 xanim xinerama xscreensaver xv xvid xvmc zoran
-+package.env : media-video/mplayer:0 media-video_mplayer_0
-env/media-video_mplayer_0 : LDFLAGS="-lintl"

 [media-video/parole:0]
 package.use/media-video_parole_0 : media-video/parole:0 -clutter -debug libnotify taglib
@ -6053,10 +5971,6 @@ package.use/media-video_ushare_0 : media-video/ushare:0 -dlna -nls
 [media-video/x264-encoder:0]
 package.use/media-video_x264-encoder_0 : 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/media-video_xanim_0 : LDFLAGS="-ldl"
-
 [net-analyzer/amap:0]
 package.use/net-analyzer_amap_0 : net-analyzer/amap:0 ssl

@ -6113,7 +6027,6 @@ package.use/net-analyzer_nagios-core_0 : net-analyzer/nagios-core:0 -apache2 -de

 [net-analyzer/nagios-plugins:0]
 package.use/net-analyzer_nagios-plugins_0 : net-analyzer/nagios-plugins:0 -mysql -nagios-dns -nagios-game -nagios-ntp -nagios-ping -nagios-ssh -postgres -radius -smart -snmp -sudo -ups -xmpp gnutls ipv6 ldap samba ssl suid
-package.mask/net-analyzer_nagios-plugins_0 : >net-analyzer/nagios-plugins-1.4.16-r2

 [net-analyzer/nagstamon:0]
 package.use/net-analyzer_nagstamon_0 : net-analyzer/nagstamon:0 -gnome -sound
@ -6219,8 +6132,6 @@ package.use/net-dns_avahi_0 : net-dns/avahi:0 -bookmarks -doc -howl-compat -mono

 [net-dns/bind-tools:0]
 package.use/net-dns_bind-tools_0 : net-dns/bind-tools:0 -doc -gost -gssapi -urandom idn ipv6 readline ssl xml
-+package.env : net-dns/bind-tools:0 net-dns_bind-tools_0
-env/net-dns_bind-tools_0 : LDFLAGS="-liconv"

 [net-dns/c-ares:0]
 package.use/net-dns_c-ares_0 : net-dns/c-ares:0 static-libs
@ -6373,7 +6284,7 @@ package.use/net-irc_shadowircd_0 : net-irc/shadowircd:0 -debug -largenet ipv6 ss
 package.use/net-irc_weechat_0 : net-irc/weechat:0 -doc -nls -test alias charset exec fifo guile irc logger lua perl python relay ruby scripts spell ssl tcl trigger xfer

 [net-irc/znc:0]
-package.use/net-irc_znc_0 : net-irc/znc:0 -daemon -debug ipv6 perl python sasl ssl tcl python_targets_python3_3
+package.use/net-irc_znc_0 : net-irc/znc:0 -daemon -debug ipv6 perl python sasl ssl tcl

 [net-libs/daq:0]
 package.use/net-libs_daq_0 : net-libs/daq:0 -ipq -nfq afpacket dump ipv6 pcap static-libs
@ -6563,8 +6474,6 @@ package.use/net-mail_dbmail_0 : net-mail/dbmail:0 -sieve -static ldap sqlite ssl

 [net-mail/dovecot:0]
 package.use/net-mail_dovecot_0 : net-mail/dovecot:0 -cydir -doc -imapc -kerberos -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
-+package.env : net-mail/dovecot:0 net-mail_dovecot_0
-env/net-mail_dovecot_0 : LDFLAGS="-liconv"

 [net-mail/fetchmail:0]
 package.use/net-mail_fetchmail_0 : net-mail/fetchmail:0 -hesiod -kerberos -nls -socks ssl tk
@ -6592,8 +6501,6 @@ package.use/net-mail_mhonarc_0 : net-mail/mhonarc:0 -examples

 [net-mail/mu:0]
 package.use/net-mail_mu_0 : net-mail/mu:0 -doc -emacs -gui
-+package.env : net-mail/mu:0 net-mail_mu_0
-env/net-mail_mu_0 : LDFLAGS="-lintl"

 [net-mail/notmuch:0]
 package.use/net-mail_notmuch_0 : net-mail/notmuch:0 -debug -doc -emacs -mutt -nmbug -test crypt python
@ -6774,8 +6681,6 @@ package.use/net-misc_suite3270_0 : net-misc/suite3270:0 -cjk -doc X ncurses ssl

 [net-misc/tor:0]
 package.use/net-misc_tor_0 : net-misc/tor:0 -bufferevents -nat-pmp -scrypt -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web seccomp upnp
-+package.env : net-misc/tor:0 net-misc_tor_0
-env/net-misc_tor_0 : LDFLAGS="-liconv"

 [net-misc/vinagre:0]
 package.use/net-misc_vinagre_0 : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
@ -6863,21 +6768,15 @@ package.use/net-p2p_transmission-remote-gtk_0 : net-p2p/transmission-remote-gtk:

 [net-p2p/transmission:0]
 package.use/net-p2p_transmission_0 : net-p2p/transmission:0 -ayatana -lightweight -systemd -xfs gtk qt4
-+package.env : net-p2p/transmission:0 net-p2p_transmission_0
-env/net-p2p_transmission_0 : LDFLAGS="-lintl"

 [net-p2p/tribler:0]
 package.use/net-p2p_tribler_0 : net-p2p/tribler:0 -vlc

 [net-print/cups-filters:0]
 package.use/net-print_cups-filters_0 : net-print/cups-filters:0 dbus foomatic jpeg perl png static-libs tiff zeroconf
-+package.env : net-print/cups-filters:0 net-print_cups-filters_0
-env/net-print_cups-filters_0 : MAKEOPTS="-j1"

 [net-print/cups:0]
 package.use/net-print_cups_0 : 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/net-print_cups_0 : MAKEOPTS="-j1"

 [net-print/gtklp:0]
 package.use/net-print_gtklp_0 : net-print/gtklp:0 -nls ssl
@ -7187,8 +7086,6 @@ package.use/sci-visualization_xgraph_0 : sci-visualization/xgraph:0 -examples

 [sys-apps/ack:0]
 package.use/sys-apps_ack_0 : sys-apps/ack:0 -test
-+package.env : sys-apps/ack:0 sys-apps_ack_0
-env/sys-apps_ack_0 : LDFLAGS="-lintl"

 [sys-apps/acl:0]
 package.use/sys-apps_acl_0 : sys-apps/acl:0 -nls static-libs
@ -7235,10 +7132,6 @@ package.use/sys-apps_dnotify_0 : sys-apps/dnotify:0 -nls
 [sys-apps/dstat:0]
 package.use/sys-apps_dstat_0 : sys-apps/dstat:0 -wifi

-[sys-apps/ed:0]
-+package.env : sys-apps/ed:0 sys-apps_ed_0
-env/sys-apps_ed_0 : LDFLAGS="-liconv"
-
 [sys-apps/edac-utils:0]
 package.use/sys-apps_edac-utils_0 : sys-apps/edac-utils:0 -debug

@ -7421,7 +7314,6 @@ package.use/sys-apps_util-linux_0 : sys-apps/util-linux:0 -fdformat -nls -pam -s

 [sys-apps/watchdog:0]
 package.use/sys-apps_watchdog_0 : sys-apps/watchdog:0 -nfs
-package.mask/sys-apps_watchdog_0 : >sys-apps/watchdog-5.13-r1

 [sys-apps/xinetd:0]
 package.use/sys-apps_xinetd_0 : sys-apps/xinetd:0 -rpc perl tcpd
@ -7432,10 +7324,6 @@ package.use/sys-apps_xmbmon_0 : sys-apps/xmbmon:0 X
 [sys-auth/skey:0]
 package.use/sys-auth_skey_0 : sys-auth/skey:0 static-libs

-[sys-block/di:0]
-+package.env : sys-block/di:0 sys-block_di_0
-env/sys-block_di_0 : LDFLAGS="-liconv"
-
 [sys-block/mbuffer:0]
 package.use/sys-block_mbuffer_0 : sys-block/mbuffer:0 -debug ssl

@ -7498,8 +7386,6 @@ package.use/sys-devel_m4_0 : sys-devel/m4:0 -examples

 [sys-devel/make:0]
 package.use/sys-devel_make_0 : sys-devel/make:0 -nls -static guile
-+package.env : sys-devel/make:0 sys-devel_make_0
-env/sys-devel_make_0 : LDFLAGS="-lpthread"

 [sys-devel/patch:0]
 package.use/sys-devel_patch_0 : sys-devel/patch:0 -static -test xattr
@ -7530,8 +7416,6 @@ package.use/sys-fs_e2fsprogs_0 : sys-fs/e2fsprogs:0 -nls static-libs

 [sys-fs/encfs:0]
 package.use/sys-fs_encfs_0 : sys-fs/encfs:0 xattr
-+package.env : sys-fs/encfs:0 sys-fs_encfs_0
-env/sys-fs_encfs_0 : LDFLAGS="-lpthread"

 [sys-fs/eudev:0]
 package.use/sys-fs_eudev_0 : sys-fs/eudev:0 -doc -introspection -selinux -test gudev hwdb keymap kmod modutils openrc rule-generator static-libs
@ -7553,8 +7437,6 @@ package.use/sys-fs_mtd-utils_0 : sys-fs/mtd-utils:0 xattr

 [sys-fs/mtools:0]
 package.use/sys-fs_mtools_0 : sys-fs/mtools:0 X
-+package.env : sys-fs/mtools:0 sys-fs_mtools_0
-env/sys-fs_mtools_0 : LDFLAGS="-liconv"

 [sys-fs/mtpfs:0]
 package.use/sys-fs_mtpfs_0 : sys-fs/mtpfs:0 -debug
@ -7597,8 +7479,6 @@ package.use/sys-libs_gpm_0 : sys-libs/gpm:0 -selinux static-libs

 [sys-libs/libavc1394:0]
 package.use/sys-libs_libavc1394_0 : sys-libs/libavc1394:0 static-libs
-+package.env : sys-libs/libavc1394:0 sys-libs_libavc1394_0
-env/sys-libs_libavc1394_0 : LDFLAGS=-largp

 [sys-libs/libcap-ng:0]
 package.use/sys-libs_libcap-ng_0 : sys-libs/libcap-ng:0 python static-libs
@ -7706,10 +7586,6 @@ package.use/sys-process_supervise-scripts_0 : sys-process/supervise-scripts:0 -d
 [virtual/acl:0]
 package.use/virtual_acl_0 : virtual/acl:0 static-libs

-[virtual/editor:0]
-+package.env : virtual/editor:0 virtual_editor_0
-env/virtual_editor_0 : LDFLAGS="-liconv"
-
 [virtual/ffmpeg:0]
 package.use/virtual_ffmpeg_0 : virtual/ffmpeg:0 -libav -truetype -vdpau -x264 X encode gsm jpeg2k mp3 opus sdl speex theora threads vaapi

@ -7843,10 +7719,6 @@ package.use/www-servers_spawn-fcgi_0 : www-servers/spawn-fcgi:0 ipv6
 [www-servers/varnish:0]
 package.use/www-servers_varnish_0 : www-servers/varnish:0 -doc -jemalloc -jit static-libs tools

-[x11-apps/ico:0]
-+package.env : x11-apps/ico:0 x11-apps_ico_0
-env/x11-apps_ico_0 : LDFLAGS="-liconv"
-
 [x11-apps/xauth:0]
 package.use/x11-apps_xauth_0 : x11-apps/xauth:0 ipv6

@ -7885,8 +7757,6 @@ package.use/x11-drivers_xf86-video-ati_0 : x11-drivers/xf86-video-ati:0 -udev gl

 [x11-drivers/xf86-video-intel:0]
 package.use/x11-drivers_xf86-video-intel_0 : x11-drivers/xf86-video-intel:0 -debug -uxa dri sna udev xvmc
-+package.env : x11-drivers/xf86-video-intel:0 x11-drivers_xf86-video-intel_0
-env/x11-drivers_xf86-video-intel_0 : CPPFLAGS=-D_GNU_SOURCE

 [x11-drivers/xf86-video-mach64:0]
 package.use/x11-drivers_xf86-video-mach64_0 : x11-drivers/xf86-video-mach64:0 dri
@ -7932,8 +7802,6 @@ package.use/x11-libs_fox_1.7 : x11-libs/fox:1.7 -debug -doc -profile bzip2 jpeg

 [x11-libs/gdk-pixbuf:2]
 package.use/x11-libs_gdk-pixbuf_2 : 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/x11-libs_gdk-pixbuf_2 : MAKEOPTS="-j1"

 [x11-libs/gksu:0]
 package.use/x11-libs_gksu_0 : x11-libs/gksu:0 -doc -gnome
@ -7943,8 +7811,6 @@ package.use/x11-libs_gl2ps_0 : x11-libs/gl2ps:0 -doc png zlib

 [x11-libs/glamor:0]
 package.use/x11-libs_glamor_0 : x11-libs/glamor:0 -gles static-libs xv
-+package.env : x11-libs/glamor:0 x11-libs_glamor_0
-env/x11-libs_glamor_0 : CPPFLAGS="-D_GNU_SOURCE"

 [x11-libs/gnome-pty-helper:0]
 package.use/x11-libs_gnome-pty-helper_0 : x11-libs/gnome-pty-helper:0 hardened
@ -8296,8 +8162,6 @@ package.use/x11-misc_shared-mime-info_0 : x11-misc/shared-mime-info:0 -test

 [x11-misc/slim:0]
 package.use/x11-misc_slim_0 : x11-misc/slim:0 -branding -consolekit -pam
-+package.env : x11-misc/slim:0 x11-misc_slim_0
-env/x11-misc_slim_0 : LDFLAGS="-lpthread"

 [x11-misc/spacefm:0]
 package.use/x11-misc_spacefm_0 : x11-misc/spacefm:0 startup-notification
@ -8322,8 +8186,6 @@ package.use/x11-misc_xcb_0 : x11-misc/xcb:0 -motif

 [x11-misc/xdg-user-dirs:0]
 package.use/x11-misc_xdg-user-dirs_0 : x11-misc/xdg-user-dirs:0 gtk
-+package.env : x11-misc/xdg-user-dirs:0 x11-misc_xdg-user-dirs_0
-env/x11-misc_xdg-user-dirs_0 : LDFLAGS="-liconv -lpthread"

 [x11-misc/xdg-utils:0]
 package.use/x11-misc_xdg-utils_0 : x11-misc/xdg-utils:0 -doc perl
--- a/core/etc/portage/env/dev-vcs_git_0
+++ b/core/etc/portage/env/dev-vcs_git_0
@ -1 +0,0 @@
-LDFLAGS="-liconv"
--- a/core/etc/portage/make.conf.CYCLE.1
+++ b/core/etc/portage/make.conf.CYCLE.1
@ -4,4 +4,7 @@ CHOST="x86_64-gentoo-linux-uclibc"
 MAKEOPTS="-j17"
 PAX_MARKINGS="XT"

-USE="-gpg"
+LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavian sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu"
+
+USE="-cups -tk"
+USE_ORDER="env:conf:pkg:defaults:pkginternal:repo:env.d"
--- a/core/etc/portage/make.conf.CYCLE.2
+++ b/core/etc/portage/make.conf.CYCLE.2
@ -3,9 +3,5 @@ CXXFLAGS="${CFLAGS}"
 CHOST="x86_64-gentoo-linux-uclibc"
 MAKEOPTS="-j17"
 PAX_MARKINGS="XT"
-PYTHON_TARGETS="python2_7 python3_4"

 LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavian sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu"
-
-USE="-cups -tk"
-USE_ORDER="env:conf:pkg:defaults:pkginternal:repo:env.d"
--- a/core/etc/portage/make.conf.CYCLE.3
+++ b/core/etc/portage/make.conf.CYCLE.3
@ -1,8 +0,0 @@
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-gentoo-linux-uclibc"
-MAKEOPTS="-j17"
-PAX_MARKINGS="XT"
-PYTHON_TARGETS="python2_7 python3_4"
-
-LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavian sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu"
--- a/core/etc/portage/make.profile
+++ b/core/etc/portage/make.profile
@ -1 +1 @@
-../../usr/portage/profiles/hardened/linux/uclibc/amd64
+../../usr/portage/profiles/hardened/linux/amd64
--- a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0
+++ b/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0
@ -1 +0,0 @@
-=sys-libs/uclibc-0.9.33.9999 **
--- a/core/etc/portage/package.env
+++ b/core/etc/portage/package.env
@ -1 +0,0 @@
-dev-vcs/git:0 dev-vcs_git_0
--- a/core/etc/portage/package.use/sys-libs_uclibc_0
+++ b/core/etc/portage/package.use/sys-libs_uclibc_0
@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig
--- a/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch
+++ b/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch
@ -1,25 +0,0 @@
-From 579dcdbc8aab966b22f6324a16dbf8fd08a607c3 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Fri, 17 Apr 2015 16:51:43 -0400
-Subject: [PATCH] ldso/libdl/libdl.c: do not unmap libraries.
-
---
- ldso/libdl/libdl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
-index 49711a8..2c43c07 100644
--- a/ldso/libdl/libdl.c
-+++ b/ldso/libdl/libdl.c
-@@ -977,7 +977,7 @@ static int do_dlclose(void *vhandle, int need_fini)
- 
- 			end = (end + ADDR_ALIGN) & PAGE_ALIGN;
- 			start = start & ~ADDR_ALIGN;
-			DL_LIB_UNMAP (tpnt, end - start);
-+			//DL_LIB_UNMAP (tpnt, end - start);
- 			/* Free elements in RTLD_LOCAL scope list */
- 			for (runp = tpnt->rtld_local; runp; runp = tmp) {
- 				tmp = runp->next;
-- 
-2.0.5
-
--- a/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
+++ b/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
@ -1,65 +0,0 @@
-From f22cca4722fa66e424562e69f4afa2bca0af871d Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sun, 28 Jul 2013 09:08:34 -0400
-Subject: [PATCH] libc: add isfdtype()
-
-isfdtype(int fd, int fdtype) check whether a file descriptor fd is
-of type fdtype, where the types are defined in stat(2).  It is
-supported in glibc and BSD, and used by utilities such as acpid.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
- libc/misc/file/isfdtype.c | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
- create mode 100644 libc/misc/file/isfdtype.c
-
-diff --git a/libc/misc/file/isfdtype.c b/libc/misc/file/isfdtype.c
-new file mode 100644
-index 0000000..4d9199b
--- /dev/null
-+++ libc/misc/file/isfdtype.c
-@@ -0,0 +1,40 @@
-+/* Determine whether descriptor has given property.
-+   Copyright (C) 1996-2013 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <errno.h>
-+#include <sys/stat.h>
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#ifdef __UCLIBC_HAS_LFS__
-+# include <_lfs_64.h>
-+#else
-+# define stat64 stat
-+# define fstat64 fstat
-+#endif
-+
-+int
-+isfdtype (int fildes, int fdtype)
-+{
-+  struct stat64 st;
-+  int save_error = errno;
-+  int result = fstat64 (fildes, &st);
-+  __set_errno (save_error);
-+  if (result)
-+	  return result;
-+  return (st.st_mode & S_IFMT) == (mode_t) fdtype;
-+}
-- 
-1.8.3.2.733.gf8abaeb
-
--- a/core/var/lib/portage/world.CYCLE.1
+++ b/core/var/lib/portage/world.CYCLE.1
@ -0,0 +1,65 @@
+app-admin/sudo
+app-admin/syslog-ng
+app-arch/file-roller
+app-editors/gedit
+app-editors/nano
+app-editors/vim
+app-office/abiword
+app-portage/gentoolkit
+app-portage/layman
+app-text/evince
+app-text/tree
+dev-lang/python
+dev-lang/tcl
+dev-libs/gmp
+dev-util/strace
+dev-vcs/git
+gnome-extra/gnome-system-monitor
+mail-client/claws-mail
+mail-client/mailx
+mail-mta/postfix
+media-gfx/eog
+media-gfx/gimp
+media-sound/alsa-utils
+media-video/smplayer
+net-analyzer/tcpdump
+net-dns/avahi
+net-dns/bind-tools
+net-fs/samba
+net-ftp/lftp
+net-irc/hexchat
+net-mail/dovecot
+net-misc/openntpd
+net-misc/rdate
+net-misc/tor
+net-misc/vinagre
+net-p2p/transmission
+net-wireless/wpa_supplicant
+sys-apps/dbus
+sys-apps/elfix
+sys-apps/gradm
+sys-apps/less
+sys-apps/paxctl
+sys-apps/pciutils
+sys-boot/lilo
+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
+sys-process/lsof
+www-client/midori
+x11-base/xorg-server
+x11-libs/gksu
+x11-misc/slim
+x11-terms/xfce4-terminal
+x11-terms/xterm
+xfce-base/xfce4-appfinder
+xfce-base/xfce4-meta
+xfce-extra/thunar-archive-plugin
+xfce-extra/thunar-shares-plugin
+xfce-extra/xfce4-mixer
+xfce-extra/xfce4-volumed
--- a/core/var/lib/portage/world.CYCLE.2
+++ b/core/var/lib/portage/world.CYCLE.2
@ -5,6 +5,7 @@ app-editors/gedit
 app-editors/nano
 app-editors/vim
 app-office/abiword
+app-office/gnumeric
 app-portage/gentoolkit
 app-portage/layman
 app-text/evince
@ -50,6 +51,7 @@ sys-libs/argp-standalone
 sys-libs/cracklib
 sys-libs/db
 sys-libs/gdbm
+sys-process/fcron
 sys-process/lsof
 www-client/midori
 x11-base/xorg-server
--- a/core/var/lib/portage/world.CYCLE.3
+++ b/core/var/lib/portage/world.CYCLE.3
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
--- a/scripts/cycle.1.sh
+++ b/scripts/cycle.1.sh
@ -1,11 +1,7 @@
 #!/bin/bash -e

-# This comes from the stage3.
-rm -f /etc/portage/package.use/uclibc
-
 source /etc/profile
 env-update
-emerge -b1q binutils
-emerge -b1q gcc
-emerge -b1q uclibc
-emerge -b1q argp-standalone
+install-worldconf
+emerge -bevq --keep-going --with-bdeps=y @world
+clean-worldconf
--- a/scripts/cycle.2.sh
+++ b/scripts/cycle.2.sh
@ -2,8 +2,7 @@

 source /etc/profile
 env-update
-emerge -b1q portage
-emerge -b1q =app-portage/grs-9999
 install-worldconf
-emerge -bevq --keep-going --with-bdeps=y @world
+emerge -buvNDq --keep-going --with-bdeps=y @world
 clean-worldconf
+emerge -bq @preserved-rebuild
--- a/scripts/cycle.3.sh
+++ b/scripts/cycle.3.sh
@ -1,8 +0,0 @@
-#!/bin/bash -e
-
-source /etc/profile
-env-update
-install-worldconf
-emerge -buvNDq --keep-going --with-bdeps=y @world
-clean-worldconf
-emerge -bq @preserved-rebuild
--- a/scripts/initrc.sh
+++ b/scripts/initrc.sh
@ -1,10 +1,5 @@
 #!/bin/bash -e

-trap "kill -9 $$" SIGTERM
-trap "kill -9 $$" SIGHUP
-trap "kill -9 $$" SIGKILL
-trap "kill -9 $$" SIGINT
-
 ln -sf /etc/init.d/net.lo /etc/init.d/net.eth0
 rc-update add alsasound default
 rc-update add cupsd default