committing changes in /etc after emerge run

diff --git a/csh.env b/csh.env
index b34bd1e760884070cfa0441d1d98971f4ab9562b..a3eab20002aff04dbe08745a1543b1f265d81993 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -3,18 +3,18 @@
 # GO INTO /etc/csh.cshrc NOT /etc/csh.env
 
 setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt'
-setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /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/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
+setenv CONFIG_PROTECT_MASK '/etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /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/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
 setenv EDITOR '/usr/bin/vi'
 setenv GCC_SPECS ''
 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 LANG 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
 setenv MANPAGER 'manpager'
-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/php5.6/man/:/usr/lib64/php7.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/php5.6/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/man'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv ORACLE_HOME '/usr/lib64/oracle/12.1/client'
-setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'
-setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'
+setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin'
+setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
 setenv TNS_ADMIN '/etc/oracle/'

diff --git a/ld.so.conf b/ld.so.conf
index 296efbedc128ea46b8063927e52df31839633b7d..388316c9990c738ba2c82cfc34650a8a5c3432ea 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -1,5 +1,6 @@
 # ld.so.conf autogenerated by env-update; make all changes to
 # contents of /etc/env.d directory
+include ld.so.conf.d/*.conf
 /lib64
 /usr/lib64
 /usr/local/lib64
@@ -9,5 +10,4 @@
 /lib
 /usr/lib
 /usr/local/lib
-include ld.so.conf.d/*.conf
 /usr/lib64/oracle/12.1/client/lib64

diff --git a/profile.env b/profile.env
index 04617902f7c1f1552fa566622085ea3c86a461cc..be814d96c5ae39f5e4fcf28605cb254e63eace53 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -3,18 +3,18 @@
 # GO INTO /etc/profile NOT /etc/profile.env
 
 export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt'
-export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /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/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
+export CONFIG_PROTECT_MASK='/etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /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/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
 export EDITOR='/usr/bin/vi'
 export GCC_SPECS=''
 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 LANG='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
 export MANPAGER='manpager'
-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/php5.6/man/:/usr/lib64/php7.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/php5.6/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/man'
 export MULTIOSDIRS='../lib64:../lib32'
 export ORACLE_HOME='/usr/lib64/oracle/12.1/client'
-export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'
-export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'
+export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin'
+export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
 export TNS_ADMIN='/etc/oracle/'