saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/printers.conf b/cups/printers.conf
index cd7e2c2c0da85beee3d3af6b348b500bf0adff0f..c9666bc98a67b8491e298e58d49ea2559eb34da2 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-26 08:30
+# Written by cupsd on 2012-02-29 08:18
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 03627cfdd7766167dc31f578f77b9e438b8653c9..d1addb3001d95313d2cadce43952747df73bf5bc 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-25 07:37
+# Written by cupsd on 2012-02-28 07:05
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 4f651c29b051c36e845e8518cd106336d49fddf9..a74c038c905e9cd37c58a5466b3c238b5189ddbb 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,11 +1,3 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-25 17:28
+# Written by cupsd on 2012-02-26 17:28
 NextSubscriptionId 133
-<Subscription 132>
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner frank
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1330273704
-NextEventId 316
-</Subscription>

diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O
index fc2a6f119e71b7fff3e1c09164b9b8a193f3813c..4f651c29b051c36e845e8518cd106336d49fddf9 100644 (file)
--- a/cups/subscriptions.conf.O
+++ b/cups/subscriptions.conf.O
@@ -1,3 +1,11 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-20 16:54
-NextSubscriptionId 132
+# Written by cupsd on 2012-02-25 17:28
+NextSubscriptionId 133
+<Subscription 132>
+Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
+Owner frank
+LeaseDuration 86400
+Interval 0
+ExpirationTime 1330273704
+NextEventId 316
+</Subscription>

diff --git a/make.conf b/make.conf
index cd0277c1de4a440ea62dce5036b81eb3eb7b03d3..a2116a9dc6525fc74314b948a6f055bc13ed7e32 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -59,7 +59,7 @@ LINGUAS="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 branding bzip2 cairo 
+     amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cairo 
      calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl 
      curlwrappers cvs dbase dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples
      encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig

diff --git a/portage/package.use b/portage/package.use
index 60d33efa241692fe2314d9d6999c36796fe9591f..0756c377b485d3f7f8240469d4f8504a4309466c 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -154,9 +154,10 @@ media-libs/libwmf                  -expat
 media-libs/mesa                                gles llvm shared-dricore
 media-libs/netpbm                      rle
 media-libs/openjpeg                    tools
+media-libs/phonon                      gstreamer
 media-libs/sdl-mixer                   mikmod
 media-libs/urt                         gs
-media-libs/xine-lib                    xvmc
+media-libs/xine-lib                    fusion vdr xvmc
 media-libs/xvid                                pic
 
 media-plugins/audacious-plugins                adplug bs2b cue fluidsynth icecast midi projectm scrobbler tta
@@ -167,9 +168,7 @@ media-sound/amarok                  cdaudio cdda daap ifp ipod mp3tunes mp4 njb visualization
 media-sound/audacious                  chardet
 # media-sound/easytag                  wavpack
 media-sound/jack-audio-connection-kit  jack-tmpfs netjack
-# move media-sound/phonon media-libs/phonon
-media-libs/phonon                      gstreamer
-media-sound/pulseaudio                 asyncns
+media-sound/pulseaudio                 asyncns equalizer
 media-sound/sox                                amrnb amrwb
 
 #media-video/ffmpeg                    dirac faac faad frei0r gsm hardcoded-tables network opencore-amr rtmp schroedinger vaapi vhook vpx
@@ -240,7 +239,7 @@ sys-block/parted                    device-mapper
 sys-apps/pciutils                      network-cron -zlib
 sys-apps/portage                       epydoc python3
 sys-apps/usbutils                      network-cron
-sys-apps/util-linux                    loop-aes
+sys-apps/util-linux                    ddate loop-aes
 
 sys-auth/consolekit                    policykit
 sys-auth/pambase                       mktemp pam_krb5 pam_ssh