From 7d13f5744a79446e17295b72288b94262790aee0 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Sat, 5 Sep 2015 22:55:39 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 paludis/bashrc | 118 ++++++++++++++++++++++++-------------------------
 profile.env    |  59 ++++++++++++-------------
 2 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/paludis/bashrc b/paludis/bashrc
index 66a684d..3f2e739 100644
--- a/paludis/bashrc
+++ b/paludis/bashrc
@@ -58,69 +58,69 @@ fi
 
 # clang incompatible or safety or missing openmp, also see #408963
 if [[
+	"${CATEGORY}" != "dev-haskell" &&
+	"${CATEGORY}/${PN}" != "app-admin/haskell-updater" &&
+	"${CATEGORY}/${PN}" != "app-crypt/gnupg" &&
+	"${CATEGORY}/${PN}" != "app-crypt/johntheripper" &&
+	"${CATEGORY}/${PN}" != "app-emulation/aqemu" &&
+	"${CATEGORY}/${PN}" != "app-emulation/virtualbox" &&
+	"${CATEGORY}/${PN}" != "app-emulation/virtualbox-modules" &&
+	"${CATEGORY}/${PN}" != "app-emulation/wine" &&
+	"${CATEGORY}/${PN}" != "app-text/pandoc" &&
+	"${CATEGORY}/${PN}" != "app-text/recode" &&
+	"${CATEGORY}/${PN}" != "dev-games/cegui" &&
+	"${CATEGORY}/${PN}" != "dev-games/goatee" &&
+	"${CATEGORY}/${PN}" != "dev-lang/gprolog" &&
+	"${CATEGORY}/${PN}" != "dev-lang/luajit" &&
+	"${CATEGORY}/${PN}" != "dev-lang/ruby" &&
+	"${CATEGORY}/${PN}" != "dev-lang/spidermonkey" &&
+	"${CATEGORY}/${PN}" != "dev-libs/crypto++" &&
+	"${CATEGORY}/${PN}" != "dev-libs/elfutils" &&
+	"${CATEGORY}/${PN}" != "dev-libs/libev" &&
+	"${CATEGORY}/${PN}" != "dev-libs/libixion" &&
+	"${CATEGORY}/${PN}" != "dev-libs/openssl" &&
+	"${CATEGORY}/${PN}" != "dev-scheme/guile" &&
+	"${CATEGORY}/${PN}" != "dev-util/nemiver" &&
+	"${CATEGORY}/${PN}" != "games-board/goatee-gtk" &&
+	"${CATEGORY}/${PN}" != "games-engines/gemrb" &&
+	"${CATEGORY}/${PN}" != "games-engines/OpenJK" &&
+	"${CATEGORY}/${PN}" != "games-engines/openmw" &&
+	"${CATEGORY}/${PN}" != "games-fps/unvanquished" &&
+	"${CATEGORY}/${PN}" != "games-strategy/0ad" &&
+	"${CATEGORY}/${PN}" != "games-strategy/freeorion" &&
+	"${CATEGORY}/${PN}" != "games-strategy/liquidwar6" &&
+	"${CATEGORY}/${PN}" != "mail-client/thunderbird" &&
+	"${CATEGORY}/${PN}" != "media-gfx/blender" &&
+	"${CATEGORY}/${PN}" != "media-libs/devil" &&
+	"${CATEGORY}/${PN}" != "media-libs/gd" &&
+	"${CATEGORY}/${PN}" != "media-libs/gstreamer" &&
+	"${CATEGORY}/${PN}" != "media-libs/id3lib" &&
+	"${CATEGORY}/${PN}" != "media-libs/libraw" &&
+	"${CATEGORY}/${PN}" != "media-libs/libvorbis" &&
+	"${CATEGORY}/${PN}" != "media-libs/mesa" &&
+	"${CATEGORY}/${PN}" != "media-libs/sdl2-gfx" &&
+	"${CATEGORY}/${PN}" != "media-video/ffmpeg" &&
+	"${CATEGORY}/${PN}" != "media-video/guvcview" &&
+	"${CATEGORY}/${PN}" != "net-firewall/pglinux" &&
+	"${CATEGORY}/${PN}" != "net-libs/libmnl" &&
+	"${CATEGORY}/${PN}" != "net-libs/opal" &&
+	"${CATEGORY}/${PN}" != "net-p2p/retroshare" &&
+	"${CATEGORY}/${PN}" != "sci-mathematics/z3" &&
+	"${CATEGORY}/${PN}" != "sys-apps/coreutils" &&
+	"${CATEGORY}/${PN}" != "sys-apps/memtest86+" &&
+	"${CATEGORY}/${PN}" != "sys-apps/paludis" &&
+	"${CATEGORY}/${PN}" != "sys-block/thin-provisioning-tools" &&
+	"${CATEGORY}/${PN}" != "sys-devel/autogen" &&
 	"${CATEGORY}/${PN}" != "sys-devel/binutils" &&
 	"${CATEGORY}/${PN}" != "sys-devel/gcc" &&
 	"${CATEGORY}/${PN}" != "sys-libs/glibc" &&
-	"${CATEGORY}/${PN}" != "sys-apps/coreutils" &&
-	"${CATEGORY}/${PN}" != "media-gfx/blender" &&
-	"${CATEGORY}/${PN}" != "x11-drivers/nvidia-drivers" &&
-	"${CATEGORY}/${PN}" != "media-libs/mesa" &&
-	"${CATEGORY}/${PN}" != "x11-base/xorg-server" &&
-	"${CATEGORY}/${PN}" != "games-strategy/freeorion" &&
-	"${CATEGORY}/${PN}" != "games-engines/openmw" &&
-	"${CATEGORY}/${PN}" != "net-p2p/retroshare" &&
-	"${CATEGORY}/${PN}" != "app-emulation/virtualbox" &&
-	"${CATEGORY}/${PN}" != "app-emulation/virtualbox-modules" &&
-	"${CATEGORY}/${PN}" != "media-libs/id3lib" &&
-	"${CATEGORY}/${PN}" != "net-firewall/pglinux" &&
-	"${CATEGORY}/${PN}" != "app-crypt/gnupg" &&
-	"${CATEGORY}/${PN}" != "dev-lang/ruby" &&
-	"${CATEGORY}/${PN}" != "mail-client/thunderbird" &&
-	"${CATEGORY}/${PN}" != "www-client/firefox" &&
-	"${CATEGORY}/${PN}" != "dev-scheme/guile" &&
-	"${CATEGORY}/${PN}" != "dev-libs/libixion" &&
-	"${CATEGORY}/${PN}" != "dev-lang/gprolog" &&
-	"${CATEGORY}/${PN}" != "x11-libs/motif" &&
-	"${CATEGORY}/${PN}" != "x11-libs/cairo" &&
-	"${CATEGORY}/${PN}" != "media-libs/devil" &&
-	"${CATEGORY}/${PN}" != "sys-devel/autogen" &&
-	"${CATEGORY}/${PN}" != "games-engines/gemrb" &&
-	"${CATEGORY}/${PN}" != "app-emulation/wine" &&
-	"${CATEGORY}/${PN}" != "app-text/recode" &&
-	"${CATEGORY}/${PN}" != "dev-libs/openssl" &&
-	"${CATEGORY}/${PN}" != "dev-games/goatee" &&
-	"${CATEGORY}/${PN}" != "games-board/goatee-gtk" &&
-	"${CATEGORY}/${PN}" != "www-client/torbrowser" &&
-	"${CATEGORY}/${PN}" != "dev-util/nemiver" &&
-	"${CATEGORY}/${PN}" != "app-text/pandoc" &&
-	"${CATEGORY}/${PN}" != "sys-apps/memtest86+" &&
-	"${CATEGORY}/${PN}" != "games-engines/OpenJK" &&
-	"${CATEGORY}/${PN}" != "dev-lang/luajit" &&
-	"${CATEGORY}/${PN}" != "app-admin/haskell-updater" &&
-	"${CATEGORY}/${PN}" != "dev-lang/spidermonkey" &&
-	"${CATEGORY}/${PN}" != "games-strategy/liquidwar6" &&
-	"${CATEGORY}/${PN}" != "sci-mathematics/z3" &&
-	"${CATEGORY}" != "dev-haskell" &&
-	"${CATEGORY}/${PN}" != "media-libs/libvorbis" &&
-	"${CATEGORY}/${PN}" != "games-fps/unvanquished" &&
-	"${CATEGORY}/${PN}" != "media-libs/gstreamer" &&
-	"${CATEGORY}/${PN}" != "media-video/ffmpeg" &&
-	"${CATEGORY}/${PN}" != "dev-libs/libev" &&
-	"${CATEGORY}/${PN}" != "games-strategy/0ad" &&
-	"${CATEGORY}/${PN}" != "dev-libs/elfutils" &&
-	"${CATEGORY}/${PN}" != "media-libs/libraw" &&
-	"${CATEGORY}/${PN}" != "media-libs/gd" &&
-	"${CATEGORY}/${PN}" != "media-libs/sdl2-gfx" &&
-	"${CATEGORY}/${PN}" != "app-crypt/johntheripper" &&
-	"${CATEGORY}/${PN}" != "dev-games/cegui" &&
-	"${CATEGORY}/${PN}" != "sys-block/thin-provisioning-tools" &&
-	"${CATEGORY}/${PN}" != "sys-apps/paludis" &&
-	"${CATEGORY}/${PN}" != "dev-libs/crypto++" &&
 	"${CATEGORY}/${PN}" != "sys-power/iasl" &&
-	"${CATEGORY}/${PN}" != "net-libs/libmnl" &&
-	"${CATEGORY}/${PN}" != "net-libs/opal" &&
-	"${CATEGORY}/${PN}" != "media-video/guvcview" &&
-	"${CATEGORY}/${PN}" != "app-emulation/aqemu" &&
+	"${CATEGORY}/${PN}" != "www-client/firefox" &&
+	"${CATEGORY}/${PN}" != "www-client/torbrowser" &&
+	"${CATEGORY}/${PN}" != "x11-base/xorg-server" &&
+	"${CATEGORY}/${PN}" != "x11-drivers/nvidia-drivers" &&
+	"${CATEGORY}/${PN}" != "x11-libs/cairo" &&
+	"${CATEGORY}/${PN}" != "x11-libs/motif" &&
 	"${CATEGORY}/${PN}" != "x11-libs/pixman"
 	]]
 then
