From f16e75b5d7eac434ce2c9d88390da0333f7221d1 Mon Sep 17 00:00:00 2001 From: hasufell Date: Tue, 11 Aug 2015 01:15:18 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- paludis/bashrc | 1 - paludis/keywords.conf | 1 + prelink.conf | 2 +- profile.csh | 8 +++--- profile.env | 59 +++++++++++++++++++++---------------------- 5 files changed, 35 insertions(+), 36 deletions(-) diff --git a/paludis/bashrc b/paludis/bashrc index bf5a896..4d48575 100644 --- a/paludis/bashrc +++ b/paludis/bashrc @@ -224,7 +224,6 @@ 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/paludis/keywords.conf b/paludis/keywords.conf index 2094ca2..8db3e14 100644 --- a/paludis/keywords.conf +++ b/paludis/keywords.conf @@ -772,6 +772,7 @@ dev-libs/protobuf-c ~amd64 ~dev-libs/glib-2.42.1 ~amd64 ~dev-util/gdbus-codegen-2.42.1 ~amd64 desktop-misc/gpaste ~amd64 +x11-misc/gpaste ~amd64 # for mediastreamer ~media-libs/libmatroska-1.4.2 ~amd64 diff --git a/prelink.conf b/prelink.conf index d4eafc7..ea14146 100644 --- a/prelink.conf +++ b/prelink.conf @@ -11,7 +11,7 @@ -l /lib64 -l /usr/lib64 -h /opt/bin/ --h /usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5/ +-h /usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3/ -h /usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3/ -h /usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3/ -h /opt/nvidia-cg-toolkit/bin/ diff --git a/profile.csh b/profile.csh index da3ad6f..690d0d3 100644 --- a/profile.csh +++ b/profile.csh @@ -1,9 +1,9 @@ # Configuration file for eselect # This file has been automatically generated. -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 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 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 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 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 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 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 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 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/fonts/fonts.conf /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 CVS_RSH 'ssh' setenv DISTCC_LOG '' diff --git a/profile.env b/profile.env index df7932c..f063567 100644 --- a/profile.env +++ b/profile.env @@ -1,44 +1,43 @@ -# THIS FILE IS AUTOMATICALLY GENERATED BY env-update. -# DO NOT EDIT THIS FILE. CHANGES TO STARTUP PROFILES -# GO INTO /etc/profile NOT /etc/profile.env - -export ADA_INCLUDE_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adainclude' -export ADA_OBJECTS_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib' -export CG_COMPILER_EXE='/opt/bin/cgc' -export CG_INC_PATH='/opt/nvidia-cg-toolkit/include' -export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64' -export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /usr/share/config' +# Configuration file for eselect +# This file has been automatically generated. +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 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 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 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 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/fonts/fonts.conf /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 CVS_RSH='ssh' -export DCCC_PATH='/usr/lib64/distcc/bin' export DISTCC_LOG='' +export DCCC_PATH='/usr/lib64/distcc/bin' export DISTCC_VERBOSE='0' -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.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.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.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.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 GCC_SPECS='' +export MULTIOSDIRS='../lib64:../lib32' export RUBYOPT='-rauto_gem' +export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /usr/share/config' +export XDG_DATA_DIRS='/usr/local/share:/usr/share' +export COLON_SEPARATED='QT_PLUGIN_PATH' +export QT_GRAPHICSSYSTEM='raster' +export GSETTINGS_BACKEND='dconf' +export GUILE_LOAD_PATH='/usr/share/guile/1.8' +export PACKAGE_MANAGER='paludis' export SBCL_HOME='/usr/lib64/sbcl' export SBCL_SOURCE_ROOT='/usr/lib64/sbcl/src' +export ADA_INCLUDE_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adainclude' +export ADA_OBJECTS_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib' +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 LESSOPEN='|lesspipe %s' +export LESS='-R -M --shift 5' +export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins' +export CG_COMPILER_EXE='/opt/bin/cgc' +export CG_INC_PATH='/opt/nvidia-cg-toolkit/include' +export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64' +export HG='/usr/bin/hg' +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 VBOX_APP_HOME='/usr/lib64/virtualbox' export XDG_CONFIG_DIRS='/etc/xdg' -export XDG_DATA_DIRS='/usr/local/share:/usr/share' +export PAGER='/usr/bin/most'