From ee10e5d9a1a50e364419ef4eadc364354484b446 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 27 Jun 2016 09:13:32 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 1 - csh.env | 2 +- env.d/50postgresql | 4 ++-- eselect/postgresql/active | 2 +- eselect/postgresql/active.links | 9 ++++----- eselect/postgresql/active.links94 | 19 ------------------- ld.so.conf | 1 - profile.env | 2 +- 8 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 eselect/postgresql/active.links94 diff --git a/.etckeeper b/.etckeeper index aa8e647..b7f2fab 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1252,7 +1252,6 @@ 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.links94' maybe chmod 0644 'eselect/postgresql/active.links95' maybe chmod 0755 'eselect/postgresql/slots' maybe chmod 0755 'eselect/postgresql/slots/9.5' diff --git a/csh.env b/csh.env index 424c4c9..83feae1 100644 --- a/csh.env +++ b/csh.env @@ -14,7 +14,7 @@ setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/i setenv LADSPA_PATH '/usr/lib64/ladspa' 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.5/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/' 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 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 19ec4d3..17f2c61 100644 --- a/eselect/postgresql/active.links +++ b/eselect/postgresql/active.links @@ -6,17 +6,17 @@ usr/include/libpq usr/include/postgres_ext.h usr/lib64/postgresql usr/lib64/libpq.so.5 -usr/lib64/libecpg.so.6.6 usr/lib64/libpgtypes.so.3 usr/lib64/libpgtypes.so usr/lib64/libecpg.so -usr/lib64/libpq.so.5.7 usr/lib64/libecpg_compat.so -usr/lib64/libpgtypes.so.3.5 +usr/lib64/libecpg.so.6.7 +usr/lib64/libecpg_compat.so.3.7 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/lib64/libecpg_compat.so.3.6 usr/bin/dropdb usr/bin/pg_restore usr/bin/pg_config @@ -35,5 +35,4 @@ usr/bin/createlang usr/bin/clusterdb usr/bin/vacuumdb usr/bin/createdb -usr/bin/pgbench usr/share/postgresql diff --git a/eselect/postgresql/active.links94 b/eselect/postgresql/active.links94 deleted file mode 100644 index b3d9d27..0000000 --- a/eselect/postgresql/active.links94 +++ /dev/null @@ -1,19 +0,0 @@ -usr/bin/dropdb94 -usr/bin/pg_restore94 -usr/bin/pg_config94 -usr/bin/pg_dump94 -usr/bin/pg_isready94 -usr/bin/psql94 -usr/bin/dropuser94 -usr/bin/pg_dumpall94 -usr/bin/ecpg94 -usr/bin/droplang94 -usr/bin/oid2name94 -usr/bin/vacuumlo94 -usr/bin/reindexdb94 -usr/bin/createuser94 -usr/bin/createlang94 -usr/bin/clusterdb94 -usr/bin/vacuumdb94 -usr/bin/createdb94 -usr/bin/pgbench94 diff --git a/ld.so.conf b/ld.so.conf index 54749d5..0c9c98b 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -13,4 +13,3 @@ 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 01989eb..d6fac80 100644 --- a/profile.env +++ b/profile.env @@ -14,7 +14,7 @@ export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/i export LADSPA_PATH='/usr/lib64/ladspa' 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.5/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/' export MULTIOSDIRS='../lib64:../lib32' export OPENGL_PROFILE='xorg-x11' export PAGER='/usr/bin/less' -- 2.39.5