From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 5 Jan 2015 23:47:08 +0000 (+0100)
Subject: Current state
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=af0284908357422969cc86cdbee10ab847f670b5;p=config%2Fbruni%2Fetc.git

Current state
---

diff --git a/X11/xinit.d/libcanberra-gtk-module.sh b/X11/xinit.d/libcanberra-gtk-module.sh
deleted file mode 100644
index 63c16af7..00000000
--- a/X11/xinit.d/libcanberra-gtk-module.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# to be sourced
-
-case "$SESSION" in
-	GNOME)
-		# Done by gnome-settings-daemon
-		;;
-	*)
-		if [ -z "$GTK_MODULES" ] ; then
-		        GTK_MODULES="canberra-gtk-module"
-		else
-	        	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-		fi
-		export GTK_MODULES
-		;;
-esac
diff --git a/X11/xinit/xinitrc.d/40-libcanberra-gtk-module b/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
new file mode 100755
index 00000000..63c16af7
--- /dev/null
+++ b/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
@@ -0,0 +1,16 @@
+#!/bin/sh
+# to be sourced
+
+case "$SESSION" in
+	GNOME)
+		# Done by gnome-settings-daemon
+		;;
+	*)
+		if [ -z "$GTK_MODULES" ] ; then
+		        GTK_MODULES="canberra-gtk-module"
+		else
+	        	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+		fi
+		export GTK_MODULES
+		;;
+esac
diff --git a/X11/xinit/xinitrc.d/49-keychain b/X11/xinit/xinitrc.d/49-keychain
old mode 100644
new mode 100755
diff --git a/X11/xinit/xinitrc.d/50-ssh-agent b/X11/xinit/xinitrc.d/50-ssh-agent
old mode 100644
new mode 100755
diff --git a/config-archive/etc/logrotate.conf b/config-archive/etc/logrotate.conf
index b6162de9..b6b141a4 100644
--- a/config-archive/etc/logrotate.conf
+++ b/config-archive/etc/logrotate.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.3 2008/12/24 20:49:10 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $
 #
 # Logrotate default configuration file for Gentoo Linux
 #
@@ -35,7 +35,7 @@ noolddir
 # packages can drop log rotation information into this directory
 include /etc/logrotate.d
 
-# no packages own lastlog or wtmp -- we'll rotate them here
+# no packages own wtmp and btmp -- we'll rotate them here
 /var/log/wtmp {
     monthly
     create 0664 root utmp
diff --git a/config-archive/etc/logrotate.conf.1 b/config-archive/etc/logrotate.conf.1
new file mode 100644
index 00000000..b6162de9
--- /dev/null
+++ b/config-archive/etc/logrotate.conf.1
@@ -0,0 +1,53 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.3 2008/12/24 20:49:10 dang Exp $
+#
+# Logrotate default configuration file for Gentoo Linux
+#
+# See "man logrotate" for details
+
+# rotate log files weekly
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs
+rotate 10
+maxage 2y
+
+# create new (empty) log files after rotating old ones
+create
+
+tabooprefix	\.
+
+# use date as a suffix of the rotated file
+dateext
+
+# do not rotate, if the file is empty
+notifempty
+
+# uncomment this if you want your log files compressed
+compress
+
+# is it okay, if a logfile doesn't exists ?
+missingok
+
+#nomail
+noolddir
+
+# packages can drop log rotation information into this directory
+include /etc/logrotate.d
+
+# no packages own lastlog or wtmp -- we'll rotate them here
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+    rotate 12
+    size=4096K
+}
+
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
+# system-specific logs may be also be configured here.
diff --git a/config-archive/etc/logrotate.conf.dist.new b/config-archive/etc/logrotate.conf.dist.new
new file mode 100644
index 00000000..4a5184a1
--- /dev/null
+++ b/config-archive/etc/logrotate.conf.dist.new
@@ -0,0 +1,43 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $
+#
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
+
+# rotate log files weekly.
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs.
+rotate 4
+
+# create new (empty) log files after rotating old ones.
+create
+
+# use date as a suffix of the rotated file.
+dateext
+
+# compress rotated log files.
+compress
+
+notifempty
+nomail
+noolddir
+
+# packages can drop log rotation information into this directory.
+include /etc/logrotate.d
+
+# no packages own wtmp and btmp -- we'll rotate them here.
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+    minsize 1M
+    rotate 1
+}
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
+# system-specific logs may be also be configured here.
diff --git a/dbus-1/system.d/org.freedesktop.machine1.conf b/dbus-1/system.d/org.freedesktop.machine1.conf
index 3a77c70b..ac1aee85 100644
--- a/dbus-1/system.d/org.freedesktop.machine1.conf
+++ b/dbus-1/system.d/org.freedesktop.machine1.conf
@@ -42,15 +42,19 @@
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Manager"
-                       send_member="GetMachineAddresses"/>
+                       send_member="GetMachine"/>
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Manager"
-                       send_member="GetMachine"/>
+                       send_member="GetMachineByPID"/>
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Manager"
-                       send_member="GetMachineByPID"/>
+                       send_member="GetMachineAddresses"/>
+
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Manager"
+                       send_member="GetMachineOSRelease"/>
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Machine"
@@ -58,7 +62,7 @@
 
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Machine"
-                       send_member="GetMachineOSRelease"/>
+                       send_member="GetOSRelease"/>
 
                 <allow receive_sender="org.freedesktop.machine1"/>
         </policy>
