1 |
Dnia 11 grudnia 2015 22:02:57 CET, dilfridge@g.o napisał(a): |
2 |
>From: "Andreas K. Huettel (dilfridge)" <dilfridge@g.o> |
3 |
> |
4 |
>--- |
5 |
>eclass/perl-module.eclass | 54 |
6 |
>++++++++++++++++++++++++++++++++++++++--------- |
7 |
> 1 file changed, 44 insertions(+), 10 deletions(-) |
8 |
> |
9 |
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass |
10 |
>index 5a476d2..82c72fc 100644 |
11 |
>--- a/eclass/perl-module.eclass |
12 |
>+++ b/eclass/perl-module.eclass |
13 |
>@@ -37,21 +37,55 @@ case "${EAPI:-0}" in |
14 |
> RDEPEND="${DEPEND}" |
15 |
> ;; |
16 |
> esac |
17 |
>+ |
18 |
>+ case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in |
19 |
>+ yes) |
20 |
>+ EXPORT_FUNCTIONS ${PERL_EXPF} |
21 |
>+ ;; |
22 |
>+ no) |
23 |
>+ debug-print "PERL_EXPORT_PHASE_FUNCTIONS=no" |
24 |
>+ ;; |
25 |
>+ *) |
26 |
>+ die "PERL_EXPORT_PHASE_FUNCTIONS=${PERL_EXPORT_PHASE_FUNCTIONS} is |
27 |
>not supported by perl-module.eclass" |
28 |
>+ ;; |
29 |
>+ esac |
30 |
|
31 |
You could split this move, you know. |
32 |
|
33 |
> ;; |
34 |
>- *) |
35 |
>- die "EAPI=${EAPI} is not supported by perl-module.eclass" |
36 |
>- ;; |
37 |
>-esac |
38 |
>+ 6) |
39 |
>+ [[ ${CATEGORY} == "perl-core" ]] && \ |
40 |
>+ PERL_EXPF+=" pkg_postinst pkg_postrm" |
41 |
>+ |
42 |
>+ case "${GENTOO_DEPEND_ON_PERL:-yes}" in |
43 |
>+ yes) |
44 |
>+ case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in |
45 |
>+ yes) |
46 |
>+ DEPEND="dev-lang/perl:=" |
47 |
>+ ;; |
48 |
>+ *) |
49 |
>+ DEPEND="dev-lang/perl" |
50 |
>+ ;; |
51 |
>+ esac |
52 |
>+ RDEPEND="${DEPEND}" |
53 |
>+ ;; |
54 |
>+ esac |
55 |
|
56 |
Why don't you pack this stuff into a single trinary variable? |
57 |
|
58 |
>+ |
59 |
>+ case "${PERL_EXPORT_PHASE_FUNCTIONS:-undefined}" in |
60 |
|
61 |
The ':' means it's not going to complain about PERL_EXPORT_PHASE_FUNCTIONS=. |
62 |
|
63 |
>+ yes) |
64 |
>+ die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. It defaults |
65 |
>to yes anyway." |
66 |
>+ ;; |
67 |
>+ no) |
68 |
>+ die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. Inherit |
69 |
>perl-functions.eclass instead." |
70 |
>+ ;; |
71 |
>+ undefined) |
72 |
>+ ;; |
73 |
>+ *) |
74 |
>+ die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6." |
75 |
>+ ;; |
76 |
>+ esac |
77 |
> |
78 |
>-case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in |
79 |
>- yes) |
80 |
> EXPORT_FUNCTIONS ${PERL_EXPF} |
81 |
> ;; |
82 |
>- no) |
83 |
>- debug-print "PERL_EXPORT_PHASE_FUNCTIONS=no" |
84 |
>- ;; |
85 |
> *) |
86 |
>- die "PERL_EXPORT_PHASE_FUNCTIONS=${PERL_EXPORT_PHASE_FUNCTIONS} is |
87 |
>not supported by perl-module.eclass" |
88 |
>+ die "EAPI=${EAPI} is not supported by perl-module.eclass" |
89 |
> ;; |
90 |
> esac |
91 |
> |
92 |
|
93 |
-- |
94 |
Sent from my Android device with K-9 Mail. Please excuse my brevity. |