From 04bdafb8bcc2b352adbb63592fae01d7d559ee35 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 5 Jan 2015 16:03:32 +0100
Subject: [PATCH] Current state

---
 .etckeeper                                    |   7 +-
 config-archive/etc/logrotate.conf             |   4 +-
 config-archive/etc/logrotate.conf.1           |  52 +++
 config-archive/etc/logrotate.conf.dist.new    |  43 +++
 eselect/postgresql/active.links               |   6 -
 eselect/postgresql/slots/9.3/base             |   2 +-
 eselect/postgresql/slots/9.3/docs             |   1 -
 eselect/postgresql/slots/9.3/server           |   1 -
 fonts/conf.avail/10-no-sub-pixel.conf         |   2 +-
 fonts/conf.avail/30-metric-aliases.conf       | 361 +++++++++++++++---
 fonts/conf.avail/30-urw-aliases.conf          |  24 +-
 fonts/conf.avail/45-latin.conf                |  16 +
 fonts/conf.d/10-scale-bitmap-fonts.conf       |   2 +-
 fonts/conf.d/README                           |   6 +-
 fonts/fonts.conf                              |   2 +-
 init.d/ntpd                                   |  31 +-
 init.d/pydoc-2.7                              |   8 +-
 logrotate.conf                                |  23 +-
 logrotate.conf.orig                           |  43 +++
 mc/mc.default.keymap                          |   1 +
 mc/mc.emacs.keymap                            |   1 +
 mc/mc.ext                                     |   5 +
 mc/mc.keymap                                  |   1 +
 mc/mc.menu                                    |   4 +-
 mc/mc.menu.sr                                 |   2 +-
 mc/mcedit.menu                                |   5 +-
 portage/package.use                           |   1 +
 .../.keep_dev-db_postgresql-base-9.3          |   0
 postgresql-9.3/psqlrc                         |   8 +
 29 files changed, 523 insertions(+), 139 deletions(-)
 create mode 100644 config-archive/etc/logrotate.conf.1
 create mode 100644 config-archive/etc/logrotate.conf.dist.new
 delete mode 100644 eselect/postgresql/slots/9.3/docs
 delete mode 100644 eselect/postgresql/slots/9.3/server
 create mode 100644 logrotate.conf.orig
 delete mode 100644 postgresql-9.3/.keep_dev-db_postgresql-base-9.3
 create mode 100644 postgresql-9.3/psqlrc

diff --git a/.etckeeper b/.etckeeper
index 32cbf14..d86c434 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -379,7 +379,9 @@ maybe chmod 0644 'config-archive/etc/layman/layman.cfg.dist'
 maybe chmod 0440 'config-archive/etc/ldap.conf.sudo'
 maybe chmod 0440 'config-archive/etc/ldap.conf.sudo.dist'
 maybe chmod 0644 'config-archive/etc/logrotate.conf'
+maybe chmod 0644 'config-archive/etc/logrotate.conf.1'
 maybe chmod 0644 'config-archive/etc/logrotate.conf.dist'
+maybe chmod 0644 'config-archive/etc/logrotate.conf.dist.new'
 maybe chmod 0755 'config-archive/etc/logrotate.d'
 maybe chmod 0644 'config-archive/etc/logrotate.d/clamav'
 maybe chmod 0644 'config-archive/etc/logrotate.d/clamav.dist'
@@ -808,8 +810,6 @@ maybe chmod 0644 'eselect/postgresql/active.links93'
 maybe chmod 0755 'eselect/postgresql/slots'
 maybe chmod 0755 'eselect/postgresql/slots/9.3'
 maybe chmod 0644 'eselect/postgresql/slots/9.3/base'
-maybe chmod 0644 'eselect/postgresql/slots/9.3/docs'
-maybe chmod 0644 'eselect/postgresql/slots/9.3/server'
 maybe chmod 0644 'etc-update.conf'
 maybe chmod 0755 'etckeeper'
 maybe chmod 0755 'etckeeper/commit.d'
