From: frank Date: Tue, 10 Apr 2012 08:11:48 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=8c57575b3593ad0959e2f4df3664db457ba23786;p=config%2Fuhu1%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/make.conf b/make.conf index e09da4b..11812a7 100644 --- 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 9643198..5135d66 100644 --- 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