saving uncommitted changes in /etc prior to emerge run

diff --git a/make.conf b/make.conf
index e2687f63e052a72e888db961a1a80883d5069ef1..890b67aec2545ea096aeb8ea3904915f7b16b25d 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -34,6 +34,7 @@ ACCEPT_LICENSE=" \
        AdobeFlash-10.1 \
        AdobeFlash-10.3 \
        skype-eula \
+       skype-4.0.0.7-copyright \
        Oracle-BCLA-JavaSE \
 "
 
@@ -76,7 +77,7 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards
      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 numpy odbc ogg openal openexr opengl pango par pch pcntl pcre pdf perl
-     perlsuid php plasma plotutils png policykit posix postgres ppds projectm pulseaudio python quicktime real
+     perlsuid php plasma plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python quicktime real
      rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp
      sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh
      subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff

diff --git a/portage/package.keywords b/portage/package.keywords
index 55f79f6f13170278ae2fecad65f3ccc11c60af79..e87ba347f40de9be55558dc83ffd8cdfc512da68 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -44,10 +44,18 @@ mail-client/thunderbird
 
 net-im/skype
 
+# ~perl-core/ExtUtils-CBuilder-0.280.205
+# ~perl-core/Module-Load-Conditional-0.500.0
+
 ~sys-apps/etckeeper-0.58
 
 ~sys-libs/zlib-1.2.7
 
+# ~virtual/perl-ExtUtils-CBuilder-0.280.205
+# ~virtual/perl-IPC-Cmd-0.780.0
+# ~virtual/perl-Module-Load-0.220.0
+# ~virtual/perl-Params-Check-0.360.0
+
 www-client/firefox
 
 ~x11-apps/desktopnova-0.7.4

diff --git a/portage/package.use b/portage/package.use
index 289bc477ed73069eb00ac765b73babe1bbe9d1be..ab124aeaf62d06b2557907f52a084f2de90d1ce3 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -160,11 +160,11 @@ media-libs/libpng                 apng
 media-libs/libquicktime                        lame
 media-libs/libvorbis                   aotuv
 media-libs/libwmf                      -expat
-media-libs/mesa                                gles llvm shared-dricore
+media-libs/mesa                                g3dvl gles gles1 gles2 llvm shared-dricore xa xvmc
 media-libs/netpbm                      rle
 media-libs/openjpeg                    tools
 media-libs/phonon                      gstreamer
-media-libs/sdl-mixer                   mikmod
+media-libs/sdl-mixer                   mikmod mod playtools
 media-libs/urt                         gs
 media-libs/xine-lib                    fusion vdr xvmc
 media-libs/xvid                                pic
@@ -188,7 +188,7 @@ media-video/mjpegtools                      yv12
 media-video/mplayer                    3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 mpg123 nemesi nut opencore-amr pnm pvr rar rtc srt teletext tga tivo vpx xanim xvmc zoran
 media-video/totem                      iplayer -tracker
 media-video/transcode                  extrafilters fame lzo mjpeg network nuv postproc
-media-video/vlc                                atmo cdda cddax cdio corba daap dc1394 dirac fluidsynth gme httpd kate libass libcaca libtiger libv4l libv4l2 live matroska mod mpeg rtsp schroedinger shine shout skins stream taglib twolame vcdinfo vcdx vlm zvbi
+media-video/vlc                                atmo cdda cddax cdio corba daap dc1394 dirac egl fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil portaudio rtsp schroedinger shine shout skins stream switcher taglib twolame vcdinfo vcdx vlm zvbi
 
 net-analyzer/nagios-nrpe               command-args
 net-analyzer/nagios-plugins            nagios-dns nagios-ntp nagios-ping nagios-ssh
@@ -242,7 +242,7 @@ sci-mathematics/pari                        -doc
 sci-visualization/gnuplot              latex plotutils thin-splines wxwidgets
 
 sys-apps/acl                           nfs
-sys-apps/busybox                       -pam savedconfig static
+sys-apps/busybox                       math -pam savedconfig static
 # sys-apps/coreutils                   xattr
 sys-apps/paludis                       glsa inquisitio qa visibility
 sys-block/parted                       device-mapper