saving uncommitted changes in /etc prior to emerge run

diff --git a/DIR_COLORS b/DIR_COLORS
index 89c085daa5f64a657d46aafe83fac8606d66ea81..c227a48ccda10dd50dc6662ac9fa722cbc086db4 100644 (file)
--- a/DIR_COLORS
+++ b/DIR_COLORS
@@ -1,7 +1,7 @@
 # Configuration file for dircolors, a utility to help you set the
 # LS_COLORS environment variable used by GNU ls with the --color option.
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2016 Free Software Foundation, Inc.
 # Copying and distribution of this file, with or without modification,
 # are permitted provided the copyright notice and this notice are preserved.
 
@@ -11,20 +11,12 @@
 # You can copy this file to .dir_colors in your $HOME directory to override
 # the system defaults.
 
-# Below, there should be one TERM entry for each termtype that is colorizable
+# Below are TERM entries, which can be a glob patterns, to match
+# against the TERM environment variable to determine if it is colorizable.
 TERM Eterm
 TERM ansi
 TERM color-xterm
-TERM con132x25
-TERM con132x30
-TERM con132x43
-TERM con132x60
-TERM con80x25
-TERM con80x28
-TERM con80x30
-TERM con80x43
-TERM con80x50
-TERM con80x60
+TERM con[0-9]*x[0-9]*
 TERM cons25
 TERM console
 TERM cygwin
@@ -43,31 +35,14 @@ TERM mach-gnu-color
 TERM mlterm
 TERM putty
 TERM putty-256color
-TERM rxvt
-TERM rxvt-256color
-TERM rxvt-cygwin
-TERM rxvt-cygwin-native
-TERM rxvt-unicode
-TERM rxvt-unicode-256color
-TERM rxvt-unicode256
-TERM screen
-TERM screen-256color
-TERM screen-256color-bce
-TERM screen-bce
-TERM screen-w
-TERM screen.Eterm
-TERM screen.rxvt
-TERM screen.linux
+TERM rxvt*
+TERM screen*
 TERM st
 TERM st-256color
 TERM terminator
+TERM tmux*
 TERM vt100
-TERM xterm
-TERM xterm-16color
-TERM xterm-256color
-TERM xterm-88color
-TERM xterm-color
-TERM xterm-debian
+TERM xterm*
 
 # Below are the color init strings for the basic file types. A color init
 # string consists of one or more of the following numeric codes:
@@ -89,7 +64,7 @@ SOCK 01;35    # socket
 DOOR 01;35     # door
 BLK 40;33;01   # block device driver
 CHR 40;33;01   # character device driver
-ORPHAN 01;05;37;41  # orphaned syminks
+ORPHAN 01;05;37;41  # symlink to nonexistent file, or non-stat'able file ...
 MISSING 01;05;37;41 # ... and the files they point to
 SETUID 37;41   # file that is setuid (u+s)
 SETGID 30;43   # file that is setgid (g+s)
@@ -207,20 +182,21 @@ EXEC 01;32
 .emf 01;35
 
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axv 01;35
-.anx 01;35
 .ogv 01;35
 .ogx 01;35
 
-# Document files
-.pdf 00;32
-.ps 00;32
-.txt 00;32
-.patch 00;32
+# Text/document files
+.cfg 00;32
+.conf 00;32
 .diff 00;32
+.doc 00;32
+.ini 00;32
 .log 00;32
+.patch 00;32
+.pdf 00;32
+.ps 00;32
 .tex 00;32
-.doc 00;32
+.txt 00;32
 
 # audio formats
 .aac 00;36
@@ -237,7 +213,7 @@ EXEC 01;32
 .wav 00;36
 
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axa 00;36
 .oga 00;36
+.opus 00;36
 .spx 00;36
 .xspf 00;36