saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/make.conf b/portage/make.conf
index d420738386cd9e29fd2ffd4ca2171448a7cb77be..e2b6375df504b0b7b524daa42ba53607db035830 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -71,16 +71,16 @@ L10N="de en en-GB en-US ru vi"
 # These are the USE flags that were used in addition to what is provided by the
 # profile used for building.
 USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards 
-     amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cairo caja
+     amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cacert cairo caja
      calendar caps cdda cddb cdparanoia cdr cgi consolekit cpudetection cscope css ctype cups curl
      curlwrappers cvs dane dbase dbi dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples
-     encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile flickr fltk fluidsynth fontconfig
+     encode epub exif expat fam fastcgi ffmpeg fftw fits flac flatfile flickr fltk fluidsynth fontconfig
      foomaticdb ftp gconf gd gd-external geoip ggi gif gimp git glade glib gmp gnome gnome-keyring 
      gnustep gost gphoto2 gpm graphviz gsl gsm gstreamer gtk gtk3 gtkhtml hal hscolour html iconv icu id3 id3tag idea
      idn ieee1394 imagemagick imap imlib inifile ithreads java javascript
      jabber jack java6 jbig jikes jingle jpeg jpeg2k json json-syck json-xs kerberos
      keyring kig-scripting kpathsea lame latex lcms ldap libcaca
-     libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lxc lz4 lzma lzo mad meanwhile mercurial
+     libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lxc lz4 lzma lzo mad magic meanwhile mercurial
      midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp
      musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis
      nptl nsplugin nss numpy odbc ogg openal openexr opengl openssl opus pango par pch pcntl pcre pdf perl

diff --git a/portage/package.keywords b/portage/package.keywords
index f52dfeacb4948fd7ea90b5d6376f0e1871703fc5..d4d5dcc4511cb3ac4b2a3157ad274abe48e525ea 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -152,9 +152,15 @@ dev-python/pb-logging
 ~dev-qt/designer-4.8.7
 ~dev-qt/qt3support-4.8.7
 ~dev-qt/qtcore-4.8.7
+~dev-qt/qtdbus-4.8.7
+~dev-qt/qtdeclarative-4.8.7
 ~dev-qt/qtgui-4.8.7
+~dev-qt/qtmultimedia-4.8.7
+~dev-qt/qtopengl-4.8.7
 ~dev-qt/qtscript-4.8.7
 ~dev-qt/qtsql-4.8.7
+~dev-qt/qtsvg-4.8.7
+~dev-qt/qttest-4.8.7
 ~dev-qt/qttranslations-4.8.7
 ~dev-qt/qtwebkit-4.8.7
 ~dev-qt/qtwebkit-4.10.4

diff --git a/portage/package.mask b/portage/package.mask
index 72b72357be70c6bfcb2274065905ef7b1c902de3..a5c43a81ca803f39c35d8ab9cbe601d8577ede94 100644 (file)
--- a/portage/package.mask
+++ b/portage/package.mask
@@ -11,9 +11,9 @@
 
 =media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r3
 
-#=media-libs/phonon-4.9.0
-#=media-libs/phonon-gstreamer-4.9.0
-#=media-libs/phonon-vlc-0.9.0
+=media-libs/phonon-4.9.0
+=media-libs/phonon-gstreamer-4.9.0
+=media-libs/phonon-vlc-0.9.0
 
 =media-video/mplayer-1.2_pre20150214
 

diff --git a/portage/package.unmask b/portage/package.unmask
index 237abaabd7f305ad20156870cb2cd8166083d05d..5d8a592ead12a894ac315ecb212865e5384c126b 100644 (file)
--- a/portage/package.unmask
+++ b/portage/package.unmask
@@ -16,7 +16,7 @@
 
 <dev-python/python-caja-1.7::mate-overlay
 
-=dev-qt/qtwebkit-4.10.4
+# =dev-qt/qtwebkit-4.10.4
 
 <mate-base/caja-1.7::mate-overlay
 <mate-base/libmatekbd-1.7::mate-overlay

diff --git a/portage/package.use b/portage/package.use
index b17dd9b56b149154f44d72404027c223b78e4365..bf8527e7150bee984a011e88af8aa09d89bc7bdf 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -190,6 +190,8 @@ mail-client/nail                    net
 
 mail-mta/postfix                       memcached -vda
 
+mate-extra/caja-extensions             gksu
+
 media-fonts/corefonts                  tahoma
 media-fonts/terminus-font              distinct-l
 media-fonts/unifont                    fontforge utils