commit: 35ef1cad1e30d52dcf72550460433478f2506c07
Author: Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Sat Jun 20 21:32:05 2015 +0000
Commit: Kent Fredric <kentfredric <AT> gmail <DOT> com>
CommitDate: Sat Jun 20 21:32:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/perl-overlay.git/commit/?id=35ef1cad
[eclass] Drop support for all EAPIS under 5
eclass/perl-functions.eclass | 23 ++++++-----------------
eclass/perl-module.eclass | 43 ++++++++++++++++---------------------------
2 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass
index d9a5343..e3a6640 100644
--- a/eclass/perl-functions.eclass
+++ b/eclass/perl-functions.eclass
@@ -11,6 +11,12 @@
# The perl-functions eclass is a collection of perl-specific utilities
# that may be useful in non-CPAN based ebuilds.
+case "${EAPI:-0}" in
+ 5) ;;
+ *) die "EAPI=${EAPI} is not supported by perl-functions.eclass"
+ ;;
+esac
+
perl_diagnostics() {
local d
d=${T}/perl-diagnostics.log
@@ -125,8 +131,6 @@ perl_fix_osx_extra() {
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
@@ -213,8 +217,6 @@ perl_link_duallife_scripts() {
return 0
fi
- perl_set_eprefix
-
local i ff execdir mandir
execdir="usr/share/perl-${P}/bin"
@@ -290,19 +292,6 @@ perl_qafatal() {
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
-}
-
# @FUNCTION: perl_check_env
# @USAGE: perl_check_env
# @DESCRIPTION:
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 99171f4..f714e13 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -15,38 +15,27 @@
inherit eutils multiprocessing unpacker perl-functions
[[ ${CATEGORY} == "perl-core" ]] && inherit alternatives
-PERL_EXPF="src_unpack src_compile src_test src_install"
+PERL_EXPF="src_unpack src_compile src_test src_install src_prepare
src_configure"
+[[ ${CATEGORY} == "perl-core" ]] && PERL_EXPF+=" pkg_postinst pkg_postrm"
case "${EAPI:-0}" in
- 2|5)
- PERL_EXPF+=" src_prepare src_configure"
- [[ ${CATEGORY} == "perl-core" ]] && \
- PERL_EXPF+=" pkg_postinst pkg_postrm"
-
- case "${GENTOO_DEPEND_ON_PERL:-yes}" in
- yes)
- case "${EAPI:-0}" in
- 5)
- case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in
- yes)
- DEPEND="dev-lang/perl:=[-build(-)]"
- ;;
- *)
- DEPEND="dev-lang/perl[-build(-)]"
- ;;
- esac
- ;;
- *)
- DEPEND="|| ( >=dev-lang/perl-5.16
<dev-lang/perl-5.16[-build] )"
- ;;
- esac
- RDEPEND="${DEPEND}"
- ;;
- esac
+ 5) ;;
+ *) die "EAPI=${EAPI} is not supported by perl-module.eclass"
+ ;;
+esac
+
+case "${GENTOO_DEPEND_ON_PERL:-yes}" in
+yes)
+ case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in
+ yes)
+ DEPEND="dev-lang/perl:=[-build(-)]"
;;
*)
- die "EAPI=${EAPI} is not supported by perl-module.eclass"
+ DEPEND="dev-lang/perl[-build(-)]"
;;
+ esac
+ RDEPEND="${DEPEND}"
+ ;;
esac
case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in
