From: Frank Brehm Date: Sat, 12 Mar 2016 07:06:01 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=cbea0098b070d5bad45622f66127204e937df99f;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/csh.env b/csh.env index 564ff127..37d378de 100644 --- a/csh.env +++ b/csh.env @@ -29,7 +29,7 @@ setenv LC_TIME 'de_DE.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar' -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.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.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 9d97cf39..41ce1899 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 0359f243..592f36ef 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 509b792c..e56dffd0 100644 --- a/eselect/postgresql/active.links +++ b/eselect/postgresql/active.links @@ -6,16 +6,16 @@ usr/include/libpq usr/include/postgres_ext.h usr/lib64/postgresql usr/lib64/libecpg_compat.so.3 +usr/lib64/libpq.so.5.8 usr/lib64/libpgtypes.so.3 usr/lib64/libpq.so.5 +usr/lib64/libpgtypes.so.3.6 usr/lib64/libecpg.so.6 usr/lib64/libecpg.so usr/lib64/libpq.so -usr/lib64/libpgtypes.so.3.5 -usr/lib64/libecpg.so.6.6 usr/lib64/libpgtypes.so -usr/lib64/libecpg_compat.so.3.6 -usr/lib64/libpq.so.5.7 +usr/lib64/libecpg_compat.so.3.7 +usr/lib64/libecpg.so.6.7 usr/lib64/libecpg_compat.so usr/bin/pg_isready usr/bin/droplang @@ -29,7 +29,6 @@ usr/bin/oid2name usr/bin/reindexdb usr/bin/vacuumdb usr/bin/createlang -usr/bin/pgbench usr/bin/createdb usr/bin/createuser usr/bin/psql diff --git a/eselect/postgresql/active.links94 b/eselect/postgresql/active.links94 deleted file mode 100644 index 728421fe..00000000 --- a/eselect/postgresql/active.links94 +++ /dev/null @@ -1,19 +0,0 @@ -usr/bin/pg_isready94 -usr/bin/droplang94 -usr/bin/pg_dump94 -usr/bin/pg_restore94 -usr/bin/pg_config94 -usr/bin/vacuumlo94 -usr/bin/dropuser94 -usr/bin/pg_dumpall94 -usr/bin/oid2name94 -usr/bin/reindexdb94 -usr/bin/vacuumdb94 -usr/bin/createlang94 -usr/bin/pgbench94 -usr/bin/createdb94 -usr/bin/createuser94 -usr/bin/psql94 -usr/bin/ecpg94 -usr/bin/clusterdb94 -usr/bin/dropdb94 diff --git a/ld.so.conf b/ld.so.conf index 75d393cd..769309d1 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 diff --git a/profile.env b/profile.env index 3f0309e8..fb91b0a3 100644 --- a/profile.env +++ b/profile.env @@ -29,7 +29,7 @@ export LC_TIME='de_DE.utf8' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' export LIBBLURAY_CP='/usr/share/libbluray/lib/libbluray.jar' -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.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.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'