From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Fri, 11 Mar 2016 08:52:28 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=cc9be660ac2fa1c6b645cb1d7b25c6523b7c83e0;p=config%2Fsamara%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/env.d/50postgresql b/env.d/50postgresql
index 9d97cf3..41ce189 100644
--- 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.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/"
+LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.5/lib64/"
+MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/"
diff --git a/eselect/postgresql/active b/eselect/postgresql/active
index 0359f24..592f36e 100644
--- a/eselect/postgresql/active
+++ b/eselect/postgresql/active
@@ -1 +1 @@
-9.4
+9.5
diff --git a/eselect/postgresql/active.links b/eselect/postgresql/active.links
index a17fc2e..ed7bafb 100644
--- a/eselect/postgresql/active.links
+++ b/eselect/postgresql/active.links
@@ -6,22 +6,21 @@ usr/include/libpq
 usr/include/postgres_ext.h
 usr/lib64/postgresql
 usr/lib64/libecpg_compat.so.3
-usr/lib64/libpq.so.5.7
 usr/lib64/libpq.so
-usr/lib64/libecpg.so.6.6
 usr/lib64/libecpg_compat.so
-usr/lib64/libpgtypes.so.3.5
 usr/lib64/libpgtypes.so
-usr/lib64/libecpg_compat.so.3.6
+usr/lib64/libecpg.so.6.7
 usr/lib64/libecpg.so
+usr/lib64/libpgtypes.so.3.6
+usr/lib64/libecpg_compat.so.3.7
 usr/lib64/libecpg.so.6
 usr/lib64/libpq.so.5
 usr/lib64/libpgtypes.so.3
+usr/lib64/libpq.so.5.8
 usr/bin/pg_dumpall
 usr/bin/dropdb
 usr/bin/createlang
 usr/bin/pg_isready
-usr/bin/pgbench
 usr/bin/ecpg
 usr/bin/createdb
 usr/bin/vacuumdb
diff --git a/eselect/postgresql/active.links94 b/eselect/postgresql/active.links94
deleted file mode 100644
index f374ae7..0000000
--- a/eselect/postgresql/active.links94
+++ /dev/null
@@ -1,19 +0,0 @@
-usr/bin/pg_dumpall94
-usr/bin/dropdb94
-usr/bin/createlang94
-usr/bin/pg_isready94
-usr/bin/pgbench94
-usr/bin/ecpg94
-usr/bin/createdb94
-usr/bin/vacuumdb94
-usr/bin/dropuser94
-usr/bin/oid2name94
-usr/bin/createuser94
-usr/bin/droplang94
-usr/bin/clusterdb94
-usr/bin/reindexdb94
-usr/bin/pg_restore94
-usr/bin/psql94
-usr/bin/pg_config94
-usr/bin/pg_dump94
-usr/bin/vacuumlo94
diff --git a/ld.so.conf b/ld.so.conf
index 75d393c..769309d 100644
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -15,7 +15,6 @@ include ld.so.conf.d/*.conf
 /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
 /usr/games/lib64