From: frank Date: Wed, 6 Jun 2012 21:15:00 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=8a221e8195f5f7ba5ef7cee6775654e55e424433;p=config%2Fuhu1%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index f70009d..c067114 100755 --- a/.etckeeper +++ b/.etckeeper @@ -628,8 +628,8 @@ maybe chmod 0755 './env.d' maybe chmod 0644 './env.d/00basic' maybe chmod 0644 './env.d/00glibc' maybe chmod 0644 './env.d/02locale' +maybe chmod 0644 './env.d/04gcc-x86_64-pc-linux-gnu' maybe chmod 0644 './env.d/05binutils' -maybe chmod 0644 './env.d/05gcc-x86_64-pc-linux-gnu' maybe chmod 0644 './env.d/09sandbox' maybe chmod 0644 './env.d/10bind' maybe chmod 0644 './env.d/20java-config' diff --git a/csh.env b/csh.env index 5dccc48..ee07e3d 100644 --- a/csh.env +++ b/csh.env @@ -10,7 +10,7 @@ setenv GDK_USE_XFT '1' setenv GSETTINGS_BACKEND 'gconf' setenv GUILE_LOAD_PATH '/usr/share/guile/1.8' setenv HG '/usr/bin/hg' -setenv INFOPATH '/usr/share/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info' +setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info' setenv LANG 'de_DE.UTF-8' setenv LC_ADDRESS 'de_DE.utf8' setenv LC_COLLATE 'de_DE.utf8' @@ -26,7 +26,7 @@ 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/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/lib64/subversion/bin' setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.2/html/library' setenv PYTHONDOCS_3_2 '/usr/share/doc/python-docs-3.2.2/html/library' diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu new file mode 100644 index 0000000..a74e5f7 --- /dev/null +++ b/env.d/04gcc-x86_64-pc-linux-gnu @@ -0,0 +1,5 @@ +PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3" +ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3" +GCC_SPECS="" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info" diff --git a/env.d/05gcc-x86_64-pc-linux-gnu b/env.d/05gcc-x86_64-pc-linux-gnu deleted file mode 100644 index a74e5f7..0000000 --- a/env.d/05gcc-x86_64-pc-linux-gnu +++ /dev/null @@ -1,5 +0,0 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3" -GCC_SPECS="" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info" diff --git a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf index 89bfd60..65c2b1f 100644 --- a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf +++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf @@ -1,4 +1,2 @@ /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3 -/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32 -/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3 diff --git a/profile.env b/profile.env index f167bd5..5040843 100644 --- a/profile.env +++ b/profile.env @@ -10,7 +10,7 @@ export GDK_USE_XFT='1' export GSETTINGS_BACKEND='gconf' export GUILE_LOAD_PATH='/usr/share/guile/1.8' export HG='/usr/bin/hg' -export INFOPATH='/usr/share/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info' +export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info' export LANG='de_DE.UTF-8' export LC_ADDRESS='de_DE.utf8' export LC_COLLATE='de_DE.utf8' @@ -26,7 +26,7 @@ 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/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' +export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/lib64/subversion/bin' export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.2/html/library' export PYTHONDOCS_3_2='/usr/share/doc/python-docs-3.2.2/html/library'