committing changes in /etc after emerge run

diff --git a/csh.env b/csh.env
index 39e4cbd9a8008c5ca9c81da41f5370e1787d14fe..34dbb543e2983c00f76f437c46a6be3c16de73e5 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -4,13 +4,13 @@
 
 setenv ANT_HOME '/usr/share/ant'
 setenv CONFIG_PROTECT '/var/bind /usr/share/gnupg/qualified.txt /usr/share/config /usr/lib64/libreoffice/program/sofficerc /usr/share/themes/oxygen-gtk/gtk-2.0'
-setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php7.0/ext-active/ /etc/php/cgi-php7.0/ext-active/ /etc/php/apache2-php7.0/ext-active/ /etc/fonts/fonts.conf /etc/chromium/policies/managed/chrome-gnome-shell.json /etc/opt/chrome/policies/managed/chrome-gnome-shell.json /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'
+setenv CONFIG_PROTECT_MASK '/etc/sandbox.d /etc/php/cli-php7.0/ext-active/ /etc/php/cgi-php7.0/ext-active/ /etc/php/apache2-php7.0/ext-active/ /etc/fonts/fonts.conf /etc/gentoo-release /etc/chromium/policies/managed/chrome-gnome-shell.json /etc/opt/chrome/policies/managed/chrome-gnome-shell.json /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'
 setenv EDITOR '/usr/bin/vim'
 setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.3-r3/html'
 setenv GCC_SPECS ''
 setenv GSETTINGS_BACKEND 'dconf'
 setenv GUILE_LOAD_PATH '/usr/share/guile/1.8'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28/info'
+setenv INFOPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28/info:/usr/share/info'
 setenv LADSPA_PATH '/usr/lib64/ladspa'
 setenv LANG 'de_DE.UTF-8'
 setenv LC_ADDRESS 'de_DE.utf8'
@@ -27,18 +27,18 @@ 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/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/:/usr/share/rust-1.19.0/man'
+setenv MANPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/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 MULTIOSDIRS '../lib64:../lib32'
 setenv OPENGL_PROFILE 'xorg-x11'
 setenv PAGER '/usr/bin/less'
-setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin:/usr/games/bin'
+setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/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 '/usr/share/doc/python-docs-2.7.10/html/library'
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.10/html/library'
 setenv QT_GRAPHICSSYSTEM 'raster'
 setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins'
-setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin'
+setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
 setenv R_HOME '/usr/lib64/R'
 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 c74fe8ca904370a9d39053179cf7a910762ce971..3eada90ebfc523255702d8c8fa149cc6bf6f6ec6 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -1,5 +1,8 @@
 # ld.so.conf autogenerated by env-update; make all changes to
 # contents of /etc/env.d directory
+include ld.so.conf.d/*.conf
+/usr/lib32/qt4
+/usr/lib64/qt4
 /lib64
 /usr/lib64
 /usr/local/lib64
@@ -9,9 +12,6 @@
 /lib
 /usr/lib
 /usr/local/lib
-include ld.so.conf.d/*.conf
-/usr/lib32/qt4
-/usr/lib64/qt4
 /usr/lib64/rust-1.19.0
 /usr/lib64/sidplay/builders
 /usr/lib/sidplay/builders

diff --git a/profile.env b/profile.env
index 240fdb01ef9943e82dc51544dddfacb5774dc8a1..6b016fbf4f0f54634b4484f35358a0b6f139289e 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -4,13 +4,13 @@
 
 export ANT_HOME='/usr/share/ant'
 export CONFIG_PROTECT='/var/bind /usr/share/gnupg/qualified.txt /usr/share/config /usr/lib64/libreoffice/program/sofficerc /usr/share/themes/oxygen-gtk/gtk-2.0'
-export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php7.0/ext-active/ /etc/php/cgi-php7.0/ext-active/ /etc/php/apache2-php7.0/ext-active/ /etc/fonts/fonts.conf /etc/chromium/policies/managed/chrome-gnome-shell.json /etc/opt/chrome/policies/managed/chrome-gnome-shell.json /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 CONFIG_PROTECT_MASK='/etc/sandbox.d /etc/php/cli-php7.0/ext-active/ /etc/php/cgi-php7.0/ext-active/ /etc/php/apache2-php7.0/ext-active/ /etc/fonts/fonts.conf /etc/gentoo-release /etc/chromium/policies/managed/chrome-gnome-shell.json /etc/opt/chrome/policies/managed/chrome-gnome-shell.json /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 EDITOR='/usr/bin/vim'
 export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.3-r3/html'
 export GCC_SPECS=''
 export GSETTINGS_BACKEND='dconf'
 export GUILE_LOAD_PATH='/usr/share/guile/1.8'
-export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28/info'
+export INFOPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28/info:/usr/share/info'
 export LADSPA_PATH='/usr/lib64/ladspa'
 export LANG='de_DE.UTF-8'
 export LC_ADDRESS='de_DE.utf8'
@@ -27,18 +27,18 @@ 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/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/:/usr/share/rust-1.19.0/man'
+export MANPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/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 MULTIOSDIRS='../lib64:../lib32'
 export OPENGL_PROFILE='xorg-x11'
 export PAGER='/usr/bin/less'
-export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin:/usr/games/bin'
+export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/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='/usr/share/doc/python-docs-2.7.10/html/library'
 export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.10/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/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin'
+export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
 export R_HOME='/usr/lib64/R'
 export XDG_CONFIG_DIRS='/etc/xdg'
 export XDG_DATA_DIRS='/usr/local/share:/usr/share:/usr/share/gdm'