saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 4cc7c775f452fdebfdb303bd51dbbedbecd4bbe6..5e058ce7e883175ec8fb7c4e940f6aa681bb24c4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -22,6 +22,8 @@ mkdir -p './polkit-1/localauthority/20-org.d'
 mkdir -p './polkit-1/localauthority/30-site.d'
 mkdir -p './polkit-1/localauthority/50-local.d'
 mkdir -p './polkit-1/localauthority/90-mandatory.d'
+mkdir -p './portage/env/media-libs'
+mkdir -p './portage/env/net-libs'
 mkdir -p './ppp/peers'
 mkdir -p './sabayon/profiles'
 mkdir -p './sane.d/dll.d'
@@ -1130,6 +1132,15 @@ maybe chmod 0644 './portage/.keep_sys-apps_portage-0'
 maybe chmod 0644 './portage/bashrc'
 maybe chmod 0755 './portage/bin'
 maybe chmod 0755 './portage/bin/post_sync'
+maybe chmod 0755 './portage/env'
+maybe chmod 0755 './portage/env/media-libs'
+maybe chmod 0755 './portage/env/net-libs'
+maybe chmod 0755 './portage/env/sys-libs'
+maybe chmod 0644 './portage/env/sys-libs/zlib'
+maybe chmod 0755 './portage/env/x11-libs'
+maybe chmod 0644 './portage/env/x11-libs/cairo'
+maybe chmod 0755 './portage/env/x11-misc'
+maybe chmod 0644 './portage/env/x11-misc/google-gadgets'
 maybe chmod 0755 './portage/etckeeper'
 maybe chmod 0644 './portage/package.keywords'
 maybe chmod 0644 './portage/package.use'
@@ -1493,6 +1504,7 @@ maybe chmod 0644 './vbox/vbox.cfg'
 maybe chmod 0755 './vim'
 maybe chmod 0644 './vim/gvimrc'
 maybe chmod 0644 './vim/vimrc'
+maybe chmod 0644 './vim/vimrc.local'
 maybe chmod 0644 './wgetrc'
 maybe chmod 0644 './whois.conf'
 maybe chmod 0755 './wpa_supplicant'

diff --git a/make.conf b/make.conf
index 5c5299cb13a3d6d6ed321837ed555180fd7ebf2f..0e5bcdef8dabd9dc5e2ec82d6212f92bcdfbe06a 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -8,8 +8,8 @@ CXXFLAGS="${CFLAGS}"
 # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
 CHOST="x86_64-pc-linux-gnu"
 
-#MAKEOPTS="-j3"
-MAKEOPTS="-j1"
+MAKEOPTS="-j3"
+#MAKEOPTS="-j1"
 
 PORT_LOGDIR=/var/log/portage
 
@@ -31,8 +31,8 @@ ACCEPT_LICENSE=" \
         Oracle-BCLA-JavaSE \
 "
 
-#EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10"
-EMERGE_DEFAULT_OPTS="--with-bdeps y"
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10"
+#EMERGE_DEFAULT_OPTS="--with-bdeps y"
 
 CONFIG_PROTECT="/usr/share/xsessions \
                 /var/www/localhost/htdocs/phpmyadmin \

diff --git a/portage/bashrc b/portage/bashrc
index 383086c2b50426507325bffd6976f0032d2efac5..d1a2cef443739c2aa01e48fd7dc0f18ca1115f5c 100644 (file)
--- a/portage/bashrc
+++ b/portage/bashrc
@@ -1 +1,14 @@
+#!/bin/bash
+
 source /etc/portage/etckeeper
+
+for conf in ${PN} ${PN}:${SLOT} ${PN}-${PV} ${PN}-${PV}-${PR}; do
+    e=/etc/portage/env/${CATEGORY}/${conf}
+    if [[ -f ${e} ]]; then
+        einfo "Reading environment from ${e}"
+        . ${e}
+    fi
+done
+
+
+# vim: noai : ts=4 expandtab fenc=utf-8 filetype=sh

diff --git a/portage/env/sys-libs/zlib b/portage/env/sys-libs/zlib
new file mode 100644 (file)
index 0000000..84069c3
--- /dev/null
+++ b/portage/env/sys-libs/zlib
@@ -0,0 +1,3 @@
+CFLAGS="$CFLAGS -fno-tree-vectorize"
+
+# vim: noai : ts=4 fenc=utf-8 filetype=sh

diff --git a/portage/env/x11-libs/cairo b/portage/env/x11-libs/cairo
new file mode 100644 (file)
index 0000000..84069c3
--- /dev/null
+++ b/portage/env/x11-libs/cairo
@@ -0,0 +1,3 @@
+CFLAGS="$CFLAGS -fno-tree-vectorize"
+
+# vim: noai : ts=4 fenc=utf-8 filetype=sh

diff --git a/portage/env/x11-misc/google-gadgets b/portage/env/x11-misc/google-gadgets
new file mode 100644 (file)
index 0000000..5b93696
--- /dev/null
+++ b/portage/env/x11-misc/google-gadgets
@@ -0,0 +1,3 @@
+MAKEOPTS="-j1"
+
+# vim: noai : ts=4 fenc=utf-8 filetype=sh

diff --git a/vim/vimrc.local b/vim/vimrc.local
new file mode 100644 (file)
index 0000000..9ddb9e1
--- /dev/null
+++ b/vim/vimrc.local
@@ -0,0 +1,19 @@
+set noai
+set nohlsearch
+set fo="tcq"
+set modeline
+
+set showmatch
+set ignorecase
+
+if has("multi_byte")
+       set encoding=utf-8
+       setglobal fileencoding=utf-8
+else
+       echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte"
+endif
+
+filetype plugin off
+
+color delek
+