From e6646aba413994148479623aa80d9492073a939e Mon Sep 17 00:00:00 2001 From: hasufell Date: Mon, 10 Aug 2015 17:34:57 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- csh.env | 8 +++--- env.d/04gcc-x86_64-pc-linux-gnu | 8 +++--- env.d/gcc/.NATIVE | 2 +- env.d/gcc/config-x86_64-pc-linux-gnu | 2 +- env.d/gcc/x86_64-pc-linux-gnu-4.9.3 | 4 +-- paludis/bashrc | 1 + prelink.conf.d/portage.conf | 42 ++++++++++++++-------------- profile.env | 8 +++--- 8 files changed, 37 insertions(+), 38 deletions(-) diff --git a/csh.env b/csh.env index 8906c1b..8d8f8da 100644 --- a/csh.env +++ b/csh.env @@ -17,25 +17,25 @@ setenv GCC_SPECS '' setenv GSETTINGS_BACKEND 'dconf' setenv GUILE_LOAD_PATH '/usr/share/guile/1.8' setenv HG '/usr/bin/hg' -setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info' +setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info' setenv LANG 'de_DE.utf8' setenv LC_COLLATE 'C' setenv LC_MESSAGES 'en_US.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/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man' setenv MULTIOSDIRS '../lib64:../lib32' setenv OPENCL_PROFILE 'nvidia' setenv OPENGL_PROFILE 'nvidia' setenv PACKAGE_MANAGER 'paludis' setenv PAGER '/usr/bin/most' -setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin' +setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin' setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so' setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.8/html/library' setenv PYTHONDOCS_3_2 '/usr/share/doc/python-docs-3.2.5/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/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin' +setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin' setenv RUBYOPT '-rauto_gem' setenv SBCL_HOME '/usr/lib64/sbcl' setenv SBCL_SOURCE_ROOT '/usr/lib64/sbcl/src' diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index f43f587..529faa9 100644 --- a/env.d/04gcc-x86_64-pc-linux-gnu +++ b/env.d/04gcc-x86_64-pc-linux-gnu @@ -1,6 +1,6 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5" +PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3" +ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3" GCC_SPECS="" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info" MULTIOSDIRS="../lib64:../lib32" diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE index 106fefd..0967d73 120000 --- a/env.d/gcc/.NATIVE +++ b/env.d/gcc/.NATIVE @@ -1 +1 @@ -x86_64-pc-linux-gnu-4.8.5 \ No newline at end of file +x86_64-pc-linux-gnu-4.9.3 \ 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 4b9db17..5ef56a3 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-4.8.5 +CURRENT=x86_64-pc-linux-gnu-4.9.3 diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.9.3 b/env.d/gcc/x86_64-pc-linux-gnu-4.9.3 index 9ff4062..e6e03df 100644 --- a/env.d/gcc/x86_64-pc-linux-gnu-4.9.3 +++ b/env.d/gcc/x86_64-pc-linux-gnu-4.9.3 @@ -1,6 +1,3 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3" -GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3" LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/32" MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man" INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info" @@ -8,3 +5,4 @@ STDCXX_INCDIR="g++-v4" CTARGET="x86_64-pc-linux-gnu" GCC_SPECS="" MULTIOSDIRS="../lib64:../lib32" +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3" diff --git a/paludis/bashrc b/paludis/bashrc index 4d48575..bf5a896 100644 --- a/paludis/bashrc +++ b/paludis/bashrc @@ -224,6 +224,7 @@ if [[ "${CATEGORY}/${PN}" != "dev-games/cegui" && "${CATEGORY}/${PN}" != "sys-block/thin-provisioning-tools" && "${CATEGORY}/${PN}" != "sys-apps/paludis" && + "${CATEGORY}/${PN}" != "dev-python/pygame_sdl2" && "${CATEGORY}/${PN}" != "x11-libs/pixman" ]] then diff --git a/prelink.conf.d/portage.conf b/prelink.conf.d/portage.conf index 32b2ee9..32c45d3 100644 --- a/prelink.conf.d/portage.conf +++ b/prelink.conf.d/portage.conf @@ -8,34 +8,34 @@ -l /usr/lib64 -l /bin -l /sbin --h /usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5/ --h /opt/nvidia-cg-toolkit/lib64/ --h /usr/lib32/OpenCL/vendors/nvidia/ --h /usr/lib32/qt4/ --h /opt/nvidia-cg-toolkit/bin/ +-h /usr/lib64/OpenCL/vendors/nvidia/ -h /lib32/ --h /usr/local/lib/ --h /usr/games/bin/ -h /usr/games/lib64/ -h /opt/bin/ --h /usr/lib32/ --h /usr/lib32/opengl/nvidia/lib/ --h /opt/nvidia-cg-toolkit/lib32/ --h /usr/lib64/OpenCL/vendors/nvidia/ --h /lib/ --h /usr/games/lib32/ --h /usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3/ --h /usr/lib64/opengl/nvidia/lib/ --h /usr/local/lib64/ --h /usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/ --h /usr/games/lib/ --h /usr/lib64/ --h /usr/lib/ -h /usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3/ +-h /opt/nvidia-cg-toolkit/bin/ +-h /usr/games/lib32/ -h /usr/lib64/qt4/ -h /lib64/ --h /usr/local/lib32/ +-h /opt/nvidia-cg-toolkit/lib32/ +-h /usr/lib/ +-h /usr/local/lib/ +-h /usr/lib32/OpenCL/vendors/nvidia/ +-h /usr/lib32/ +-h /usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3/ +-h /lib/ +-h /usr/local/lib64/ +-h /usr/lib64/opengl/nvidia/lib/ +-h /opt/nvidia-cg-toolkit/lib64/ -h /usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib/ +-h /usr/lib32/qt4/ +-h /usr/games/lib/ +-h /usr/lib64/ +-h /usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3/ +-h /usr/games/bin/ +-h /usr/lib32/opengl/nvidia/lib/ +-h /usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/ +-h /usr/local/lib32/ -h include ld.so.conf.d/*.conf/ -b /usr/lib64/libfreebl3.so -b /usr/lib64/libnssdbm3.so diff --git a/profile.env b/profile.env index 8994d04..df7932c 100644 --- a/profile.env +++ b/profile.env @@ -17,25 +17,25 @@ export GCC_SPECS='' export GSETTINGS_BACKEND='dconf' export GUILE_LOAD_PATH='/usr/share/guile/1.8' export HG='/usr/bin/hg' -export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info' +export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info' export LANG='de_DE.utf8' export LC_COLLATE='C' export LC_MESSAGES='en_US.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/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man' +export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man' export MULTIOSDIRS='../lib64:../lib32' export OPENCL_PROFILE='nvidia' export OPENGL_PROFILE='nvidia' export PACKAGE_MANAGER='paludis' export PAGER='/usr/bin/most' -export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin' +export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin' export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so' export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.8/html/library' export PYTHONDOCS_3_2='/usr/share/doc/python-docs-3.2.5/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/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin' +export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin' export RUBYOPT='-rauto_gem' export SBCL_HOME='/usr/lib64/sbcl' export SBCL_SOURCE_ROOT='/usr/lib64/sbcl/src'