[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Hüttel]

commit:     574f814bb1f43c2b3a714d67151920dfe1f0347d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  5 19:56:25 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 13:24:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574f814b

perl-module.eclass: Make some former warnings fatal to get rid of PERLQAFATAL, 
eqawarn, and (in EAPI=6) eutils.eclass

 eclass/perl-module.eclass | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 6716a22..9971b03 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -24,7 +24,7 @@ case "${EAPI:-0}" in
                PERL_EXPF="src_unpack src_prepare src_configure src_compile 
src_test src_install"
                ;;
        6)
-               inherit eutils multiprocessing perl-functions
+               inherit multiprocessing perl-functions
                PERL_EXPF="src_prepare src_configure src_compile src_test 
src_install"
                ;;
        *)
@@ -197,7 +197,6 @@ perl-module_src_prepare() {
                perl_rm_files "${PERL_RM_FILES[@]}"
        fi
        perl_fix_osx_extra
-       esvn_clean
 }
 
 # @FUNCTION: perl-module_src_configure
@@ -231,22 +230,14 @@ perl-module_src_configure() {
                if grep -q '\(use\|require\)\s*Module::Build::Tiny' Build.PL ; 
then
                        einfo "Using Module::Build::Tiny"
                        if [[ ${DEPEND} != *dev-perl/Module-Build-Tiny* && 
${PN} != Module-Build-Tiny ]]; then
-                               eqawarn "QA Notice: The ebuild uses 
Module::Build::Tiny but doesn't depend on it."
-                               eqawarn " Add dev-perl/Module-Build-Tiny to 
DEPEND!"
-                               if [[ -n ${PERLQAFATAL} ]]; then
-                                       eerror "Bailing out due to 
PERLQAFATAL=1";
-                                       die
-                               fi
+                               eerror "QA Notice: The ebuild uses 
Module::Build::Tiny but doesn't depend on it."
+                               die    " Add dev-perl/Module-Build-Tiny to 
DEPEND!"
                        fi
                else
                        einfo "Using Module::Build"
                        if [[ ${DEPEND} != *virtual/perl-Module-Build* && 
${DEPEND} != *dev-perl/Module-Build* && ${PN} != Module-Build ]] ; then
-                               eqawarn "QA Notice: The ebuild uses 
Module::Build but doesn't depend on it."
-                               eqawarn " Add dev-perl/Module-Build to DEPEND!"
-                               if [[ -n ${PERLQAFATAL} ]]; then
-                                       eerror "Bailing out due to 
PERLQAFATAL=1";
-                                       die
-                               fi
+                               eerror "QA Notice: The ebuild uses 
Module::Build but doesn't depend on it."
+                               die    " Add dev-perl/Module-Build to DEPEND!"
                        fi
                fi
                set -- \
@@ -436,9 +427,8 @@ perl-module_src_install() {
 perl-module_pkg_postinst() {
        debug-print-function $FUNCNAME "$@"
        if [[ ${CATEGORY} != perl-core ]] ; then
-               eqawarn "perl-module.eclass: You are calling 
perl-module_pkg_postinst outside the perl-core category."
-               eqawarn "   This does not do anything; the call can be safely 
removed."
-               return 0
+               eerror "perl-module.eclass: You are calling 
perl-module_pkg_postinst outside the perl-core category."
+               die    "   This does not do anything; the call can be removed."
        fi
        perl_link_duallife_scripts
 }
@@ -453,9 +443,8 @@ perl-module_pkg_postinst() {
 perl-module_pkg_postrm() {
        debug-print-function $FUNCNAME "$@"
        if [[ ${CATEGORY} != perl-core ]] ; then
-               eqawarn "perl-module.eclass: You are calling 
perl-module_pkg_postrm outside the perl-core category."
-               eqawarn "   This does not do anything; the call can be safely 
removed."
-               return 0
+               eerror "perl-module.eclass: You are calling 
perl-module_pkg_postrm outside the perl-core category."
+               die    "   This does not do anything; the call can be removed."
        fi
        perl_link_duallife_scripts
 }