@@ -1241,6 +1241,7 @@ maybe chmod 0644 'locale.gen'
 maybe chmod 0644 'localtime'
 maybe chmod 0644 'login.defs'
 maybe chmod 0644 'logrotate.conf'
+maybe chmod 0644 'logrotate.conf.orig'
 maybe chmod 0755 'logrotate.d'
 maybe chmod 0644 'logrotate.d/.keep_app-admin_logrotate-0'
 maybe chmod 0644 'logrotate.d/apache2'
@@ -1576,7 +1577,6 @@ maybe chmod 0640 'postfix/postgrey_whitelist_recipients'
 maybe chmod 0600 'postfix/saslpass'
 maybe chmod 0644 'postfix/smtp_auth'
 maybe chmod 0755 'postgresql-9.3'
-maybe chmod 0644 'postgresql-9.3/.keep_dev-db_postgresql-base-9.3'
 maybe chown 'postgres' 'postgresql-9.3/pg_hba.conf'
 maybe chgrp 'postgres' 'postgresql-9.3/pg_hba.conf'
 maybe chmod 0600 'postgresql-9.3/pg_hba.conf'
@@ -1586,6 +1586,7 @@ maybe chmod 0600 'postgresql-9.3/pg_ident.conf'
 maybe chown 'postgres' 'postgresql-9.3/postgresql.conf'
 maybe chgrp 'postgres' 'postgresql-9.3/postgresql.conf'
 maybe chmod 0600 'postgresql-9.3/postgresql.conf'
+maybe chmod 0644 'postgresql-9.3/psqlrc'
 maybe chmod 0644 'procmailrc'
 maybe chmod 0644 'profile'
 maybe chmod 0755 'profile.d'
diff --git a/config-archive/etc/logrotate.conf b/config-archive/etc/logrotate.conf
index 3968f20..41dfc3a 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
 #
@@ -34,7 +34,7 @@ missingok
 # 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 0000000..3968f20
--- /dev/null
+++ b/config-archive/etc/logrotate.conf.1
@@ -0,0 +1,52 @@
+# $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 4
+rotate 10
+maxage 2y
+
+# create new (empty) log files after rotating old ones
+create
+
+# use date as a suffix of the rotated file
+dateext
+
+tabooprefix	\.
+
+# uncomment this if you want your log files compressed
+compress
+
+notifempty
+#nomail
+noolddir
+
+# is it okay, if a logfile doesn't exists ?
+missingok
+
+# 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
+    size=4096K
+    rotate 12
+}
+
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 12
+}
+
+# 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 0000000..4a5184a
--- /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/eselect/postgresql/active.links b/eselect/postgresql/active.links
index 4b60381..57e4eaa 100644
--- a/eselect/postgresql/active.links
+++ b/eselect/postgresql/active.links
@@ -7,22 +7,16 @@ usr/include/postgres_ext.h
 usr/lib64/postgresql
 usr/lib64/libecpg_compat.so.3.5
 usr/lib64/libecpg_compat.so
-usr/lib64/libpgport.a
 usr/lib64/libecpg.so.6
 usr/lib64/libecpg.so.6.5
 usr/lib64/libpqwalreceiver.so
 usr/lib64/libpgtypes.so
-usr/lib64/libecpg.a
-usr/lib64/libpgcommon.a
 usr/lib64/libpgtypes.so.3.4
-usr/lib64/libpgtypes.a
 usr/lib64/libpq.so
-usr/lib64/libpq.a
 usr/lib64/libpq.so.5.6
 usr/lib64/libecpg.so
 usr/lib64/libecpg_compat.so.3
 usr/lib64/libpgtypes.so.3
-usr/lib64/libecpg_compat.a
 usr/lib64/libpq.so.5
 usr/bin/pg_ctl
 usr/bin/psql
