From: frank <frank@uhu1.uhu-banane.de>
Date: Mon, 12 Mar 2012 15:51:49 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=6edeba70ac3f6a9b487934c905433d62f091e05b;p=config%2Fuhu1%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/.etckeeper b/.etckeeper
index c3fa644..604ac7d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -803,6 +803,7 @@ maybe chmod 0644 './ld.so.cache'
 maybe chmod 0644 './ld.so.conf'
 maybe chmod 0755 './ld.so.conf.d'
 maybe chmod 0644 './ld.so.conf.d/05binutils.conf'
+maybe chmod 0644 './ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf'
 maybe chmod 0440 './ldap.conf.sudo'
 maybe chmod 0755 './lftp'
 maybe chmod 0644 './lftp/lftp.conf'
diff --git a/env.d/05gcc-x86_64-pc-linux-gnu b/env.d/05gcc-x86_64-pc-linux-gnu
index ff3514a..a74e5f7 100644
--- a/env.d/05gcc-x86_64-pc-linux-gnu
+++ b/env.d/05gcc-x86_64-pc-linux-gnu
@@ -1,6 +1,5 @@
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info"
-LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32"
 PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
 ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
 GCC_SPECS=""
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info"
diff --git a/ld.so.conf b/ld.so.conf
index 6d3cc3f..f1e7e22 100644
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -10,8 +10,6 @@ include ld.so.conf.d/*.conf
 /usr/local/lib32
 /lib
 /usr/lib
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32
 /usr/lib/postgresql
 /usr/lib64/postgresql
 /usr/lib64/postgresql-9.1/lib64/
diff --git a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
new file mode 100644
index 0000000..89bfd60
--- /dev/null
+++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
@@ -0,0 +1,4 @@
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3