Add perl-helper.eclass (#302183) and update perl-module.eclass per <http://archives...

diff --git a/eclass/perl-helper.eclass b/eclass/perl-helper.eclass
new file mode 100644 (file)
index 0000000..11cd29a
--- /dev/null
+++ b/eclass/perl-helper.eclass
@@ -0,0 +1,130 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-helper.eclass,v 1.1 2010/04/17 19:56:27 tove Exp $
+
+[[ ${CATEGORY} == "perl-core" ]] && inherit alternatives
+
+perlinfo() {
+       debug-print-function $FUNCNAME "$@"
+       perl_set_version
+}
+
+perl_set_version() {
+       debug-print-function $FUNCNAME "$@"
+       debug-print "$FUNCNAME: perlinfo_done=${perlinfo_done}"
+       ${perlinfo_done} && return 0
+       perlinfo_done=true
+
+       local f version install{{site,vendor}{arch,lib},archlib}
+       eval "$(perl -V:{version,install{{site,vendor}{arch,lib},archlib}} )"
+       PERL_VERSION=${version}
+       SITE_ARCH=${installsitearch}
+       SITE_LIB=${installsitelib}
+       ARCH_LIB=${installarchlib}
+       VENDOR_LIB=${installvendorlib}
+       VENDOR_ARCH=${installvendorarch}
+}
+
+fixlocalpod() {
+       debug-print-function $FUNCNAME "$@"
+       perl_delete_localpod
+}
+
+perl_delete_localpod() {
+       debug-print-function $FUNCNAME "$@"
+
+       find "${D}" -type f -name perllocal.pod -delete
+       find "${D}" -depth -mindepth 1 -type d -empty -delete
+}
+
+perl_fix_osx_extra() {
+       debug-print-function $FUNCNAME "$@"
+
+       local f
+       find "${S}" -type f -name "._*" -print0 | while read -rd '' f ; do
+               einfo "Removing AppleDouble encoded Macintosh file: ${f#${S}/}"
+               rm -f "${f}"
+               f=${f#${S}/}
+       #       f=${f//\//\/}
+       #       f=${f//\./\.}
+       #       sed -i "/${f}/d" "${S}"/MANIFEST || die
+               grep -q "${f}" "${S}"/MANIFEST && \
+                       elog "AppleDouble encoded Macintosh file in MANIFEST: ${f}"
+       done
+}
+
+perl_delete_module_manpages() {
+       debug-print-function $FUNCNAME "$@"
+
+       perl_set_eprefix
+
+       if [[ -d "${ED}"/usr/share/man ]] ; then
+#              einfo "Cleaning out stray man files"
+               find "${ED}"/usr/share/man -type f -name "*.3pm" -delete
+               find "${ED}"/usr/share/man -depth -type d -empty -delete
+       fi
+}
+
+
+perl_delete_packlist() {
+       debug-print-function $FUNCNAME "$@"
+       perl_set_version
+       if [[ -d ${D}/${VENDOR_LIB} ]] ; then
+               find "${D}/${VENDOR_LIB}" -type f -a \( -name .packlist \
+                       -o \( -name '*.bs' -a -empty \) \) -delete
+               find "${D}/${VENDOR_LIB}" -depth -mindepth 1 -type d -empty -delete
+       fi
+}
+
+perl_remove_temppath() {
+       debug-print-function $FUNCNAME "$@"
+
+       find "${D}" -type f -not -name '*.so' -print0 | while read -rd '' f ; do
+               if file "${f}" | grep -q -i " text" ; then
+                       grep -q "${D}" "${f}" && ewarn "QA: File contains a temporary path ${f}"
+                       sed -i -e "s:${D}:/:g" "${f}"
+               fi
+       done
+}
+
+perl_link_duallife_scripts() {
+       debug-print-function $FUNCNAME "$@"
+       if [[ ${CATEGORY} != perl-core ]] || ! has_version ">=dev-lang/perl-5.8.8-r8" ; then
+               return 0
+       fi
+
+       perl_set_eprefix
+
+       local i ff
+       if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ; then
+               for i in "${DUALLIFESCRIPTS[@]}" ; do
+                       alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
+                       ff=`echo "${EROOT}"/usr/share/man/man1/${i}-${PV}-${P}.1*`
+                       ff=${ff##*.1}
+                       alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
+               done
+       else
+               pushd "${ED}" > /dev/null
+               for i in $(find usr/bin -maxdepth 1 -type f 2>/dev/null) ; do
+                       mv ${i}{,-${PV}-${P}} || die
+                       DUALLIFESCRIPTS[${#DUALLIFESCRIPTS[*]}]=${i##*/}
+                       if [[ -f usr/share/man/man1/${i##*/}.1 ]] ; then
+                               mv usr/share/man/man1/${i##*/}{.1,-${PV}-${P}.1} || die
+                       fi
+               done
+               popd > /dev/null
+       fi
+}
+
+perl_set_eprefix() {
+       debug-print-function $FUNCNAME "$@"
+       case ${EAPI:-0} in
+               0|1|2)
+                       if ! use prefix; then
+                               EPREFIX=
+                               ED=${D}
+                               EROOT=${ROOT}
+                       fi
+                       ;;
+       esac
+}

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 991afbbbf8053e2ef4cee9bcd321fee990dc6334..ac46d48ec4726472adb626daacc04062e5456fd9 100644 (file)
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.122 2010/02/03 00:20:07 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.123 2010/04/17 19:56:27 tove Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 
@@ -12,8 +12,7 @@
 # The perl-module eclass is designed to allow easier installation of perl
 # modules, and their incorporation into the Gentoo Linux system.
 
-inherit eutils base
-[[ ${CATEGORY} == "perl-core" ]] && inherit alternatives
+inherit perl-helper eutils base
 
 PERL_EXPF="src_unpack src_compile src_test src_install"
 
@@ -21,7 +20,7 @@ case "${EAPI:-0}" in
        0|1)
                PERL_EXPF="${PERL_EXPF} pkg_setup pkg_preinst pkg_postinst pkg_prerm pkg_postrm"
                ;;
-       2)
+       2|3)
                PERL_EXPF="${PERL_EXPF} src_prepare src_configure"
                [[ ${CATEGORY} == "perl-core" ]] && \
                        PERL_EXPF="${PERL_EXPF} pkg_postinst pkg_postrm"
@@ -33,6 +32,9 @@ case "${EAPI:-0}" in
                                ;;
                esac
                ;;
+       *)
+               DEPEND="EAPI-UNSUPPORTED"
+               ;;
 esac
 
 EXPORT_FUNCTIONS ${PERL_EXPF}
@@ -43,7 +45,7 @@ LICENSE="${LICENSE:-|| ( Artistic GPL-1 GPL-2 GPL-3 )}"
 
 [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && MODULE_A="${MY_P:-${P}}.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_A}"
+       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/${MY_PN:-${PN}}/"
 
@@ -51,35 +53,34 @@ SRC_PREP="no"
 SRC_TEST="skip"
 PREFER_BUILDPL="yes"
 
-PERL_VERSION=""
-SITE_ARCH=""
-SITE_LIB=""
-ARCH_LIB=""
-VENDOR_ARCH=""
-VENDOR_LIB=""
-
 pm_echovar=""
 perlinfo_done=false
 
 perl-module_src_unpack() {
+       debug-print-function $FUNCNAME "$@"
        base_src_unpack
        has src_prepare ${PERL_EXPF} || perl-module_src_prepare
 }
 
 perl-module_src_prepare() {
+       debug-print-function $FUNCNAME "$@"
        has src_prepare ${PERL_EXPF} && base_src_prepare
+       perl_fix_osx_extra
        esvn_clean
 }
 
 perl-module_src_configure() {
+       debug-print-function $FUNCNAME "$@"
        perl-module_src_prep
 }
 
 perl-module_src_prep() {
+       debug-print-function $FUNCNAME "$@"
        [[ ${SRC_PREP} = yes ]] && return 0
        SRC_PREP="yes"
 
-       ${perlinfo_done} || perlinfo
+       perl_set_version
+       perl_set_eprefix
 
        export PERL_MM_USE_DEFAULT=1
        # Disable ExtUtils::AutoInstall from prompting
@@ -91,23 +92,25 @@ perl-module_src_prep() {
                        ewarn "QA Notice: The ebuild uses Module::Build but doesn't depend on it."
                        ewarn "           Add virtual/perl-Module-Build to DEPEND!"
                fi
-               perl Build.PL \
+               set -- \
                        --installdirs=vendor \
                        --libdoc= \
                        --destdir="${D}" \
                        --create_packlist=0 \
-                       ${myconf} \
-                       <<< "${pm_echovar}" \
+                       ${myconf}
+               einfo "perl Build.PL" "$@"
+               perl Build.PL "$@" <<< "${pm_echovar}" \
                                || die "Unable to build! (are you using USE=\"build\"?)"
        elif [[ -f Makefile.PL ]] ; then
                einfo "Using ExtUtils::MakeMaker"
-               perl Makefile.PL \
-                       PREFIX=/usr \
+               set -- \
+                       PREFIX=${EPREFIX}/usr \
                        INSTALLDIRS=vendor \
                        INSTALLMAN3DIR='none' \
                        DESTDIR="${D}" \
-                       ${myconf} \
-                       <<< "${pm_echovar}" \
+                       ${myconf}
+               einfo "perl Makefile.PL" "$@"
+               perl Makefile.PL "$@" <<< "${pm_echovar}" \
                                || die "Unable to build! (are you using USE=\"build\"?)"
        fi
        if [[ ! -f Build.PL && ! -f Makefile.PL ]] ; then
@@ -117,7 +120,8 @@ perl-module_src_prep() {
 }
 
 perl-module_src_compile() {
-       ${perlinfo_done} || perlinfo
+       debug-print-function $FUNCNAME "$@"
+       perl_set_version
 
        has src_configure ${PERL_EXPF} || perl-module_src_prep
 
@@ -155,12 +159,13 @@ perl-module_src_compile() {
 #
 
 perl-module_src_test() {
+       debug-print-function $FUNCNAME "$@"
        if has 'do' ${SRC_TEST} || has 'parallel' ${SRC_TEST} ; then
                if has "${TEST_VERBOSE:-0}" 0 && has 'parallel' ${SRC_TEST} ; then
                        export HARNESS_OPTIONS=j$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
                        einfo "Test::Harness Jobs=${HARNESS_OPTIONS}"
                fi
-               ${perlinfo_done} || perlinfo
+               ${perlinfo_done} || perl_set_version
                if [[ -f Build ]] ; then
                        ./Build test verbose=${TEST_VERBOSE:-0} || die "test failed"
                elif [[ -f Makefile ]] ; then
@@ -170,8 +175,12 @@ perl-module_src_test() {
 }
 
 perl-module_src_install() {
+       debug-print-function $FUNCNAME "$@"
+
+       perl_set_version
+       perl_set_eprefix
+
        local f
-       ${perlinfo_done} || perlinfo
 
        if [[ -z ${mytargets} ]] ; then
                case "${CATEGORY}" in
@@ -188,94 +197,38 @@ perl-module_src_install() {
                        || die "emake ${myinst} ${mytargets} failed"
        fi
 
-       if [[ -d "${D}"/usr/share/man ]] ; then
-#              einfo "Cleaning out stray man files"
-               find "${D}"/usr/share/man -type f -name "*.3pm" -delete
-               find "${D}"/usr/share/man -depth -type d -empty -delete
-       fi
-
-       fixlocalpod
+       perl_delete_module_manpages
+       perl_delete_localpod
+       perl_delete_packlist
+       perl_remove_temppath
 
-       for f in Change* CHANGES README* TODO ${mydoc}; do
+       for f in Change* CHANGES README* TODO FAQ ${mydoc}; do
                [[ -s ${f} ]] && dodoc ${f}
        done
 
-       if [[ -d ${D}/${VENDOR_LIB} ]] ; then
-               find "${D}/${VENDOR_LIB}" -type f -a \( -name .packlist \
-                       -o \( -name '*.bs' -a -empty \) \) -delete
-               find "${D}/${VENDOR_LIB}" -depth -mindepth 1 -type d -empty -delete
-       fi
-
-       find "${D}" -type f -not -name '*.so' -print0 | while read -rd '' f ; do
-               if file "${f}" | grep -q -i " text" ; then
-                       grep -q "${D}" "${f}" && ewarn "QA: File contains a temporary path ${f}"
-                       sed -i -e "s:${D}:/:g" "${f}"
-               fi
-       done
-
-       linkduallifescripts
+       perl_link_duallife_scripts
 }
 
 perl-module_pkg_setup() {
-       ${perlinfo_done} || perlinfo
+       debug-print-function $FUNCNAME "$@"
+       perl_set_version
 }
 
 perl-module_pkg_preinst() {
-       ${perlinfo_done} || perlinfo
+       debug-print-function $FUNCNAME "$@"
+       perl_set_version
 }
 
 perl-module_pkg_postinst() {
-       linkduallifescripts
+       debug-print-function $FUNCNAME "$@"
+       perl_link_duallife_scripts
 }
 
-perl-module_pkg_prerm() { : ; }
-
-perl-module_pkg_postrm() {
-       linkduallifescripts
-}
-
-perlinfo() {
-       perlinfo_done=true
-
-       local f version install{{site,vendor}{arch,lib},archlib}
-       for f in version install{{site,vendor}{arch,lib},archlib} ; do
-               eval "$(perl -V:${f} )"
-       done
-       PERL_VERSION=${version}
-       SITE_ARCH=${installsitearch}
-       SITE_LIB=${installsitelib}
-       ARCH_LIB=${installarchlib}
-       VENDOR_LIB=${installvendorlib}
-       VENDOR_ARCH=${installvendorarch}
+perl-module_pkg_prerm() {
+       debug-print-function $FUNCNAME "$@"
 }
 
-fixlocalpod() {
-       find "${D}" -type f -name perllocal.pod -delete
-       find "${D}" -depth -mindepth 1 -type d -empty -delete
-}
-
-linkduallifescripts() {
-       if [[ ${CATEGORY} != perl-core ]] || ! has_version ">=dev-lang/perl-5.8.8-r8" ; then
-               return 0
-       fi
-
-       local i ff
-       if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ; then
-               for i in "${DUALLIFESCRIPTS[@]}" ; do
-                       alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
-                       ff=`echo "${ROOT}"/usr/share/man/man1/${i}-${PV}-${P}.1*`
-                       ff=${ff##*.1}
-                       alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
-               done
-       else
-               pushd "${D}" > /dev/null
-               for i in $(find usr/bin -maxdepth 1 -type f 2>/dev/null) ; do
-                       mv ${i}{,-${PV}-${P}} || die
-                       DUALLIFESCRIPTS[${#DUALLIFESCRIPTS[*]}]=${i##*/}
-                       if [[ -f usr/share/man/man1/${i##*/}.1 ]] ; then
-                               mv usr/share/man/man1/${i##*/}{.1,-${PV}-${P}.1} || die
-                       fi
-               done
-               popd > /dev/null
-       fi
+perl-module_pkg_postrm() {
+       debug-print-function $FUNCNAME "$@"
+       perl_link_duallife_scripts
 }