| 1 |
From: Andreas K. Hüttel <dilfridge@g.o> |
| 2 |
|
| 3 |
--- |
| 4 |
eclass/perl-module.eclass | 29 +++++++++-------------------- |
| 5 |
1 file changed, 9 insertions(+), 20 deletions(-) |
| 6 |
|
| 7 |
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass |
| 8 |
index 86c0a48..faa8a34 100644 |
| 9 |
--- a/eclass/perl-module.eclass |
| 10 |
+++ b/eclass/perl-module.eclass |
| 11 |
@@ -24,7 +24,7 @@ case "${EAPI:-0}" in |
| 12 |
PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install" |
| 13 |
;; |
| 14 |
6) |
| 15 |
- inherit eutils multiprocessing perl-functions |
| 16 |
+ inherit multiprocessing perl-functions |
| 17 |
PERL_EXPF="src_prepare src_configure src_compile src_test src_install" |
| 18 |
;; |
| 19 |
*) |
| 20 |
@@ -211,7 +211,6 @@ perl-module_src_prepare() { |
| 21 |
perl_rm_files "${PERL_RM_FILES[@]}" |
| 22 |
fi |
| 23 |
perl_fix_osx_extra |
| 24 |
- esvn_clean |
| 25 |
} |
| 26 |
|
| 27 |
# @FUNCTION: perl-module_src_configure |
| 28 |
@@ -245,22 +244,14 @@ perl-module_src_configure() { |
| 29 |
if grep -q '\(use\|require\)\s*Module::Build::Tiny' Build.PL ; then |
| 30 |
einfo "Using Module::Build::Tiny" |
| 31 |
if [[ ${DEPEND} != *dev-perl/Module-Build-Tiny* && ${PN} != Module-Build-Tiny ]]; then |
| 32 |
- eqawarn "QA Notice: The ebuild uses Module::Build::Tiny but doesn't depend on it." |
| 33 |
- eqawarn " Add dev-perl/Module-Build-Tiny to DEPEND!" |
| 34 |
- if [[ -n ${PERLQAFATAL} ]]; then |
| 35 |
- eerror "Bailing out due to PERLQAFATAL=1"; |
| 36 |
- die |
| 37 |
- fi |
| 38 |
+ eerror "QA Notice: The ebuild uses Module::Build::Tiny but doesn't depend on it." |
| 39 |
+ die " Add dev-perl/Module-Build-Tiny to DEPEND!" |
| 40 |
fi |
| 41 |
else |
| 42 |
einfo "Using Module::Build" |
| 43 |
if [[ ${DEPEND} != *virtual/perl-Module-Build* && ${DEPEND} != *dev-perl/Module-Build* && ${PN} != Module-Build ]] ; then |
| 44 |
- eqawarn "QA Notice: The ebuild uses Module::Build but doesn't depend on it." |
| 45 |
- eqawarn " Add dev-perl/Module-Build to DEPEND!" |
| 46 |
- if [[ -n ${PERLQAFATAL} ]]; then |
| 47 |
- eerror "Bailing out due to PERLQAFATAL=1"; |
| 48 |
- die |
| 49 |
- fi |
| 50 |
+ eerror "QA Notice: The ebuild uses Module::Build but doesn't depend on it." |
| 51 |
+ die " Add dev-perl/Module-Build to DEPEND!" |
| 52 |
fi |
| 53 |
fi |
| 54 |
set -- \ |
| 55 |
@@ -425,9 +416,8 @@ perl-module_src_install() { |
| 56 |
perl-module_pkg_postinst() { |
| 57 |
debug-print-function $FUNCNAME "$@" |
| 58 |
if [[ ${CATEGORY} != perl-core ]] ; then |
| 59 |
- eqawarn "perl-module.eclass: You are calling perl-module_pkg_postinst outside the perl-core category." |
| 60 |
- eqawarn " This does not do anything; the call can be safely removed." |
| 61 |
- return 0 |
| 62 |
+ eerror "perl-module.eclass: You are calling perl-module_pkg_postinst outside the perl-core category." |
| 63 |
+ die " This does not do anything; the call can be removed." |
| 64 |
fi |
| 65 |
perl_link_duallife_scripts |
| 66 |
} |
| 67 |
@@ -442,9 +432,8 @@ perl-module_pkg_postinst() { |
| 68 |
perl-module_pkg_postrm() { |
| 69 |
debug-print-function $FUNCNAME "$@" |
| 70 |
if [[ ${CATEGORY} != perl-core ]] ; then |
| 71 |
- eqawarn "perl-module.eclass: You are calling perl-module_pkg_postrm outside the perl-core category." |
| 72 |
- eqawarn " This does not do anything; the call can be safely removed." |
| 73 |
- return 0 |
| 74 |
+ eerror "perl-module.eclass: You are calling perl-module_pkg_postrm outside the perl-core category." |
| 75 |
+ die " This does not do anything; the call can be removed." |
| 76 |
fi |
| 77 |
perl_link_duallife_scripts |
| 78 |
} |
| 79 |
-- |
| 80 |
2.6.3 |
Archives