diff --git a/dbus-1/system.d/org.freedesktop.resolve1.conf b/dbus-1/system.d/org.freedesktop.resolve1.conf
new file mode 100644
index 00000000..25b09774
--- /dev/null
+++ b/dbus-1/system.d/org.freedesktop.resolve1.conf
@@ -0,0 +1,27 @@
+<?xml version="1.0"?> <!--*-nxml-*-->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<!--
+  This file is part of systemd.
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+-->
+
+<busconfig>
+
+        <policy user="systemd-resolve">
+                <allow own="org.freedesktop.resolve1"/>
+                <allow send_destination="org.freedesktop.resolve1"/>
+                <allow receive_sender="org.freedesktop.resolve1"/>
+        </policy>
+
+        <policy context="default">
+                <allow send_destination="org.freedesktop.resolve1"/>
+                <allow receive_sender="org.freedesktop.resolve1"/>
+        </policy>
+
+</busconfig>
diff --git a/dbus-1/system.d/org.freedesktop.systemd1.conf b/dbus-1/system.d/org.freedesktop.systemd1.conf
index 9dfca81c..3e138252 100644
--- a/dbus-1/system.d/org.freedesktop.systemd1.conf
+++ b/dbus-1/system.d/org.freedesktop.systemd1.conf
@@ -28,6 +28,8 @@
         <policy context="default">
                 <deny send_destination="org.freedesktop.systemd1"/>
 
+                <!-- Completely open to anyone -->
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.DBus.Introspectable"/>
 
@@ -94,6 +96,112 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="GetDefaultTarget"/>
 
+                <!-- Managed via polkit or other criteria -->
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="StartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="StartUnitReplace"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="StopUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ReloadUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="RestartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="TryRestartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ReloadOrRestartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ReloadOrTryRestartUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="KillUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ResetFailedUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="SetUnitProperties"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="StartTransientUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="CancelJob"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="Reload"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="Reexecute"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="EnableUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="DisableUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ReenableUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="LinkUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="PresetUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="PresetUnitFilesWithMode"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="MaskUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="UnmaskUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="SetDefaultTarget"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="PresetAllUnitFiles"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Job"
+                       send_member="Cancel"/>
+
                 <allow receive_sender="org.freedesktop.systemd1"/>
         </policy>
 
diff --git a/eselect/postgresql/active.links b/eselect/postgresql/active.links
index d34088b1..de418bbf 100644
--- a/eselect/postgresql/active.links
+++ b/eselect/postgresql/active.links
@@ -9,8 +9,6 @@ usr/lib64/libecpg_compat.so.3
 usr/lib64/libpgtypes.so.3
 usr/lib64/libpq.so.5
 usr/lib64/libpgtypes.so.3.4
-usr/lib64/libpgport.a
-usr/lib64/libecpg.a
 usr/lib64/libecpg_compat.so.3.5
 usr/lib64/libecpg.so.6
 usr/lib64/libecpg.so
@@ -18,10 +16,6 @@ usr/lib64/libpq.so
 usr/lib64/libpq.so.5.6
 usr/lib64/libpgtypes.so
 usr/lib64/libecpg.so.6.5
-usr/lib64/libpgtypes.a
-usr/lib64/libpq.a
-usr/lib64/libecpg_compat.a
-usr/lib64/libpgcommon.a
 usr/lib64/libecpg_compat.so
 usr/bin/pg_isready
 usr/bin/droplang
diff --git a/eselect/postgresql/slots/9.3/base b/eselect/postgresql/slots/9.3/base
index 7d4a07f9..d7f0fd83 100644
--- a/eselect/postgresql/slots/9.3/base
+++ b/eselect/postgresql/slots/9.3/base
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.3.5"
+postgres_ebuilds="${postgres_ebuilds} postgresql-9.3.5-r2"
diff --git a/eselect/postgresql/slots/9.3/docs b/eselect/postgresql/slots/9.3/docs
deleted file mode 100644
index 41c72331..00000000
--- a/eselect/postgresql/slots/9.3/docs
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.3.5"
diff --git a/fonts/conf.avail/10-no-sub-pixel.conf b/fonts/conf.avail/10-no-sub-pixel.conf
index cf124656..635847c4 100644
--- a/fonts/conf.avail/10-no-sub-pixel.conf
+++ b/fonts/conf.avail/10-no-sub-pixel.conf
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-<!--  Enable sub-pixel rendering --> 
+<!--  Disable sub-pixel rendering --> 
   <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf
index f25052a2..08c8ba32 100644
--- a/fonts/conf.avail/30-metric-aliases.conf
+++ b/fonts/conf.avail/30-metric-aliases.conf
@@ -2,57 +2,49 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
-	<!-- Alias similar/metric-compatible families from various sources:
-
-		PostScript fonts:
-			Helvetica
-			Times
-			Courier
-		URW fonts:
-			Nimbus Sans L
-			Nimbus Roman No9 L
-			Nimbus Mono L
-
-		Microsoft fonts:
-			Arial
-			Arial Narrow
-			Times New Roman
-			Courier New
-		Liberation fonts:
-			Liberation Sans
-			Liberation Sans Narrow
-			Liberation Serif
-			Liberation Mono
-		StarOffice fonts:
-			Albany
-			Thorndale
-			Cumberland
-		AMT fonts:
-			Albany AMT
-			Thorndale AMT
-			Cumberland AMT
-		Google CrOS Core fonts:
-			Arimo
-			Cousine
-			Tinos
-
-	     Of these, URW fonts are design compatible with PostScrict fonts,
-	     and the Liberation, StarOffice, AMT and CrOS Core ones are
-	     compatible with Microsoft fonts.
-
-	     We want for each of them to fallback to any of these
-	     available, but in an order preferring similar designs
-	     first.  We do this in three steps:
-
-		1) Alias each specific to it's generic family.
-		   eg. Liberation Sans to Arial
-
-		2) Weak alias each generic to the other generic of its family.
-		   eg. Arial to Helvetica
-
-		3) Alias each generic to its specifics.
-		   eg. Arial to Liberation Sans, Albany, and Albany AMT
-	-->
+<!--
+
+Alias similar/metric-compatible families from various sources:
+
+PostScript fonts:       URW fonts:            GUST fonts:        Windows fonts:
+======================  ====================  =================  ==================
+Helvetica               Nimbus Sans L         TeX Gyre Heros
+Helvetica Condensed                           TeX Gyre Heros Cn
+Times                   Nimbus Roman No9 L    TeX Gyre Termes
+Courier                 Nimbus Mono L         TeX Gyre Cursor
+ITC Avant Garde Gothic  URW Gothic L          TeX Gyre Adventor
+ITC Bookman             URW Bookman L         TeX Gyre Bonum     Bookman Old Style
+ITC Zapf Chancery       URW Chancery L        TeX Gyre Chorus
+Palatino                URW Palladio L        TeX Gyre Pagella   Palatino Linotype
+New Century Schoolbook  Century Schoolbook L  TeX Gyre Schola    Century Schoolbook
+
+Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fonts:  AMT fonts:
+================  ======================  =======================  =================  ==============
+Arial             Liberation Sans         Arimo                    Albany             Albany AMT
+Arial Narrow      Liberation Sans Narrow
+Times New Roman   Liberation Serif        Tinos                    Thorndale          Thorndale AMT
+Courier New       Liberation Mono         Cousine                  Cumberland         Cumberland AMT
+Cambria                                   Caladea
+Calibri                                   Carlito
+Symbol                                    SymbolNeu
+
+Microsoft fonts:  Other fonts:
+================  ============
+Georgia           Gelasio
+
+We want for each of them to fallback to any of these available,
+but in an order preferring similar designs first.  We do this in three steps:
+
+1) Alias each specific to its generic family.
+   e.g. Liberation Sans to Arial
+
+2) Weak alias each generic to the other generic of its family.
+   e.g. Arial to Helvetica
+
+3) Alias each generic to its specifics.
+   e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
+
+-->
 
 <!-- Map specifics to generics -->
 
