saving uncommitted changes in /etc prior to emerge run

diff --git a/csh.env b/csh.env
index 9737598ce7c15e44b72ec356292bdb3fc0eeea3a..564ff12737e897c65d3d18905de7cf74ba60089a 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -29,7 +29,7 @@ setenv LC_TIME 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
 setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar'
-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:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/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:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/:/usr/share/postgresql-9.4/man/'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv OPENGL_PROFILE 'xorg-x11'
 setenv PAGER '/usr/bin/less'

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..894eb5e
--- /dev/null
+++ b/eselect/postgresql/active.links95
@@ -0,0 +1,18 @@
+usr/bin/pg_isready95
+usr/bin/droplang95
+usr/bin/pg_dump95
+usr/bin/pg_restore95
+usr/bin/pg_config95
+usr/bin/vacuumlo95
+usr/bin/dropuser95
+usr/bin/pg_dumpall95
+usr/bin/oid2name95
+usr/bin/reindexdb95
+usr/bin/vacuumdb95
+usr/bin/createlang95
+usr/bin/createdb95
+usr/bin/createuser95
+usr/bin/psql95
+usr/bin/ecpg95
+usr/bin/clusterdb95
+usr/bin/dropdb95

diff --git a/ld.so.conf b/ld.so.conf
index 186788d6f3f36c95ceea93e7197e324971bd5cc1..75d393cdff2bf3ab73499b492adc2f856d020cd3 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -14,6 +14,7 @@ include ld.so.conf.d/*.conf
 /usr/lib64/qt4
 /usr/lib/postgresql
 /usr/lib64/postgresql
+/usr/lib64/postgresql-9.5/lib64/
 /usr/lib64/postgresql-9.4/lib64/
 /usr/lib64/sidplay/builders
 /usr/lib/sidplay/builders

diff --git a/profile.env b/profile.env
index 3a096d08d7f60b5e2dd969da8e6a7482c118acaa..3f0309e8086f1293391d93bfeb4ace9de2b6b966 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -29,7 +29,7 @@ export LC_TIME='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
 export LIBBLURAY_CP='/usr/share/libbluray/lib/libbluray.jar'
-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:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/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:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/:/usr/share/postgresql-9.4/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export OPENGL_PROFILE='xorg-x11'
 export PAGER='/usr/bin/less'