From: Andreas K. Hüttel <dilfri...@gentoo.org>
---
eclass/perl-module.eclass | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 6a5f2ff..7434bcf 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -102,12 +102,18 @@ esac
LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
-if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
- : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
- S=${MY_S:-${WORKDIR}/${MY_P}}
+if [[ ${EAPI:-0} = 5 ]] ; then
+ if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
+ : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
+ S=${MY_S:-${WORKDIR}/${MY_P}}
+ fi
+ MODULE_NAME=${MY_PN:-${PN}}
+ MODULE_P=${MY_P:-${P}}
+else
+ MODULE_NAME=${MODULE_NAME:-${PN}}
+ MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
+ S=${WORKDIR}/${MODULE_P}
fi
-MODULE_NAME=${MY_PN:-${PN}}
-MODULE_P=${MY_P:-${P}}
[[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
--
2.6.3
