1 |
commit: 487a775183d1f62734c80d67e9e49a21292adab7 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 19 21:35:58 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 20 09:34:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=487a7751 |
7 |
|
8 |
latex-package: remove old EAPIs support |
9 |
|
10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
11 |
|
12 |
eclass/latex-package.eclass | 55 +++++++++++++++++---------------------------- |
13 |
1 file changed, 20 insertions(+), 35 deletions(-) |
14 |
|
15 |
diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass |
16 |
index 1a684ef00a6..17b937683ac 100644 |
17 |
--- a/eclass/latex-package.eclass |
18 |
+++ b/eclass/latex-package.eclass |
19 |
@@ -7,7 +7,7 @@ |
20 |
# @AUTHOR: |
21 |
# Matthew Turk <satai@g.o> |
22 |
# Martin Ehmsen <ehmsen@g.o> |
23 |
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 |
24 |
+# @SUPPORTED_EAPIS: 7 |
25 |
# @BLURB: An eclass for easy installation of LaTeX packages |
26 |
# @DESCRIPTION: |
27 |
# This eClass is designed to be easy to use and implement. The vast majority of |
28 |
@@ -53,18 +53,15 @@ |
29 |
# |
30 |
# It inherits base and eutils in EAPI 5 and earlier. |
31 |
|
32 |
-case ${EAPI:-0} in |
33 |
- 0|1|2|3|4|5) inherit base eutils ;; |
34 |
-esac |
35 |
- |
36 |
RDEPEND="virtual/latex-base" |
37 |
DEPEND="${RDEPEND} |
38 |
>=sys-apps/texinfo-4.2-r5" |
39 |
+ |
40 |
case ${EAPI:-0} in |
41 |
0|1|2|3|4|5|6) ;; |
42 |
- 7) BDEPEND="${DEPEND}"; DEPEND="" ;; |
43 |
- *) die "${ECLASS}: Unknown EAPI ${EAPI}" ;; |
44 |
+ *) die "${EAPI} is not supported" ;; |
45 |
esac |
46 |
+ |
47 |
HOMEPAGE="http://www.tug.org/" |
48 |
TEXMF="/usr/share/texmf-site" |
49 |
|
50 |
@@ -81,14 +78,6 @@ SUPPLIER="misc" |
51 |
# must be set after inherit, as it gets automatically cleared otherwise. |
52 |
LATEX_DOC_ARGUMENTS="" |
53 |
|
54 |
-# Kept for backwards compatibility |
55 |
-latex-package_has_tetex_3() { |
56 |
- case ${EAPI:-0} in |
57 |
- 0|1|2|3|4|5) return 0 ;; |
58 |
- *) die "${FUNCNAME} no longer supported in EAPI ${EAPI}" ;; |
59 |
- esac |
60 |
-} |
61 |
- |
62 |
# @FUNCTION: latex-package_src_doinstall |
63 |
# @USAGE: [ module ] |
64 |
# @DESCRIPTION: |
65 |
@@ -105,34 +94,31 @@ latex-package_src_doinstall() { |
66 |
|
67 |
# This actually follows the directions for a "single-user" system |
68 |
# at http://www.ctan.org/installationadvice/ modified for gentoo. |
69 |
- [ -z "$1" ] && latex-package_src_install all |
70 |
+ [[ -z $1 ]] && latex-package_src_install all |
71 |
|
72 |
- while [ "$1" ]; do |
73 |
+ while [[ $1 ]]; do |
74 |
case $1 in |
75 |
"sh") |
76 |
for i in `find . -maxdepth 1 -type f -name "*.${1}"` |
77 |
do |
78 |
- dobin $i || die "dobin $i failed" |
79 |
+ dobin ${i} || die "dobin $i failed" |
80 |
done |
81 |
;; |
82 |
"sty" | "cls" | "fd" | "clo" | "def" | "cfg") |
83 |
for i in `find . -maxdepth 1 -type f -name "*.${1}"` |
84 |
do |
85 |
insinto ${TEXMF}/tex/latex/${PN} |
86 |
- doins $i || die "doins $i failed" |
87 |
+ doins ${i} |
88 |
done |
89 |
;; |
90 |
"dvi" | "ps" | "pdf") |
91 |
for i in `find . -maxdepth 1 -type f -name "*.${1}"` |
92 |
do |
93 |
insinto /usr/share/doc/${PF} |
94 |
- doins $i || die "doins $i failed" |
95 |
+ doins ${i} |
96 |
dosym /usr/share/doc/${PF}/$(basename ${i}) ${TEXMF}/doc/latex/${PN}/${i} |
97 |
- case "${EAPI:-0}" in |
98 |
- 0|1|2|3) ;; |
99 |
- *) |
100 |
# prevent compression of symlink target |
101 |
- docompress -x /usr/share/doc/${PF}/$(basename ${i}) |
102 |
+ docompress -x /usr/share/doc/${PF}/$(basename ${i}) |
103 |
;; |
104 |
esac |
105 |
done |
106 |
@@ -141,13 +127,13 @@ latex-package_src_doinstall() { |
107 |
if ! in_iuse doc || use doc ; then |
108 |
for i in `find . -maxdepth 1 -type f -name "*.${1}"` |
109 |
do |
110 |
- [ -n "${LATEX_PACKAGE_SKIP}" ] && has ${i##*/} ${LATEX_PACKAGE_SKIP} && continue |
111 |
- einfo "Making documentation: $i" |
112 |
+ [[-n ${LATEX_PACKAGE_SKIP} ]] && has ${i##*/} ${LATEX_PACKAGE_SKIP} && continue |
113 |
+ einfo "Making documentation: ${i}" |
114 |
if pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i ; then |
115 |
pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i || die |
116 |
else |
117 |
einfo "pdflatex failed, trying texi2dvi" |
118 |
- texi2dvi -q -c --language=latex $i || die |
119 |
+ texi2dvi -q -c --language=latex ${i} || die |
120 |
fi |
121 |
done |
122 |
fi |
123 |
@@ -156,28 +142,27 @@ latex-package_src_doinstall() { |
124 |
for i in `find . -maxdepth 1 -type f -name "*.${1}"` |
125 |
do |
126 |
insinto ${TEXMF}/fonts/${1}/${SUPPLIER}/${PN} |
127 |
- doins $i || die "doins $i failed" |
128 |
+ doins ${i} |
129 |
done |
130 |
;; |
131 |
"pfb") |
132 |
for i in `find . -maxdepth 1 -type f -name "*.pfb"` |
133 |
do |
134 |
insinto ${TEXMF}/fonts/type1/${SUPPLIER}/${PN} |
135 |
- doins $i || die "doins $i failed" |
136 |
- done |
137 |
+ doins ${i} |
138 |
;; |
139 |
"ttf") |
140 |
for i in `find . -maxdepth 1 -type f -name "*.ttf"` |
141 |
do |
142 |
insinto ${TEXMF}/fonts/truetype/${SUPPLIER}/${PN} |
143 |
- doins $i || die "doins $i failed" |
144 |
+ doins ${i} |
145 |
done |
146 |
;; |
147 |
"bst") |
148 |
for i in `find . -maxdepth 1 -type f -name "*.bst"` |
149 |
do |
150 |
insinto ${TEXMF}/bibtex/bst/${PN} |
151 |
- doins $i || die "doins $i failed" |
152 |
+ doins ${i} |
153 |
done |
154 |
;; |
155 |
"styles") |
156 |
@@ -208,8 +193,8 @@ latex-package_src_compile() { |
157 |
debug-print function $FUNCNAME $* |
158 |
for i in `find \`pwd\` -maxdepth 1 -type f -name "*.ins"` |
159 |
do |
160 |
- einfo "Extracting from $i" |
161 |
- latex --halt-on-error --interaction=nonstopmode $i || die |
162 |
+ einfo "Extracting from ${i}" |
163 |
+ latex --halt-on-error --interaction=nonstopmode ${i} || die |
164 |
done |
165 |
} |
166 |
|
167 |
@@ -219,7 +204,7 @@ latex-package_src_compile() { |
168 |
latex-package_src_install() { |
169 |
debug-print function $FUNCNAME $* |
170 |
latex-package_src_doinstall all |
171 |
- if [ -n "${DOCS}" ] ; then |
172 |
+ if [[ -n ${DOCS} ]] ; then |
173 |
dodoc ${DOCS} |
174 |
fi |
175 |
} |