@@ -64,6 +56,20 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>TeX Gyre Heros</family>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Heros Cn</family>
+	  <default>
+	  <family>Helvetica Condensed</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>Nimbus Roman No9 L</family>
 	  <default>
@@ -71,6 +77,16 @@
 	  </default>
 	</alias>
 
+<!--
+     Due to Bug#73291, commented out those lines until the broken font are fixed.
+	<alias binding="same">
+	  <family>TeX Gyre Termes</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+-->
+
 	<alias binding="same">
 	  <family>Nimbus Mono L</family>
 	  <default>
@@ -78,6 +94,125 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>TeX Gyre Cursor</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Avant Garde</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Gothic L</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Adventor</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Bookman L</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Bonum</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman Old Style</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Zapf Chancery</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Chancery L</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Chorus</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Palladio L</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Pagella</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palatino Linotype</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century Schoolbook L</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Schola</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century Schoolbook</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
 
 	<!-- Microsoft -->
 	<alias binding="same">
@@ -171,10 +306,35 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Gelasio</family>
+	  <default>
+	  <family>Georgia</family>
+	  </default>
+	</alias>
 
+	<alias binding="same">
+	  <family>Caladea</family>
+	  <default>
+	  <family>Cambria</family>
+	  </default>
+	</alias>
 
-<!-- Accept the other group as fallback -->
+	<alias binding="same">
+	  <family>Carlito</family>
+	  <default>
+	  <family>Calibri</family>
+	  </default>
+	</alias>
 
+	<alias binding="same">
+	  <family>SymbolNeu</family>
+	  <default>
+	  <family>Symbol</family>
+	  </default>
+  </alias>
+
+<!-- Accept the other group as fallback -->
 
 	<!-- PostScript -->
 	<alias>
@@ -184,6 +344,13 @@
 	  </default>
 	</alias>
 
+	<alias>
+	  <family>Helvetica Condensed</family>
+	  <default>
+	  <family>Arial Narrow</family>
+	  </default>
+	</alias>
+
 	<alias>
 	  <family>Times</family>
 	  <default>
@@ -207,6 +374,13 @@
 	  </default>
 	</alias>
 
+	<alias>
+	  <family>Arial Narrow</family>
+	  <default>
+	  <family>Helvetica Condensed</family>
+	  </default>
+	</alias>
+
 	<alias>
 	  <family>Times New Roman</family>
 	  <default>
@@ -225,18 +399,29 @@
 
 <!-- Map generics to specifics -->
 
-
 	<!-- PostScript -->
 	<alias binding="same">
 	  <family>Helvetica</family>
 	  <accept>
+	  <family>TeX Gyre Heros</family>
 	  <family>Nimbus Sans L</family>
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>Helvetica Condensed</family>
+	  <accept>
+	  <family>TeX Gyre Heros Cn</family>
+	  </accept>
+	</alias>
+
 	<alias binding="same">
 	  <family>Times</family>
 	  <accept>
+<!--
+     Due to Bug#73291, commented out this line until the broken font are fixed.
+	  <family>TeX Gyre Termes</family>
+-->
 	  <family>Nimbus Roman No9 L</family>
 	  </accept>
 	</alias>
@@ -244,10 +429,53 @@
 	<alias binding="same">
 	  <family>Courier</family>
 	  <accept>
+	  <family>TeX Gyre Cursor</family>
 	  <family>Nimbus Mono L</family>
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>ITC Avant Garde Gothic</family>
+	  <accept>
+	  <family>TeX Gyre Adventor</family>
+	  <family>URW Gothic L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Bookman</family>
+	  <accept>
+	  <family>Bookman Old Style</family>
+	  <family>TeX Gyre Bonum</family>
+	  <family>URW Bookman L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Zapf Chancery</family>
+	  <accept>
+	  <family>TeX Gyre Chorus</family>
+	  <family>URW Chancery L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palatino</family>
+	  <accept>
+	  <family>Palatino Linotype</family>
+	  <family>TeX Gyre Pagella</family>
+	  <family>URW Palladio L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>New Century Schoolbook</family>
+	  <accept>
+	  <family>Century Schoolbook</family>
+	  <family>TeX Gyre Schola</family>
+	  <family>Century Schoolbook L</family>
+	  </accept>
+	</alias>
 
 	<!-- Microsoft -->
 	<alias binding="same">