diff --git a/eselect/postgresql/slots/9.3/base b/eselect/postgresql/slots/9.3/base
index 7d4a07f..d7f0fd8 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 41c7233..0000000
--- a/eselect/postgresql/slots/9.3/docs
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.3.5"
diff --git a/eselect/postgresql/slots/9.3/server b/eselect/postgresql/slots/9.3/server
deleted file mode 100644
index c2a9ed2..0000000
--- a/eselect/postgresql/slots/9.3/server
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.3.5"
diff --git a/fonts/conf.avail/10-no-sub-pixel.conf b/fonts/conf.avail/10-no-sub-pixel.conf
index cf12465..635847c 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 f25052a..08c8ba3 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 aae06ac..e0d45da 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 09fd526..aa62ed4 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 56049bc..c3ca696 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 c2fb52c..6a774c5 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 e2d5567..2530eef 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/init.d/ntpd b/init.d/ntpd
index a5bd1ff..1a34bb2 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/init.d/pydoc-2.7 b/init.d/pydoc-2.7
index 6f901a1..79c2374 100755
--- a/init.d/pydoc-2.7
+++ b/init.d/pydoc-2.7
@@ -1,11 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Technologies, Inc.
+# Copyright 1999-2014 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public Licence v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.4 2011/10/27 13:56:55 neurogeek Exp $
-
-depend() {
-	need net
-}
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.5 2014/10/12 12:37:07 djc Exp $
 
 start() {
 	local pydoc_port="${PYDOC2_7_PORT-${PYDOC_PORT}}"
diff --git a/logrotate.conf b/logrotate.conf
index 41dfc3a..116d4a5 100644
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -1,27 +1,26 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.6 2014/07/07 09:55:32 nimiux Exp $
 #
-# Logrotate default configuration file for Gentoo Linux
-#
-# See "man logrotate" for details
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
 
-# rotate log files weekly
+# rotate log files weekly.
 weekly
 #daily
 
-# keep 4 weeks worth of backlogs
+# keep 4 weeks worth of backlogs.
 #rotate 4
 rotate 10
 maxage 2y
 
-# create new (empty) log files after rotating old ones
+# create new (empty) log files after rotating old ones.
 create
 
-# use date as a suffix of the rotated file
+# use date as a suffix of the rotated file.
 dateext
 
 tabooprefix	\.
 
-# uncomment this if you want your log files compressed
+# compress rotated log files.
 compress
 
 notifempty
@@ -31,10 +30,10 @@ noolddir
 # is it okay, if a logfile doesn't exists ?
 missingok
 
-# packages can drop log rotation information into this directory
+# packages can drop log rotation information into this directory.
 include /etc/logrotate.d
 
-# no packages own wtmp and btmp -- we'll rotate them here
+# no packages own wtmp and btmp -- we'll rotate them here.
 /var/log/wtmp {
     monthly
     create 0664 root utmp
@@ -50,3 +49,5 @@ include /etc/logrotate.d
 }
 
 # system-specific logs may be also be configured here.
+
+# vim: ts=4 filetype=conf
diff --git a/logrotate.conf.orig b/logrotate.conf.orig
new file mode 100644
index 0000000..4a5184a
--- /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/mc/mc.default.keymap b/mc/mc.default.keymap
index f627fad..a82756f 100644
--- a/mc/mc.default.keymap
+++ b/mc/mc.default.keymap
@@ -38,6 +38,7 @@ Unselect = kpminus
 SelectInvert = kpasterisk
 ScreenList = alt-prime
 # OptionsLayout =
+# OptionsAppearance =
 # OptionsPanel =
 # OptionsConfirm =
 # OptionsDisplayBits =
diff --git a/mc/mc.emacs.keymap b/mc/mc.emacs.keymap
index 1f89773..4c43c5c 100644
--- a/mc/mc.emacs.keymap
+++ b/mc/mc.emacs.keymap
@@ -38,6 +38,7 @@ Unselect = kpminus
 SelectInvert = kpasterisk
 ScreenList = alt-prime
 # OptionsLayout =
+# OptionsAppearance =
 # OptionsPanel =
 # OptionsConfirm =
 # OptionsDisplayBits =
diff --git a/mc/mc.ext b/mc/mc.ext
index 9a4afa7..7a8a545 100644
--- a/mc/mc.ext
+++ b/mc/mc.ext
@@ -680,6 +680,11 @@ shell/i/.arc
 	Extract=arc x %f '*'
 	Extract (with flags)=I=%{Enter any Arc flags:}; if test -n "$I"; then arc x $I %f; fi
 
+# zip
+shell/i/.zip
+	Open=%cd %p/uzip://
+	View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view zip
+
 # zip
 type/i/^zip\ archive
 	Open=%cd %p/uzip://
diff --git a/mc/mc.keymap b/mc/mc.keymap
index f627fad..a82756f 100644
--- a/mc/mc.keymap
+++ b/mc/mc.keymap
@@ -38,6 +38,7 @@ Unselect = kpminus
 SelectInvert = kpasterisk
 ScreenList = alt-prime
 # OptionsLayout =
+# OptionsAppearance =
 # OptionsPanel =
 # OptionsConfirm =
 # OptionsDisplayBits =
diff --git a/mc/mc.menu b/mc/mc.menu
index 577f927..5ec140c 100644
--- a/mc/mc.menu
+++ b/mc/mc.menu
@@ -21,7 +21,7 @@ shell_patterns=0
 
 =+ f \.1$ | f \.3$ | f \.4$ | f \.5$ | f \.6$ | f \.7$ | f \.8$ | f \.man$ & t r
 1       Display the file with roff -man
-	nroff -man %f | less
+	%view{ascii,nroff} roff -c -Tlatin1 -mandoc %f
 
 2       Call the info hypertext browser
         info
@@ -121,7 +121,7 @@ D       Delete tagged files if a copy exists in the other directory.
 
 m       View manual page
 	MAN=%{Enter manual name}
-	%view man -P cat $MAN
+	%view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat $MAN
 
 = f \.gz$ & t r
 + ! t t
diff --git a/mc/mc.menu.sr b/mc/mc.menu.sr
index 6a505f4..bb8b316 100644
--- a/mc/mc.menu.sr
+++ b/mc/mc.menu.sr
@@ -102,7 +102,7 @@ D       Обриши означене датотеке ако постоји к
 
 m       Погледај страницу упутства
 	MAN=%{Унесите назив упутства}
-	%view man -P cat $MAN
+	%view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat $MAN
 
 = f \.gz$ & t r
 + ! t t
diff --git a/mc/mcedit.menu b/mc/mcedit.menu
index 3d11d96..6163c50 100644
--- a/mc/mcedit.menu
+++ b/mc/mcedit.menu
@@ -459,10 +459,7 @@ s       Invoke `shell'
 
 m       view `man'
         MAN=%{Enter name of man:}
-        TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/mcview.$MAN.XXXXXX` || exit 1
-        man -Pcat $MAN >$TMPFILE
-        mcview $TMPFILE
-        rm -f $TMPFILE
+        %view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat $MAN
 
 i       Insert a out of command to cursor.
         CMD=%{ Enter command: }
diff --git a/portage/package.use b/portage/package.use
index 370167d..e47b05a 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -31,6 +31,7 @@ dev-db/libdbi				-doc
 dev-db/libdbi-drivers			-doc
 dev-db/mysql                            extraengine profiling xtradb
 dev-db/phpmyadmin			setup
+dev-db/postgresql			server uuid xml
 dev-db/postgresql-server		uuid
 dev-db/sqlite				extensions fts3 soundex unlock-notify
 dev-db/unixODBC				odbcmanual
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 e69de29..0000000
diff --git a/postgresql-9.3/psqlrc b/postgresql-9.3/psqlrc
new file mode 100644
index 0000000..8152cac
--- /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".
+--
-- 
2.39.5