1 |
commit: 398e71f185e2db1fb123ec27e6999aa8194d81f9 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Mar 27 18:48:13 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 27 21:44:03 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=398e71f1 |
7 |
|
8 |
dev-texlive/texlive-basic: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/7658 |
11 |
|
12 |
.../texlive-basic/files/texmfcnflua2012.patch | 49 ------------------ |
13 |
.../texlive-basic/files/texmfcnflua2013.patch | 49 ------------------ |
14 |
.../texlive-basic/files/texmfcnflua2014.patch | 59 ---------------------- |
15 |
3 files changed, 157 deletions(-) |
16 |
|
17 |
diff --git a/dev-texlive/texlive-basic/files/texmfcnflua2012.patch b/dev-texlive/texlive-basic/files/texmfcnflua2012.patch |
18 |
deleted file mode 100644 |
19 |
index dfc58e6eaf8..00000000000 |
20 |
--- a/dev-texlive/texlive-basic/files/texmfcnflua2012.patch |
21 |
+++ /dev/null |
22 |
@@ -1,49 +0,0 @@ |
23 |
---- texmf/web2c/texmfcnf.lua.old 2012-07-26 10:58:15.984959743 -0400 |
24 |
-+++ texmf/web2c/texmfcnf.lua 2012-07-26 11:03:03.998622207 -0400 |
25 |
-@@ -30,7 +30,7 @@ |
26 |
- -- most cases you can leve this one untouched. The built-in definition |
27 |
- -- permits relocation of the tree. |
28 |
- -- |
29 |
-- -- TEXMFCNF = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}" |
30 |
-+ -- TEXMFCNF = "selfautodir:/share/texmf/web2c" |
31 |
- -- |
32 |
- -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is: |
33 |
- -- |
34 |
-@@ -44,14 +44,14 @@ |
35 |
- |
36 |
- -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live |
37 |
- |
38 |
-- TEXMFSYSVAR = "selfautoparent:texmf-var", |
39 |
-- TEXMFVAR = "home:.texlive2012/texmf-var", |
40 |
-+ TEXMFSYSVAR = "selfautodir:/../var/lib/texmf", |
41 |
-+ TEXMFVAR = "home:.texlive/texmf-var", |
42 |
- |
43 |
- -- We have only one cache path but there can be more. The first writable one |
44 |
- -- will be chosen but there can be more readable paths. |
45 |
- |
46 |
- TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", |
47 |
-- TEXMFCONFIG = "home:.texlive2012/texmf-config", |
48 |
-+ TEXMFCONFIG = "home:.texlive/texmf-config", |
49 |
- |
50 |
- -- I don't like this texmf under home and texmf-home would make more |
51 |
- -- sense. One never knows what installers put under texmf anywhere and |
52 |
-@@ -62,13 +62,13 @@ |
53 |
- -- entry. This makes the tex root relocatable. |
54 |
- |
55 |
- TEXMFOS = "selfautodir:", |
56 |
-- TEXMFMAIN = "selfautoparent:texmf", |
57 |
-- TEXMFDIST = "selfautoparent:texmf-dist", |
58 |
-+ TEXMFMAIN = "selfautodir:share/texmf", |
59 |
-+ TEXMFDIST = "selfautoparent:share/texmf-dist", |
60 |
- |
61 |
-- TEXMFLOCAL = texmflocal, |
62 |
-- TEXMFSYSCONFIG = "selfautoparent:texmf-config", |
63 |
-- TEXMFFONTS = "selfautoparent:texmf-fonts", |
64 |
-- TEXMFPROJECT = "selfautoparent:texmf-project", |
65 |
-+ TEXMFLOCAL = "selfautodir:local/share/texmf", |
66 |
-+ TEXMFSYSCONFIG = "selfautodir:/../etc/texmf", |
67 |
-+ TEXMFFONTS = "selfautodir:share/texmf-dist", |
68 |
-+ TEXMFPROJECT = "selfautodir:share/texmf-dist", |
69 |
- |
70 |
- TEXMFHOME = "home:texmf", |
71 |
- -- TEXMFHOME = os.name == "macosx" and "home:Library/texmf" or "home:texmf", |
72 |
|
73 |
diff --git a/dev-texlive/texlive-basic/files/texmfcnflua2013.patch b/dev-texlive/texlive-basic/files/texmfcnflua2013.patch |
74 |
deleted file mode 100644 |
75 |
index 9444832cdcd..00000000000 |
76 |
--- a/dev-texlive/texlive-basic/files/texmfcnflua2013.patch |
77 |
+++ /dev/null |
78 |
@@ -1,49 +0,0 @@ |
79 |
-Index: work/texmf-dist/web2c/texmfcnf.lua |
80 |
-=================================================================== |
81 |
---- work.orig/texmf-dist/web2c/texmfcnf.lua |
82 |
-+++ work/texmf-dist/web2c/texmfcnf.lua |
83 |
-@@ -30,7 +30,7 @@ return { |
84 |
- -- most cases you can leve this one untouched. The built-in definition |
85 |
- -- permits relocation of the tree. |
86 |
- -- |
87 |
-- -- TEXMFCNF = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}" |
88 |
-+ -- TEXMFCNF = "selfautodir:share/texmf-dist/web2c" |
89 |
- -- |
90 |
- -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is: |
91 |
- -- |
92 |
-@@ -44,14 +44,14 @@ return { |
93 |
- |
94 |
- -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live |
95 |
- |
96 |
-- TEXMFSYSVAR = "selfautoparent:texmf-var", |
97 |
-- TEXMFVAR = "home:.texlive2013/texmf-var", |
98 |
-+ TEXMFSYSVAR = "selfautoparent:var/lib/texmf", |
99 |
-+ TEXMFVAR = "home:.texlive/texmf-var", |
100 |
- |
101 |
- -- We have only one cache path but there can be more. The first writable one |
102 |
- -- will be chosen but there can be more readable paths. |
103 |
- |
104 |
- TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", |
105 |
-- TEXMFCONFIG = "home:.texlive2013/texmf-config", |
106 |
-+ TEXMFCONFIG = "home:.texlive/texmf-config", |
107 |
- |
108 |
- -- I don't like this texmf under home and texmf-home would make more |
109 |
- -- sense. One never knows what installers put under texmf anywhere and |
110 |
-@@ -62,12 +62,12 @@ return { |
111 |
- -- entry. This makes the tex root relocatable. |
112 |
- |
113 |
- TEXMFOS = "selfautodir:", |
114 |
-- TEXMFDIST = "selfautoparent:texmf-dist", |
115 |
-+ TEXMFDIST = "selfautoparent:share/texmf-dist", |
116 |
- |
117 |
-- TEXMFLOCAL = texmflocal, |
118 |
-- TEXMFSYSCONFIG = "selfautoparent:texmf-config", |
119 |
-- TEXMFFONTS = "selfautoparent:texmf-fonts", |
120 |
-- TEXMFPROJECT = "selfautoparent:texmf-project", |
121 |
-+ TEXMFLOCAL = "selfautodir:local/share/texmf", |
122 |
-+ TEXMFSYSCONFIG = "selfautoparent:etc/texmf", |
123 |
-+ TEXMFFONTS = "selfautodir:share/texmf-dist", |
124 |
-+ TEXMFPROJECT = "selfautodir:share/texmf-dist", |
125 |
- |
126 |
- TEXMFHOME = "home:texmf", |
127 |
- -- TEXMFHOME = os.name == "macosx" and "home:Library/texmf" or "home:texmf", |
128 |
|
129 |
diff --git a/dev-texlive/texlive-basic/files/texmfcnflua2014.patch b/dev-texlive/texlive-basic/files/texmfcnflua2014.patch |
130 |
deleted file mode 100644 |
131 |
index ca8b61be0bb..00000000000 |
132 |
--- a/dev-texlive/texlive-basic/files/texmfcnflua2014.patch |
133 |
+++ /dev/null |
134 |
@@ -1,59 +0,0 @@ |
135 |
-Index: work/texmf-dist/web2c/texmfcnf.lua |
136 |
-=================================================================== |
137 |
---- work.orig/texmf-dist/web2c/texmfcnf.lua |
138 |
-+++ work/texmf-dist/web2c/texmfcnf.lua |
139 |
-@@ -3,9 +3,6 @@ |
140 |
- -- ConTeXt needs a properly expanded TEXMFLOCAL, so here is a |
141 |
- -- bit of lua code to make that happen |
142 |
- |
143 |
--local texmflocal = resolvers.prefixes.selfautoparent(); |
144 |
--texmflocal = string.gsub(texmflocal, "20%d%d$", "texmf-local"); |
145 |
-- |
146 |
- return { |
147 |
- |
148 |
- type = "configuration", |
149 |
-@@ -30,7 +27,7 @@ return { |
150 |
- -- most cases you can leve this one untouched. The built-in definition |
151 |
- -- permits relocation of the tree. |
152 |
- -- |
153 |
-- -- TEXMFCNF = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}" |
154 |
-+ -- TEXMFCNF = "selfautodir:share/texmf-dist/web2c" |
155 |
- -- |
156 |
- -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is: |
157 |
- -- |
158 |
-@@ -44,14 +41,14 @@ return { |
159 |
- |
160 |
- -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live |
161 |
- |
162 |
-- TEXMFSYSVAR = "selfautoparent:texmf-var", |
163 |
-- TEXMFVAR = "home:.texlive2014/texmf-var", |
164 |
-+ TEXMFSYSVAR = "selfautoparent:var/lib/texmf", |
165 |
-+ TEXMFVAR = "home:.texlive/texmf-var", |
166 |
- |
167 |
- -- We have only one cache path but there can be more. The first writable one |
168 |
- -- will be chosen but there can be more readable paths. |
169 |
- |
170 |
- TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", |
171 |
-- TEXMFCONFIG = "home:.texlive2014/texmf-config", |
172 |
-+ TEXMFCONFIG = "home:.texlive/texmf-config", |
173 |
- |
174 |
- -- I don't like this texmf under home and texmf-home would make more |
175 |
- -- sense. One never knows what installers put under texmf anywhere and |
176 |
-@@ -62,12 +59,12 @@ return { |
177 |
- -- entry. This makes the tex root relocatable. |
178 |
- |
179 |
- TEXMFOS = "selfautodir:", |
180 |
-- TEXMFDIST = "selfautoparent:texmf-dist", |
181 |
-+ TEXMFDIST = "selfautodir:share/texmf-dist", |
182 |
- |
183 |
-- TEXMFLOCAL = texmflocal, |
184 |
-- TEXMFSYSCONFIG = "selfautoparent:texmf-config", |
185 |
-- TEXMFFONTS = "selfautoparent:texmf-fonts", |
186 |
-- TEXMFPROJECT = "selfautoparent:texmf-project", |
187 |
-+ TEXMFLOCAL = "selfautodir:local/share/texmf", |
188 |
-+ TEXMFSYSCONFIG = "selfautoparent:etc/texmf", |
189 |
-+ TEXMFFONTS = "selfautodir:share/texmf-dist", |
190 |
-+ TEXMFPROJECT = "selfautodir:share/texmf-dist", |
191 |
- |
192 |
- TEXMFHOME = "home:texmf", |
193 |
- -- TEXMFHOME = os.name == "macosx" and "home:Library/texmf" or "home:texmf", |