saving uncommitted changes in /etc prior to emerge run

diff --git a/csh.env b/csh.env
index fc985265fdb98a752c1887df28364830d6e93578..82711b45b83e02446947f6a9043c0368af47edd1 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -27,15 +27,15 @@ setenv LC_TELEPHONE 'de_DE.utf8'
 setenv LC_TIME 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
-setenv MANPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.29.1/man:/usr/lib/llvm/5/share/man:/usr/lib/llvm/4/share/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.1/man/:/usr/local/share/man:/usr/share/man:/usr/share/rust-1.19.0/man'
+setenv MANPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.29.1/man:/usr/lib/llvm/5/share/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.1/man/:/usr/local/share/man:/usr/share/man:/usr/share/rust-1.19.0/man'
 setenv MOZ_GMP_PATH '/usr/lib64/nsbrowser/plugins/gmp-gmpopenh264/system-installed'
 setenv OPENGL_PROFILE 'xorg-x11'
 setenv PAGER '/usr/bin/less'
-setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/lib/llvm/5/bin:/usr/lib/llvm/4/bin:/opt/stuffit/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin:/usr/games/bin'
+setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/lib/llvm/5/bin:/opt/stuffit/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin:/usr/games/bin'
 setenv PRELINK_PATH_MASK '/usr/bin/evolution'
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.14/html/library'
 setenv QT_GRAPHICSSYSTEM 'raster'
 setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins'
-setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/lib/llvm/5/bin:/usr/lib/llvm/4/bin:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
+setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/lib/llvm/5/bin:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
 setenv XDG_CONFIG_DIRS '/etc/xdg'
 setenv XDG_DATA_DIRS '/usr/local/share:/usr/share:/usr/share/gdm'

diff --git a/ld.so.conf b/ld.so.conf
index 5d7704356004139f15835da0a4a559c69491f84b..374d9bff6f3af28ece567bd2f67d9a5085edda56 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -3,8 +3,6 @@
 include ld.so.conf.d/*.conf
 /usr/lib/llvm/5/lib32
 /usr/lib/llvm/5/lib64
-/usr/lib/llvm/4/lib32
-/usr/lib/llvm/4/lib64
 /usr/lib32/qt4
 /usr/lib64/qt4
 /lib64

diff --git a/profile.env b/profile.env
index a6407a829ce46f9a242775d4eaee4a984eeb04ca..59d5ca6bb509323529cc05d6b79479105ecb5c4a 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -27,15 +27,15 @@ export LC_TELEPHONE='de_DE.utf8'
 export LC_TIME='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
-export MANPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.29.1/man:/usr/lib/llvm/5/share/man:/usr/lib/llvm/4/share/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.1/man/:/usr/local/share/man:/usr/share/man:/usr/share/rust-1.19.0/man'
+export MANPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.29.1/man:/usr/lib/llvm/5/share/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.1/man/:/usr/local/share/man:/usr/share/man:/usr/share/rust-1.19.0/man'
 export MOZ_GMP_PATH='/usr/lib64/nsbrowser/plugins/gmp-gmpopenh264/system-installed'
 export OPENGL_PROFILE='xorg-x11'
 export PAGER='/usr/bin/less'
-export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/lib/llvm/5/bin:/usr/lib/llvm/4/bin:/opt/stuffit/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin:/usr/games/bin'
+export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/lib/llvm/5/bin:/opt/stuffit/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin:/usr/games/bin'
 export PRELINK_PATH_MASK='/usr/bin/evolution'
 export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.14/html/library'
 export QT_GRAPHICSSYSTEM='raster'
 export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
-export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/lib/llvm/5/bin:/usr/lib/llvm/4/bin:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
+export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/lib/llvm/5/bin:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
 export XDG_CONFIG_DIRS='/etc/xdg'
 export XDG_DATA_DIRS='/usr/local/share:/usr/share:/usr/share/gdm'