1 |
commit: 41a08abd3d38f05509245a82d65d7503de8e3661 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 4 17:32:17 2019 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 4 17:42:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a08abd |
7 |
|
8 |
texlive-module.eclass: code cleanup |
9 |
|
10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
11 |
|
12 |
eclass/texlive-module.eclass | 58 ++++++++------------------------------------ |
13 |
1 file changed, 10 insertions(+), 48 deletions(-) |
14 |
|
15 |
diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass |
16 |
index bd338ee625c..52b26cdca4d 100644 |
17 |
--- a/eclass/texlive-module.eclass |
18 |
+++ b/eclass/texlive-module.eclass |
19 |
@@ -6,7 +6,7 @@ |
20 |
# tex@g.o |
21 |
# @AUTHOR: |
22 |
# Original Author: Alexis Ballier <aballier@g.o> |
23 |
-# @SUPPORTED_EAPIS: 3 4 5 6 7 |
24 |
+# @SUPPORTED_EAPIS: 7 |
25 |
# @BLURB: Provide generic install functions so that modular texlive's texmf ebuild will only have to inherit this eclass |
26 |
# @DESCRIPTION: |
27 |
# Purpose: Provide generic install functions so that modular texlive's texmf ebuilds will |
28 |
@@ -24,7 +24,7 @@ |
29 |
# bash array. |
30 |
|
31 |
# @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS |
32 |
-# @REQUIRED |
33 |
+# @REQUIRED |
34 |
# @DESCRIPTION: |
35 |
# The list of packages that will be installed. This variable will be expanded to |
36 |
# SRC_URI: |
37 |
@@ -68,17 +68,10 @@ |
38 |
# Information to display about the package. |
39 |
# e.g. for enabling/disabling a feature |
40 |
|
41 |
-# @ECLASS-VARIABLE: PATCHES |
42 |
-# @DESCRIPTION: |
43 |
-# Array variable specifying any patches to be applied. |
44 |
- |
45 |
case "${EAPI:-0}" in |
46 |
- 0|1|2) |
47 |
+ 0|1|2|3|4|5|6) |
48 |
die "EAPI='${EAPI}' is not supported anymore" |
49 |
;; |
50 |
- 3|4|5) |
51 |
- inherit texlive-common eutils |
52 |
- ;; |
53 |
*) |
54 |
inherit texlive-common |
55 |
;; |
56 |
@@ -92,19 +85,12 @@ IUSE="source" |
57 |
|
58 |
# Starting from TeX Live 2009, upstream provides .tar.xz modules. |
59 |
PKGEXT=tar.xz |
60 |
-case "${EAPI:-0}" in |
61 |
- 0|1|2|3|4|5|6) |
62 |
- DEPEND="${COMMON_DEPEND} |
63 |
- app-arch/xz-utils" |
64 |
- ;; |
65 |
- *) |
66 |
- # We do not need anything from SYSROOT: |
67 |
- # Everything is built from the texlive install in / |
68 |
- # Generated files are noarch |
69 |
- BDEPEND="${COMMON_DEPEND} |
70 |
- app-arch/xz-utils" |
71 |
- ;; |
72 |
-esac |
73 |
+ |
74 |
+# We do not need anything from SYSROOT: |
75 |
+# Everything is built from the texlive install in / |
76 |
+# Generated files are noarch |
77 |
+BDEPEND="${COMMON_DEPEND} |
78 |
+ app-arch/xz-utils" |
79 |
|
80 |
for i in ${TEXLIVE_MODULE_CONTENTS}; do |
81 |
SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}" |
82 |
@@ -164,22 +150,6 @@ texlive-module_src_unpack() { |
83 |
done |
84 |
} |
85 |
|
86 |
-# @FUNCTION: texlive-module_src_prepare |
87 |
-# @DESCRIPTION: |
88 |
-# Apply patches from the PATCHES array and user patches, if any. |
89 |
- |
90 |
-texlive-module_src_prepare() { |
91 |
- case "${EAPI:-0}" in |
92 |
- 0|1|2|3|4|5) |
93 |
- [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}" |
94 |
- epatch_user |
95 |
- ;; |
96 |
- *) |
97 |
- die "texlive-module_src_prepare is not to be used in EAPI ${EAPI}" |
98 |
- ;; |
99 |
- esac |
100 |
-} |
101 |
- |
102 |
# @FUNCTION: texlive-module_add_format |
103 |
# @DESCRIPTION: |
104 |
# Creates/appends to a format.${PN}.cnf file for fmtutil. |
105 |
@@ -429,12 +399,4 @@ texlive-module_pkg_postrm() { |
106 |
etexmf-update |
107 |
} |
108 |
|
109 |
-case "${EAPI:-0}" in |
110 |
- 0|1|2|3|4|5) |
111 |
- EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install \ |
112 |
- pkg_postinst pkg_postrm |
113 |
- ;; |
114 |
- *) |
115 |
- EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm |
116 |
- ;; |
117 |
-esac |
118 |
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm |