saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index dec0d28d2410436ce71f9b232c9f5e4041b5df38..7820a3031041f085d97e24430076203921a1a2aa 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -277,7 +277,6 @@ maybe chmod 0644 'env.d/37fontconfig'
 maybe chmod 0644 'env.d/50guile'
 maybe chmod 0644 'env.d/50ncurses'
 maybe chmod 0644 'env.d/50oracle-instantclient'
-maybe chmod 0644 'env.d/50postgresql'
 maybe chmod 0644 'env.d/70less'
 maybe chmod 0644 'env.d/80subversion-extras'
 maybe chmod 0644 'env.d/98ca-certificates'
@@ -295,9 +294,6 @@ maybe chmod 0644 'env.d/python/config'
 maybe chmod 0644 'environment'
 maybe chmod 0755 'eselect'
 maybe chmod 0755 'eselect/postgresql'
-maybe chmod 0644 'eselect/postgresql/active'
-maybe chmod 0644 'eselect/postgresql/active.links'
-maybe chmod 0644 'eselect/postgresql/active.links95'
 maybe chmod 0755 'eselect/postgresql/slots'
 maybe chmod 0755 'eselect/postgresql/slots/9.5'
 maybe chmod 0644 'eselect/postgresql/slots/9.5/base'

diff --git a/csh.env b/csh.env
index 8fd604ca3411a8b9ba54415b2d0b647d36fd5a55..3423c03f7db381deb6197fb0432169df0642fa99 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -13,7 +13,7 @@ setenv LANG 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
 setenv MANPAGER 'manpager'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv ORACLE_HOME '/usr/lib64/oracle/12.1/client'
 setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'

diff --git a/env.d/50postgresql b/env.d/50postgresql
deleted file mode 100644 (file)
index 41ce189..0000000
--- a/env.d/50postgresql
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration file for eselect
-# This file has been automatically generated.
-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
deleted file mode 100644 (file)
index 592f36e..0000000
--- a/eselect/postgresql/active
+++ /dev/null
@@ -1 +0,0 @@
-9.5

diff --git a/eselect/postgresql/active.links b/eselect/postgresql/active.links
deleted file mode 100644 (file)
index cba7dc2..0000000
--- a/eselect/postgresql/active.links
+++ /dev/null
@@ -1,62 +0,0 @@
-usr/include/postgresql
-usr/include/libpq-fe.h
-usr/include/pg_config_ext.h
-usr/include/pg_config_manual.h
-usr/include/libpq
-usr/include/postgres_ext.h
-usr/lib64/postgresql
-usr/lib64/libecpg.a
-usr/lib64/libpqwalreceiver.so
-usr/lib64/libpq.so
-usr/lib64/libpq.so.5
-usr/lib64/libpq.a
-usr/lib64/libecpg.so.6.7
-usr/lib64/libecpg_compat.a
-usr/lib64/libpgport.a
-usr/lib64/libpq.so.5.8
-usr/lib64/libecpg.so
-usr/lib64/libecpg_compat.so.3
-usr/lib64/libecpg_compat.so
-usr/lib64/libpgtypes.a
-usr/lib64/libpgtypes.so.3
-usr/lib64/libecpg.so.6
-usr/lib64/libpgtypes.so
-usr/lib64/libpgcommon.a
-usr/lib64/libpgtypes.so.3.6
-usr/lib64/libecpg_compat.so.3.7
-usr/bin/pg_config
-usr/bin/pg_xlogdump
-usr/bin/initdb
-usr/bin/pg_basebackup
-usr/bin/postgres
-usr/bin/createlang
-usr/bin/postmaster
-usr/bin/ecpg
-usr/bin/dropuser
-usr/bin/pg_dump
-usr/bin/pg_ctl
-usr/bin/pg_rewind
-usr/bin/pg_test_fsync
-usr/bin/dropdb
-usr/bin/clusterdb
-usr/bin/pgbench
-usr/bin/droplang
-usr/bin/pg_restore
-usr/bin/pg_dumpall
-usr/bin/pg_receivexlog
-usr/bin/pg_recvlogical
-usr/bin/createuser
-usr/bin/pg_resetxlog
-usr/bin/pg_controldata
-usr/bin/pg_archivecleanup
-usr/bin/pg_isready
-usr/bin/pg_test_timing
-usr/bin/psql
-usr/bin/oid2name
-usr/bin/pg_upgrade
-usr/bin/vacuumlo
-usr/bin/createdb
-usr/bin/pg_standby
-usr/bin/reindexdb
-usr/bin/vacuumdb
-usr/share/postgresql

diff --git a/eselect/postgresql/active.links95 b/eselect/postgresql/active.links95
deleted file mode 100644 (file)
index 3f7739d..0000000
--- a/eselect/postgresql/active.links95
+++ /dev/null
@@ -1,35 +0,0 @@
-usr/bin/pg_config95
-usr/bin/pg_xlogdump95
-usr/bin/initdb95
-usr/bin/pg_basebackup95
-usr/bin/postgres95
-usr/bin/createlang95
-usr/bin/postmaster95
-usr/bin/ecpg95
-usr/bin/dropuser95
-usr/bin/pg_dump95
-usr/bin/pg_ctl95
-usr/bin/pg_rewind95
-usr/bin/pg_test_fsync95
-usr/bin/dropdb95
-usr/bin/clusterdb95
-usr/bin/pgbench95
-usr/bin/droplang95
-usr/bin/pg_restore95
-usr/bin/pg_dumpall95
-usr/bin/pg_receivexlog95
-usr/bin/pg_recvlogical95
-usr/bin/createuser95
-usr/bin/pg_resetxlog95
-usr/bin/pg_controldata95
-usr/bin/pg_archivecleanup95
-usr/bin/pg_isready95
-usr/bin/pg_test_timing95
-usr/bin/psql95
-usr/bin/oid2name95
-usr/bin/pg_upgrade95
-usr/bin/vacuumlo95
-usr/bin/createdb95
-usr/bin/pg_standby95
-usr/bin/reindexdb95
-usr/bin/vacuumdb95

diff --git a/ld.so.conf b/ld.so.conf
index e8dafc6277a4da7b9fbfb090b2a72051972f0b18..296efbedc128ea46b8063927e52df31839633b7d 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -11,6 +11,3 @@
 /usr/local/lib
 include ld.so.conf.d/*.conf
 /usr/lib64/oracle/12.1/client/lib64
-/usr/lib/postgresql
-/usr/lib64/postgresql
-/usr/lib64/postgresql-9.5/lib64/

diff --git a/profile.env b/profile.env
index a207e3fe4af7311bc5acc67f5479eb7a3f997028..46a7308eeb23a3a516e956feb42bb77906243ca0 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -13,7 +13,7 @@ export LANG='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
 export MANPAGER='manpager'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export ORACLE_HOME='/usr/lib64/oracle/12.1/client'
 export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'