@@ -287,5 +515,32 @@
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>Georgia</family>
+	  <accept>
+	    <family>Gelasio</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Cambria</family>
+	  <accept>
+	    <family>Caladea</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Calibri</family>
+	  <accept>
+	    <family>Carlito</family>
+	  </accept>
+  </alias>
+
+	<alias binding="same">
+	  <family>Symbol</family>
+	  <accept>
+	    <family>SymbolNeu</family>
+	  </accept>
+  </alias>
 
 </fontconfig>
diff --git a/fonts/conf.avail/30-urw-aliases.conf b/fonts/conf.avail/30-urw-aliases.conf
index aae06acd..e0d45da8 100644
--- a/fonts/conf.avail/30-urw-aliases.conf
+++ b/fonts/conf.avail/30-urw-aliases.conf
@@ -3,30 +3,14 @@
 <fontconfig>
 <!--
   URW provides metric and shape compatible fonts for some Adobe families.
-  Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
+  Most of these are handled in 30-metric-aliases.conf.
   -->
 	<alias binding="same">
-	  <family>Avant Garde</family>
-	  <accept><family>URW Gothic L</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Bookman</family>
-	  <accept><family>URW Bookman L</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>New Century Schoolbook</family>
-	  <accept><family>Century Schoolbook L</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Palatino</family>
-	  <accept><family>URW Palladio L</family></accept>
-	</alias>
-	<alias binding="same">
-	  <family>Zapf Chancery</family>
-	  <accept><family>URW Chancery L</family></accept>
+	  <family>Zapf Dingbats</family>
+	  <accept><family>Dingbats</family></accept>
 	</alias>
 	<alias binding="same">
-	  <family>Zapf Dingbats</family>
+	  <family>ITC Zapf Dingbats</family>
 	  <accept><family>Dingbats</family></accept>
 	</alias>
 	<match target="pattern">
diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf
index 09fd5265..aa62ed42 100644
--- a/fonts/conf.avail/45-latin.conf
+++ b/fonts/conf.avail/45-latin.conf
@@ -45,6 +45,22 @@
 		<family>Thorndale</family>
 		<default><family>serif</family></default>
 	</alias>
+	<alias>
+		<family>Georgia</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Garamond</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Palatino Linotype</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Trebuchet MS</family>
+		<default><family>serif</family></default>
+	</alias>
 <!--
   Sans-serif faces
  -->
diff --git a/fonts/conf.d/10-scale-bitmap-fonts.conf b/fonts/conf.d/10-scale-bitmap-fonts.conf
index 56049bc6..c3ca696b 120000
--- a/fonts/conf.d/10-scale-bitmap-fonts.conf
+++ b/fonts/conf.d/10-scale-bitmap-fonts.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
\ No newline at end of file
+../conf.avail/10-scale-bitmap-fonts.conf
\ No newline at end of file
diff --git a/fonts/conf.d/README b/fonts/conf.d/README
index c2fb52c3..6a774c5d 100644
--- a/fonts/conf.d/README
+++ b/fonts/conf.d/README
@@ -2,9 +2,9 @@ conf.d/README
 
 Each file in this directory is a fontconfig configuration file.  Fontconfig
 scans this directory, loading all files of the form [0-9][0-9]*.conf.
-These files are normally installed in ../conf.avail and then symlinked here,
-allowing them to be easily installed and then enabled/disabled by adjusting
-the symlinks.
+These files are normally installed in /usr/share/fontconfig/conf.avail
+and then symlinked here, allowing them to be easily installed and then
+enabled/disabled by adjusting the symlinks.
 
 The files are loaded in numeric order, the structure of the configuration
 has led to the following conventions in usage:
diff --git a/fonts/fonts.conf b/fonts/fonts.conf
index e2d5567f..2530eef0 100644
--- a/fonts/fonts.conf
+++ b/fonts/fonts.conf
@@ -68,7 +68,7 @@
 <!--
   Load local system customization file
 -->
-	<include ignore_missing="yes">/etc/fonts/conf.d</include>
+	<include ignore_missing="yes">conf.d</include>
 
 <!-- Font cache directory list -->
 
diff --git a/group b/group
index 3a62aaab..ca948a1a 100644
--- a/group
+++ b/group
@@ -80,3 +80,6 @@ systemd-bus-proxy:x:977:
 systemd-network:x:976:
 systemd-resolve:x:975:
 systemd-timesync:x:974:
+systemd-journal-gateway:x:973:
+systemd-journal-remote:x:972:
+systemd-journal-upload:x:971:
diff --git a/group- b/group-
index 02222326..49c1e795 100644
--- a/group-
+++ b/group-
@@ -79,3 +79,6 @@ input:x:978:
 systemd-bus-proxy:x:977:
 systemd-network:x:976:
 systemd-resolve:x:975:
+systemd-timesync:x:974:
+systemd-journal-gateway:x:973:
+systemd-journal-remote:x:972:
diff --git a/gshadow b/gshadow
index ced083f9..3e365c10 100644
--- a/gshadow
+++ b/gshadow
@@ -78,3 +78,6 @@ systemd-bus-proxy:!::
 systemd-network:!::
 systemd-resolve:!::
 systemd-timesync:!::
+systemd-journal-gateway:!::
+systemd-journal-remote:!::
+systemd-journal-upload:!::
diff --git a/gshadow- b/gshadow-
index 2527ca8d..8fd0b688 100644
--- a/gshadow-
+++ b/gshadow-
@@ -77,3 +77,6 @@ input:!::
 systemd-bus-proxy:!::
 systemd-network:!::
 systemd-resolve:!::
+systemd-timesync:!::
+systemd-journal-gateway:!::
+systemd-journal-remote:!::
diff --git a/hp/hplip.conf b/hp/hplip.conf
index a747a354..1b05a738 100644
--- a/hp/hplip.conf
+++ b/hp/hplip.conf
@@ -1,15 +1,15 @@
 # hplip.conf.  Generated from hplip.conf.in by configure.
 
 [hplip]
-version=3.14.1
+version=3.14.10
 
 [dirs]
 home=/usr/share/hplip
 run=/var/run
 ppd=/usr/share/ppd/HP
 ppdbase=/usr/share/ppd
-doc=/usr/share/doc/hplip-3.14.1
-html=/usr/share/doc/hplip-3.14.1/html
+doc=/usr/share/doc/hplip-3.14.10
+html=/usr/share/doc/hplip-3.14.10/html
 icon=/usr/share/applications
 cupsbackend=/usr/libexec/cups/backend
 cupsfilter=/usr/libexec/cups/filter
@@ -35,14 +35,13 @@ foomatic-rip-hplip-install=no
 hpcups-install=yes
 cups-drv-install=yes
 cups-ppd-install=no
-internal-tag=3.14.1
+internal-tag=3.14.10
 restricted-build=no
 ui-toolkit=qt4
 qt3=no
 qt4=yes
 policy-kit=yes
 lite-build=no
-udev-acl-rules=no
 udev_sysfs_rules=no
 hpcups-only-build=no
 hpijs-only-build=no
diff --git a/init.d/ntpd b/init.d/ntpd
index a5bd1ffc..1a34bb2f 100755
--- a/init.d/ntpd
+++ b/init.d/ntpd
@@ -1,36 +1,23 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.24 2010/07/18 21:53:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc-r1,v 1.2 2014/12/23 17:43:25 floppym Exp $
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="-p ${pidfile} ${NTPD_OPTS}"
+start_stop_daemon_args="--pidfile ${pidfile}"
 
 depend() {
 	use net dns logger
 	after ntp-client
 }
 
-checkconfig() {
+start_pre() {
 	if [ ! -f /etc/ntp.conf ] ; then
 		eerror "Please create /etc/ntp.conf"
-		eerror "Sample conf: /usr/share/ntp/ntp.conf"
 		return 1
 	fi
 	return 0
 }
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting ntpd"
-	start-stop-daemon --start --exec /usr/sbin/ntpd \
-	    --pidfile /var/run/ntpd.pid \
-	    -- -p /var/run/ntpd.pid ${NTPD_OPTS}
-	eend $? "Failed to start ntpd"
-}
-
-stop() {
-	ebegin "Stopping ntpd"
-	start-stop-daemon --stop \
-		--pidfile /var/run/ntpd.pid \
-		--exec /usr/sbin/ntpd
-	eend $? "Failed to stop ntpd"
-}
diff --git a/logrotate.conf.orig b/logrotate.conf.orig
new file mode 100644
index 00000000..4a5184a1
--- /dev/null
+++ b/logrotate.conf.orig
@@ -0,0 +1,43 @@
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $
+#
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
+
+# rotate log files weekly.
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs.
+rotate 4
+
+# create new (empty) log files after rotating old ones.
+create
+
+# use date as a suffix of the rotated file.
+dateext
+
+# compress rotated log files.
+compress
+
+notifempty
+nomail
+noolddir
+
+# packages can drop log rotation information into this directory.
+include /etc/logrotate.d
+
+# no packages own wtmp and btmp -- we'll rotate them here.
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+    minsize 1M
+    rotate 1
+}
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
+# system-specific logs may be also be configured here.
diff --git a/pam.d/systemd-user b/pam.d/systemd-user
index 7b57dbf7..8112d746 100644
--- a/pam.d/systemd-user
+++ b/pam.d/systemd-user
@@ -1,8 +1,6 @@
-#%PAM-1.0
+# This file is part of systemd.
+#
+# Used by systemd --user instances.
 
