From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 9 Jul 2014 07:51:21 +0000 (+0200)
Subject: Current state
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a449ddeba65d2ff951c8e2e3f86358f12c42ff7b;p=config%2Fbruni%2Fetc.git

Current state
---

diff --git a/.java/deployment/deployment.properties b/.java/deployment/deployment.properties
new file mode 100644
index 00000000..74571d74
--- /dev/null
+++ b/.java/deployment/deployment.properties
@@ -0,0 +1 @@
+deployment.jre.dir=/etc/java-config-2/current-icedtea-web-vm
diff --git a/UPower/UPower.conf b/UPower/UPower.conf
new file mode 100644
index 00000000..31753cfd
--- /dev/null
+++ b/UPower/UPower.conf
@@ -0,0 +1,60 @@
+# Only the system vendor should modify this file, ordinary users
+# should not have to change anything.
+
+[UPower]
+
+# This is the smallest amount of time that UPower gives to session and system
+# processes after the suspend or hibernate request is given.
+# If the session power management component uses AboutToSuspend() then the
+# session process can only make this time larger than the value below, never
+# smaller.
+#
+# Reducing this time means the suspend happens quicker, but might also not give
+# some processes enough time to save state.
+#
+# default=1000
+SleepTimeout=1000
+
+# This controls whether hibernate is allowed when using encrypted swap.
+#
+# default=true
+AllowHibernateEncryptedSwap=true
+
+# This controls whether we want the powersave commands to be run when running
+# on battery or plugging AC.
+#
+# default=true
+RunPowersaveCommand=true
+
+# Enable the Watts Up Pro device.
+#
+# The Watts Up Pro contains a generic FTDI USB device without a specific
+# vendor and product ID. When we probe for WUP devices, we can cause
+# the user to get a perplexing "Device or resource busy" error when
+# attempting to use their non-WUP device.
+#
+# The generic FTDI device is known to also be used on:
+#
+# - Sparkfun FT232 breakout board
+# - Parallax Propeller
+#
+# default=false
+EnableWattsUpPro=false
+
+# Poll the kernel for dock state changes.
+#
+# Some drivers are still broken, and do not send out uvents when the
+# connected state changes.
+#
+# default=false
+PollDockDevices=false
+
+# Do we ignore the lid state
+#
+# Some laptops are broken. The lid state is either inverted, or stuck
+# on or off. We can't do much to fix these problems, but this is a way
+# for users to make the laptop panel vanish and for programs like
+# gnome-power-manager to not suspend on system startup.
+#
+# default=false
+IgnoreLid=false
diff --git a/bash_completion.d/pulseaudio-bash-completion.sh b/bash_completion.d/pulseaudio-bash-completion.sh
deleted file mode 100644
index 43f4a2c3..00000000
--- a/bash_completion.d/pulseaudio-bash-completion.sh
+++ /dev/null
@@ -1,570 +0,0 @@
-#!/bin/bash
-
-__cards () {
-    while IFS=$'\t' read idx name _; do
-        printf "%s %s\n" "$idx" "$name"
-    done < <(pactl list cards short 2> /dev/null)
-}
-
-__sinks () {
-    while IFS=$'\t' read _ name _ _ _; do
-        printf "%s\n" "$name"
-    done < <(pactl list sinks short 2> /dev/null)
-}
-
-__sinks_idx () {
-    while IFS=$'\t' read idx _ _ _ _; do
-        printf "%s\n" "$idx"
-    done < <(pactl list sinks short 2> /dev/null)
-}
-
-__sources () {
-    while IFS=$'\t' read _ name _ _ _; do
-        printf "%s\n" "$name"
-    done < <(pactl list sources short 2> /dev/null)
-}
-
-__sink_inputs () {
-    while IFS=$'\t' read idx _ _ _ _; do
-        printf "%s\n" "$idx"
-    done < <(pactl list sink-inputs short 2> /dev/null)
-}
-
-__source_outputs () {
-    while IFS=$'\t' read idx _ _ _ _; do
-        printf "%s\n" "$idx"
-    done < <(pactl list source-outputs short 2> /dev/null)
-}
-
-__ports () {
-    pactl list cards 2> /dev/null | awk -e \
-        '/^\tPorts:/ {
-            flag=1; next
-         }
-
-         /^\t[A-Za-z]/ {
-             flag=0
-         }
-
-         flag {
-             if (/^\t\t[A-Za-z]/)
-                 ports = ports substr($0, 3, index($0, ":")-3) " "
-         }
-
-         END {
-             print ports
-         }'
-}
-
-__profiles () {
-    pactl list cards 2> /dev/null | awk -e \
-        '/^\tProfiles:/ {
-            flag=1; next
-        }
-
-        /^\t[A-Za-z]/ {
-            flag=0
-        }
-
-        flag {
-            if (/^\t\t[A-Za-z]/)
-                profiles = profiles substr($0, 3, index($0, ": ")-3) " "
-        }
-
-        END {
-            print profiles
-        }'
-}
-
-__all_modules () {
-    while read name; do
-        name=${name%% *}
-        printf "%s\n" "$name"
-    done < <(pulseaudio --dump-modules 2> /dev/null)
-}
-
-__loaded_modules () {
-    while IFS=$'\t' read idx name _; do
-        printf "%s %s\n" "$idx" "$name"
-    done < <(pactl list modules short 2> /dev/null)
-}
-
-__resample_methods () {
-    while read name; do
-        printf "%s\n" "$name"
-    done < <(pulseaudio --dump-resample-methods 2> /dev/null)
-}
-
-_pacat_file_formats () {
-    while IFS=$'\t' read name _; do
-        printf "%s\n" "$name"
-    done < <(pacat --list-file-formats 2> /dev/null)
-}
-
-in_array() {
-    local i
-    for i in "${@:2}"; do
-        [[ $1 = "$i" ]] && return
-    done
-}
-
-_pactl() {
-    local cur prev words cword preprev command
-    local comps
-    local flags='-h --help --version -s --server= --client-name='
-    local list_types='short sinks sources sink-inputs source outputs cards
-                    modules samples clients'
-    local commands=(stat info list exit upload-sample play-sample remove-sample
-                    load-module unload-module move-sink-input move-source-output
-                    suspend-sink suspend-source set-card-profile set-sink-port
-                    set-source-port set-sink-volume set-source-volume
-                    set-sink-input-volume set-source-output-volume set-sink-mute
-                    set-source-mute set-sink-input-mute set-source-output-mute
-                    set-sink-formats set-port-latency-offset subscribe help)
-
-    _init_completion -n = || return
-    preprev=${words[$cword-2]}
-
-    for word in "${COMP_WORDS[@]}"; do
-        if in_array "$word" "${commands[@]}"; then
-            command=$word
-            break
-        fi
-    done
-
-    case $preprev in
-        list) COMPREPLY=($(compgen -W 'short' -- "$cur")) ;;
-
-        play-sample)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        move-sink-input)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        move-source-output)
-            comps=$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-card-profile)
-            comps=$(__profiles)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-*-port)
-            comps=$(__ports)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-*-mute) COMPREPLY=($(compgen -W 'true false toggle' -- "$cur")) ;;
-
-        set-sink-formats)
-            ;; #TODO
-
-        set-port-*)
-            comps=$(__ports)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-        --server)
-            compopt +o nospace
-            _known_hosts_real "$cur"
-            ;;
-    esac
-    [[ $COMPREPLY ]] && return 0
-
-    case $prev in
-        list) COMPREPLY=($(compgen -W '${list_types[*]}' -- "$cur")) ;;
-
-        stat) COMPREPLY=($(compgen -W 'short' -- "$cur")) ;;
-
-        upload-sample) _filedir ;;
-
-        play-sample) ;; # TODO
-
-        remove-sample) ;; # TODO
-
-        load-module)
-            comps=$(__all_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        unload-module)
-            comps=$(__loaded_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-card*)
-            comps=$(__cards)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *sink-input*)
-            comps=$(__sink_inputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *source-output*)
-            comps=$(__source_outputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-sink-formats)
-            comps=$(__sinks_idx)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *sink*)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *source*)
-            comps=$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-port*)
-            comps=$(__cards)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        -s)
-            _known_hosts_real "$cur" ;;
-    esac
-    [[ $COMPREPLY ]] && return 0
-
-    case $cur in
-        --server=*)
-            cur=${cur#*=}
-            _known_hosts_real "$cur"
-            ;;
-
-        -*)
-            COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur"))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-            ;;
-
-        *)
-            [[ -z $command ]] && COMPREPLY=($(compgen -W '${commands[*]}' -- "$cur"))
-            ;;
-    esac
-}
-complete -F _pactl pactl
-
-_pacmd() {
-    local cur prev words cword preprev command
-    local comps
-    local flags='-h --help --version'
-    local commands=(exit help list-modules list-cards list-sinks list-sources list-clients
-                    list-samples list-sink-inputs list-source-outputs stat info
-                    load-module unload-module describe-module set-sink-volume
-                    set-source-volume set-sink-input-volume set-source-output-volume
-                    set-sink-mute set-source-mut set-sink-input-mute
-                    set-source-output-mute update-sink-proplist update-source-proplist
-                    update-sink-input-proplist update-source-output-proplist
-                    set-default-sink set-default-source kill-client kill-sink-input
-                    kill-source-output play-sample remove-sample load-sample
-                    load-sample-lazy load-sample-dir-lazy play-file dump
-                    move-sink-input move-source-output suspend-sink suspend-source
-                    suspend set-card-profile set-sink-port set-source-port
-                    set-port-latency-offset set-log-target set-log-level set-log-meta
-                    set-log-time set-log-backtrace)
-    _init_completion -n = || return
-    preprev=${words[$cword-2]}
-
-    for word in "${COMP_WORDS[@]}"; do
-        if in_array "$word" "${commands[@]}"; then
-            command=$word
-            break
-        fi
-    done
-
-    case $preprev in
-        play-sample|play-file)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        load-sample*) _filedir ;;
-
-        move-sink-input)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        move-source-output)
-            comps=$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-card-profile)
-            comps=$(__profiles)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-*port*)
-            comps=$(__ports)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-*-mute) COMPREPLY=($(compgen -W 'true false' -- "$cur"));;
-
-        set-sink-formats)
-            ;; #TODO
-    esac
-
-    case $prev in
-        list-*) ;;
-        describe-module|load-module)
-            comps=$(__all_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        unload-module)
-            comps=$(__loaded_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        load-sample-dir-lazy) _filedir -d ;;
-        play-file) _filedir ;;
-
-        *sink-input*)
-            comps=$(__sink_inputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *source-output*)
-            comps=$(__source_outputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *sink*)
-            comps=$(__sinks)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        *source*)
-            comps=$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-card*)
-            comps=$(__cards)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-port-*)
-            comps=$(__cards)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        set-log-target)
-            COMPREPLY=($(compgen -W 'auto syslog stderr file: newfile:' -- "$cur"))
-            ;;
-
-        set-log-level)
-            COMPREPLY=($(compgen -W '{0..4}' -- "$cur"))
-            ;;
-
-        set-log-meta|set-log-time|suspend)
-            COMPREPLY=($(compgen -W 'true false' -- "$cur"))
-            ;;
-    esac
-
-    case $cur in
-        -*) COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur")) ;;
-        suspend)
-            COMPREPLY=($(compgen -W 'suspend suspend-sink suspend-source' -- "$cur"))
-            ;;
-
-        load-sample)
-            COMPREPLY=($(compgen -W 'load-sample load-sample-lazy load-sample-dir-lazy' -- "$cur"))
-            ;;
-
-        *)
-            [[ -z $command ]] && COMPREPLY=($(compgen -W '${commands[*]}' -- "$cur"))
-            ;;
-    esac
-}
-complete -F _pacmd pacmd
-
-_pasuspender () {
-    local cur prev
-    local flags='-h --help --version -s --server='
-
-    _init_completion -n = || return
-
-    case $cur in
-        --server=*)
-            cur=${cur#*=}
-            _known_hosts_real "$cur"
-            ;;
-
-        -*)
-            COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur"))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-            ;;
-    esac
-
-    case $prev in
-        -s) _known_hosts_real "$cur" ;;
-    esac
-}
-complete -F _pasuspender pasuspender
-
-_padsp () {
-    local cur prev
-    local flags='-h -s -n -m -M -S -D -d'
-
-    _get_comp_words_by_ref cur prev
-
-    case $cur in
-        -*) COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur")) ;;
-    esac
-
-    case $prev in
-        -s) _known_hosts_real "$cur" ;;
-    esac
-}
-complete -F _padsp padsp
-
-_pacat () {
-    local cur prev comps
-    local flags='-h --help --version -r --record -p --playback -v --verbose -s
-                --server= -d --device= -n --client-name= --stream-name= --volume=
-                --rate= --format= --channels= --channel-map= --fix-format --fix-rate
-                --fix-channels --no-remix --no-remap --latency= --process-time=
-                --latency-msec= --process-time-msec= --property= --raw --passthrough
-                --file-format= --list-file-formats --monitor-stream='
-
-    _init_completion -n = || return
-
-    case $cur in
-        --server=*)
-            cur=${cur#*=}
-            _known_hosts_real "$cur"
-            ;;
-
-        --device=*)
-            cur=${cur#*=}
-            comps=$(__sinks)
-            comps+=" "$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --monitor-stream=*)
-            cur=${cur#*=}
-            comps=$(__sink_inputs)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --rate=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W '32000 44100 48000 9600 192000' -- "$cur"))
-            ;;
-
-        --file-format=*)
-            cur=${cur#*=}
-            comps=$(_pacat_file_formats)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --*=*)
-            ;;
-
-        -*)
-            COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur"))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-            ;;
-        *) _filedir ;;
-    esac
-
-    case $prev in
-        -s) _known_hosts_real "$cur" ;;
-        -d)
-            comps=$(__sinks)
-            comps+=" "$(__sources)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-    esac
-}
-complete -F _pacat pacat paplay parecord
-
-_pulseaudio()
-{
-    local cur prev words cword
-    local flags='-h --help --version --dump-conf --dump-resample-methods --cleanup-shm
-                --start -k --kill --check --system= -D --daemonize= --fail= --high-priority=
-                --realtime= --disallow-module-loading= --disallow-exit= --exit-idle-time=
-                --scache-idle-time= --log-level= -v --log-target= --log-meta= --log-time=
-                --log-backtrace= -p --dl-search-path= --resample-method= --use-pit-file=
-                --no-cpu-limit= --disable-shm= -L --load= -F --file= -C -n'
-    _init_completion -n = || return
-
-    case $cur in
-        --system=*|--daemonize=*|--fail=*|--high-priority=*|--realtime=*| \
-            --disallow-*=*|--log-meta=*|--log-time=*|--use-pid-file=*| \
-            --no-cpu-limit=*|--disable-shm=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W 'true false' -- "$cur"))
-            ;;
-
-        --log-target=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W 'auto syslog stderr file: newfile:' -- "$cur"))
-            ;;
-
-        --log-level=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W '{0..4}' -- "$cur"))
-            ;;
-
-        --dl-search-path=*)
-            cur=${cur#*=}
-            _filedir -d
-            ;;
-
-        --file=*)
-            cur=${cur#*=}
-            _filedir
-            ;;
-
-        --resample-method=*)
-            cur=${cur#*=}
-            comps=$(__resample_methods)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --load=*)
-            cur=${cur#*=}
-            comps=$(__all_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-
-        --*=*)
-            ;;
-
-        -*)
-            COMPREPLY=($(compgen -W '${flags[*]}' -- "$cur"))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-            ;;
-    esac
-
-    case $prev in
-        -D) COMPREPLY=($(compgen -W 'true false' -- "$cur")) ;;
-        -p) _filedir -d ;;
-        -F) _filedir ;;
-        -L)
-            cur=${cur#*=}
-            comps=$(__all_modules)
-            COMPREPLY=($(compgen -W '${comps[*]}' -- "$cur"))
-            ;;
-    esac
-}
-complete -F _pulseaudio pulseaudio
-
-#vim: set ft=zsh sw=4 ts=4 noet
diff --git a/csh.env b/csh.env
index b5e85356..4924e4ff 100644
--- a/csh.env
+++ b/csh.env
@@ -37,7 +37,6 @@ setenv PAGER '/usr/bin/less'
 setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3:/usr/lib64/subversion/bin:/usr/games/bin'
 setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/opt/bin/skype'
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.3/html/library'
-setenv PYTHONDOCS_3_2 '/usr/share/doc/python-docs-3.2.3/html/library'
 setenv PYTHONDOCS_3_3 '/usr/share/doc/python-docs-3.3.2/html/library'
 setenv QT_GRAPHICSSYSTEM 'raster'
 setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins'
