saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 24c77dfa09d1821d2e7cd2c3d2d9ae86ad6fc0d8..3dd3667a88b454899e93aa5522739f61312da195 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -419,6 +419,7 @@ maybe chmod 0644 'eselect/postgresql/.keep_app-admin_eselect-postgresql-0'
 maybe chmod 0644 'eselect/postgresql/active'
 maybe chmod 0644 'eselect/postgresql/active.links'
 maybe chmod 0644 'eselect/postgresql/active.links94'
+maybe chmod 0644 'eselect/postgresql/active.links95'
 maybe chmod 0755 'eselect/postgresql/slots'
 maybe chmod 0755 'eselect/postgresql/slots/9.4'
 maybe chmod 0644 'eselect/postgresql/slots/9.4/base'

diff --git a/csh.env b/csh.env
index a909c0a0716d7da415ad0abac23ac2d042b28004..be9216b8cd9c3db6e983cc0321d6a1082ad87517 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -13,7 +13,7 @@ setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/i
 setenv LANG 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/:/usr/share/postgresql-9.4/man/'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3'
 setenv PRELINK_PATH_MASK '/usr/lib64/klibc'

diff --git a/env.d/50postgresql b/env.d/50postgresql
index c72ad599be9c6a40123a3ad211518e795694fce3..9d97cf39fd9e413e525e8f589993dab97f59ed16 100644 (file)
--- a/env.d/50postgresql
+++ b/env.d/50postgresql
@@ -1,4 +1,4 @@
 # Configuration file for eselect
 # This file has been automatically generated.
-LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.4/lib64/"
-MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/"
+LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.5/lib64/:/usr/lib64/postgresql-9.4/lib64/"
+MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/:/usr/share/postgresql-9.4/man/"

diff --git a/eselect/postgresql/active.links95 b/eselect/postgresql/active.links95
new file mode 100644 (file)
index 0000000..8ae26ae
--- /dev/null
+++ b/eselect/postgresql/active.links95
@@ -0,0 +1,18 @@
+usr/bin/createlang95
+usr/bin/clusterdb95
+usr/bin/pg_dumpall95
+usr/bin/createuser95
+usr/bin/dropdb95
+usr/bin/droplang95
+usr/bin/createdb95
+usr/bin/oid2name95
+usr/bin/pg_dump95
+usr/bin/dropuser95
+usr/bin/vacuumlo95
+usr/bin/pg_restore95
+usr/bin/vacuumdb95
+usr/bin/pg_config95
+usr/bin/pg_isready95
+usr/bin/reindexdb95
+usr/bin/psql95
+usr/bin/ecpg95

diff --git a/ld.so.conf b/ld.so.conf
index 1876ba8961278a1d7ba488e86c58488e0ac70695..54749d5ff41e2bb75411057abede69c3ace31f0b 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -12,4 +12,5 @@
 include ld.so.conf.d/*.conf
 /usr/lib/postgresql
 /usr/lib64/postgresql
+/usr/lib64/postgresql-9.5/lib64/
 /usr/lib64/postgresql-9.4/lib64/

diff --git a/profile.env b/profile.env
index b7818800902f0d086868f1e875f34ede1abf6d51..2aa438a77c1b78edc0c9e5537fc575774be92cf4 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -13,7 +13,7 @@ export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/i
 export LANG='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/:/usr/share/postgresql-9.4/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3'
 export PRELINK_PATH_MASK='/usr/lib64/klibc'