From 7726acc4a3a1645e12983c4b44678cfb1367c041 Mon Sep 17 00:00:00 2001 From: hasufell Date: Fri, 18 Sep 2015 20:59:23 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- X11/xorg.conf | 3 +- paludis/use.conf | 2 +- paludis/use.conf.d/desktop.conf | 2 +- profile.csh | 1 + profile.env | 63 ++++++++++++++++----------------- 5 files changed, 36 insertions(+), 35 deletions(-) diff --git a/X11/xorg.conf b/X11/xorg.conf index aa812f7..3dd4487 100644 --- a/X11/xorg.conf +++ b/X11/xorg.conf @@ -112,8 +112,9 @@ Section "Screen" Monitor "Monitor0" DefaultDepth 24 Option "Stereo" "0" - # Option "nvidiaXineramaInfoOrder" "DFP-0" # Option "metamodes" "DVI-I-1: nvidia-auto-select +0+0, DVI-I-2: nvidia-auto-select +1920+0" +# Option "nvidiaXineramaInfoOrder" "DFP-0" +# Option "metamodes" "DVI-I-1: nvidia-auto-select +1920+0, DVI-D-0: nvidia-auto-select +0+0" Option "SLI" "Off" Option "MultiGPU" "Off" Option "BaseMosaic" "off" diff --git a/paludis/use.conf b/paludis/use.conf index 4e58470..21d196e 100644 --- a/paludis/use.conf +++ b/paludis/use.conf @@ -1,5 +1,5 @@ # use.conf -*/* cups qt3support -libav -qt5 qt4 -gnutls a52 aac acpi alsa apng bash-completion cairo cdr consolekit cscope css dbus dri dv dvd dvdr exif fat ffmpeg flac fontconfig gif gpm gstreamer hddtemp icq icu ipv6 jabber jpeg jpeg2k lame libressl libnotify lm_sensors matroska mmx mp3 mp4 mpeg musepack nsplugin ntfs ogg opengl oscar pdf png profile policykit python raw sdl sound sse sse2 ssse3 svg tcpd tiff timidity truetype threads udev unicode usb v4l vcd vdpau vim-syntax vnc vorbis wavpack wayland win32codecs wmf x264 xv xvmc xvid X +*/* cups qt3support -libav -qt5 qt4 -gnutls a52 aac acpi alsa apng bash-completion cairo cdr consolekit cscope css dbus dri dv dvd dvdr exif fat ffmpeg flac fontconfig gif -gnome-keyring gpm gstreamer hddtemp icq icu ipv6 jabber jpeg jpeg2k lame libressl libnotify lm_sensors matroska mmx mp3 mp4 mpeg musepack nsplugin ntfs ogg opengl oscar pdf png profile policykit python raw sdl sound sse sse2 ssse3 svg tcpd tiff timidity truetype threads udev unicode usb v4l vcd vdpau vim-syntax vnc vorbis wavpack wayland win32codecs wmf x264 xv xvmc xvid X */* ABI_X86: 32 64 */* CURL_SSL: -* -polarssl openssl */* INPUT_DEVICES: -* evdev keyboard mouse joystick diff --git a/paludis/use.conf.d/desktop.conf b/paludis/use.conf.d/desktop.conf index c66a3c1..0794853 100644 --- a/paludis/use.conf.d/desktop.conf +++ b/paludis/use.conf.d/desktop.conf @@ -44,7 +44,7 @@ app-office/libreoffice-bin java app-office/writerscafe gtk2 app-text/evince djvu dvi -app-crypt/pinentry gtk gnome-keyring +app-crypt/pinentry gtk gnome-base/gvfs cdda fuse http udisks diff --git a/profile.csh b/profile.csh index a6db51c..874e55b 100644 --- a/profile.csh +++ b/profile.csh @@ -41,5 +41,6 @@ setenv CAVE_SEARCH_INDEX '/root/cave-search-index' 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 VBOX_APP_HOME '/usr/lib64/virtualbox' setenv XDG_CONFIG_DIRS '/etc/xdg' +setenv XSESSION 'Xfce4' setenv 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' setenv PAGER '/usr/bin/most' diff --git a/profile.env b/profile.env index 09bbf47..241874a 100644 --- a/profile.env +++ b/profile.env @@ -1,47 +1,46 @@ -# 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 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' +# 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 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:/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 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 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 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 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 CAVE_RESUME_FILE_OPT='--resume-file ~/cave_resume' +export CAVE_SEARCH_INDEX='/root/cave-search-index' +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 XSESSION='Xfce4' +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'