saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/make.conf b/portage/make.conf
index a7c56825cfad2e0c6e1eedea61f07ae5aecc399d..728c6643dd22246bc3d659d63c7c2bb43566d9e6 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -12,10 +12,10 @@ CHOST="x86_64-pc-linux-gnu"
 # These are the USE flags that were used in addition to what is provided by the
 # profile used for building.
 USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi curl cvs \
-     dane djvu doc examples expat fam fastcgi flac fontconfig ftp fuse gd geoip gif git gmp \
-     gnome-keyring gnutls gost gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n \
+     dane djvu examples expat fam fastcgi flac fontconfig ftp fuse gd geoip gif git gmp \
+     gnutls gost gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n \
      icu idn imagemagick imap ipv6 ithreads jadetex java javascript jbig jpeg \
-     jpeg2k json kerberos lasi ldap libwww lua lzma lzo maildir mailwrapper \
+     jpeg2k json kerberos lasi ldap libwww lua lz4 lzma lzo maildir mailwrapper \
      mercurial mmx mmxext mod modperl modplug motif mp3 mysql \
      nis nss odbc ogg openexr openldap openssl pam pch pcre pdf perl php pic png postgres \
      postscript python rar samba sasl sctp session smtp snmp soap spamassassin \

diff --git a/portage/package.use b/portage/package.use
index dffb2c2085b185c003f45d15707ab83ee3818cd4..61552adbd4815fc95aa57e4acdc6604626acf259 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -1,4 +1,5 @@
-app-admin/rsyslog                      normalize omudpspoof relp rfc3195 rfc5424hmac usertools zeromq
+app-admin/eselect                      doc
+app-admin/rsyslog                      mdblookup normalize omudpspoof relp rfc3195 rfc5424hmac usertools zeromq
 app-admin/sysstat                      cron
 app-admin/syslog-ng                    dbi spoof-source sql
 app-admin/ulogd                                -doc nfacct ulog
@@ -22,8 +23,8 @@ app-eselect/eselect-php                       fpm
 app-misc/mc                            7zip chdir mclib sftp -slang
 app-misc/screen                                multiuser
 
-app-portage/eix                                optimization strong-optimization tools
-pp-portage/layman                      squashfs sync-plugin-portage
+app-portage/eix                                doc optimization strong-optimization tools
+app-portage/layman                     squashfs sync-plugin-portage
 
 app-shells/bash                                plugins
 
@@ -37,7 +38,7 @@ dev-db/libdbi-drivers                 -doc
 dev-db/mysql                           extraengine profiling xtradb
 dev-db/postgresql                      server threads uuid xml
 dev-db/postgresql-server               uuid
-dev-db/sqlite                          extensions fts3 soundex unlock-notify
+dev-db/sqlite                          doc extensions fts3 soundex unlock-notify
 dev-db/unixODBC                                odbcmanual
 
 
@@ -47,7 +48,7 @@ dev-db/unixODBC                               odbcmanual
 dev-java/blackdown-jdk                 -doc
 dev-java/sun-jdk                       jce
 
-dev-lang/perl                          perlsuid
+dev-lang/perl                          doc perlsuid
 dev-lang/php                           bcmath calendar cgi cli ctype curlwrappers dbase embed enchant exif filter flatfile fpm gd gd-external hash iconv imap inifile intl json ldap-sasl mhash mysqli mysqlnd pcntl pdo posix -recode sharedext sharedmem simplexml sockets spl sqlite2 suhosin sysvipc -threads tidy tokenizer wddx xmlreader xmlwriter -xpm yaz zip
 dev-lang/ruby                          threads
 dev-lang/tk                            threads
@@ -96,9 +97,10 @@ dev-ruby/rubygems                    server
 
 dev-scheme/guile                       discouraged networking regex
 
+dev-util/cmake                         doc
 dev-util/strace                                aio unwind
 
-dev-vcs/git                            highlight
+dev-vcs/git                            doc highlight
 dev-vcs/subversion                     -dso extras
 
 games-misc/fortune-mod                 offensive
@@ -109,7 +111,7 @@ mail-client/nail                    net
 
 mail-filter/amavisd-new                        courier
 
-mail-mta/postfix                       memcached -vda
+mail-mta/postfix                       doc memcached -vda
 
 media-gfx/album                                ffmpeg plugins themes
 media-gfx/exiv2                                contrib xmp
@@ -155,14 +157,14 @@ net-dns/unbound                           dnstap
 
 net-firewall/iptables                  extensions
 
-net-fs/samba                           client oav quotas syslog
+net-fs/samba                           client -gpg oav quotas syslog
 
 net-ftp/lftp                           -gnutls verify-file
 # net-ftp/proftpd                              authfile ifsession rewrite shaper sitemisc softquota vroot
 # net-ftp/proftpd                              authfile ban case ctrls deflate exec ident ifsession -kerberos openssl ratio readme rewrite sftp shaper sitemisc softquota vroot
-net-ftp/proftpd                                authfile ban case copy ctrls deflate diskuse dso exec ident ifsession ifversion -kerberos memcache openssl qos ratio readme rewrite sftp shaper sitemisc softquota vroot
+net-ftp/proftpd                                authfile ban case copy ctrls deflate diskuse doc dso exec ident ifsession ifversion -kerberos memcache openssl qos ratio readme rewrite sftp shaper sitemisc softquota vroot
 
-net-libs/gnutls                                -doc
+net-libs/gnutls                                -doc openpgp
 net-libs/libssh2                       gcrypt
 
 net-mail/courier-imap                  -gnutls
@@ -170,13 +172,14 @@ net-mail/courier-imap                     -gnutls
 net-misc/curl                          libssh2
 net-misc/iputils                       arping caps clockdiff -doc gnutls rarpd rdisc tftpd tracepath traceroute
 net-misc/openssh                       sctp -X509
-# move net-misc/openvpn net-vpn/openvpn
-net-vpn/openvpn                        down-root iproute2 socks
 
 net-nds/openldap                       experimental -kerberos overlays
 
 net-print/cups                         dbus
 
+# move net-misc/openvpn net-vpn/openvpn
+net-vpn/openvpn                                down-root inotify iproute2 socks
+
 sci-mathematics/pari                   data -doc
 
 sys-apps/apt                           apt-pkg largefile latex rpath utils
@@ -197,6 +200,7 @@ sys-auth/pam_mysql                  openssl
 sys-block/parted                       device-mapper
 
 sys-devel/gcc                          gcj libffi mudflap objc objc-gc objc++
+sys-devel/gettext                      doc
 
 sys-fs/lvm2                            lvm2create_initrd static-libs
 sys-fs/quota                           rpc
@@ -205,6 +209,7 @@ sys-fs/udev                         devfs-compat edd extras hwdb static-libs
 sys-kernel/gentoo-sources              -doc
 sys-kernel/vanilla-sources             -doc
 
+sys-libs/ncurses                       doc
 sys-libs/pam                           audit
 
 #sys-process/cronie                    anacron