saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 6783e1a77d3fcc4a06a27557bd527b3562b04888..ea2cb51a29665460e73a0a98796208c769c357b1 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1367,6 +1367,9 @@ maybe chmod 0644 './texmf/updmap.d/texlive-omega.cfg'
 maybe chmod 0644 './texmf/updmap.d/texlive-pictures.cfg'
 maybe chmod 0644 './texmf/updmap.d/texlive-science.cfg'
 maybe chmod 0755 './texmf/web2c'
+maybe chmod 0755 './texmf/web2c.d'
+maybe chmod 0644 './texmf/web2c.d/fmtutil-hdr.cnf'
+maybe chmod 0644 './texmf/web2c.d/updmap-hdr.cfg'
 maybe chmod 0644 './texmf/web2c/.keep_app-text_texlive-core-0'
 maybe chmod 0644 './texmf/web2c/fmtutil.cnf'
 maybe chmod 0644 './texmf/web2c/texmf.cnf'

diff --git a/texmf/updmap.d/00updmap.cfg b/texmf/updmap.d/00updmap.cfg
index b8cccf0bea2a182f8b5f228297f7e191d7b33997..1b91171cf0cb5411b8e42d98387b95062896c9c2 100644 (file)
--- a/texmf/updmap.d/00updmap.cfg
+++ b/texmf/updmap.d/00updmap.cfg
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun Oct  3 04:04:52 2010
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue May 31 04:12:04 2011
 # $Id: updmap-hdr.cfg 11382 2008-11-20 18:59:26Z karl $
 # 
 # The full updmap.cfg is generated by concatenating updmap-hdr.cfg with
@@ -125,11 +125,15 @@ dvipdfmDownloadBase14 true
 #! Map auncial.map
 #! Map aurical.map
 #! Map ybv.map
+#! MixedMap bbold.map
 #! Map belleek.map
 #! Map bera.map
 #! Map ybd.map
+#! Map sqrcaps.map
+#! Map boondox.map
 #! Map pbsi.map
 #! Map burmese.map
+#! Map cantarell.map
 #! Map cmin.map
 #! MixedMap cbgreek-full.map
 #! MixedMap ccpl.map
@@ -147,19 +151,23 @@ dvipdfmDownloadBase14 true
 #! MixedMap cm-super-x2.map
 #! Map cmcyr.map
 #! MixedMap cmll.map
+#! Map comfortaa.map
+#! Map original-context-symbol.map
 #! MixedMap csother.map
 #! MixedMap cstext.map
 #! Map cyklop.map
 #! Map dictsym.map
 #! Map dstroke.map
+#! Map droid.map
 #! Map yes.map
 #! Map epigrafica.map
 #! Map epiolmec.map
 #! MixedMap esint.map
+#! Map ESSTIX.map
 #! Map esvect.map
 #! MixedMap ethiop.map
-#! Map zpeu.map
 #! MixedMap eurosym.map
+#! Map fdsymbol.map
 #! Map fge.map
 #! Map foekfont.map
 #! Map fonetika.map
@@ -175,7 +183,6 @@ dvipdfmDownloadBase14 true
 #! Map gfsporson.map
 #! Map gfssolomos.map
 #! Map yfrak.map
-#! Map troff-updmap.map
 #! Map ugq.map
 #! Map grverb.map
 #! MixedMap hfbright.map
@@ -209,6 +216,7 @@ dvipdfmDownloadBase14 true
 #! Map knitfont.map
 #! Map kpfonts.map
 #! Map kurier.map
+#! Map lato.map
 #! Map libertine.map
 #! Map yly.map
 #! Map linearA.map
@@ -217,15 +225,18 @@ dvipdfmDownloadBase14 true
 #! MixedMap lxfonts.map
 #! MixedMap manfnt.map
 #! Map marvosym.map
+#! Map mathabx.map
 #! Map mdbch.map
 #! Map mdput.map
 #! Map mdugm.map
+#! Map troff-updmap.map
 #! MixedMap mflogo.map
 #! Map MnSymbol.map
 #! MixedMap mongolian.map
 #! MixedMap musix.map
 #! Map norasi-c90.map
 #! Map cherokee.map
+#! Map ocrb.map
 #! Map oinuit.map
 #! Map omega.map
 #! Map phaistos.map
@@ -233,10 +244,13 @@ dvipdfmDownloadBase14 true
 #! MixedMap plother.map
 #! MixedMap pltext.map
 #! Map ap.map
+#! Map prodint.map
 #! Map charter.map
 #! Map fpls.map
 #! Map pazo.map
 #! Map utopia.map
+#! Map PTSans-type1.map
+#! Map PTSerif-type1.map
 #! Map pxfonts.map
 #! Map recycle.map
 #! Map yrd.map
@@ -248,6 +262,7 @@ dvipdfmDownloadBase14 true
 #! Map icelandic.map
 #! MixedMap stmaryrd.map
 #! Map tabvar.map
+Map mathpple.map
 #! Map qag.map
 #! Map qbk.map
 #! Map qcr.map
@@ -256,6 +271,7 @@ dvipdfmDownloadBase14 true
 #! Map qpl.map
 #! Map qtm.map
 #! Map qzc.map
+#! Map tfrupee.map
 #! MixedMap tipa.map
 #! MixedMap trajan.map
 #! Map txfonts.map
@@ -286,4 +302,3 @@ dvipdfmDownloadBase14 true
 #! MixedMap wasy.map
 #! MixedMap xypic.map
 #! MixedMap yhmath.map
-#! Map slantcm.map

