Drop support for EAPI=4

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 82d073accbd5d5e9003fed67990491d75a1c28d7..35101caeb2da2c550b9665ed70dc699940bf3229 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1519 2015/01/31 10:16:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1520 2015/02/01 12:01:06 dilfridge Exp $
+
+  01 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
+  Drop support for EAPI=4
 
   31 Jan 2015; Jeroen Roovers <jer@gentoo.org> intel-sdp.eclass:
   Spelling.

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 762214357e2896656f25c81a2bff1d3caf528b5d..f8225f48e376c5e36b123d3950eb445dffb417b7 100644 (file)
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.161 2014/12/17 16:40:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.162 2015/02/01 12:01:06 dilfridge Exp $
 
 # @ECLASS: perl-module.eclass
 # @MAINTAINER:
@@ -18,25 +18,18 @@ inherit eutils multiprocessing unpacker
 PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install"
 
 case "${EAPI:-0}" in
-       4|5)
+       5)
                [[ ${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
+                       case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in
+                       yes)
+                               DEPEND="dev-lang/perl:=[-build(-)]"
                                ;;
                        *)
-                               DEPEND="|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )"
+                               DEPEND="dev-lang/perl[-build(-)]"
                                ;;
                        esac
                        RDEPEND="${DEPEND}"
@@ -48,20 +41,6 @@ case "${EAPI:-0}" in
                ;;
 esac
 
-case "${EAPI:-0}" in
-       5)
-               ;;
-       *)
-               ewarn
-               ewarn "******************************************************************"
-               ewarn "${EBUILD}:"
-               ewarn "Support for EAPI=${EAPI:-0} in perl-module.eclass will be removed"
-               ewarn "on 1/Feb/2015. Please fix your overlay ebuilds to use EAPI=5."
-               ewarn "******************************************************************"
-               ewarn
-               ;;
-esac
-
 case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in
        yes)
                EXPORT_FUNCTIONS ${PERL_EXPF}