| 1 |
commit: 574f814bb1f43c2b3a714d67151920dfe1f0347d |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 5 19:56:25 2015 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 19 13:24:21 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574f814b |
| 7 |
|
| 8 |
perl-module.eclass: Make some former warnings fatal to get rid of PERLQAFATAL, eqawarn, and (in EAPI=6) eutils.eclass |
| 9 |
|
| 10 |
eclass/perl-module.eclass | 29 +++++++++-------------------- |
| 11 |
1 file changed, 9 insertions(+), 20 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass |
| 14 |
index 6716a22..9971b03 100644 |
| 15 |
--- a/eclass/perl-module.eclass |
| 16 |
+++ b/eclass/perl-module.eclass |
| 17 |
@@ -24,7 +24,7 @@ case "${EAPI:-0}" in |
| 18 |
PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install" |
| 19 |
;; |
| 20 |
6) |
| 21 |
- inherit eutils multiprocessing perl-functions |
| 22 |
+ inherit multiprocessing perl-functions |
| 23 |
PERL_EXPF="src_prepare src_configure src_compile src_test src_install" |
| 24 |
;; |
| 25 |
*) |
| 26 |
@@ -197,7 +197,6 @@ perl-module_src_prepare() { |
| 27 |
perl_rm_files "${PERL_RM_FILES[@]}" |
| 28 |
fi |
| 29 |
perl_fix_osx_extra |
| 30 |
- esvn_clean |
| 31 |
} |
| 32 |
|
| 33 |
# @FUNCTION: perl-module_src_configure |
| 34 |
@@ -231,22 +230,14 @@ perl-module_src_configure() { |
| 35 |
if grep -q '\(use\|require\)\s*Module::Build::Tiny' Build.PL ; then |
| 36 |
einfo "Using Module::Build::Tiny" |
| 37 |
if [[ ${DEPEND} != *dev-perl/Module-Build-Tiny* && ${PN} != Module-Build-Tiny ]]; then |
| 38 |
- eqawarn "QA Notice: The ebuild uses Module::Build::Tiny but doesn't depend on it." |
| 39 |
- eqawarn " Add dev-perl/Module-Build-Tiny to DEPEND!" |
| 40 |
- if [[ -n ${PERLQAFATAL} ]]; then |
| 41 |
- eerror "Bailing out due to PERLQAFATAL=1"; |
| 42 |
- die |
| 43 |
- fi |
| 44 |
+ eerror "QA Notice: The ebuild uses Module::Build::Tiny but doesn't depend on it." |
| 45 |
+ die " Add dev-perl/Module-Build-Tiny to DEPEND!" |
| 46 |
fi |
| 47 |
else |
| 48 |
einfo "Using Module::Build" |
| 49 |
if [[ ${DEPEND} != *virtual/perl-Module-Build* && ${DEPEND} != *dev-perl/Module-Build* && ${PN} != Module-Build ]] ; then |
| 50 |
- eqawarn "QA Notice: The ebuild uses Module::Build but doesn't depend on it." |
| 51 |
- eqawarn " Add dev-perl/Module-Build to DEPEND!" |
| 52 |
- if [[ -n ${PERLQAFATAL} ]]; then |
| 53 |
- eerror "Bailing out due to PERLQAFATAL=1"; |
| 54 |
- die |
| 55 |
- fi |
| 56 |
+ eerror "QA Notice: The ebuild uses Module::Build but doesn't depend on it." |
| 57 |
+ die " Add dev-perl/Module-Build to DEPEND!" |
| 58 |
fi |
| 59 |
fi |
| 60 |
set -- \ |
| 61 |
@@ -436,9 +427,8 @@ perl-module_src_install() { |
| 62 |
perl-module_pkg_postinst() { |
| 63 |
debug-print-function $FUNCNAME "$@" |
| 64 |
if [[ ${CATEGORY} != perl-core ]] ; then |
| 65 |
- eqawarn "perl-module.eclass: You are calling perl-module_pkg_postinst outside the perl-core category." |
| 66 |
- eqawarn " This does not do anything; the call can be safely removed." |
| 67 |
- return 0 |
| 68 |
+ eerror "perl-module.eclass: You are calling perl-module_pkg_postinst outside the perl-core category." |
| 69 |
+ die " This does not do anything; the call can be removed." |
| 70 |
fi |
| 71 |
perl_link_duallife_scripts |
| 72 |
} |
| 73 |
@@ -453,9 +443,8 @@ perl-module_pkg_postinst() { |
| 74 |
perl-module_pkg_postrm() { |
| 75 |
debug-print-function $FUNCNAME "$@" |
| 76 |
if [[ ${CATEGORY} != perl-core ]] ; then |
| 77 |
- eqawarn "perl-module.eclass: You are calling perl-module_pkg_postrm outside the perl-core category." |
| 78 |
- eqawarn " This does not do anything; the call can be safely removed." |
| 79 |
- return 0 |
| 80 |
+ eerror "perl-module.eclass: You are calling perl-module_pkg_postrm outside the perl-core category." |
| 81 |
+ die " This does not do anything; the call can be removed." |
| 82 |
fi |
| 83 |
perl_link_duallife_scripts |
| 84 |
} |
Archives