-# Used by systemd when launching systemd user instances.
-
-account include system-auth
-session include system-auth
-auth required pam_deny.so
-password required pam_deny.so
+account  include system-auth
+session  include system-auth
diff --git a/passwd b/passwd
index 7fd3f711..ac806add 100644
--- a/passwd
+++ b/passwd
@@ -62,3 +62,6 @@ systemd-bus-proxy:x:124:977:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-network:x:125:976:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-resolve:x:126:975:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-timesync:x:127:974:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-gateway:x:128:973:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-remote:x:129:972:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-upload:x:130:971:added by portage for systemd:/dev/null:/sbin/nologin
diff --git a/passwd- b/passwd-
index cfc4cc17..0eaa4630 100644
--- a/passwd-
+++ b/passwd-
@@ -61,3 +61,6 @@ dhcp:x:122:979:added by portage for dhcp:/var/lib/dhcp:/sbin/nologin
 systemd-bus-proxy:x:124:977:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-network:x:125:976:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-resolve:x:126:975:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-timesync:x:127:974:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-gateway:x:128:973:added by portage for systemd:/dev/null:/sbin/nologin
+systemd-journal-remote:x:129:972:added by portage for systemd:/dev/null:/sbin/nologin
diff --git a/php/apache2-php5.5/php.ini b/php/apache2-php5.5/php.ini
index 717f4f95..8d5ae6c1 100644
--- a/php/apache2-php5.5/php.ini
+++ b/php/apache2-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
diff --git a/php/cgi-php5.5/php.ini b/php/cgi-php5.5/php.ini
index 717f4f95..8d5ae6c1 100644
--- a/php/cgi-php5.5/php.ini
+++ b/php/cgi-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
diff --git a/php/cli-php5.5/php.ini b/php/cli-php5.5/php.ini
index 717f4f95..8d5ae6c1 100644
--- a/php/cli-php5.5/php.ini
+++ b/php/cli-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
diff --git a/php/embed-php5.5/php.ini b/php/embed-php5.5/php.ini
index 717f4f95..8d5ae6c1 100644
--- a/php/embed-php5.5/php.ini
+++ b/php/embed-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
diff --git a/php/fpm-php5.5/php.ini b/php/fpm-php5.5/php.ini
index 717f4f95..8d5ae6c1 100644
--- a/php/fpm-php5.5/php.ini
+++ b/php/fpm-php5.5/php.ini
@@ -293,20 +293,17 @@ serialize_precision = 17
 
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; or per-virtualhost web server configuration file.
 ; http://php.net/open-basedir
 ;open_basedir =
 
 ; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of function names.
 ; http://php.net/disable-functions
 disable_functions =
 
 ; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
+; It receives a comma-delimited list of class names.
 ; http://php.net/disable-classes
 disable_classes =
 
@@ -1005,7 +1002,7 @@ smtp_port = 25
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
+; the 5th parameter to mail().
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
diff --git a/portage/package.use b/portage/package.use
index f43c731d..e2f93a8f 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -56,6 +56,7 @@ dev-cpp/gtkmm				accessibility
 dev-db/libdbi				-doc
 dev-db/libdbi-drivers			-doc
 dev-db/mysql				cluster extraengine profiling xtradb
+dev-db/postgresql			-server uuid xml
 dev-db/sqlite				extensions fts3 secure-delete soundex unlock-notify
 dev-db/unixODBC				odbcmanual
 
@@ -79,6 +80,7 @@ dev-libs/libgcrypt			idea static-libs
 dev-libs/libpeas			-python_targets_python3_3
 dev-libs/libusb				-doc
 dev-libs/openssl			rfc3779
+dev-libs/ossp-uuid			-php
 dev-libs/STLport			boost
 
 dev-perl/Catalyst-Action-REST		php xml config-general data-taxi freezethaw json
@@ -258,7 +260,7 @@ net-misc/ntp				parse-clocks -zeroconf
 net-misc/openssh			-X509 sftplogging
 net-misc/openvpn			down-root eurephia iproute2 passwordsave
 net-misc/rdesktop			rdpusb
-net-misc/spice-gtk			-pulseaudio
+net-misc/spice-gtk			-pulseaudio usbredir
 # net-misc/vnc				server
 net-misc/vpnc				hybrid-auth
 
