From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Wed, 14 Oct 2015 09:25:23 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=166388ffb69f9cce9a93c91f3275af3a8fd6109d;p=config%2Fsamara%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf
index c1da4bf..a5983d9 100644
--- a/etckeeper/etckeeper.conf
+++ b/etckeeper/etckeeper.conf
@@ -41,4 +41,4 @@ LOWLEVEL_PACKAGE_MANAGER=qlist
 
 # To push each commit to a remote, put the name of the remote here.
 # (eg, "origin" for git).
-PUSH_REMOTE=""
+PUSH_REMOTE="origin"
diff --git a/portage/make.conf b/portage/make.conf
index 1be0efa..42ec58c 100644
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -13,12 +13,12 @@ CHOST="x86_64-pc-linux-gnu"
 USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \
      bazaar bluray caja calendar caps cddb cdparanoia cgi cpudetection cscope \
      css ctype curl curlwrappers cvs dane dbase dga djvu dv dvb dvdread \
-     examples expat fastcgi fftw fits flatfile flickr fltk fontconfig \
+     examples expat fastcgi ffmpeg fftw fits flatfile flickr fltk fontconfig \
      foomaticdb ftp fuse gconf gd geoip ggi gimp git git glade glib gmp gnustep gost \
      gphoto2 graphviz gsl gsm gtk3 gtkhtml handbook highlight hscolour html icu id3 \
      id3tag idea idn ieee1394 imagemagick imap imlib inifile jabber jack \
      java java6 javascript jbig jikes jingle jpeg2k json json-syck json-xs \
-     kde kdeenablefinal kerberos keyring kig-scripting kpathsea lame latex libav \
+     kde kdeenablefinal kerberos keyring kig-scripting kpathsea lame latex \
      libsamplerate libwww live lm_sensors log4j logrotate lua lz4 lzma lzo \
      mate meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \
      musepack musicbrainz mysql mysqli nas networkmanager next nfs nis \
diff --git a/portage/package.use b/portage/package.use
index db9b5b1..512d2de 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -226,7 +226,8 @@ media-libs/faad2                        digitalradio
 media-libs/fontconfig                   -doc
 media-libs/freetype                     utils
 # media-libs/gd                         fontconfig
-media-libs/gegl                         -ffmpeg graphviz lensfun raw
+#media-libs/gegl                         -ffmpeg graphviz lensfun raw
+media-libs/gegl                         graphviz lensfun raw
 # graphviz% -raw -umfpack
 media-libs/giflib                       rle
 media-libs/libgphoto2                   -zeroconf
@@ -262,7 +263,7 @@ media-sound/pulseaudio                  asyncns equalizer native-headset
 media-sound/sox                         amrnb amrwb
 
 # media-video/ffmpeg                     dirac faac faad frei0r gsm hardcoded-tables network opencore-amr rtmp schroedinger vaapi vhook vpx
-media-video/ffmpeg                      aac aacplus amr ass dirac faac faad gsm hardcoded-tables network opencore-amr openssl rtmp schroedinger speex vaapi vhook vpx
+media-video/ffmpeg                      aac aacplus amr ass dirac faac faad gsm hardcoded-tables librtmp network opencore-amr openssl rtmp schroedinger speex vaapi vhook vpx
 media-video/kino                        gpac
 media-video/libav			bs2b vaapi webp x265
 media-video/mjpegtools                  yv12