From ffe7d2c412a1ffebfe1635c80ca488b3fa186c27 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 4 May 2016 16:57:49 +0200 Subject: [PATCH] committing changes in /etc after emerge run Package changes: --- X11/Sessions/KDE-4 | 97 ---------------------------------- kde/shutdown/agent-shutdown.sh | 13 ----- kde/startup/agent-startup.sh | 29 ---------- 3 files changed, 139 deletions(-) delete mode 100755 X11/Sessions/KDE-4 delete mode 100644 kde/shutdown/agent-shutdown.sh delete mode 100644 kde/startup/agent-startup.sh diff --git a/X11/Sessions/KDE-4 b/X11/Sessions/KDE-4 deleted file mode 100755 index 29fb10a..0000000 --- a/X11/Sessions/KDE-4 +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh -# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ - -# source of this file: x11-apps/xinit-1.3.0-r2 - -case $# in -1) - case $1 in - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - esac -esac - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# clean up after xbanner -if which freetemp 2> /dev/null ; then - freetemp -fi - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -userxkbmap=$HOME/.Xkbmap - -sysresources=/etc/X11/Xresources -sysmodmap=/etc/X11/Xmodmap -sysxkbmap=/etc/X11/Xkbmap - -rh6sysresources=/etc/X11/xinit/Xresources -rh6sysmodmap=/etc/X11/xinit/Xmodmap - - -# merge in defaults -if [ -f "$rh6sysresources" ]; then - xrdb -merge "$rh6sysresources" -fi - -if [ -f "$sysresources" ]; then - xrdb -merge "$sysresources" -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -# merge in keymaps -if [ -f "$sysxkbmap" ]; then - setxkbmap `cat "$sysxkbmap"` - XKB_IN_USE=yes -fi - -if [ -f "$userxkbmap" ]; then - setxkbmap `cat "$userxkbmap"` - XKB_IN_USE=yes -fi - -# -# Eeek, this seems like too much magic here -# -if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then - if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then - xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` - if [ -n "$xkbsymbols" ]; then - setxkbmap -symbols "$xkbsymbols" - XKB_IN_USE=yes - fi - fi -fi - -# xkb and xmodmap don't play nice together -if [ -z "$XKB_IN_USE" ]; then - if [ -f "$rh6sysmodmap" ]; then - xmodmap "$rh6sysmodmap" - fi - - if [ -f "$sysmodmap" ]; then - xmodmap "$sysmodmap" - fi - - if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" - fi -fi - -unset XKB_IN_USE - -exec "/usr/bin/startkde" diff --git a/kde/shutdown/agent-shutdown.sh b/kde/shutdown/agent-shutdown.sh deleted file mode 100644 index 07cf747..0000000 --- a/kde/shutdown/agent-shutdown.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# This file is executed at kde shutdown. -# Uncomment the following lines to kill the agents -# that were started at session startup. - -#if [ -n "${GPG_AGENT_INFO}" ]; then -# kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1 -#fi - -#if [ -n "${SSH_AGENT_PID}" ]; then -# eval "$(ssh-agent -s -k)" -#fi diff --git a/kde/startup/agent-startup.sh b/kde/startup/agent-startup.sh deleted file mode 100644 index 4b99f6e..0000000 --- a/kde/startup/agent-startup.sh +++ /dev/null @@ -1,29 +0,0 @@ -# Agents startup file -# -# This file is sourced at kde startup, so that -# the environment variables set here are available -# throughout the session. - -# Uncomment the following lines to start gpg-agent -# and/or ssh-agent at kde startup. -# If you do so, do not forget to uncomment the respective -# lines in KDEDIR/shutdown/agent-shutdown.sh to -# properly kill the agents when the session ends. - -#if [ -x /usr/bin/gpg-agent ]; then -# eval "$(/usr/bin/gpg-agent --daemon)" -#fi - -#if [ -x /usr/bin/ssh-agent ]; then -# eval "$(/usr/bin/ssh-agent -s)" -#fi - -# Uncomment the following lines to start rxvt-unicode which has the ability to -# run multiple terminals in one single process, thus starting up faster and -# saving resources. -# The --opendisplay ensures that the daemon quits when the X server terminates, -# therefore we don't need matching lines in agent-shutdown.sh. - -#if [ -x /usr/bin/urxvtd ]; then -# /usr/bin/urxvtd --opendisplay --fork --quiet -#fi -- 2.39.5