diff --git a/postgresql-9.3/.keep_dev-db_postgresql-base-9.3 b/postgresql-9.3/.keep_dev-db_postgresql-base-9.3
deleted file mode 100644
index e69de29b..00000000
diff --git a/postgresql-9.3/psqlrc b/postgresql-9.3/psqlrc
new file mode 100644
index 00000000..8152cace
--- /dev/null
+++ b/postgresql-9.3/psqlrc
@@ -0,0 +1,8 @@
+--
+--	system-wide psql configuration file
+--
+--  This file is read before the .psqlrc file in the user's home directory.
+--
+--  Copy this to your installation's sysconf directory and rename it psqlrc.
+--  The sysconf directory can be identified via "pg_config --sysconfdir".
+--
diff --git a/shadow b/shadow
index 28bbc24a..76c6b409 100644
--- a/shadow
+++ b/shadow
@@ -61,3 +61,6 @@ systemd-bus-proxy:!:16398::::::
 systemd-network:!:16398::::::
 systemd-resolve:!:16398::::::
 systemd-timesync:!:16398::::::
+systemd-journal-gateway:!:16440::::::
+systemd-journal-remote:!:16440::::::
+systemd-journal-upload:!:16440::::::
diff --git a/shadow- b/shadow-
index 7716051e..4f949ee4 100644
--- a/shadow-
+++ b/shadow-
@@ -60,3 +60,6 @@ dhcp:!:16237::::::
 systemd-bus-proxy:!:16398::::::
 systemd-network:!:16398::::::
 systemd-resolve:!:16398::::::
+systemd-timesync:!:16398::::::
+systemd-journal-gateway:!:16440::::::
+systemd-journal-remote:!:16440::::::
diff --git a/systemd/journal-upload.conf b/systemd/journal-upload.conf
new file mode 100644
index 00000000..d2610278
--- /dev/null
+++ b/systemd/journal-upload.conf
@@ -0,0 +1,5 @@
+[Upload]
+# URL=
+# ServerKeyFile=/etc/ssl/private/journal-upload.pem
+# ServerCertificateFile=/etc/ssl/certs/journal-upload.pem
+# TrustedCertificateFile=/etc/ssl/ca/trusted.pem
diff --git a/systemd/journald.conf b/systemd/journald.conf
index cded4a9d..2073f1bf 100644
--- a/systemd/journald.conf
+++ b/systemd/journald.conf
@@ -23,7 +23,7 @@
 #RuntimeMaxFileSize=
 #MaxRetentionSec=
 #MaxFileSec=1month
-#ForwardToSyslog=yes
+#ForwardToSyslog=no
 #ForwardToKMsg=no
 #ForwardToConsole=no
 #ForwardToWall=yes
diff --git a/systemd/resolved.conf b/systemd/resolved.conf
index e3165987..0b2e0f2b 100644
--- a/systemd/resolved.conf
+++ b/systemd/resolved.conf
@@ -8,4 +8,6 @@
 # See resolved.conf(5) for details
 
 [Resolve]
-#DNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
+#DNS=
+#FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
+#LLMNR=yes
diff --git a/systemd/system/sysinit.target.wants/systemd-timesyncd.service b/systemd/system/sysinit.target.wants/systemd-timesyncd.service
new file mode 120000
index 00000000..f10f26ed
--- /dev/null
+++ b/systemd/system/sysinit.target.wants/systemd-timesyncd.service
@@ -0,0 +1 @@
+../../../../usr/lib/systemd/system/systemd-timesyncd.service
\ No newline at end of file
diff --git a/systemd/timesyncd.conf b/systemd/timesyncd.conf
index 6e9ed9e9..d2130f90 100644
--- a/systemd/timesyncd.conf
+++ b/systemd/timesyncd.conf
@@ -8,4 +8,5 @@
 # See timesyncd.conf(5) for details
 
 [Time]
-#Servers=0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org
+#NTP=
+#FallbackNTP=0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org
diff --git a/udev/hwdb.bin b/udev/hwdb.bin
index b57718aa..80175bce 100644
Binary files a/udev/hwdb.bin and b/udev/hwdb.bin differ
diff --git a/udev/udev.conf b/udev/udev.conf
index f39253eb..47d14330 100644
--- a/udev/udev.conf
+++ b/udev/udev.conf
@@ -1,3 +1,3 @@
-# see udev(7) for details
+# see udev.conf(5) for details
 
 #udev_log="info"