From: frank <frank@uhu1.uhu-banane.de>
Date: Wed, 15 Feb 2012 16:52:56 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=074393835e6a38c6344ab49bc981a0a5042ac64a;p=config%2Fuhu1%2Fetc.git

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

diff --git a/make.conf b/make.conf
index c5aa1ff..96f0239 100644
--- a/make.conf
+++ b/make.conf
@@ -8,7 +8,7 @@ CXXFLAGS="${CFLAGS}"
 # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
 CHOST="x86_64-pc-linux-gnu"
 
-MAKEOPTS="-j5"
+MAKEOPTS="-j3"
 #MAKEOPTS="-j1"
 
 PORTDIR_OVERLAY="/usr/local/portage"
@@ -28,7 +28,7 @@ ACCEPT_LICENSE=" \
 	skype-eula \
 "
 
-EMERGE_DEFAULT_OPTS="--with-bdeps y "
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10"
 
 FEATURES="parallel-fetch userpriv usersandbox"
 
diff --git a/portage/package.use b/portage/package.use
index 3a98c2d..870ce05 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -11,7 +11,7 @@ app-crypt/gnupg                         idea
 
 app-editors/vim                         cscope vim-with-x
 
-app-misc/mc                             7zip chdir -slang
+app-misc/mc                             7zip chdir mclib -slang
 app-misc/screen                         multiuser
 
 app-portage/eix                         optimization strong-optimization tools
@@ -45,7 +45,6 @@ dev-libs/libusb                         -doc
 dev-libs/openssl			rfc3779
 dev-libs/yaz                            icu
 
-
 dev-perl/Catalyst-Action-REST           php xml config-general data-taxi freezethaw json
 dev-perl/Catalyst-Model-DBIC-Schema     caching catalyst_helper replication
 dev-perl/DBIx-Class			admin admin_script deploy replicated
@@ -57,6 +56,7 @@ dev-perl/Sysadm-Install			hammer
 dev-perl/Task-Moose                     cli async declare instancetype logging other strict traits types utilroles utils
 
 dev-php/PEAR-MDB2                       mysqli
+dev-php/pecl-apc			lock_pthreadmutex
 
 dev-python/ipython			smp
 dev-python/pycairo                      -doc
@@ -82,7 +82,7 @@ mail-mta/postfix                        vda
 
 media-gfx/album                         ffmpeg plugins themes
 media-gfx/exiv2                         contrib xmp
-media-gfx/imagemagick                   -autotrace fftw mpeg raw webp
+media-gfx/imagemagick                   autotrace corefonts fftw mpeg pango raw webp
 #media-gfx/imagemagick                   autotrace fftw mpeg raw webp
 #media-gfx/imagemagick			-autotrace fftw mpeg raw
 media-gfx/pstoedit			emf
diff --git a/resolv.conf b/resolv.conf
index 750a926..e311fff 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,4 +1,5 @@
 # Generated by dhcpcd from eth0
 # /etc/resolv.conf.head can replace this line
 nameserver 8.8.8.8
+nameserver 8.8.4.4
 # /etc/resolv.conf.tail can replace this line