Rename all helper functions to perl_do_something

2 files changed, 35 insertions, 26 deletions

diff --git a/eclass/perl-helper.eclass b/eclass/perl-helper.eclass
index ece24e5f4..4edcb5289 100644
--- a/eclass/perl-helper.eclass
+++ b/eclass/perl-helper.eclass
@@ -4,6 +4,11 @@
 
 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
@@ -20,14 +25,18 @@ perlinfo() {
 
 fixlocalpod() {
 	debug-print-function $FUNCNAME "$@"
+	perl_delete_localpod
+}
 
-	fixperlprefix
+perl_delete_localpod() {
+	debug-print-function $FUNCNAME "$@"
+	perl_set_eprefix
 
 	find "${ED}" -type f -name perllocal.pod -delete
 	find "${ED}" -depth -mindepth 1 -type d -empty -delete
 }
 
-fixperlosxcrap() {
+perl_fix_osx_extra() {
 	debug-print-function $FUNCNAME "$@"
 
 	# Remove "AppleDouble encoded Macintosh file"
@@ -44,10 +53,10 @@ fixperlosxcrap() {
 	done
 }
 
-fixperlmodulemanpages() {
+perl_delete_module_manpages() {
 	debug-print-function $FUNCNAME "$@"
 
-	fixperlprefix
+	perl_set_eprefix
 
 	if [[ -d "${ED}"/usr/share/man ]] ; then
 #		einfo "Cleaning out stray man files"
@@ -57,7 +66,7 @@ fixperlmodulemanpages() {
 }
 
 
-fixperlpacklist() {
+perl_delete_packlist() {
 	debug-print-function $FUNCNAME "$@"
 	perlinfo
 	if [[ -d ${D}/${VENDOR_LIB} ]] ; then
@@ -67,10 +76,10 @@ fixperlpacklist() {
 	fi
 }
 
-fixperltemppath() {
+perl_remove_temppath() {
 	debug-print-function $FUNCNAME "$@"
 
-	fixperlprefix
+	perl_set_eprefix
 
 	find "${ED}" -type f -not -name '*.so' -print0 | while read -rd '' f ; do
 		if file "${f}" | grep -q -i " text" ; then
@@ -81,13 +90,13 @@ fixperltemppath() {
 }
 
 
-linkduallifescripts() {
+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
 
-	fixperlprefix
+	perl_set_eprefix
 
 	local i ff
 	if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ; then
@@ -110,7 +119,7 @@ linkduallifescripts() {
 	fi
 }
 
-fixperlprefix() {
+perl_set_eprefix() {
 	debug-print-function $FUNCNAME "$@"
 	case ${EAPI:-0} in
 		0|1|2)
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index be35a36bb..4a8dbdbee 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -63,7 +63,7 @@ perl-module_src_unpack() {
 perl-module_src_prepare() {
 	debug-print-function $FUNCNAME "$@"
 	has src_prepare ${PERL_EXPF} && base_src_prepare
-	fixperlosxcrap
+	perl_fix_osx_extra
 	esvn_clean
 }
 
@@ -77,8 +77,8 @@ perl-module_src_prep() {
 	[[ ${SRC_PREP} = yes ]] && return 0
 	SRC_PREP="yes"
 
-	perlinfo
-	fixperlprefix
+	perl_set_version
+	perl_set_eprefix
 
 	export PERL_MM_USE_DEFAULT=1
 	# Disable ExtUtils::AutoInstall from prompting
@@ -119,7 +119,7 @@ perl-module_src_prep() {
 
 perl-module_src_compile() {
 	debug-print-function $FUNCNAME "$@"
-	perlinfo
+	perl_set_version
 
 	has src_configure ${PERL_EXPF} || perl-module_src_prep
 
@@ -163,7 +163,7 @@ perl-module_src_test() {
 			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
@@ -175,8 +175,8 @@ perl-module_src_test() {
 perl-module_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
-	perlinfo
-	fixperlprefix
+	perl_set_version
+	perl_set_eprefix
 
 	local f
 
@@ -195,31 +195,31 @@ perl-module_src_install() {
 			|| die "emake ${myinst} ${mytargets} failed"
 	fi
 
-	fixperlmodulemanpages
-	fixlocalpod
-	fixperlpacklist
-	fixperltemppath
+	perl_delete_module_manpages
+	perl_delete_localpod
+	perl_delete_packlist
+	perl_remove_temppath
 
 	for f in Change* CHANGES README* TODO FAQ ${mydoc}; do
 		[[ -s ${f} ]] && dodoc ${f}
 	done
 
-	linkduallifescripts
+	perl_link_duallife_scripts
 }
 
 perl-module_pkg_setup() {
 	debug-print-function $FUNCNAME "$@"
-	perlinfo
+	perl_set_version
 }
 
 perl-module_pkg_preinst() {
 	debug-print-function $FUNCNAME "$@"
-	perlinfo
+	perl_set_version
 }
 
 perl-module_pkg_postinst() {
 	debug-print-function $FUNCNAME "$@"
-	linkduallifescripts
+	perl_link_duallife_scripts
 }
 
 perl-module_pkg_prerm() {
@@ -228,5 +228,5 @@ perl-module_pkg_prerm() {
 
 perl-module_pkg_postrm() {
 	debug-print-function $FUNCNAME "$@"
-	linkduallifescripts
+	perl_link_duallife_scripts
 }