saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index f96a96fb60ac3acba460d41fb47d7259f1745a81..2dfbddd64082c085f36f599227c3500112aeafd1 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1239,7 +1239,6 @@ maybe chmod 0644 'env.d/30xdg-data-local'
 maybe chmod 0644 'env.d/37fontconfig'
 maybe chmod 0644 'env.d/50guile'
 maybe chmod 0644 'env.d/50ncurses'
-maybe chmod 0644 'env.d/50postgresql'
 maybe chmod 0644 'env.d/60python-docs-2.7'
 maybe chmod 0644 'env.d/65python-docs'
 maybe chmod 0644 'env.d/70less'
@@ -1270,9 +1269,6 @@ maybe chmod 0644 'environment'
 maybe chmod 0755 'eselect'
 maybe chmod 0755 'eselect/boost'
 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 a98f407b407851808a85c3e4954c432016d1c16c..f5cf0b4d981d6f32310c15403809d18169bcd571 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -11,7 +11,7 @@ setenv GUILE_LOAD_PATH '/usr/share/guile/1.8'
 setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/info'
 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/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/php5.6/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/php5.6/man/:/usr/lib64/php7.0/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
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 9b3378a..0000000
--- a/eselect/postgresql/active.links
+++ /dev/null
@@ -1,56 +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/libpq.so.5
-usr/lib64/libpgtypes.so.3
-usr/lib64/libpgtypes.so
-usr/lib64/libecpg.so
-usr/lib64/libecpg_compat.so
-usr/lib64/libecpg.so.6.7
-usr/lib64/libecpg_compat.so.3.7
-usr/lib64/libpqwalreceiver.so
-usr/lib64/libpq.so
-usr/lib64/libpq.so.5.8
-usr/lib64/libecpg.so.6
-usr/lib64/libpgtypes.so.3.6
-usr/lib64/libecpg_compat.so.3
-usr/bin/pg_upgrade
-usr/bin/pg_controldata
-usr/bin/dropdb
-usr/bin/pg_restore
-usr/bin/pg_test_timing
-usr/bin/pg_config
-usr/bin/pg_test_fsync
-usr/bin/postmaster
-usr/bin/pg_dump
-usr/bin/pg_isready
-usr/bin/psql
-usr/bin/pg_basebackup
-usr/bin/dropuser
-usr/bin/pg_dumpall
-usr/bin/ecpg
-usr/bin/droplang
-usr/bin/oid2name
-usr/bin/vacuumlo
-usr/bin/pg_recvlogical
-usr/bin/reindexdb
-usr/bin/pg_archivecleanup
-usr/bin/createuser
-usr/bin/pg_standby
-usr/bin/pg_receivexlog
-usr/bin/createlang
-usr/bin/clusterdb
-usr/bin/vacuumdb
-usr/bin/pg_xlogdump
-usr/bin/pg_rewind
-usr/bin/initdb
-usr/bin/pg_ctl
-usr/bin/postgres
-usr/bin/pg_resetxlog
-usr/bin/createdb
-usr/bin/pgbench
-usr/share/postgresql

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

diff --git a/ld.so.conf b/ld.so.conf
index 0c9c98b22966a99b0ba111f0e1885f0ad5ce7c36..dd6fd581fa3793c2d7a08885b77156f189ca299a 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -10,6 +10,3 @@
 /usr/lib
 /usr/local/lib
 include ld.so.conf.d/*.conf
-/usr/lib/postgresql
-/usr/lib64/postgresql
-/usr/lib64/postgresql-9.5/lib64/

diff --git a/profile.env b/profile.env
index e18dddbc3d6f022807c027babe405fc363236e3f..d5d55c6c690d25278055961b22197f9c1f1d7b13 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -11,7 +11,7 @@ export GUILE_LOAD_PATH='/usr/share/guile/1.8'
 export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/info'
 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/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/php5.6/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/php5.6/man/:/usr/lib64/php7.0/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export OPENGL_PROFILE='xorg-x11'
 export PAGER='/usr/bin/less'