saving uncommitted changes in /etc prior to emerge run

diff --git a/texmf/dvipdfmx.d/dvipdfmx.cfg b/texmf/dvipdfmx.d/dvipdfmx.cfg
index 1832f5a9a857f645bd5b2ceeec0166b8fc678a81..490de000745adbdc089167cd19a5b1edac37fbf2 100644 (file)
--- a/texmf/dvipdfmx.d/dvipdfmx.cfg
+++ b/texmf/dvipdfmx.d/dvipdfmx.cfg
@@ -120,6 +120,25 @@ P  0x003C
 %% ps2pdf is a front-end to gs. For a complete list of options, see
 %% http://ghostscript.com/doc/current/Ps2pdf.htm#Options
 %%
+%% In TeX Live, we use the rungs wrapper instead of ps2pdf, becuse we
+%% must omit the -dSAFER which ps2pdf specifies: in order for pstricks
+%% to work with xetex,
+%% /usr/local/texlive/*/texmf-dist/dvips/pstricks/pstricks.pro (for
+%% example) needs to be accessed.  Also, it is better to use our
+%% supplied gs on Windows.
+%% 
+%% Without the -dEPSCROP below, an eps file with negative llx/lly (as
+%% created by MetaPost, for example) fails.  In 2013, changes were made
+%% to the drivers xetex.def, dvipdfmx.def, etc., to handle non-zero
+%% llx/lly so we could use it.  The file epsf-dvipdfmx.tex is available
+%% from CTAN/TL/etc. to support plain's epsf.tex.
+%% 
+%% In 2014, we discovered that -sPAPERSIZE=a0 was needed to support
+%% pstricks under xetex; otherwise, images were cropped (see thread at
+%% http://tug.org/pipermail/xetex/2014-November/025664.html).
+%% Happily, it seems that using both -dEPSCROP and -sPAPERSIZE=a0
+%% simultaneously works ok.  So that's we do below.
+%% 
 %% By default, gs encodes all images contained in a PS file using
 %% the lossy DCT (i.e., JPEG) filter. This often leads to inferior
 %% result (see the discussion at http://electron.mit.edu/~gsteele/pdf/).
@@ -130,27 +149,12 @@ P  0x003C
 %% will also be re-encoded using Flate. To turn the conversion off,
 %% simply remove the options mentioned above.
 %% 
-%% The -dEPSCROP below converts PS files.  Before TL 2013,
-%% -sPAPERSIZE=a0 was used for this.  In 2013, changes were made to
-%% xetex.def, dvipdfmx.def, etc., to handle non-zero llx/lly.
-%%
-%% In TeX Live, we use the rungs wrapper instead of ps2pdf, becuse we
-%% must omit the -dSAFER which ps2pdf specifies: in order for pstricks
-%% to work with xetex,
-%% /usr/local/texlive/*/texmf-dist/dvips/pstricks/pstricks.pro (for
-%% example) needs to be accessed.  (Also, it is better to use our
-%% supplied gs on Windows.)  You can also add -dNOSAFER to the ps2pdf
-%% command line.
-%%
 %% Incidentally, especially in TL, more than one dvipdfmx.cfg may be
 %% extant.  You can find the one that is active by running:
 %% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg
 %% and control which one is found by setting DVIPDFMXINPUTS.
 %%
-D  "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
-
-% pre-2013 invocation using -sPAPERSIZE instead of -dEPSCrop, no other changes:
-%D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
+D  "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
 
 % other random ps converters people have experimented with.
 %D "/usr/local/bin/ps2pdf -dEPSCrop '%i' '%o'"

diff --git a/texmf/updmap.d/00updmap.cfg b/texmf/updmap.d/00updmap.cfg
index 53e4c564a88933605222102977ca9e8f73ac0b51..83e30615e6cb0905a5e12b0415961c73d1aa4286 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 Tue Sep 30 03:19:47 2014
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sat Jul  4 03:20:26 2015
 # $Id: updmap-hdr.cfg 29729 2013-04-08 00:26:46Z karl $
 # 
 # The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by
@@ -133,7 +133,7 @@ kanjiEmbed noEmbed
 #! Map aurical.map
 #! Map uag.map
 #! Map ybv.map
-#! Map Baskervaldx.map
+#! Map baskervaldx.map
 #! MixedMap bbold.map
 #! Map belleek.map
 #! Map bera.map
@@ -169,6 +169,8 @@ kanjiEmbed noEmbed
 #! Map cmcyr.map
 #! MixedMap cmll.map
 #! Map comfortaa.map
+#! Map ComicNeue.map
+#! Map ComicNeueAngular.map
 #! Map original-context-symbol.map
 #! Map CountriesOfEurope.map
 #! Map ucr.map
@@ -189,6 +191,7 @@ kanjiEmbed noEmbed
 #! Map epiolmec.map
 #! Map erewhon.map
 #! MixedMap esint.map
+#! Map esrelation.map
 #! Map ESSTIX.map
 #! Map esvect.map
 #! MixedMap ethiop.map
@@ -218,7 +221,6 @@ kanjiEmbed noEmbed
 #! Map gfsporson.map
 #! Map gfssolomos.map
 #! Map gillius.map
-#! Map yfrak.map
 #! Map ugq.map
 #! Map hacm.map
 #! Map uhv.map
@@ -291,6 +293,7 @@ kanjiEmbed noEmbed
 #! Map unc.map
 #! Map newpx.map
 #! Map newtx.map
+#! Map newtxsf.map
 #! Map newtxtt.map
 #! Map norasi-c90.map
 #! Map cherokee.map
@@ -331,6 +334,7 @@ kanjiEmbed noEmbed
 #! Map SkakNew.map
 #! Map SourceCodePro.map
 #! Map SourceSansPro.map
+#! Map SourceSerifPro.map
 #! Map starfont.map
 #! Map icelandic.map
 #! Map stix.map
@@ -381,6 +385,7 @@ Map mathpple.map
 #! MixedMap wasy.map
 #! Map XCharter.map
 #! MixedMap xypic.map
+#! Map yfrak.map
 #! MixedMap yhmath.map
 #! Map uzc.map
 #! Map uzd.map

diff --git a/texmf/web2c.d/fmtutil-hdr.cnf b/texmf/web2c.d/fmtutil-hdr.cnf
index b7532740d029894ce98f9bad9e89094d9d744040..46bda14592ffa8257b50a1c25f64b24a00be280a 100644 (file)
--- a/texmf/web2c.d/fmtutil-hdr.cnf
+++ b/texmf/web2c.d/fmtutil-hdr.cnf
@@ -1,10 +1,12 @@
-# $Id: fmtutil-hdr.cnf 30214 2013-05-02 22:31:16Z karl $
+# $Id: fmtutil-hdr.cnf 37176 2015-05-04 02:06:19Z 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.
+# As of TeX Live 2015, fmtutil reads *all* fmtutil.cnf files found.
+# Consequently, any manual edits of this file (fmtutil.cnf in the 
+# TEXMFDIST tree) will be lost on update. So don't do that.
+#
+# For guidance on how to achieve local configurations, see the man
+# page of fmtutil, or the output of fmtutil --help.
 #
 # The format of the table is:
 #