diff --git a/cups/printers.conf b/cups/printers.conf
index 3a130b31..68263ddb 100644
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.7.1
-# Written by cupsd on 2014-06-17 00:25
+# Written by cupsd on 2014-07-08 00:01
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d
diff --git a/dbus-1/session.conf b/dbus-1/session.conf
index dde5ef6b..66d46b8b 100644
--- a/dbus-1/session.conf
+++ b/dbus-1/session.conf
@@ -49,7 +49,7 @@
   <limit name="max_outgoing_bytes">1000000000</limit>
   <limit name="max_outgoing_unix_fds">250000000</limit>
   <limit name="max_message_size">1000000000</limit>
-  <limit name="max_message_unix_fds">4096</limit>
+  <limit name="max_message_unix_fds">1024</limit>
   <limit name="service_start_timeout">120000</limit>  
   <limit name="auth_timeout">240000</limit>
   <limit name="max_completed_connections">100000</limit>  
diff --git a/dbus-1/system.d/org.freedesktop.UDisks.conf b/dbus-1/system.d/org.freedesktop.UDisks.conf
deleted file mode 100644
index 21e6d8ff..00000000
--- a/dbus-1/system.d/org.freedesktop.UDisks.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
-
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Only root can own the service -->
-  <policy user="root">
-    <allow own="org.freedesktop.UDisks"/>
-  </policy>
-
-  <policy context="default">
-    <allow send_destination="org.freedesktop.UDisks"/>
-
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.DBus.Introspectable"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks.Device"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks.Adapter"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks.Expander"/>
-    <allow send_destination="org.freedesktop.UDisks"
-           send_interface="org.freedesktop.UDisks.Port"/>
-  </policy>
-</busconfig>
diff --git a/dbus-1/system.d/org.freedesktop.UPower.conf b/dbus-1/system.d/org.freedesktop.UPower.conf
new file mode 100644
index 00000000..fc2b604a
--- /dev/null
+++ b/dbus-1/system.d/org.freedesktop.UPower.conf
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="org.freedesktop.UPower"/>
+  </policy>
+  <policy context="default">
+
+    <allow send_destination="org.freedesktop.UPower"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+
+    <allow send_destination="org.freedesktop.UPower"
+           send_interface="org.freedesktop.DBus.Peer"/>
+    <allow send_destination="org.freedesktop.UPower"
+           send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.freedesktop.UPower.Device"
+           send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.freedesktop.UPower.QoS"
+           send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.freedesktop.UPower.KbdBacklight"
+           send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.freedesktop.UPower.Wakeups"
+           send_interface="org.freedesktop.DBus.Properties"/>
+
+    <allow send_destination="org.freedesktop.UPower"
+           send_interface="org.freedesktop.UPower"/>
+    <allow send_destination="org.freedesktop.UPower"
+           send_interface="org.freedesktop.UPower.Device"/>
+    <allow send_destination="org.freedesktop.UPower"
+           send_interface="org.freedesktop.UPower.QoS"/>
+    <allow send_destination="org.freedesktop.UPower"
+           send_interface="org.freedesktop.UPower.KbdBacklight"/>
+    <allow send_destination="org.freedesktop.UPower"
+	   send_interface="org.freedesktop.UPower.Wakeups"/>
+  </policy>
+</busconfig>
diff --git a/dbus-1/system.d/org.freedesktop.login1.conf b/dbus-1/system.d/org.freedesktop.login1.conf
index 0407609c..1318328a 100644
--- a/dbus-1/system.d/org.freedesktop.login1.conf
+++ b/dbus-1/system.d/org.freedesktop.login1.conf
@@ -50,19 +50,19 @@
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="GetSeat"/>
+                       send_member="GetUserByPID"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListSessions"/>
+                       send_member="GetSeat"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListUsers"/>
+                       send_member="ListSessions"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListMachines"/>
+                       send_member="ListUsers"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
@@ -140,6 +140,18 @@
                        send_interface="org.freedesktop.login1.Seat"
                        send_member="ActivateSession"/>
 
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchTo"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchToPrevious"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchToNext"/>
+
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="Activate"/>
@@ -148,6 +160,26 @@
                        send_interface="org.freedesktop.login1.Session"
                        send_member="SetIdleHint"/>
 
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="TakeControl"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="ReleaseControl"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="TakeDevice"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="ReleaseDevice"/>
+
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="PauseDeviceComplete"/>
+
                 <allow receive_sender="org.freedesktop.login1"/>
         </policy>
 
