]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Mon, 15 Jun 2015 22:31:03 +0000 (00:31 +0200)
committerFrank Brehm <frank@brehm-online.com>
Mon, 15 Jun 2015 22:31:03 +0000 (00:31 +0200)
19 files changed:
bash/bashrc
bash/bashrc.d/.keep_app-shells_bash-0 [new file with mode: 0644]
bash/bashrc.d/bash_completion.sh [new file with mode: 0644]
bash/bashrc.orig [new file with mode: 0644]
bash_completion.d/gentoo-style-init [new file with mode: 0644]
config-archive/etc/bash/bashrc
config-archive/etc/bash/bashrc.1
config-archive/etc/bash/bashrc.2
config-archive/etc/bash/bashrc.3 [new file with mode: 0644]
config-archive/etc/bash/bashrc.dist.new [new file with mode: 0644]
csh.env
env.d/50bash_completion [deleted file]
fonts/conf.avail/75-yes-terminus.conf [new file with mode: 0644]
group
portage/make.conf
portage/package.use
profile.d/bash-completion.sh [deleted file]
profile.env
xdg/qtchooser/.keep_dev-qt_qtchooser-0 [new file with mode: 0644]

index b52cbd59d029df888a3cf5d27e2ef8666c56aa83..63aecc2c9ffc622a0e697f89d179fdf522555a6a 100644 (file)
@@ -20,9 +20,22 @@ fi
 # http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
 shopt -s checkwinsize
 
+# Disable completion when the input buffer is empty.  i.e. Hitting tab
+# and waiting a long time for bash to expand all of $PATH.
+shopt -s no_empty_cmd_completion
+
 # Enable history appending instead of overwriting.  #139609
 shopt -s histappend
 
+# Save each command to the history file as it's executed.  #517342
+# This does mean sessions get interleaved when reading later on, but this
+# way the history is always up to date.  History is not synced across live
+# sessions though; that is what `history -n` does.
+# Disabled by default due to concerns related to system recovery when $HOME
+# is under duress, or lives somewhere flaky (like NFS).  Constantly syncing
+# the history will halt the shell prompt until it's finished.
+#PROMPT_COMMAND='history -a'
+
 # Change the window title of X terminals 
 case ${TERM} in
        xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
@@ -80,6 +93,10 @@ else
        fi
 fi
 
