dev-texlive/texlive-*: Drop obsolete 2015 files
authorAndreas Sturmlechner <asturm@gentoo.org>
Mon, 19 Mar 2018 18:44:44 +0000 (19:44 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Mon, 9 Apr 2018 18:16:23 +0000 (20:16 +0200)
Package-Manager: Portage-2.3.24, Repoman-2.3.6

dev-texlive/texlive-basic/files/texmfcnflua2015.patch [deleted file]
dev-texlive/texlive-context/files/luacnfspec2013.patch [deleted file]
dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch [deleted file]

diff --git a/dev-texlive/texlive-basic/files/texmfcnflua2015.patch b/dev-texlive/texlive-basic/files/texmfcnflua2015.patch
deleted file mode 100644 (file)
index bcf35e0..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: work/texmf-dist/web2c/texmfcnf.lua
-===================================================================
---- work.orig/texmf-dist/web2c/texmfcnf.lua
-+++ work/texmf-dist/web2c/texmfcnf.lua
-@@ -3,9 +3,6 @@
- -- ConTeXt needs a properly expanded TEXMFLOCAL, so here is a
- -- bit of lua code to make that happen
--local texmflocal = resolvers.prefixes.selfautoparent();
--texmflocal = string.gsub(texmflocal, "20%d%d$", "texmf-local");
--
- return {
-     type    = "configuration",
-@@ -30,7 +27,7 @@ return {
-             -- most cases you can leve this one untouched. The built-in definition
-             -- permits relocation of the tree.
-             --
--            -- TEXMFCNF     = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}"
-+            -- TEXMFCNF     = "selfautodir:share/texmf-dist/web2c"
-             --
-             -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is:
-             --
-@@ -44,14 +41,14 @@ return {
-             -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
--            TEXMFSYSVAR     = "selfautoparent:texmf-var",
--            TEXMFVAR        = "home:.texlive2015/texmf-var",
-+            TEXMFSYSVAR     = "selfautoparent:var/lib/texmf",
-+            TEXMFVAR        = "home:.texlive/texmf-var",
-             -- We have only one cache path but there can be more. The first writable one
-             -- will be chosen but there can be more readable paths.
-             TEXMFCACHE      = "$TEXMFSYSVAR;$TEXMFVAR",
--            TEXMFCONFIG     = "home:.texlive2015/texmf-config",
-+            TEXMFCONFIG     = "home:.texlive/texmf-config",
-             -- I don't like this texmf under home and texmf-home would make more
-             -- sense. One never knows what installers put under texmf anywhere and
-@@ -62,12 +59,12 @@ return {
-             -- entry. This makes the tex root relocatable.
-             TEXMFOS         = "selfautodir:",
--            TEXMFDIST       = "selfautoparent:texmf-dist",
-+            TEXMFDIST       = "selfautodir:share/texmf-dist",
--            TEXMFLOCAL      = texmflocal,
--            TEXMFSYSCONFIG  = "selfautoparent:texmf-config",
--            TEXMFFONTS      = "selfautoparent:texmf-fonts",
--            TEXMFPROJECT    = "selfautoparent:texmf-project",
-+            TEXMFLOCAL      = "selfautodir:local/share/texmf",
-+            TEXMFSYSCONFIG  = "selfautoparent:etc/texmf",
-+            TEXMFFONTS      = "selfautodir:share/texmf-dist",
-+            TEXMFPROJECT    = "selfautodir:share/texmf-dist",
-             TEXMFHOME       = "home:texmf",
-          -- TEXMFHOME       = os.name == "macosx" and "home:Library/texmf" or "home:texmf",
diff --git a/dev-texlive/texlive-context/files/luacnfspec2013.patch b/dev-texlive/texlive-context/files/luacnfspec2013.patch
deleted file mode 100644 (file)
index e55d3f4..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-We install texmfcnf.lua in a different location than TeX Live so default
-heuristics fail. Help it.
-
-Index: work/texmf-dist/scripts/context/lua/mtxrun.lua
-===================================================================
---- work.orig/texmf-dist/scripts/context/lua/mtxrun.lua
-+++ work/texmf-dist/scripts/context/lua/mtxrun.lua
-@@ -12970,10 +12970,8 @@ if environment.default_texmfcnf then
- else
-   resolvers.luacnfspec=concat ({
-     "home:texmf/web2c",
--    "selfautoparent:/texmf-local/web2c",
--    "selfautoparent:/texmf-context/web2c",
--    "selfautoparent:/texmf-dist/web2c",
--    "selfautoparent:/texmf/web2c",
-+    "selfautodir:local/share/texmf/web2c",
-+    "selfautodir:share/texmf/web2c",
-   },";")
- end
- local unset_variable="unset"
-Index: work/texmf-dist/scripts/context/stubs/unix/mtxrun
-===================================================================
---- work.orig/texmf-dist/scripts/context/stubs/unix/mtxrun
-+++ work/texmf-dist/scripts/context/stubs/unix/mtxrun
-@@ -12970,10 +12970,8 @@ if environment.default_texmfcnf then
- else
-   resolvers.luacnfspec=concat ({
-     "home:texmf/web2c",
--    "selfautoparent:/texmf-local/web2c",
--    "selfautoparent:/texmf-context/web2c",
--    "selfautoparent:/texmf-dist/web2c",
--    "selfautoparent:/texmf/web2c",
-+    "selfautodir:local/share/texmf/web2c",
-+    "selfautodir:share/texmf/web2c",
-   },";")
- end
- local unset_variable="unset"
-Index: work/texmf-dist/tex/context/base/data-res.lua
-===================================================================
---- work.orig/texmf-dist/tex/context/base/data-res.lua
-+++ work/texmf-dist/tex/context/base/data-res.lua
-@@ -122,10 +122,8 @@ if environment.default_texmfcnf then
- else
-     resolvers.luacnfspec = concat ( {
-         "home:texmf/web2c",
--        "selfautoparent:/texmf-local/web2c",
--        "selfautoparent:/texmf-context/web2c",
--        "selfautoparent:/texmf-dist/web2c",
--        "selfautoparent:/texmf/web2c",
-+      "selfautodir:local/share/texmf/web2c",
-+      "selfautodir:share/texmf/web2c",
-     }, ";")
- end
diff --git a/dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch b/dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch
deleted file mode 100644 (file)
index 27351bf..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-Ported from upstream by Dennis Schridde.
-
-https://bugs.gentoo.org/show_bug.cgi?id=560654
-
-https://bitbucket.org/rivanvx/beamer/issues/261/beamer-and-subcaption
-https://sourceforge.net/p/latex-caption/tickets/21/
-https://sourceforge.net/p/latex-caption/code/100/
-
-Index: texmf-dist/tex/latex/caption/caption.sty
-===================================================================
---- texmf-dist/tex/latex/caption/caption.sty   (revision 99)
-+++ texmf-dist/tex/latex/caption/caption.sty   (revision 100)
-@@ -36,7 +36,6 @@
- %% and the user manuals
- %%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
- %% 
-- % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
- \NeedsTeXFormat{LaTeX2e}[1994/12/01]
- \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
-   \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
-@@ -379,6 +378,18 @@
-       {\@dblarg{\@caption\@captype}}%
-     }}%
-   \caption@CheckCommand\caption{%
-+    % beamerbaselocalstructure.sty, Joseph Wright committed 4ac715c 2013-09-04
-+    \def\caption{%
-+      \ifx\@captype\@undefined
-+        \@latex@error{\noexpand\caption outside figure or table}\@ehd
-+        \expandafter\@gobble
-+      \else
-+        \refstepcounter\@captype
-+        \expandafter\@firstofone
-+      \fi
-+      {\@dblarg{\@caption\@captype}}%
-+    }}%
-+  \caption@CheckCommand\caption{%
-     % float.sty [2001/11/08 v1.3d Float enhancements (AL)]
-     \long\def\caption{%
-       \ifx\@captype\@undefined