From dc6e1c06415af879cabc10f67ab5406d4b17bb83 Mon Sep 17 00:00:00 2001 From: hasufell Date: Fri, 18 Sep 2015 16:47:31 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- X11/xinit/xinitrc | 57 --------------------- X11/xinit/xinitrc.d/11-xdg-menu-kde-4 | 5 -- X11/xinit/xinitrc.d/96-gnupg-agent | 21 ++++++++ csh.env | 1 + env.d/90xsession | 1 + profile.env | 74 ++++++++++++++------------- 6 files changed, 61 insertions(+), 98 deletions(-) delete mode 100755 X11/xinit/xinitrc.d/11-xdg-menu-kde-4 create mode 100755 X11/xinit/xinitrc.d/96-gnupg-agent create mode 100644 env.d/90xsession diff --git a/X11/xinit/xinitrc b/X11/xinit/xinitrc index e6dd7fe..d9d00c6 100644 --- a/X11/xinit/xinitrc +++ b/X11/xinit/xinitrc @@ -1,46 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #!/bin/sh userresources=$HOME/.Xresources @@ -51,13 +8,6 @@ sysmodmap=/etc/X11/xinit/Xmodmap # merge in defaults and keymaps if [ -f $sysresources ]; then - - - - - - - xrdb -merge $sysresources fi @@ -67,13 +17,6 @@ if [ -f $sysmodmap ]; then fi if [ -f "$userresources" ]; then - - - - - - - xrdb -merge "$userresources" fi diff --git a/X11/xinit/xinitrc.d/11-xdg-menu-kde-4 b/X11/xinit/xinitrc.d/11-xdg-menu-kde-4 deleted file mode 100755 index 2374fba..0000000 --- a/X11/xinit/xinitrc.d/11-xdg-menu-kde-4 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ -z "${XDG_MENU_PREFIX}" ] && [ "${DESKTOP_SESSION}" = "KDE-4" ]; then - export XDG_MENU_PREFIX="kde-4-" -fi diff --git a/X11/xinit/xinitrc.d/96-gnupg-agent b/X11/xinit/xinitrc.d/96-gnupg-agent new file mode 100755 index 0000000..60b62af --- /dev/null +++ b/X11/xinit/xinitrc.d/96-gnupg-agent @@ -0,0 +1,21 @@ +#: ${GNUPGHOME=$HOME/.gnupg} + +#GPGAGENT=/usr/bin/gpg-agent +#PID_FILE="$GNUPGHOME/gpg-agent-info-$(hostname)" + +#if grep -qs '^[[:space:]]*use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" && +# test -x $GPGAGENT && +# { test -z "$GPG_AGENT_INFO" || ! $GPGAGENT 2>/dev/null; }; then + +# if [ -r "$PID_FILE" ]; then +# . "$PID_FILE" +# fi + + # Invoking gpg-agent with no arguments exits successfully if the agent + # is already running as pointed by $GPG_AGENT_INFO +# if ! $GPGAGENT 2>/dev/null; then +# STARTUP="$GPGAGENT --use-standard-socket --daemon --sh --enable-ssh-support --write-env-file=$PID_FILE" +# fi +#fi + +#eval `${STARTUP}` diff --git a/csh.env b/csh.env index 75d1c8c..7747d1f 100644 --- a/csh.env +++ b/csh.env @@ -44,3 +44,4 @@ setenv SGML_CATALOG_FILES '/etc/sgml/openjade-1.3.2.cat:/etc/sgml/sgml-ent.cat:/ setenv VBOX_APP_HOME '/usr/lib64/virtualbox' setenv XDG_CONFIG_DIRS '/etc/xdg' setenv XDG_DATA_DIRS '/usr/local/share:/usr/share' +setenv XSESSION 'Xfce4' diff --git a/env.d/90xsession b/env.d/90xsession new file mode 100644 index 0000000..d844358 --- /dev/null +++ b/env.d/90xsession @@ -0,0 +1 @@ +XSESSION=Xfce4 diff --git a/profile.env b/profile.env index d9f10a0..09bbf47 100644 --- a/profile.env +++ b/profile.env @@ -1,45 +1,47 @@ -# 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:/etc/java-config-2/current-system-vm/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/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/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 DISTCC_LOG='' -export DCCC_PATH='/usr/lib64/distcc/bin' -export DISTCC_VERBOSE='0' -export LANG='de_DE.utf8' -export LC_COLLATE='C' -export LC_MESSAGES='en_US.utf8' -export OPENCL_PROFILE='nvidia' -export OPENGL_PROFILE='nvidia' -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' +# 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 PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.8/html/library' -export LESSOPEN='|lesspipe %s' -export LESS='-R -M --shift 5' -export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins' +export CAVE_RESUME_FILE_OPT='--resume-file ~/cave_resume' +export CAVE_SEARCH_INDEX='~/cave-search-index' 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' +export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /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 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 CAVE_RESUME_FILE_OPT='--resume-file ~/cave_resume' -export CAVE_SEARCH_INDEX='/root/cave-search-index' +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:/etc/java-config-2/current-system-vm/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/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 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 RUBYOPT='-rauto_gem' +export SBCL_HOME='/usr/lib64/sbcl' +export SBCL_SOURCE_ROOT='/usr/lib64/sbcl/src' +export SGML_CATALOG_FILES='/etc/sgml/openjade-1.3.2.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.1.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-lite.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.2.cat' export VBOX_APP_HOME='/usr/lib64/virtualbox' export XDG_CONFIG_DIRS='/etc/xdg' -export SGML_CATALOG_FILES='/etc/sgml/openjade-1.3.2.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.1.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-lite.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.2.cat' -export PAGER='/usr/bin/most' +export XDG_DATA_DIRS='/usr/local/share:/usr/share' +export XSESSION='Xfce4'