diff --git a/profile.env b/profile.env
index 0941fa7..110cf0d 100644
--- a/profile.env
+++ b/profile.env
@@ -1,44 +1,43 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY env-update.
-# DO NOT EDIT THIS FILE. CHANGES TO STARTUP PROFILES
-# GO INTO /etc/profile NOT /etc/profile.env
-
-export ADA_INCLUDE_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adainclude'
-export ADA_OBJECTS_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib'
-export CG_COMPILER_EXE='/opt/bin/cgc'
-export CG_INC_PATH='/opt/nvidia-cg-toolkit/include'
-export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
-export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /usr/share/config'
+# Configuration file for eselect
+# This file has been automatically generated.
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin'
+export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
+export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
 export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.5/ext-active/ /etc/php/cgi-php5.5/ext-active/ /etc/php/apache2-php5.5/ext-active/ /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
 export CVS_RSH='ssh'
-export DCCC_PATH='/usr/lib64/distcc/bin'
 export DISTCC_LOG=''
+export DCCC_PATH='/usr/lib64/distcc/bin'
 export DISTCC_VERBOSE='0'
-export GCC_SPECS=''
-export GSETTINGS_BACKEND='dconf'
-export GUILE_LOAD_PATH='/usr/share/guile/1.8'
-export HG='/usr/bin/hg'
-export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
 export LANG='de_DE.utf8'
 export LC_COLLATE='C'
 export LC_MESSAGES='en_US.utf8'