diff --git a/texmf/web2c.d/fmtutil-hdr.cnf b/texmf/web2c.d/fmtutil-hdr.cnf
new file mode 100644 (file)
index 0000000..1d93173
--- /dev/null
+++ b/texmf/web2c.d/fmtutil-hdr.cnf
@@ -0,0 +1,35 @@
+# $Id: fmtutil-hdr.cnf 13067 2009-05-12 22:04:17Z preining $
+# Originally written by Thomas Esser, 1998. Public domain.
+#
+# As of TeX Live 2008, the final fmtutil.cnf is generated by
+# tlmgr generate fmtutil.  You can use
+# tlmgr generate fmtutil -localcfg /some/file to make local additions.
+# See tlmgr --help for more info.
+#
+# The format of the table is:
+#
+# format  engine  pattern-file  arguments
+#
+# The last "argument" must be the name of the file on which to run
+# the ini-engine (such as initex).  If the ini-engine is e-TeX, and the
+# e-TeX extensions should be enabled, the filename must be prefixed with
+# a * character.
+# 
+# fmtutil always passes the -ini option to the engine.
+# If no pattern-file is desired, use -.
+# Either spaces or tabs can be used as separators.
+# 
+# Other notes:
+# 1) tex and amstex just load hyphen.tex. No customization.
+#    You can have your own customized (via babel's hyphen.cfg)
+#    formats on top of plain by using "bplain.tex" instead of
+#    plain.tex (see e.g. bplain.ini file for bplain format).
+#
+# 2) etex-based formats load language.def, not language.dat.
+#
+# 3) The symbolic link to the right engines (e.g. bplain -> tex)
+#    is generated by the "texlinks" script.
+# 
+# 4) usual comments start with "# ", whereas disabled configurations
+#    start with "#! " in this file.
+

diff --git a/texmf/web2c.d/updmap-hdr.cfg b/texmf/web2c.d/updmap-hdr.cfg
new file mode 100644 (file)
index 0000000..68bdc36
--- /dev/null
+++ b/texmf/web2c.d/updmap-hdr.cfg
@@ -0,0 +1,101 @@
+# $Id: updmap-hdr.cfg 11382 2008-11-20 18:59:26Z karl $
+# 
+# The full updmap.cfg is generated by concatenating updmap-hdr.cfg with
+# all the Map and MixedMap lines from an installation, possibly
+# appending a local configuration file.
+#
+# To make local customizations to the map files, please use of the
+# following methods:
+#
+# 1) call 
+#       updmap-sys --enable Map=foo.map
+#    for each map file.  (Or MixedMap instead of Map, if your font has
+#    both Metafont and outline definitions.)  See the updmap --help
+#    documentation.
+#
+# 2) add your local map entries to the file
+#       TEXMFLOCAL/web2c/updmap-local.cfg
+#    and then call
+#       tlmgr generate updmap
+#    which will concatenate updmap-local.cfg to the end of the final
+#    updmap.cfg.  (You can override the local.cfg file location with the
+#    --localcfg option; see tlmgr --help.)
+#
+# If you use either of these methods, your local adaptations will be
+# preserved when tlmgr updates the installation or this config file.
+# Manual edits to updmap.cfg may be lost on update.
+
+
+################################################################
+# OPTIONS
+################################################################
+
+#
+# dvipsPreferOutline
+#
+# Should dvips (by default) prefer bitmap fonts or outline fonts
+# if both are available? Independent of this setting, outlines
+# can be forced by putting "p psfonts_t1.map" into a config file
+# that dvips reads. Bitmaps (for the fonts in question) can
+# be forced by putting "p psfonts_pk.map" into a config file.
+# We provide such config files which can be enabled via
+# dvips -Poutline ... resp. dvips -Ppk ...
+#
+# Valid settings for dvipsPreferOutline are true / false:
+dvipsPreferOutline true
+
+#
+# LW35
+#
+# Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and
+# how are the filenames chosen? Valid settings:
+#   URW:     URW fonts with "vendor" filenames (e.g. n019064l.pfb)
+#   URWkb:   URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb)
+#   ADOBE:   Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb)
+#   ADOBEkb: Adobe fonts with  "berry" filenames (e.g. phvbo8an.pfb)
+LW35 URWkb
+
+#
+# dvipsDownloadBase35
+# 
+# Should dvips (by default) download the standard 35 LaserWriter fonts
+# with the document (then set dvipsDownloadBase35 true) or should these
+# fonts be used from the ps interpreter / printer?
+# Whatever the default is, the user can override it by specifying
+# dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download
+# the LW35 fonts resp. use the built-in fonts.
+#
+# Valid settings are true / false:
+dvipsDownloadBase35 false
+
+#
+# pdftexDownloadBase14
+#
+# Should pdftex download the base 14 pdf fonts? Since some configurations
+# (ps / pdf tools / printers) use bad default fonts, it is safer to download
+# the fonts. The pdf files will get bigger, though.
+# Valid settings are true (download the fonts) or false (don't download
+# the fonts). Adobe recommends embedding all fonts.
+pdftexDownloadBase14 true
+
+#
+# dvipdfmDownloadBase14
+#
+# Should dvipdfm download the base 14 pdf fonts? Since some configurations
+# (ps / pdf tools / printers) use bad default fonts, it is safer to download
+# the fonts. The pdf files will get bigger, though.
+# Valid settings are true (download the fonts) or false (don't download
+# the fonts).
+dvipdfmDownloadBase14 true
+
+################################################################
+# Map files.
+################################################################
+#
+# There are two possible entries: Map and MixedMap. Both have one additional
+# argument: the filename of the map file. MixedMap ("mixed" means that
+# the font is available as bitmap and as outline) lines will not be used
+# in the default map of dvips if dvipsPreferOutline is false. Inactive
+# Map files should be marked by "#! " (without the quotes), not just #.
+#
+