diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-11-01 17:34:28 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-11-01 17:34:28 +0000 |
| commit | 6552f54babd6ebf20edf3968469409a2fad15108 (patch) | |
| tree | ab0e6a54bafb41d8ccb7bac68928e6418fbac1de /eclass | |
| parent | Bump revision r7 of SELinux policies (diff) | |
| download | gentoo-2-6552f54babd6ebf20edf3968469409a2fad15108.tar.gz gentoo-2-6552f54babd6ebf20edf3968469409a2fad15108.tar.bz2 gentoo-2-6552f54babd6ebf20edf3968469409a2fad15108.zip | |
Drop EAPI=0,1,2,3 support in perl-module.eclass, this time for real. Further cleanups will follow.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/perl-module.eclass | 44 |
2 files changed, 22 insertions, 28 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8caf1ab73c3c..c44a2d519508 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1397 2014/10/31 00:57:49 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1398 2014/11/01 17:34:28 dilfridge Exp $ + + 01 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass: + Drop EAPI=0,1,2,3 support in perl-module.eclass, this time for real. Further + cleanups will follow. 31 Oct 2014; Davide Pesavento <pesa@gentoo.org> multibuild.eclass: Make sure BUILD_DIR exists before pushd'ing into it. diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 4209b849cf37..b4ee02d5011e 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.143 2014/10/20 12:47:32 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.144 2014/11/01 17:34:28 dilfridge Exp $ # @ECLASS: perl-module.eclass # @MAINTAINER: @@ -18,10 +18,7 @@ inherit eutils multiprocessing unpacker PERL_EXPF="src_unpack src_compile src_test src_install" case "${EAPI:-0}" in - 0|1) - PERL_EXPF+=" pkg_setup pkg_preinst pkg_postinst pkg_prerm pkg_postrm" - ;; - 2|3|4|5) + 4|5) PERL_EXPF+=" src_prepare src_configure" [[ ${CATEGORY} == "perl-core" ]] && \ PERL_EXPF+=" pkg_postinst pkg_postrm" @@ -52,19 +49,21 @@ case "${EAPI:-0}" in ;; esac -case "${EAPI:-0}" in - 4|5) - ;; - *) - ewarn - ewarn "******************************************************************" - ewarn "${EBUILD}:" - ewarn "Support for EAPI=${EAPI:-0} in perl-module.eclass will be removed" - ewarn "on 1/Nov/2014. Please fix your overlay ebuilds to use EAPI=5." - ewarn "******************************************************************" - ewarn - ;; -esac +# we will need this again soon +# +#case "${EAPI:-0}" in +# 5) +# ;; +# *) +# ewarn +# ewarn "******************************************************************" +# ewarn "${EBUILD}:" +# ewarn "Support for EAPI=${EAPI:-0} in perl-module.eclass will be removed" +# ewarn "on XX/XX/2015. Please fix your overlay ebuilds to use EAPI=5." +# ewarn "******************************************************************" +# ewarn +# ;; +#esac case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in yes) @@ -434,13 +433,4 @@ perl_link_duallife_scripts() { 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 } |