-export LESS='-R -M --shift 5'
-export LESSOPEN='|lesspipe %s'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
-export MULTIOSDIRS='../lib64:../lib32'
 export OPENCL_PROFILE='nvidia'
 export OPENGL_PROFILE='nvidia'
-export PACKAGE_MANAGER='paludis'
-export PAGER='/usr/bin/most'
-export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin'
-export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
-export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.8/html/library'
-export QT_GRAPHICSSYSTEM='raster'
-export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
-export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin'
+export GCC_SPECS=''
+export MULTIOSDIRS='../lib64:../lib32'
 export RUBYOPT='-rauto_gem'
+export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /usr/share/config'
+export XDG_DATA_DIRS='/usr/local/share:/usr/share'
+export COLON_SEPARATED='QT_PLUGIN_PATH'
+export QT_GRAPHICSSYSTEM='raster'
+export GSETTINGS_BACKEND='dconf'
+export GUILE_LOAD_PATH='/usr/share/guile/1.8'
+export PACKAGE_MANAGER='paludis'
 export SBCL_HOME='/usr/lib64/sbcl'
 export SBCL_SOURCE_ROOT='/usr/lib64/sbcl/src'
-export SGML_CATALOG_FILES='/etc/sgml/openjade-1.3.2.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.1.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-lite.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.2.cat'
+export ADA_INCLUDE_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adainclude'
+export ADA_OBJECTS_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib'
+export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.8/html/library'
+export LESSOPEN='|lesspipe %s'
+export LESS='-R -M --shift 5'
+export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
+export CG_COMPILER_EXE='/opt/bin/cgc'
+export CG_INC_PATH='/opt/nvidia-cg-toolkit/include'
+export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
+export HG='/usr/bin/hg'
+export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
 export VBOX_APP_HOME='/usr/lib64/virtualbox'
 export XDG_CONFIG_DIRS='/etc/xdg'
-export XDG_DATA_DIRS='/usr/local/share:/usr/share'
+export SGML_CATALOG_FILES='/etc/sgml/openjade-1.3.2.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.1.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-lite.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.2.cat'
+export PAGER='/usr/bin/most'