saving uncommitted changes in /etc prior to emerge run

diff --git a/make.conf b/make.conf
index e09da4bdc37d9c97d628f25b0b49943db746d265..11812a76f4f9cf95e26a15a387f8bcfdda900c97 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -67,8 +67,8 @@ USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl \
      darcs djvu doc examples expat fam fastcgi fontconfig ftp gd gif git gmp gnome-keyring \
      gnutls gpg graphviz gs gsl gtk guile hscolour html i18n icu idn imagemagick imap ipv6 ithreads \
      jadetex java javascript jbig jpeg jpeg2k kerberos lasi ldap libwww lua \
-     lzma lzo maildir mailwrapper mercurial mmx mmxext modperl motif mp3 mysql \
-     nis odbc ogg openldap pam pch pcre pdf perl pic png php postgres python rar samba sasl \
+     lzma lzo maildir mailwrapper mercurial mmx mmxext modperl modplug motif mp3 mysql \
+     nis odbc ogg openexr openldap pam pch pcre pdf perl pic png php postgres python rar samba sasl \
      session smtp snmp soap spamassassin spell sqlite sqlite3 sse sse2 ssh \
      subversion svg syslog theora tiff tk truetype unicode vhosts vim-syntax \
      vorbis wmf x264 xattr xml xmlrpc xpm xsl xvid zlib"

diff --git a/portage/package.use b/portage/package.use
index 964319872ee520d7d6d3214c8c11c6fa4901f2a8..5135d66a70ccf9cc67feb9e98eebc6c4b3b5731b 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -82,7 +82,8 @@ mail-mta/postfix                        vda
 
 media-gfx/album                         ffmpeg plugins themes
 media-gfx/exiv2                         contrib xmp
-media-gfx/imagemagick                   autotrace corefonts fftw mpeg pango raw webp
+media-gfx/graphicsmagick               fpx
+media-gfx/imagemagick                   autotrace corefonts fftw fpx hdri mpeg pango raw webp
 #media-gfx/imagemagick                   autotrace fftw mpeg raw webp
 #media-gfx/imagemagick                 -autotrace fftw mpeg raw
 media-gfx/pstoedit                     emf
@@ -98,9 +99,10 @@ media-libs/libwmf                    -expat
 media-libs/openjpeg                     tools
 #media-libs/opencv                     cuda eigen ffmpeg gstreamer ieee1394 openexr opengl qt4 sse3 ssse3 v4l xine
 media-libs/opencv                      cuda ffmpeg v4l
+media-libs/x264                                interlaced
 
-#media-video/ffmpeg                      aac amr dirac frei0r gsm hardcoded-tables -pic schroedinger speex v4l2 vhook
-media-video/ffmpeg                      aac amr dirac gsm hardcoded-tables -pic schroedinger speex v4l2 vhook
+# media-video/ffmpeg                      aac amr dirac frei0r gsm hardcoded-tables -pic schroedinger speex v4l2 vhook
+media-video/ffmpeg                      aac aacplus amr ass dirac gsm hardcoded-tables openssl -pic schroedinger speex v4l2 vhook
 
 net-analyzer/nagios-nrpe                command-args
 net-analyzer/nagios-plugins             nagios-dns nagios-ntp nagios-ping nagios-ssh