saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/make.conf b/portage/make.conf
index 6519706a3161a35ab86705fef1e7ae6d0b9135a0..76c8d0735af90d7c97fd7a87957996a7ed586655 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -23,7 +23,7 @@ USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \
      mate meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \
      musepack musicbrainz mysql mysqli nas networkmanager next nfs nis \
      nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl \
-     plotutils posix postgres postscript projectm python quicktime rdesktop \
+     plotutils posix postgres postscript projectm python qt5 quicktime rdesktop \
      rle sasl sctp semantic-desktop sharedmem sid simplexml sip slang slp smtp sndfile \
      snmp soap sockets sox speex sqlite sqlite3 srtp \
      sse sse2 ssh subversion sysvipc tetex theora threads thumbnail tidy \

diff --git a/portage/package.use b/portage/package.use
index 94be246d4b7b2c56774041c22de0632635a0f25f..26862de336c456d03e365541ec5c3165ae947ddc 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -197,6 +197,8 @@ kde-base/kwin                           captury
 kde-base/kdeplasma-addons               desktopglobe json qalculate qwt
 kde-base/plasma-workspace               google-gadgets
 
+kde-plasma/plasma-desktop              legacy-systray
+
 mail-client/claws-mail                  -pda
 mail-client/evolution                   exchange -pda
 mail-client/thunderbird                 mozdom replytolist system-sqlite
@@ -234,6 +236,7 @@ media-libs/gegl                         graphviz lensfun raw
 # graphviz% -raw -umfpack
 media-libs/giflib                       rle
 media-libs/libgphoto2                   -zeroconf
+media-libs/libmediaart                 -qt5
 media-libs/libmp4v2                     utils
 media-libs/libpng                       apng
 media-libs/libquicktime                 lame
@@ -241,7 +244,7 @@ media-libs/libvorbis                    aotuv
 media-libs/libvpx                      postproc
 media-libs/libwmf                       -expat
 media-libs/mediastreamer               g726 g729 ilbc -silk
-media-libs/mesa                         g3dvl gbm gles gles1 gles2 llvm shared-dricore xa xvmc
+media-libs/mesa                         g3dvl gbm gles gles1 gles2 llvm shared-dricore wayland xa xvmc
 media-libs/netpbm                       rle
 media-libs/openjpeg                     tools
 media-libs/phonon                       gstreamer
@@ -273,7 +276,7 @@ media-video/mjpegtools                  yv12
 media-video/mplayer                     3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 nemesi nut opencore-amr pvr rar rtc srt teletext tga tivo xanim xvmc yuv4mpeg
 media-video/totem                       iplayer -tracker upnp-av
 media-video/transcode                   extrafilters fame lzo mjpeg network nuv postproc
-media-video/vlc                         atmo cdda cddax cdio chromaprint corba daap dc1394 dirac egl faad fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil opencv portaudio postproc -rdp rtsp schroedinger sftp shine shout skins stream switcher taglib tremor twolame vcdinfo vcdx vlm vnc vpx zvbi
+media-video/vlc                         atmo cdda cddax cdio chromaprint corba daap dc1394 dirac egl faad fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil opencv portaudio postproc -qt4 -rdp rtsp schroedinger sftp shine shout skins stream switcher taglib tremor twolame vcdinfo vcdx vlm vnc vpx zvbi
 
 net-analyzer/nagios-nrpe                command-args
 net-analyzer/nagios-plugins             nagios-dns nagios-ntp nagios-ping nagios-ssh
@@ -328,7 +331,7 @@ net-nds/openldap                        cxx experimental -minimal overlays syslo
 
 net-print/hplip                         cupsddk fax new-hpcups parport scanner
 
-net-wireless/wpa_supplicant             wps
+net-wireless/wpa_supplicant             -qt4 wps
 
 sci-libs/cln                           -doc
 sci-libs/hdf5                          -threads