diff --git a/dbus-1/system.d/org.freedesktop.machine1.conf b/dbus-1/system.d/org.freedesktop.machine1.conf
index b2d6df31..970ccd8d 100644
--- a/dbus-1/system.d/org.freedesktop.machine1.conf
+++ b/dbus-1/system.d/org.freedesktop.machine1.conf
@@ -44,6 +44,10 @@
                        send_interface="org.freedesktop.machine1.Manager"
                        send_member="GetMachine"/>
 
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Manager"
+                       send_member="GetMachineByPID"/>
+
                 <allow receive_sender="org.freedesktop.machine1"/>
         </policy>
 
diff --git a/env.d/60python-docs-3.2 b/env.d/60python-docs-3.2
deleted file mode 100644
index 9fce20d5..00000000
--- a/env.d/60python-docs-3.2
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONDOCS_3_2="/usr/share/doc/python-docs-3.2.3/html/library"
diff --git a/gtk-2.0/i686-pc-linux-gnu/gtk.immodules b/gtk-2.0/i686-pc-linux-gnu/gtk.immodules
index fca80ac0..d5179154 100644
--- a/gtk-2.0/i686-pc-linux-gnu/gtk.immodules
+++ b/gtk-2.0/i686-pc-linux-gnu/gtk.immodules
@@ -1,8 +1,8 @@
 # GTK+ Input Method Modules file
 # Automatically generated file, do not edit