+for sh in /etc/bash/bashrc.d/* ; do
+       [[ -r ${sh} ]] && source "${sh}"
+done
+
 # Try to keep environment pollution down, EPA loves us.
 unset use_color safe_term match_lhs
 
diff --git a/bash/bashrc.d/.keep_app-shells_bash-0 b/bash/bashrc.d/.keep_app-shells_bash-0
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/bash/bashrc.d/bash_completion.sh b/bash/bashrc.d/bash_completion.sh
new file mode 100644 (file)
index 0000000..bb0fdb6
--- /dev/null
@@ -0,0 +1,15 @@
+# Check for interactive bash and that we haven't already been sourced.
+if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
+
+    # Check for recent enough version of bash.
+    if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
+       [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
+        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+            . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
+        if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
+            # Source completion code.
+            . /usr/share/bash-completion/bash_completion
+        fi
+    fi
+
+fi
diff --git a/bash/bashrc.orig b/bash/bashrc.orig
new file mode 100644 (file)
index 0000000..7006bf9
--- /dev/null
@@ -0,0 +1,102 @@
+# /etc/bash/bashrc
+#
+# This file is sourced by all *interactive* bash shells on startup,
+# including some apparently interactive shells such as scp and rcp
+# that can't tolerate any output.  So make sure this doesn't display
+# anything or bad things will happen !
+
+
+# Test for an interactive shell.  There is no need to set anything
+# past this point for scp and rcp, and it's important to refrain from
+# outputting anything in those cases.
+if [[ $- != *i* ]] ; then
+       # Shell is non-interactive.  Be done now!
+       return
+fi
+
+# Bash won't get SIGWINCH if another process is in the foreground.
+# Enable checkwinsize so that bash will check the terminal size when
+# it regains control.  #65623
+# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
+shopt -s checkwinsize
+
+# Disable completion when the input buffer is empty.  i.e. Hitting tab
+# and waiting a long time for bash to expand all of $PATH.
+shopt -s no_empty_cmd_completion
+
+# Enable history appending instead of overwriting when exiting.  #139609
+shopt -s histappend
+
+# Save each command to the history file as it's executed.  #517342
+# This does mean sessions get interleaved when reading later on, but this
+# way the history is always up to date.  History is not synced across live
+# sessions though; that is what `history -n` does.
+# Disabled by default due to concerns related to system recovery when $HOME
+# is under duress, or lives somewhere flaky (like NFS).  Constantly syncing
+# the history will halt the shell prompt until it's finished.
+#PROMPT_COMMAND='history -a'
+
+# Change the window title of X terminals 
+case ${TERM} in
+       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
+               PS1='\[\033]0;\u@\h:\w\007\]'
+               ;;
+       screen*)
+               PS1='\[\033k\u@\h:\w\033\\\]'
+               ;;
+       *)
+               unset PS1
+               ;;
+esac
+
+use_color=false
+
+# Set colorful PS1 only on colorful terminals.
+# dircolors --print-database uses its own built-in database
+# instead of using /etc/DIR_COLORS.  Try to use the external file
+# first to take advantage of user additions.  Use internal bash
+# globbing instead of external grep binary.
+safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
+match_lhs=""
+[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
+[[ -z ${match_lhs}    ]] \
+       && type -P dircolors >/dev/null \
+       && match_lhs=$(dircolors --print-database)
+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
+
+if ${use_color} ; then
+       # Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
+       if type -P dircolors >/dev/null ; then
+               if [[ -f ~/.dir_colors ]] ; then
+                       eval $(dircolors -b ~/.dir_colors)
+               elif [[ -f /etc/DIR_COLORS ]] ; then
+                       eval $(dircolors -b /etc/DIR_COLORS)
+               fi
+       fi
+
+       if [[ ${EUID} == 0 ]] ; then
+               PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
+       else
+               PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+       fi
+
+       alias ls='ls --color=auto'
+       alias grep='grep --colour=auto'
+       alias egrep='egrep --colour=auto'
+       alias fgrep='fgrep --colour=auto'
+else
+       if [[ ${EUID} == 0 ]] ; then
+               # show root@ when we don't have colors
+               PS1+='\u@\h \W \$ '
+       else
+               PS1+='\u@\h \w \$ '
+       fi
+fi
+
+for sh in /etc/bash/bashrc.d/* ; do
+       [[ -r ${sh} ]] && source "${sh}"
+done
+
+# Try to keep environment pollution down, EPA loves us.
+unset use_color safe_term match_lhs sh
diff --git a/bash_completion.d/gentoo-style-init b/bash_completion.d/gentoo-style-init
new file mode 100644 (file)
index 0000000..8545692
--- /dev/null
@@ -0,0 +1,27 @@
+# Gentoo init.d completion
+#
+# $Id$
+#
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+_gentoo_style_init()
+{
+    local script="${COMP_WORDS[0]}"
+    local cur="${COMP_WORDS[$COMP_CWORD]}"
+
+    if [[ ( -f "${script}" || -h "${script}" ) && -r "${script}" ]] \
+    && [[ "${script}" != *.sh ]] \
+    && [[ "$(head -n 1 "${script}")" = "#!/sbin/runscript" ]]
+    then
+    [[ $COMP_CWORD -gt 1 ]] && return 1
+    COMPREPLY=($(opts="start stop status restart pause zap ineed needsme iuse usesme broken"; \
+            eval "$(grep '^opts=' "${script}")"; echo "${opts}"))
+    [[ -n "$COMPREPLY" ]] || COMPREPLY=(start stop restart zap)
+    COMPREPLY=($(compgen -W "${COMPREPLY[*]}" -- "${cur}"))
+    else
+    COMPREPLY=($(compgen -o default -- "${cur}"))
+    fi
+    return 0
+}
+complete -F _gentoo_style_init /etc/init.d/*
index 856e9e4d3741a58d336d8d764c5a00e68f43562d..b52cbd59d029df888a3cf5d27e2ef8666c56aa83 100644 (file)
@@ -25,7 +25,7 @@ shopt -s histappend
 
 # Change the window title of X terminals 
 case ${TERM} in
-       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix)
+       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
                PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
                ;;
        screen*)
index 3ac0859adcce2c68c3fe78466692f1e89ca7bf8b..856e9e4d3741a58d336d8d764c5a00e68f43562d 100644 (file)
@@ -25,10 +25,10 @@ shopt -s histappend
 
 # Change the window title of X terminals 
 case ${TERM} in
-       xterm*|rxvt*|Eterm|aterm|kterm|gnome*|interix)
+       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix)
                PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
                ;;
-       screen)
+       screen*)
                PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
                ;;
 esac
@@ -68,7 +68,9 @@ if ${use_color} ; then
        fi
 
        alias ls='ls --color=auto'
-       #alias grep='grep --colour=auto'
+       alias grep='grep --colour=auto'
+       alias egrep='egrep --colour=auto'
+       alias fgrep='fgrep --colour=auto'
 else
        if [[ ${EUID} == 0 ]] ; then
                # show root@ when we don't have colors
index d1281e353a23ae6f7e39e0f761be51056612d794..3ac0859adcce2c68c3fe78466692f1e89ca7bf8b 100644 (file)
@@ -139,8 +139,7 @@ if [ -f /usr/share/mc/mc.gentoo ]; then
     . /usr/share/mc/mc.gentoo
 fi
 
-if [ -f /etc/profile.d/bash-completion ]; then
-    . /etc/profile.d/bash-completion
+if [ -e /etc/bash_completion.d/git ] ; then
     if [[ ${EUID} == 0 ]] ; then
         PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]'
     else
@@ -148,5 +147,4 @@ if [ -f /etc/profile.d/bash-completion ]; then
     fi
 fi
 
-
 # vim: ts=4 expandtab
diff --git a/config-archive/etc/bash/bashrc.3 b/config-archive/etc/bash/bashrc.3
new file mode 100644 (file)
index 0000000..d1281e3
--- /dev/null
@@ -0,0 +1,152 @@
+# /etc/bash/bashrc
+#
+# This file is sourced by all *interactive* bash shells on startup,
+# including some apparently interactive shells such as scp and rcp
+# that can't tolerate any output.  So make sure this doesn't display
+# anything or bad things will happen !
+
+
+# Test for an interactive shell.  There is no need to set anything
+# past this point for scp and rcp, and it's important to refrain from
+# outputting anything in those cases.
+if [[ $- != *i* ]] ; then
+       # Shell is non-interactive.  Be done now!
+       return
+fi
+
+# Bash won't get SIGWINCH if another process is in the foreground.
+# Enable checkwinsize so that bash will check the terminal size when
+# it regains control.  #65623
+# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
+shopt -s checkwinsize
+
+# Enable history appending instead of overwriting.  #139609
+shopt -s histappend
+
+# Change the window title of X terminals 
+case ${TERM} in
+       xterm*|rxvt*|Eterm|aterm|kterm|gnome*|interix)
+               PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
+               ;;
+       screen)
+               PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
+               ;;
+esac
+
+use_color=false
+
+# Set colorful PS1 only on colorful terminals.
+# dircolors --print-database uses its own built-in database
+# instead of using /etc/DIR_COLORS.  Try to use the external file
+# first to take advantage of user additions.  Use internal bash
+# globbing instead of external grep binary.
+safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
+match_lhs=""
+[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
+[[ -z ${match_lhs}    ]] \
+       && type -P dircolors >/dev/null \
+       && match_lhs=$(dircolors --print-database)
+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
+
+if ${use_color} ; then
+       # Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
+       if type -P dircolors >/dev/null ; then
+               if [[ -f ~/.dir_colors ]] ; then
+                       eval $(dircolors -b ~/.dir_colors)
+               elif [[ -f /etc/DIR_COLORS ]] ; then
+                       eval $(dircolors -b /etc/DIR_COLORS)
+               fi
+       fi
+
+       if [[ ${EUID} == 0 ]] ; then
+        #PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
+        PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w \$ \[\033[00m\]'
+       else
+        #PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+        PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\033[01;34m\]\w > \[\033[00m\]'
+       fi
+
+       alias ls='ls --color=auto'
+       #alias grep='grep --colour=auto'
+else
+       if [[ ${EUID} == 0 ]] ; then
+               # show root@ when we don't have colors
+               PS1='\u@\h \W \$ '
+       else
+               PS1='\u@\h \w \$ '
+       fi
+fi
+
+# Try to keep environment pollution down, EPA loves us.
+unset use_color safe_term match_lhs
+
+if [ -d /usr/scripts ] ; then
+  PATH=/usr/scripts:$PATH
+  export PATH
+fi
+
+if [ -d $HOME/bin ] ; then
+  PATH=$PATH:$HOME/bin
+  export PATH
+fi
+
+if [ -d $HOME/lib ] ; then
+  PERL5LIB=$HOME/lib
+  export PERL5LIB
+fi
+
+#if [[ ${EUID} == 0 ]] ; then
+#  alias ll="ls -lA"
+#else
+#  alias ll="ls -l"
+#fi
+alias l="ls -l"
+alias ll="ls -lA"
+alias la="ls -la"
+alias md=mkdir
+alias rd=rmdir
+alias ..='cd ..'
+alias ...='cd ../..'
+alias cd..='cd ..'
+alias cd...='cd ../..'
+alias pl="ps -fu $USER"
+
+lcd() {
+    cd $( perl -e '
+use strict;
+use Cwd;
+my $new = shift;
+my $cwd = Cwd::abs_path(getcwd());
+my $newa = $cwd;
+if ($new){
+    $newa = Cwd::abs_path($new);
+    $newa = $cwd unless $newa;
+};
+printf("%s\n", $newa);
+' $1 )
+}
+
+export LESS="-R -M -I --shift 5"
+export LESSCHARSET="utf-8"
+
+HISTCONTROL=ignoreboth
+HISTSIZE=50000
+HISTFILESIZE=50000
+HISTTIMEFORMAT='%Y-%m-%d %H:%M:%S '
+
+if [ -f /usr/share/mc/mc.gentoo ]; then
+    . /usr/share/mc/mc.gentoo
+fi
+
+if [ -f /etc/profile.d/bash-completion ]; then
+    . /etc/profile.d/bash-completion
+    if [[ ${EUID} == 0 ]] ; then
+        PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]'
+    else
+        PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] > \[\033[00m\]'
+    fi
+fi
+
+
+# vim: ts=4 expandtab
diff --git a/config-archive/etc/bash/bashrc.dist.new b/config-archive/etc/bash/bashrc.dist.new
new file mode 100644 (file)
index 0000000..7006bf9
--- /dev/null
@@ -0,0 +1,102 @@
+# /etc/bash/bashrc
+#
+# This file is sourced by all *interactive* bash shells on startup,
+# including some apparently interactive shells such as scp and rcp
+# that can't tolerate any output.  So make sure this doesn't display
+# anything or bad things will happen !
+
+
+# Test for an interactive shell.  There is no need to set anything
+# past this point for scp and rcp, and it's important to refrain from
+# outputting anything in those cases.
+if [[ $- != *i* ]] ; then
+       # Shell is non-interactive.  Be done now!
+       return
+fi
+
+# Bash won't get SIGWINCH if another process is in the foreground.
+# Enable checkwinsize so that bash will check the terminal size when
+# it regains control.  #65623
+# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
+shopt -s checkwinsize
+
+# Disable completion when the input buffer is empty.  i.e. Hitting tab
+# and waiting a long time for bash to expand all of $PATH.
+shopt -s no_empty_cmd_completion
+
+# Enable history appending instead of overwriting when exiting.  #139609
+shopt -s histappend
+
+# Save each command to the history file as it's executed.  #517342
+# This does mean sessions get interleaved when reading later on, but this
+# way the history is always up to date.  History is not synced across live
+# sessions though; that is what `history -n` does.
+# Disabled by default due to concerns related to system recovery when $HOME
+# is under duress, or lives somewhere flaky (like NFS).  Constantly syncing
+# the history will halt the shell prompt until it's finished.
+#PROMPT_COMMAND='history -a'
+
+# Change the window title of X terminals 
+case ${TERM} in
+       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
+               PS1='\[\033]0;\u@\h:\w\007\]'
+               ;;
+       screen*)
+               PS1='\[\033k\u@\h:\w\033\\\]'
+               ;;
+       *)
+               unset PS1
+               ;;
+esac
+
+use_color=false
+
+# Set colorful PS1 only on colorful terminals.
+# dircolors --print-database uses its own built-in database
+# instead of using /etc/DIR_COLORS.  Try to use the external file
+# first to take advantage of user additions.  Use internal bash
+# globbing instead of external grep binary.
+safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
+match_lhs=""
+[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
+[[ -z ${match_lhs}    ]] \
+       && type -P dircolors >/dev/null \
+       && match_lhs=$(dircolors --print-database)
+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
+
+if ${use_color} ; then
+       # Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
+       if type -P dircolors >/dev/null ; then
+               if [[ -f ~/.dir_colors ]] ; then
+                       eval $(dircolors -b ~/.dir_colors)
+               elif [[ -f /etc/DIR_COLORS ]] ; then
+                       eval $(dircolors -b /etc/DIR_COLORS)
+               fi
+       fi
+
+       if [[ ${EUID} == 0 ]] ; then
+               PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
+       else
+               PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+       fi
+
+       alias ls='ls --color=auto'
+       alias grep='grep --colour=auto'
+       alias egrep='egrep --colour=auto'
+       alias fgrep='fgrep --colour=auto'
+else
+       if [[ ${EUID} == 0 ]] ; then
+               # show root@ when we don't have colors
+               PS1+='\u@\h \W \$ '
+       else
+               PS1+='\u@\h \w \$ '
+       fi
+fi
+
+for sh in /etc/bash/bashrc.d/* ; do
+       [[ -r ${sh} ]] && source "${sh}"
+done
+
+# Try to keep environment pollution down, EPA loves us.
+unset use_color safe_term match_lhs sh
diff --git a/csh.env b/csh.env
index 904b6e5f7c85c33ae8cffc5274018f2763f646d1..9d2eece46145de580e8fe81fe3683ca20df5558c 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -7,7 +7,6 @@ setenv CONFIG_PROTECT '/var/bind /usr/share/gnupg/qualified.txt /var/lib/hsqldb
 setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.5/ext-active/ /etc/php/cgi-php5.5/ext-active/ /etc/php/apache2-php5.5/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 EDITOR '/usr/bin/vim'
-setenv ES_BASHCOMP_DIRS '/usr/share/bash-completion/completions'
 setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.2/html'
 setenv GCC_SPECS ''
 setenv GSETTINGS_BACKEND 'dconf'
diff --git a/env.d/50bash_completion b/env.d/50bash_completion
deleted file mode 100644 (file)
index ef1d881..0000000
+++ /dev/null
@@ -1 +0,0 @@
-ES_BASHCOMP_DIRS="/usr/share/bash-completion/completions"
diff --git a/fonts/conf.avail/75-yes-terminus.conf b/fonts/conf.avail/75-yes-terminus.conf
new file mode 100644 (file)
index 0000000..5028215
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Accept terminus font -->
+ <selectfont>
+  <acceptfont>
+   <pattern>
+     <patelt name="family"><string>Terminus</string></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont>
+</fontconfig>
diff --git a/group b/group
index 97a7e9889f2a8aca51c395004710106dad64dd28..dc8e720c0dc7c9c568337ad6e8b64011c91780a8 100644 (file)
--- a/group
+++ b/group
@@ -37,7 +37,7 @@ messagebus:x:122:
 ldap:x:439:
 lpadmin:x:106:frank,heiko,patrick,vivi,doris,robert,steffen
 mysql:x:60:
-plugdev:x:105:
+plugdev:x:105:frank
 pulse-access:x:104:
 pulse:x:103:
 apache:x:81:
index 323faf8365c15d8df419523008fc96e7c9832426..6ff3a9b980c9ef3233842226c11135cf29ea4896 100644 (file)
@@ -130,8 +130,9 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \
 
 #CURL_SSL="nss"
 
-PHP_TARGETS="php5-3"
+PHP_TARGETS="php5-3 php5-5"
 PYTHON_TARGETS="python2_7 python3_3 python3_4"
+PYTHON_SINGLE_TARGET="python3_4"
 
 CPU_FLAGS_X86="3dnow 3dnowext mmx mmxext popcnt sse sse2 sse3 sse4a"
 
index a937c092874b0dcebf34f905fd52c936c647c1be..dbb96136361b4699564642935e527d9a7eda83ea 100644 (file)
@@ -20,7 +20,7 @@ app-crypt/qca                         gpg
 app-crypt/seahorse-plugins             applet
 
 #app-doc/xorg-docs                     -doc
-app-doc/doxygen                                dot
+app-doc/doxygen                                clang dot
 
 app-editors/gedit                      -python_targets_python3_3
 #app-editors/vim                               vim-pager vim-with-x
@@ -46,6 +46,7 @@ app-portage/eix                               optimization strong-optimization
 app-shells/bash                                plugins
 app-shells/tcsh                                catalogs
 
+app-text/asciidoc                      python_single_target_python2_7
 app-text/atril                         dvi t1lib xps
 app-text/djvu                          doc threads
 app-text/docbook-sgml-utils            jadetex
@@ -135,7 +136,8 @@ games-misc/fortune-mod-slackware    offensive
 
 games-strategy/warzone2100             videos
 
-gnome-base/gdm                         remote 
+gnome-base/gdm                         remote
+gnome-base/libglade                    python_single_target_python2_7
 gnome-base/gnome-volume-manager                consolekit
 gnome-base/gvfs                                gdu
 gnome-base/nautilus                    -tracker
@@ -177,7 +179,8 @@ mail-client/nail                    net
 
 mail-mta/postfix                       memcached -vda
 
-media-fonts/terminus-font               distinct-l
+media-fonts/corefonts                  tahoma
+media-fonts/terminus-font              distinct-l
 
 media-gfx/dcraw                                gimp
 media-gfx/exiv2                                contrib xmp
@@ -232,7 +235,7 @@ media-sound/sox                             amrnb amrwb
 media-video/dvdrip                     subtitles
 media-video/ffmpeg                     aac aacplus amr ass dirac faac faad gsm hardcoded-tables network opencore-amr openssl rtmp schroedinger vaapi vhook vpx
 media-video/kino                       gpac
-media-video/libav                      vaapi
+media-video/libav                      bs2b vaapi
 media-video/mjpegtools                 yv12
 media-video/mplayer                    3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 mpg123 nemesi nut opencore-amr pnm pvr rar rtc srt teletext tga tivo vpx xanim xvmc zoran
 media-video/totem                      iplayer -tracker upnp-av
@@ -306,8 +309,8 @@ sys-apps/acl                                nfs
 sys-apps/apt                           apt-pkg largefile latex rpath utils
 sys-apps/busybox                       math -pam savedconfig static
 # sys-apps/coreutils                   xattr
+sys-apps/openrc                                audit
 sys-apps/paludis                       glsa inquisitio qa visibility
-sys-block/parted                       device-mapper
 sys-apps/pciutils                      network-cron -zlib
 sys-apps/portage                       epydoc python3
 sys-apps/usbutils                      network-cron
@@ -316,8 +319,11 @@ sys-apps/util-linux                        ddate loop-aes tty-helpers
 sys-auth/consolekit                    policykit
 sys-auth/pambase                       mktemp pam_krb5 pam_ssh
 
+sys-block/parted                       device-mapper
+
 sys-devel/gcc                          libffi mudflap objc objc-gc objc++
 sys-devel/libperl                      ithreads
+sys-devel/llvm                         clang
 
 sys-fs/udev                            devfs-compat edd extras hwdb
 
@@ -325,6 +331,7 @@ sys-kernel/gentoo-sources           -doc
 
 sys-libs/glibc                         nptlonly
 sys-libs/pam                           audit pam_chroot pam_console pam_timestamp pwdb
+sys-libs/readline                      utils
 sys-libs/zlib                          minizip
 
 sys-power/acpid                                logrotate
diff --git a/profile.d/bash-completion.sh b/profile.d/bash-completion.sh
deleted file mode 100644 (file)
index d5f03fe..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion.sh-gentoo-1.2,v 1.1 2010/07/02 15:07:33 darkside Exp $
-
-# Check for interactive bash and that we haven't already been sourced.
-[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return
-
-# Check for recent enough version of bash.
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ $bmajor -gt 3 ] || [ $bmajor -eq 3 -a $bminor -ge 2 ]; then
-    _load_completions() {
-    declare f x loaded_pre=false
-    for f; do
-        if [[ -f $f ]]; then
-        # Prevent loading base twice, initially and via glob
-        if $loaded_pre && [[ $f == */base ]]; then
-            continue
-        fi
-
-        # Some modules, including base, depend on the definitions
-        # in .pre.  See the ebuild for how this is created.
-        if ! $loaded_pre; then
-            if [[ ${BASH_COMPLETION-unset} == unset ]]; then
-            BASH_COMPLETION="/usr/share/bash-completion/base"
-            fi
-            source "/usr/share/bash-completion/.pre"
-            loaded_pre=true
-        fi
-
-        source "$f"
-        fi
-    done
-
-    # Clean up
-    $loaded_pre && source "/usr/share/bash-completion/.post"
-    unset -f _load_completions  # not designed to be called more than once
-    }
-
-    # 1. Load base, if eselected.  This was previously known as
-    #    /etc/bash_completion
-    # 2. Load completion modules, maintained via eselect bashcomp --global
-    # 3. Load user completion modules, maintained via eselect bashcomp
-    # 4. Load user completion file last, overrides modules at user discretion
-       # This order is subject to change once upstream decides on something.
-    _load_completions \
-    "/etc/bash_completion.d/base" \
-    ~/.bash_completion.d/base \
-    "/etc/bash_completion.d/"* \
-    ~/.bash_completion.d/* \
-    ~/.bash_completion
-fi
-unset bash bmajor bminor
index cc72327bcea7eae5e118868337bd5d2effdbc594..c5c6e4d497a9bc0f40f9c8fc4c15ba37e7c2d80d 100644 (file)
@@ -7,7 +7,6 @@ export CONFIG_PROTECT='/var/bind /usr/share/gnupg/qualified.txt /var/lib/hsqldb
 export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.5/ext-active/ /etc/php/cgi-php5.5/ext-active/ /etc/php/apache2-php5.5/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 EDITOR='/usr/bin/vim'
-export ES_BASHCOMP_DIRS='/usr/share/bash-completion/completions'
 export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.2/html'
 export GCC_SPECS=''
 export GSETTINGS_BACKEND='dconf'
diff --git a/xdg/qtchooser/.keep_dev-qt_qtchooser-0 b/xdg/qtchooser/.keep_dev-qt_qtchooser-0
new file mode 100644 (file)
index 0000000..e69de29