From: Frank Brehm Date: Fri, 11 Mar 2016 12:52:38 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=45f5b07c9c7b5304e6736582867b4c470c419282;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/csh.env b/csh.env index 9737598c..564ff127 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.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/:/usr/share/postgresql-9.4/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 c72ad599..9d97cf39 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 00000000..894eb5ef --- /dev/null +++ b/eselect/postgresql/active.links95 @@ -0,0 +1,18 @@ +usr/bin/pg_isready95 +usr/bin/droplang95 +usr/bin/pg_dump95 +usr/bin/pg_restore95 +usr/bin/pg_config95 +usr/bin/vacuumlo95 +usr/bin/dropuser95 +usr/bin/pg_dumpall95 +usr/bin/oid2name95 +usr/bin/reindexdb95 +usr/bin/vacuumdb95 +usr/bin/createlang95 +usr/bin/createdb95 +usr/bin/createuser95 +usr/bin/psql95 +usr/bin/ecpg95 +usr/bin/clusterdb95 +usr/bin/dropdb95 diff --git a/ld.so.conf b/ld.so.conf index 186788d6..75d393cd 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -14,6 +14,7 @@ include ld.so.conf.d/*.conf /usr/lib64/qt4 /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 diff --git a/profile.env b/profile.env index 3a096d08..3f0309e8 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.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/:/usr/share/postgresql-9.4/man/' export MULTIOSDIRS='../lib64:../lib32' export OPENGL_PROFILE='xorg-x11' export PAGER='/usr/bin/less'