saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 12c944547311904b0e6fe0bcb25d627b6b599cc8..bba29132bcd8e7261b05bf2f4e2f9c20c895d90e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -58,6 +58,8 @@ maybe chmod 0755 'X11/xinit'
 maybe chmod 0755 'X11/xinit/xinitrc.d'
 maybe chmod 0755 'X11/xinit/xinitrc.d/40-libcanberra-gtk-module'
 maybe chmod 0755 'X11/xinit/xinitrc.d/80-dbus'
+maybe chmod 0755 'X11/xorg.conf.d'
+maybe chmod 0644 'X11/xorg.conf.d/20opengl.conf'
 maybe chmod 0755 'acpi'
 maybe chmod 0755 'acpi/actions'
 maybe chmod 0755 'acpi/actions/powerbtn.sh'
@@ -836,10 +838,10 @@ maybe chmod 0644 'elinks/elinks.conf'
 maybe chmod 0644 'elinks/keybind-full.sample'
 maybe chmod 0644 'elinks/keybind.conf.sample'
 maybe chmod 0755 'env.d'
+maybe chmod 0644 'env.d/000opengl'
 maybe chmod 0644 'env.d/00basic'
 maybe chmod 0644 'env.d/00glibc'
 maybe chmod 0644 'env.d/01cvs'
-maybe chmod 0644 'env.d/03opengl'
 maybe chmod 0644 'env.d/04gcc-x86_64-pc-linux-gnu'
 maybe chmod 0644 'env.d/05binutils'
 maybe chmod 0644 'env.d/09sandbox'

diff --git a/X11/xorg.conf.d/20opengl.conf b/X11/xorg.conf.d/20opengl.conf
new file mode 100644 (file)
index 0000000..b3fc2f9
--- /dev/null
+++ b/X11/xorg.conf.d/20opengl.conf
@@ -0,0 +1,3 @@
+Section "Files"
+       ModulePath "/usr/lib64/xorg/modules"
+EndSection

diff --git a/env.d/000opengl b/env.d/000opengl
new file mode 100644 (file)
index 0000000..05c9617
--- /dev/null
+++ b/env.d/000opengl
@@ -0,0 +1,4 @@
+# Configuration file for eselect
+# This file has been automatically generated.
+LDPATH="/usr/lib64/opengl/xorg-x11/lib"
+OPENGL_PROFILE="xorg-x11"

diff --git a/env.d/03opengl b/env.d/03opengl
deleted file mode 100644 (file)
index 05c9617..0000000
--- a/env.d/03opengl
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration file for eselect
-# This file has been automatically generated.
-LDPATH="/usr/lib64/opengl/xorg-x11/lib"
-OPENGL_PROFILE="xorg-x11"

diff --git a/ld.so.conf b/ld.so.conf
index ba2c55dfd91175315d8b5bff3c2bca061792210e..6dd5e01d06cc03b308732a563d0af5e2beee1a61 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -1,5 +1,6 @@
 # ld.so.conf autogenerated by env-update; make all changes to
 # contents of /etc/env.d directory
+/usr/lib64/opengl/xorg-x11/lib
 /lib64
 /usr/lib64
 /usr/local/lib64
@@ -10,7 +11,6 @@
 /usr/lib
 /usr/local/lib
 include ld.so.conf.d/*.conf
-/usr/lib64/opengl/xorg-x11/lib
 /usr/lib/postgresql
 /usr/lib64/postgresql
 /usr/lib64/postgresql-9.4/lib64/