From 264097c31d54ddffb0df12fb6298dd2e23c45fbe Mon Sep 17 00:00:00 2001 From: root Date: Thu, 10 Mar 2016 18:45:07 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 1 + csh.env | 2 +- env.d/50postgresql | 4 ++-- eselect/postgresql/active.links95 | 35 +++++++++++++++++++++++++++++++ ld.so.conf | 1 + profile.env | 2 +- 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 eselect/postgresql/active.links95 diff --git a/.etckeeper b/.etckeeper index 03f7770..2fb271c 100755 --- a/.etckeeper +++ b/.etckeeper @@ -906,6 +906,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 80359c1..d2e228d 100644 --- a/csh.env +++ b/csh.env @@ -13,7 +13,7 @@ setenv HG '/usr/bin/hg' setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.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/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.5/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.5/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 PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/lib64/subversion/bin' diff --git a/env.d/50postgresql b/env.d/50postgresql index c72ad59..9d97cf3 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.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 index 0000000..95f6b03 --- /dev/null +++ b/eselect/postgresql/active.links95 @@ -0,0 +1,35 @@ +usr/bin/pg_ctl95 +usr/bin/psql95 +usr/bin/dropdb95 +usr/bin/vacuumlo95 +usr/bin/vacuumdb95 +usr/bin/reindexdb95 +usr/bin/pg_archivecleanup95 +usr/bin/clusterdb95 +usr/bin/pg_restore95 +usr/bin/pg_dumpall95 +usr/bin/createuser95 +usr/bin/pg_dump95 +usr/bin/pg_upgrade95 +usr/bin/pg_config95 +usr/bin/postgres95 +usr/bin/pg_recvlogical95 +usr/bin/pgbench95 +usr/bin/pg_rewind95 +usr/bin/pg_resetxlog95 +usr/bin/ecpg95 +usr/bin/pg_basebackup95 +usr/bin/createdb95 +usr/bin/postmaster95 +usr/bin/pg_isready95 +usr/bin/initdb95 +usr/bin/pg_test_fsync95 +usr/bin/pg_xlogdump95 +usr/bin/dropuser95 +usr/bin/pg_controldata95 +usr/bin/oid2name95 +usr/bin/pg_test_timing95 +usr/bin/pg_standby95 +usr/bin/createlang95 +usr/bin/pg_receivexlog95 +usr/bin/droplang95 diff --git a/ld.so.conf b/ld.so.conf index 1876ba8..54749d5 100644 --- 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 62e4e68..0aeef30 100644 --- a/profile.env +++ b/profile.env @@ -13,7 +13,7 @@ export HG='/usr/bin/hg' export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.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/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.5/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.5/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 PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/lib64/subversion/bin' -- 2.39.5