From: Frank Brehm Date: Fri, 29 Jun 2018 18:00:18 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=e87f80cf758b5f6c8d2a1391e744500f71538914;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/csh.env b/csh.env index c7439a4..bb41a9a 100644 --- a/csh.env +++ b/csh.env @@ -6,13 +6,13 @@ setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt' setenv CONFIG_PROTECT_MASK '/etc/sandbox.d /etc/php/cli-php7.1/ext-active/ /etc/php/cgi-php7.1/ext-active/ /etc/php/apache2-php7.1/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 INFOPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.30/info:/usr/share/info' +setenv INFOPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/7.3.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.30/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/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.30/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.1/man/:/usr/local/share/man:/usr/share/man' +setenv MANPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/7.3.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.30/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.1/man/:/usr/local/share/man:/usr/share/man' setenv ORACLE_HOME '/usr/lib64/oracle/12.2/client' -setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin' -setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin' +setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin' +setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.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/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index c694ab6..5dfdcf5 100644 --- a/env.d/04gcc-x86_64-pc-linux-gnu +++ b/env.d/04gcc-x86_64-pc-linux-gnu @@ -1,5 +1,5 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0" +PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0" +ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0" GCC_SPECS="" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/info" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/7.3.0/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/7.3.0/info" diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE index f4847c6..284ec2a 120000 --- a/env.d/gcc/.NATIVE +++ b/env.d/gcc/.NATIVE @@ -1 +1 @@ -x86_64-pc-linux-gnu-6.4.0 \ No newline at end of file +x86_64-pc-linux-gnu-7.3.0 \ No newline at end of file diff --git a/env.d/gcc/config-x86_64-pc-linux-gnu b/env.d/gcc/config-x86_64-pc-linux-gnu index d42812a..058201a 100644 --- a/env.d/gcc/config-x86_64-pc-linux-gnu +++ b/env.d/gcc/config-x86_64-pc-linux-gnu @@ -1 +1 @@ -CURRENT=x86_64-pc-linux-gnu-6.4.0 +CURRENT=x86_64-pc-linux-gnu-7.3.0 diff --git a/env.d/gcc/x86_64-pc-linux-gnu-7.3.0 b/env.d/gcc/x86_64-pc-linux-gnu-7.3.0 index 6096fbf..ce2ee6b 100644 --- a/env.d/gcc/x86_64-pc-linux-gnu-7.3.0 +++ b/env.d/gcc/x86_64-pc-linux-gnu-7.3.0 @@ -1,6 +1,3 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0" -GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0" LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/7.3.0:/usr/lib/gcc/x86_64-pc-linux-gnu/7.3.0/32" MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/7.3.0/man" INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/7.3.0/info" @@ -8,3 +5,4 @@ STDCXX_INCDIR="g++-v7" CTARGET="x86_64-pc-linux-gnu" GCC_SPECS="" MULTIOSDIRS="../lib64:../lib32" +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0" diff --git a/profile.env b/profile.env index 4168851..3094011 100644 --- a/profile.env +++ b/profile.env @@ -6,13 +6,13 @@ export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt' export CONFIG_PROTECT_MASK='/etc/sandbox.d /etc/php/cli-php7.1/ext-active/ /etc/php/cgi-php7.1/ext-active/ /etc/php/apache2-php7.1/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 INFOPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.30/info:/usr/share/info' +export INFOPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/7.3.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.30/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/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.30/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.1/man/:/usr/local/share/man:/usr/share/man' +export MANPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/7.3.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.30/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.1/man/:/usr/local/share/man:/usr/share/man' export ORACLE_HOME='/usr/lib64/oracle/12.2/client' -export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin' -export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin' +export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin' +export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/7.3.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin' export TNS_ADMIN='/etc/oracle/'