From: frank Date: Wed, 29 Feb 2012 09:34:35 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1407f7160b7620d67cbb78c3e100b2b0a381a73f;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/cups/printers.conf b/cups/printers.conf index cd7e2c2c..c9666bc9 100644 --- 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 Info Kyocera FS-1020D diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 03627cfd..d1addb30 100644 --- 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 Info Kyocera FS-1020D diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 4f651c29..a74c038c 100644 --- 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 - -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 - diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O index fc2a6f11..4f651c29 100644 --- 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 + +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 + diff --git a/make.conf b/make.conf index cd0277c1..a2116a9d 100644 --- 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 60d33efa..0756c377 100644 --- 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