commit:     3f3d74016a147390d2e494fa615d61bf6f395688
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 21:22:40 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 21:23:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3d7401

perl-module.eclass: Fix M::B and M::B::T QA check for EAPI=7

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 eclass/perl-module.eclass | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 4c43c0e67ea..3f7e4100db0 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -276,19 +276,38 @@ perl-module_src_configure() {
        fi
 
        if [[ ( ${PREFER_BUILDPL} == yes || ! -f Makefile.PL ) && -f Build.PL 
]] ; then
-               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
-                               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
-                               eerror "QA Notice: The ebuild uses 
Module::Build but doesn't depend on it."
-                               die    " Add dev-perl/Module-Build to DEPEND!"
-                       fi
-               fi
+               case ${EAPI:-0} in
+                       5|6)
+                               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
+                                               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
+                                               eerror "QA Notice: The ebuild 
uses Module::Build but doesn't depend on it."
+                                               die    " Add 
dev-perl/Module-Build to DEPEND!"
+                                       fi
+                               fi
+                               ;;
+                       *)
+                               if grep -q 
'\(use\|require\)\s*Module::Build::Tiny' Build.PL ; then
+                                       einfo "Using Module::Build::Tiny"
+                                       if [[ ${BDEPEND} != 
*dev-perl/Module-Build-Tiny* && ${PN} != Module-Build-Tiny ]]; then
+                                               eerror "QA Notice: The ebuild 
uses Module::Build::Tiny but doesn't depend on it."
+                                               eerror " Add 
dev-perl/Module-Build-Tiny to BDEPEND!"
+                                       fi
+                               else
+                                       einfo "Using Module::Build"
+                                       if [[ ${BDEPEND} != 
*virtual/perl-Module-Build* && ${BDEPEND} != *dev-perl/Module-Build* && ${PN} 
!= Module-Build ]] ; then
+                                               eerror "QA Notice: The ebuild 
uses Module::Build but doesn't depend on it."
+                                               eerror " Add 
dev-perl/Module-Build to BDEPEND!"
+                                       fi
+                               fi
+                               ;;
+               esac
                set -- \
                        --installdirs=vendor \
                        --libdoc= \

Reply via email to