-# Created by gtk-query-immodules-2.0-32 from gtk+-2.24.22
+# Created by gtk-query-immodules-2.0-32 from gtk+-2.24.23
 #
-# ModulesPath = /var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/2.10.0/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/immodules:/usr/lib32/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/2.10.0/immodules:/usr/lib32/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/immodules
+# ModulesPath = /var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140508-r3/homedir/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140508-r3/homedir/.gtk-2.0/2.10.0/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140508-r3/homedir/.gtk-2.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140508-r3/homedir/.gtk-2.0/immodules:/usr/lib32/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/2.10.0/immodules:/usr/lib32/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/immodules
 #
 "/usr/lib32/gtk-2.0/2.10.0/immodules/im-viqr.so" 
 "viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi" 
diff --git a/hotplug/usb/libsane.usermap b/hotplug/usb/libsane.usermap
index 337615c5..91b3daab 100644
--- a/hotplug/usb/libsane.usermap
+++ b/hotplug/usb/libsane.usermap
@@ -1,5 +1,5 @@
 # This file was automatically created based on description files (*.desc)
-# by sane-desc 3.5 from sane-backends 1.0.24 on Tue May 13 00:54:43 2014
+# by sane-desc 3.5 from sane-backends 1.0.24 on Tue Jul  8 08:24:50 2014
 #
 # The entries below are used to detect a USB device and change owner
 # and permissions on the "device node" used by libusb.
