Dnia 11 grudnia 2015 22:03:05 CET, dilfri...@gentoo.org napisał(a):
>From: "Andreas K. Huettel (dilfridge)" <dilfri...@gentoo.org>
>
>This is more consistent with upstream terminology and avoids clashes in
>case of kernel modules.
>---
>eclass/perl-module.eclass | 52
>+++++++++++++++++++++++++++--------------------
> 1 file changed, 30 insertions(+), 22 deletions(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index 82707fe..efcc47c 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -114,30 +114,31 @@ esac
>
> LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
>
>-# @ECLASS-VARIABLE: MODULE_NAME
>+# @ECLASS-VARIABLE: DIST_NAME
> # @DESCRIPTION:
># (EAPI=6) This variable provides a way to override PN for the
>calculation of S,
> # SRC_URI, and HOMEPAGE. Defaults to PN.
>
>-# @ECLASS-VARIABLE: MODULE_VERSION
>+# @ECLASS-VARIABLE: DIST_VERSION
> # @DESCRIPTION:
>-# This variable provides a way to override PV for the calculation of S
>and SRC_URI.
>+# (EAPI=6) This variable provides a way to override PV for the
>calculation of S and SRC_URI.
># Use it to provide the non-normalized, upstream version number.
>Defaults to PV.
>+# Named MODULE_VERSION in EAPI=5.
>
>-# @ECLASS-VARIABLE: MODULE_A_EXT
>+# @ECLASS-VARIABLE: DIST_A_EXT
> # @DESCRIPTION:
>-# This variable provides a way to override the distfile extension for
>the calculation of
>-# SRC_URI. Defaults to tar.gz
>+# (EAPI=6) This variable provides a way to override the distfile
>extension for the calculation of
>+# SRC_URI. Defaults to tar.gz. Named MODULE_A_EXT in EAPI=5.
>
>-# @ECLASS-VARIABLE: MODULE_A
>+# @ECLASS-VARIABLE: DIST_A
> # @DESCRIPTION:
>-# This variable provides a way to override the distfile name for the
>calculation of
>-# SRC_URI. Defaults to
>${MODULE_NAME}-${MODULE_VERSION}.${MODULE_A_EXT}
>+# (EAPI=6) This variable provides a way to override the distfile name
>for the calculation of
>+# SRC_URI. Defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT}
>Named MODULE_A in EAPI=5.
>
>-# @ECLASS-VARIABLE: MODULE_AUTHOR
>+# @ECLASS-VARIABLE: DIST_AUTHOR
> # @DESCRIPTION:
>-# This variable sets the module author name for the calculation of
>-# SRC_URI.
>+# (EAPI=6) This variable sets the module author name for the
>calculation of
>+# SRC_URI. Named MODULE_AUTHOR in EAPI=5.
>
> if [[ ${EAPI:-0} = 5 ]] ; then
> if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
>@@ -146,19 +147,26 @@ if [[ ${EAPI:-0} = 5 ]] ; then
> 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}"
>+ [[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
>+
>SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
>+ [[ -z "${HOMEPAGE}" ]] && \
>+ HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/";
> else
>- MODULE_NAME=${MODULE_NAME:-${PN}}
>- MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
>- S=${WORKDIR}/${MODULE_P}
>+ DIST_NAME=${DIST_NAME:-${PN}}
>+ DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}}
>+ S=${WORKDIR}/${DIST_P}
>+
>+ [[ -z "${SRC_URI}" && -z "${DIST_A}" ]] && \
>+ DIST_A="${DIST_P}.${DIST_A_EXT:-tar.gz}"
>+ [[ -z "${SRC_URI}" && -n "${DIST_AUTHOR}" ]] && \
>+
>SRC_URI="mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${DIST_SECTION:+${DIST_SECTION}/}${DIST_A}"
>+ [[ -z "${HOMEPAGE}" ]] && \
>+ HOMEPAGE="http://search.cpan.org/dist/${DIST_NAME}/";
> fi
>
>-[[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
>- MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
>-[[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
>-
>SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
>-[[ -z "${HOMEPAGE}" ]] && \
>- HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/";
>-
> SRC_PREP="no"
> SRC_TEST="skip"
> PREFER_BUILDPL="yes"
Now that's confusing history. You introduce new variables, document them all,
then suddenly rename then. Wouldn't it be better to rename old ones first and
introduce new ones directly with correct names?
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