diff --git a/init.d/nfs b/init.d/nfs
index ab25b4d1..e4239b70 100755
--- a/init.d/nfs
+++ b/init.d/nfs
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.27 2013/03/24 19:37:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.28 2014/06/20 06:21:22 vapier Exp $
 
 extra_started_commands="reload"
 
@@ -36,7 +36,7 @@ depend() {
 
 mkdir_nfsdirs() {
 	local d
-	for d in rpc_pipefs v4recovery v4root ; do
+	for d in v4recovery v4root ; do
 		d="/var/lib/nfs/${d}"
 		[ ! -d "${d}" ] && mkdir -p "${d}"
 	done
@@ -62,7 +62,7 @@ mount_nfsd() {
 
 	# This is the new "kernel 2.6 way" to handle the exports file
 	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfsd" /proc/mounts ; then
+		if ! mountinfo -q /proc/fs/nfsd ; then
 			ebegin "Mounting nfsd filesystem in /proc"
 			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfsd
 			eend $?
diff --git a/init.d/rpc.pipefs b/init.d/rpc.pipefs
index 08467eed..ebae3b91 100755
--- a/init.d/rpc.pipefs
+++ b/init.d/rpc.pipefs
@@ -1,21 +1,23 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.pipefs.initd,v 1.2 2011/06/19 23:04:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.pipefs.initd,v 1.3 2014/06/20 04:33:57 vapier Exp $
+
+MNT="/var/lib/nfs/rpc_pipefs"
 
 mount_pipefs() {
-	local fstype=rpc_pipefs mntpoint=/var/lib/nfs/rpc_pipefs
+	local fstype=rpc_pipefs
 
 	# if things are already mounted, nothing to do
-	mountinfo -q ${mntpoint} && return 0
+	mountinfo -q ${MNT} && return 0
 
 	# if rpc_pipefs is not available, try to load sunrpc for it #219566
 	grep -qs ${fstype} /proc/filesystems || modprobe -q sunrpc
 	# if still not available, the `mount` will issue an error for the user
 
 	# now just do it for kicks
-	mkdir -p ${mntpoint}
-	mount -t ${fstype} ${fstype} ${mntpoint}
+	mkdir -p ${MNT}
+	mount -t ${fstype} ${fstype} ${MNT}
 }
 
 start() {
@@ -23,3 +25,9 @@ start() {
 	mount_pipefs
 	eend $? "make sure you have NFS/SUNRPC enabled in your kernel"
 }
+
+stop() {
+	ebegin "Unmounting RPC pipefs"
+	umount ${MNT}
+	eend $?
+}
diff --git a/php/apache2-php5.5/php.ini b/php/apache2-php5.5/php.ini
index f631c715..717f4f95 100644
--- a/php/apache2-php5.5/php.ini
+++ b/php/apache2-php5.5/php.ini
@@ -573,7 +573,7 @@ html_errors = On
 ; http://php.net/error-log
 ; Example:
 ;error_log = php_errors.log
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
+; Log errors to syslog (Event Log on Windows).
 ;error_log = syslog
 
 ;windows.show_crt_warning
@@ -1014,7 +1014,7 @@ mail.add_x_header = On
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
 ;mail.log =
-; Log mail to syslog (Event Log on NT, not valid in Windows 95).
+; Log mail to syslog (Event Log on Windows).
 ;mail.log = syslog
 
 [SQL]
diff --git a/php/cgi-php5.5/php.ini b/php/cgi-php5.5/php.ini
index f631c715..717f4f95 100644
--- a/php/cgi-php5.5/php.ini
+++ b/php/cgi-php5.5/php.ini
@@ -573,7 +573,7 @@ html_errors = On
 ; http://php.net/error-log
 ; Example:
 ;error_log = php_errors.log
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
+; Log errors to syslog (Event Log on Windows).
 ;error_log = syslog
 
 ;windows.show_crt_warning
@@ -1014,7 +1014,7 @@ mail.add_x_header = On
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
 ;mail.log =
-; Log mail to syslog (Event Log on NT, not valid in Windows 95).
+; Log mail to syslog (Event Log on Windows).
 ;mail.log = syslog
 
 [SQL]
diff --git a/php/cli-php5.5/php.ini b/php/cli-php5.5/php.ini
index f631c715..717f4f95 100644
--- a/php/cli-php5.5/php.ini
+++ b/php/cli-php5.5/php.ini
@@ -573,7 +573,7 @@ html_errors = On
 ; http://php.net/error-log
 ; Example:
 ;error_log = php_errors.log
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
+; Log errors to syslog (Event Log on Windows).
 ;error_log = syslog
 
 ;windows.show_crt_warning
@@ -1014,7 +1014,7 @@ mail.add_x_header = On
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
 ;mail.log =
-; Log mail to syslog (Event Log on NT, not valid in Windows 95).
+; Log mail to syslog (Event Log on Windows).
 ;mail.log = syslog
 
 [SQL]
diff --git a/php/embed-php5.5/php.ini b/php/embed-php5.5/php.ini
index f631c715..717f4f95 100644
--- a/php/embed-php5.5/php.ini
+++ b/php/embed-php5.5/php.ini
@@ -573,7 +573,7 @@ html_errors = On
 ; http://php.net/error-log
 ; Example:
 ;error_log = php_errors.log
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
+; Log errors to syslog (Event Log on Windows).
 ;error_log = syslog
 
 ;windows.show_crt_warning
@@ -1014,7 +1014,7 @@ mail.add_x_header = On
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
 ;mail.log =
-; Log mail to syslog (Event Log on NT, not valid in Windows 95).
+; Log mail to syslog (Event Log on Windows).
 ;mail.log = syslog
 
 [SQL]
diff --git a/php/fpm-php5.5/php.ini b/php/fpm-php5.5/php.ini
index f631c715..717f4f95 100644
--- a/php/fpm-php5.5/php.ini
+++ b/php/fpm-php5.5/php.ini
@@ -573,7 +573,7 @@ html_errors = On
 ; http://php.net/error-log
 ; Example:
 ;error_log = php_errors.log
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
+; Log errors to syslog (Event Log on Windows).
 ;error_log = syslog
 
 ;windows.show_crt_warning
@@ -1014,7 +1014,7 @@ mail.add_x_header = On
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
 ;mail.log =
-; Log mail to syslog (Event Log on NT, not valid in Windows 95).
+; Log mail to syslog (Event Log on Windows).
 ;mail.log = syslog
 
 [SQL]
diff --git a/portage/make.conf b/portage/make.conf
index 3c66d5f6..96f5f2a7 100644
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -8,7 +8,7 @@ CXXFLAGS="${CFLAGS}"
 # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
 CHOST="x86_64-pc-linux-gnu"
 
-MAKEOPTS="-j5"
+MAKEOPTS="-j3"
 #MAKEOPTS="-j1"
 
 GENTOO_MIRRORS="http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
@@ -41,7 +41,8 @@ ACCEPT_LICENSE=" \
 "
 
 #EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=8"
-EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=8 --ignore-built-slot-operator-deps=y"
+#EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=8 --ignore-built-slot-operator-deps=y"
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=1 --load-average=5 --ignore-built-slot-operator-deps=y"
 #EMERGE_DEFAULT_OPTS="--with-bdeps y --load-average=10 --ignore-built-slot-operator-deps=y"
 #EMERGE_DEFAULT_OPTS="--with-bdeps y"
 
@@ -127,6 +128,7 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \
 #CURL_SSL="nss"
 
 PHP_TARGETS="php5-3"
+#PYTHON_TARGETS="python2_7 python3_3"
 
 source /var/lib/layman/make.conf
 
diff --git a/portage/package.keywords b/portage/package.keywords
index a2f52b4b..69caee7f 100644
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -35,6 +35,7 @@ app-emulation/virtualbox-modules
 ~app-text/mate-document-viewer-1.6.2
 ~app-text/mate-doc-utils-1.6.2
 
+~dev-db/sqlite-3.8.5
 ~dev-db/virtuoso-odbc-6.1.4
 ~dev-db/virtuoso-server-6.1.4
 
@@ -55,6 +56,7 @@ app-emulation/virtualbox-modules
 ~dev-libs/libappindicator-12.10.0
 ~dev-libs/libdbusmenu-12.10.2
 ~dev-libs/libgcrypt-1.5.0
+~dev-libs/libgcrypt-1.6.1
 ~dev-libs/libindicator-12.10.1
 ~dev-libs/libmateweather-1.6.2
 # ~dev-libs/libzeitgeist-0.3.18
@@ -71,12 +73,15 @@ app-emulation/virtualbox-modules
 ~dev-python/astng-0.24.3
 ~dev-python/bcrypt-1.0.2
 dev-python/fbrehm-libs
+~dev-python/gdata-2.0.18
 ~dev-python/iniparse-0.4
 # ~dev-python/isodate-0.4.9
 ~dev-python/logilab-common-0.59.1
+~dev-python/markupsafe-0.23
 dev-python/passlib
 ~dev-python/pathlib-1.0
 dev-python/pb-logging
+~dev-python/pbr-0.8.2
 ~dev-python/pillow-2.3.0
 ~dev-python/pygments-1.6
 ~dev-python/pylint-0.28.0
@@ -85,12 +90,15 @@ dev-python/pb-logging
 ~dev-python/reportlab-2.6
 ~dev-python/setuptools-0.8
 ~dev-python/sphinx-1.2.1
+~dev-python/sphinx-1.2.2
 ~dev-python/sphinx-better-theme-0.1.5
 ~dev-python/stevedore-0.8
+~dev-python/stevedore-0.15
 ~dev-python/virtualenv-clone-0.2.4
 ~dev-python/virtualenvwrapper-3.6
 ~dev-python/virtualenvwrapper-3.7
 ~dev-python/virtualenvwrapper-4.1.1
+~dev-python/virtualenvwrapper-4.3
 
 ~dev-ruby/dnsruby-1.53
 ~dev-ruby/zonecheck-3.0.4
@@ -139,6 +147,7 @@ mail-client/thunderbird
 ~mate-base/mate-session-manager-1.6.1
 ~mate-base/mate-settings-daemon-1.6.2
 
+~mate-extra/caja-extensions-1.8.0
 ~mate-extra/mate-calc-1.6.0
 ~mate-extra/mate-calc-1.6.1
 ~mate-extra/mate-character-map-1.6.0
diff --git a/portage/package.use b/portage/package.use
index 66a30dc1..6d6fdc33 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -88,15 +88,10 @@ dev-perl/Sysadm-Install			hammer
 dev-perl/Task-Moose			cli async declare instancetype logging other strict traits types utilroles utils
 dev-perl/Template-Toolkit		latex
 
->=dev-python/docutils-0.10		python_targets_python3_2
 dev-python/ipython			gnuplot smp wxwidgets
 dev-python/jinja			-doc i18n
-~dev-python/markupsafe-0.15		python_targets_python3_2
->=dev-python/pygments-1.6		python_targets_python3_2
-dev-python/pyopenssl			-doc
 #dev-python/PyQt4			assistant declarative multimedia phonon qt3support sql webkit xmlpatterns
 dev-python/PyQt4			assistant declarative multimedia qt3support script sql webkit xmlpatterns
-~dev-python/setuptools-0.8		python_targets_python3_2
 dev-python/sphinx			-doc
 
 dev-ruby/hoe				-doc
@@ -211,7 +206,7 @@ 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
 media-video/transcode			extrafilters fame lzo mjpeg network nuv postproc
-media-video/vlc				atmo cdda cddax cdio corba daap dc1394 dirac egl fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil portaudio rtsp schroedinger shine shout skins stream switcher taglib twolame vcdinfo vcdx vlm zvbi
+media-video/vlc				atmo cdda cddax cdio chromaprint corba daap dc1394 dirac egl faad fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil opencv portaudio rdp rtsp schroedinger sftp shine shout skins stream switcher taglib twolame vcdinfo vcdx vlm zvbi
 
 net-analyzer/nagios-nrpe		command-args
 net-analyzer/nagios-plugins		nagios-dns nagios-ntp nagios-ping nagios-ssh
diff --git a/profile.env b/profile.env
index ab2657e6..c04eb471 100644
--- a/profile.env
+++ b/profile.env
@@ -37,7 +37,6 @@ export PAGER='/usr/bin/less'
 export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3:/usr/lib64/subversion/bin:/usr/games/bin'
 export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/opt/bin/skype'
 export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.3/html/library'
-export PYTHONDOCS_3_2='/usr/share/doc/python-docs-3.2.3/html/library'
 export PYTHONDOCS_3_3='/usr/share/doc/python-docs-3.3.2/html/library'
 export QT_GRAPHICSSYSTEM='raster'
 export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
diff --git a/resolv.conf b/resolv.conf
index 7a104c01..9076c0f3 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,7 +1,5 @@
-# Hand made by Frank Brehm
-domain home.brehm-online.com
-#search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local
-search home.brehm-online.com brehm-online.com uhu-banane.de pb.local dc1.de.profitbricks.net dc2.us.profitbricks.net dc3.de.profitbricks.net
-#nameserver 10.12.11.1
-nameserver 192.168.178.30
-nameserver 192.168.178.89
+# Generated by net-scripts for interface eth0
+domain brehm-online.com
+search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
+#nameserver 10.12.11.254
+nameserver 127.0.0.1
diff --git a/revdep-rebuild/61-icedtea-bin-6 b/revdep-rebuild/61-icedtea-bin-6
index 309815c6..59221b2b 100644
--- a/revdep-rebuild/61-icedtea-bin-6
+++ b/revdep-rebuild/61-icedtea-bin-6
@@ -1 +1 @@
-SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.12.7"
+SEARCH_DIRS_MASK="/opt/icedtea-bin-6.1.13.3"
diff --git a/sandbox.d/20icedtea-bin-6 b/sandbox.d/20icedtea-bin-6
new file mode 100644
index 00000000..3001f3cf
--- /dev/null
+++ b/sandbox.d/20icedtea-bin-6
@@ -0,0 +1 @@
+SANDBOX_PREDICT="/proc/self/coredump_filter"
diff --git a/sgml/sgml-docbook-4.4.cat b/sgml/sgml-docbook-4.4.cat
index a6edda2b..d22e86f9 100644
--- a/sgml/sgml-docbook-4.4.cat
+++ b/sgml/sgml-docbook-4.4.cat
@@ -1,2 +1 @@
-CATALOG "/usr/share/sgml/docbook/sgml-dtd-4.4/catalog"
 CATALOG "/etc/sgml/sgml-docbook.cat"
diff --git a/sysstat b/sysstat
index 348add68..8694e31d 100644
--- a/sysstat
+++ b/sysstat
@@ -1,4 +1,4 @@
-# sysstat-10.2.0 configuration file.
+# sysstat-10.2.1 configuration file.
 
 # How long to keep log files (in days).
 # If value is greater than 28, then log files are kept in
diff --git a/systemd/journald.conf b/systemd/journald.conf
index 54f6833a..d106d00b 100644
--- a/systemd/journald.conf
+++ b/systemd/journald.conf
@@ -26,8 +26,10 @@
 #ForwardToSyslog=yes
 #ForwardToKMsg=no
 #ForwardToConsole=no
+#ForwardToWall=yes
 #TTYPath=/dev/console
 #MaxLevelStore=debug
 #MaxLevelSyslog=debug
 #MaxLevelKMsg=notice
 #MaxLevelConsole=info
+#MaxLevelWall=emerg
diff --git a/systemd/logind.conf b/systemd/logind.conf
index c0abf01b..79f96ec0 100644
--- a/systemd/logind.conf
+++ b/systemd/logind.conf
@@ -24,3 +24,5 @@
 #LidSwitchIgnoreInhibited=yes
 #IdleAction=ignore
 #IdleActionSec=30min
+#RuntimeDirectorySize=10%
+#RemoveIPC=yes
diff --git a/systemd/system.conf b/systemd/system.conf
index 7b03c878..65a35a06 100644
--- a/systemd/system.conf
+++ b/systemd/system.conf
@@ -17,14 +17,24 @@
 #ShowStatus=yes
 #CrashChVT=1
 #CPUAffinity=1 2
-#DefaultStandardOutput=journal
-#DefaultStandardError=inherit
 #JoinControllers=cpu,cpuacct net_cls,net_prio
 #RuntimeWatchdogSec=0
 #ShutdownWatchdogSec=10min
 #CapabilityBoundingSet=
+#SystemCallArchitectures=
 #TimerSlackNSec=
+#DefaultTimerAccuracySec=1min
+#DefaultStandardOutput=journal
+#DefaultStandardError=inherit
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
 #DefaultEnvironment=
+#DefaultCPUAccounting=no
+#DefaultBlockIOAccounting=no
+#DefaultMemoryAccounting=no
 #DefaultLimitCPU=
 #DefaultLimitFSIZE=
 #DefaultLimitDATA=
diff --git a/systemd/system/getty.target.wants/getty@tty1.service b/systemd/system/getty.target.wants/getty@tty1.service
index 7bfe0808..baabfc6a 120000
--- a/systemd/system/getty.target.wants/getty@tty1.service
+++ b/systemd/system/getty.target.wants/getty@tty1.service
@@ -1 +1 @@
-/usr/lib/systemd/system/getty@.service
\ No newline at end of file
+../../../../usr/lib/systemd/system/getty@.service
\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/remote-fs.target b/systemd/system/multi-user.target.wants/remote-fs.target
index 2bc8b1cc..e6177c7f 120000
--- a/systemd/system/multi-user.target.wants/remote-fs.target
+++ b/systemd/system/multi-user.target.wants/remote-fs.target
@@ -1 +1 @@
-/usr/lib/systemd/system/remote-fs.target
\ No newline at end of file
+../../../../usr/lib/systemd/system/remote-fs.target
\ No newline at end of file
diff --git a/systemd/user.conf b/systemd/user.conf
index 4a0129a9..8c7ecde7 100644
--- a/systemd/user.conf
+++ b/systemd/user.conf
@@ -12,5 +12,30 @@
 #LogTarget=console
 #LogColor=yes
 #LogLocation=no
+#SystemCallArchitectures=
+#TimerSlackNSec=
+#DefaultTimerAccuracySec=1min
 #DefaultStandardOutput=inherit
 #DefaultStandardError=inherit
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
+#DefaultEnvironment=
+#DefaultLimitCPU=
+#DefaultLimitFSIZE=
+#DefaultLimitDATA=
+#DefaultLimitSTACK=
+#DefaultLimitCORE=
+#DefaultLimitRSS=
+#DefaultLimitNOFILE=
+#DefaultLimitAS=
+#DefaultLimitNPROC=
+#DefaultLimitMEMLOCK=
+#DefaultLimitLOCKS=
+#DefaultLimitSIGPENDING=
+#DefaultLimitMSGQUEUE=
+#DefaultLimitNICE=
+#DefaultLimitRTPRIO=
+#DefaultLimitRTTIME=
diff --git a/texmf/ls-R b/texmf/ls-R
index 66ffaf37..7c91452d 100644
--- a/texmf/ls-R
+++ b/texmf/ls-R
@@ -66,8 +66,8 @@ language.texlive-langgerman.def
 80jadetex.cnf
 
 ./updmap.d:
-.keep_app-text_texlive-core-0
 00updmap.cfg
+.keep_app-text_texlive-core-0
 texlive-basic.cfg
 texlive-context.cfg
 texlive-fontsextra.cfg
@@ -85,8 +85,8 @@ texlive-pictures.cfg
 texlive-science.cfg
 
 ./web2c:
-.keep_app-text_texlive-core-0
 fmtutil.cnf
+.keep_app-text_texlive-core-0
 texmf.cnf
 updmap.cfg
 
diff --git a/udev/hwdb.bin b/udev/hwdb.bin
index c7be4096..7bea6fec 100644
Binary files a/udev/hwdb.bin and b/udev/hwdb.bin differ
diff --git a/udev/rules.d/80-net-setup-link.rules b/udev/rules.d/80-net-setup-link.rules
new file mode 100644
index 00000000..7244c87f
--- /dev/null
+++ b/udev/rules.d/80-net-setup-link.rules
@@ -0,0 +1,39 @@
+#
+# Udev 197 and above has implemented predictable network interface names
+# for hardware network interfaces. This new scheme does not affect
+# stacked network interfaces such as bonds, bridges or vlans.
+#
+# This file is here to prevent your interfaces from being renamed automatically,
+# because the new names will be drastically different from the eth*, wlan*, etc
+# names you are used to working with.
+#
+# To activate this function, move this file to a name that doesn't end in.rules,
+# or remove it then reboot your system.
+#
+# If you want to deactivate this function, install a udev rules file as
+# /etc/udev/rules.d/80-net-name-slot.rules then reboot your system.
+#
+# This functionality has not been tested with gentoo. In fact, we are aware that
+# things will break if you activate it.
+#
+# If you are not comfortable testing this, leave this file as is. We will
+# publish a news item when you can migrate.
+#
+# If you do want to activate and help us come up with a migration plan, feel
+# free to do so and report bugs.
+# Your bugs should block the following tracker:
+# https://bugs.gentoo.org/show_bug.cgi?id=450938
+#
+# Before you activate this function, it is important that you fully understand
+# the following documentation:
+#
+# http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
+#
+# Also, be aware that you can get the attributes of your network interface that
+# would be used to name the interface in the new scheme by doing the following
+# with this version of udev running:
+#
+# udevadm test-builtin net_id /sys/class/net/ifname 2> /dev/null
+#
+# for example, on my system, I can find that eth0's new name would be enp1s5.
+#
diff --git a/xdg/autostart/gdu-notification-daemon.desktop b/xdg/autostart/gdu-notification-daemon.desktop
deleted file mode 100644
index 08821eca..00000000
--- a/xdg/autostart/gdu-notification-daemon.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Name=Disk Notifications
-Name[de]=Benachrichtigungen über das Laufwerk
-Name[en_GB]=Disk Notifications
-Name[ru]=Уведомления диска
-Name[vi]=Thông báo đĩa
-Comment=Provides notifications related to disks
-Comment[de]=Stellt auf Medien bezogene Benachrichtigungen bereit
-Comment[en_GB]=Provides notifications related to disks
-Comment[ru]=Уведомления, относящиеся к дискам
-Comment[vi]=Cung cấp thông báo liên quan đến đĩa
-Icon=gdu-notification-daemon
-Exec=/usr/libexec/gdu-notification-daemon
-Terminal=false
-Type=Application
-Categories=
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-disk-utility
-X-GNOME-Bugzilla-Component=notifications
-X-GNOME-Bugzilla-Version=3.0.2
-#X-GNOME-AutoRestart=true
-NotShowIn=KDE;
diff --git a/xdg/autostart/mate-bluetooth-applet.desktop b/xdg/autostart/mate-bluetooth-applet.desktop
deleted file mode 100644
index 84fe9de2..00000000
--- a/xdg/autostart/mate-bluetooth-applet.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Bluetooth Manager
-Name[de]=Bluetooth-Verwaltung
-Name[en_GB]=Bluetooth Manager
-Name[ru]=Менеджер Bluetooth
-Name[vi]=Trình quản lí Bluetooth
-Comment=MATE Bluetooth Manager applet
-Comment[ru]=Апплет MATE Bluetooth Manager
-Icon=bluetooth
-Exec=mate-bluetooth-applet
-Terminal=false
-Type=Application
-Categories=
-OnlyShowIn=MATE;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-bluetooth
-X-MATE-Bugzilla-Component=applet
-X-MATE-Bugzilla-Version=1.6.0
diff --git a/xdg/systemd/user b/xdg/systemd/user
index 3bc1f8c6..1c75bd30 120000
--- a/xdg/systemd/user
+++ b/xdg/systemd/user
@@ -1 +1 @@
-/etc/systemd/user
\ No newline at end of file
+../../systemd/user
\ No newline at end of file